tdf#96099 Remove various smart pointer typedefs in vcl

Change-Id: I4ac1bb25d3d63f150b42d9e1708efc344bbdb6a7
Reviewed-on: https://gerrit.libreoffice.org/26113
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

16 files changed, 41 insertions, 52 deletions

diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 372be72ca846..bb2e2f51f972 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -147,7 +147,7 @@ public:
     virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) override;
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
-                                            Int32Vector& rWidths,
+                                            std::vector< sal_Int32 >& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc ) override;
     virtual bool            GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) override;
     virtual bool            GetGlyphOutline( sal_GlyphId nIndex, basegfx::B2DPolyPolygon& ) override;
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 9ab275a5e6ec..f737a14a8d9b 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -45,11 +45,10 @@ struct ImageAryData
 
 struct ImplImageList
 {
-    typedef std::vector<ImageAryData *> ImageAryDataVec;
     typedef std::unordered_map< OUString, ImageAryData *, OUStringHash >
         ImageAryDataNameHash;
 
-    ImageAryDataVec        maImages;
+    std::vector<ImageAryData *>        maImages;
     ImageAryDataNameHash   maNameHash;
     OUString               maPrefix;
     Size                   maImageSize;
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index b32aa05f250e..82f5c2ca0a97 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -25,7 +25,6 @@
 #include <unordered_map>
 
 typedef std::unordered_map< OString, GLuint, OStringHash > UniformCache;
-typedef std::list< OpenGLTexture > TextureList;
 
 enum class TextureShaderType
 {
@@ -55,7 +54,7 @@ private:
     GLuint          mnExtrusionVectorsAttrib;
     GLuint          mnVertexColorsAttrib;
 
-    TextureList     maTextures;
+    std::list< OpenGLTexture >     maTextures;
     bool            mbBlending;
 
     float mfLastWidth;
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 61448259c1b9..2047ec5c16f8 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -75,8 +75,7 @@ public:
     osl::Mutex                              maUserEventListMutex;
     oslCondition                            maWaitingYieldCond;
 
-    typedef std::list<const ApplicationEvent*> AppEventList;
-    static AppEventList aAppEventList;
+    static std::list<const ApplicationEvent*> aAppEventList;
 
 public:
     AquaSalInstance();
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 1a06185eaace..82750c23748a 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -96,8 +96,7 @@ class ImplDirectFontSubstitution
 :   public ImplFontSubstitution
 {
 private:
-    typedef std::list<ImplFontSubstEntry> FontSubstList;
-    FontSubstList maFontSubstList;
+    std::list<ImplFontSubstEntry> maFontSubstList;
 public:
     void    AddFontSubstitute( const OUString& rFontName, const OUString& rSubstName, AddFontSubstituteFlags nFlags );
     void    RemoveFontSubstitute( int nIndex );
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 3f051a473d50..3cf501d2d4d5 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -52,7 +52,6 @@ class CoreTextStyle;
 class XorEmulation;
 
 typedef sal_uInt32 sal_GlyphId;
-typedef std::vector<unsigned char> ByteVector;
 
 // CoreText-specific physically available font face
 class CoreTextFontFace : public PhysicalFontFace
@@ -395,7 +394,7 @@ public:
 
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
-                                            Int32Vector& rWidths,
+                                            std::vector< sal_Int32 >& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc ) override;
 
     virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& ) override;
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 5dd9b4c570dd..51b5e3ec78f9 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -60,7 +60,6 @@ typedef sal_Unicode sal_Ucs; // TODO: use sal_UCS4 instead of sal_Unicode
 typedef std::map< sal_Ucs, sal_Int32 >    Ucs2SIntMap;
 typedef std::map< sal_Ucs, sal_uInt32 >   Ucs2UIntMap;
 typedef std::map< sal_Ucs, OString > Ucs2OStrMap;
-typedef std::vector< sal_Int32 > Int32Vector;
 
 // note: if you add any new methods to class SalGraphics using coordinates
 //       make sure they have a corresponding protected pure virtual method
@@ -210,7 +209,7 @@ public:
     virtual void                GetGlyphWidths(
                                     const PhysicalFontFace* pFont,
                                     bool bVertical,
-                                    Int32Vector& rWidths,
+                                    std::vector< sal_Int32 >& rWidths,
                                     Ucs2UIntMap& rUnicodeEnc ) = 0;
 
     virtual bool                GetGlyphBoundRect( sal_GlyphId, Rectangle& ) = 0;
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index daae365e065c..6e0cc307876c 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -319,7 +319,6 @@ public:
 };
 
 typedef std::list<GlyphItem> GlyphList;
-typedef std::vector<GlyphItem> GlyphVector;
 
 class VCL_PLUGIN_PUBLIC GenericSalLayout : public SalLayout
 {
@@ -356,7 +355,7 @@ protected:
 
     bool            GetCharWidths( DeviceCoordinate* pCharWidths ) const;
 
-    GlyphVector     m_GlyphItems;
+    std::vector<GlyphItem>     m_GlyphItems;
 
 private:
     mutable Point   maBasePoint;
diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx
index e08274ee22c5..29559aa00b4b 100644
--- a/vcl/inc/textrender.hxx
+++ b/vcl/inc/textrender.hxx
@@ -65,7 +65,7 @@ public:
     virtual void                    GetGlyphWidths(
                                         const PhysicalFontFace*,
                                         bool bVertical,
-                                        Int32Vector& rWidths,
+                                        std::vector< sal_Int32 >& rWidths,
                                         Ucs2UIntMap& rUnicodeEnc ) = 0;
 
     virtual bool                    GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) = 0;
diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index 612daaede16d..1e2eb9cc6b18 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -112,7 +112,7 @@ public:
     virtual void                GetGlyphWidths(
                                     const PhysicalFontFace*,
                                     bool bVertical,
-                                    Int32Vector& rWidths,
+                                    std::vector< sal_Int32 >& rWidths,
                                     Ucs2UIntMap& rUnicodeEnc ) override;
 
     virtual bool                GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) override;
diff --git a/vcl/inc/unx/fontcache.hxx b/vcl/inc/unx/fontcache.hxx
index 9c40040f01a2..98a7c8bee3fa 100644
--- a/vcl/inc/unx/fontcache.hxx
+++ b/vcl/inc/unx/fontcache.hxx
@@ -36,10 +36,9 @@ class VCL_PLUGIN_PUBLIC FontCache
     struct FontFile;
     friend struct FontFile;
 
-    typedef std::list< PrintFontManager::PrintFont* > FontCacheEntry;
     struct FontFile
     {
-        FontCacheEntry      m_aEntry;
+        std::list< PrintFontManager::PrintFont* >      m_aEntry;
     };
 
     typedef std::unordered_map< OString, FontFile, OStringHash > FontDirMap;
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 01b3c6a080ce..339ec1656cd7 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -67,7 +67,7 @@ public:
                                                        std::set<sal_Unicode> const** ppPriority);
     static void             DoGetGlyphWidths( psp::fontID aFont,
                                               bool bVertical,
-                                              Int32Vector& rWidths,
+                                              std::vector< sal_Int32 >& rWidths,
                                               Ucs2UIntMap& rUnicodeEnc );
 
     static FontAttributes Info2FontAttributes( const psp::FastPrintFontInfo& );
@@ -126,7 +126,7 @@ public:
     virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) override;
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
-                                            Int32Vector& rWidths,
+                                            std::vector< sal_Int32 >& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc ) override;
     virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& ) override;
     virtual bool            GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) override;
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 3aac4d103039..f0880c6dea50 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -243,7 +243,6 @@ public:
                                       SalGraphics* pSrcGraphics ) override;
 
 protected:
-    typedef std::list< Rectangle > clipList;
 
     GdkX11Pixmap* NWGetPixmapFromScreen( Rectangle srcRect, int nBgColor = 0 );
     bool NWRenderPixmapToScreen( GdkX11Pixmap* pPixmap, GdkX11Pixmap* pMask, Rectangle dstRect );
@@ -252,7 +251,7 @@ protected:
                            ControlType nType,
                            ControlPart nPart,
                            const Rectangle& aCtrlRect,
-                           const clipList& aClip,
+                           const std::list< Rectangle >& aClip,
                            ControlState nState,
                            const ImplControlValue& aValue,
                            const OUString& rCaption,
@@ -260,114 +259,114 @@ protected:
 
     bool NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
-                           const clipList& rClipList,
+                           const std::list< Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
-                           const clipList& rClipList,
+                           const std::list< Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
-                           const clipList& rClipList,
+                           const std::list< Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
-                           const clipList& rClipList,
+                           const std::list< Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
-                           const clipList& rClipList,
+                           const std::list< Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
-                           const clipList& rClipList,
+                           const std::list< Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
-                           const clipList& rClipList,
+                           const std::list< Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                           const Rectangle& rControlRectangle,
-                          const clipList& rClipList,
+                          const std::list< Rectangle >& rClipList,
                           ControlState nState, const ImplControlValue& aValue,
                           const OUString& rCaption );
     bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                           const Rectangle& rControlRectangle,
-                          const clipList& rClipList,
+                          const std::list< Rectangle >& rClipList,
                           ControlState nState, const ImplControlValue& aValue,
                           const OUString& rCaption );
     bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart,
                               const Rectangle& rControlRectangle,
-                              const clipList& rClipList,
+                              const std::list< Rectangle >& rClipList,
                               ControlState nState, const ImplControlValue& aValue,
                               const OUString& rCaption );
     bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
-                            const clipList& rClipList,
+                            const std::list< Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
-                           const clipList& rClipList,
+                           const std::list< Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption,
                            ControlCacheKey& rControlCacheKey);
     bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                              const Rectangle& rControlRectangle,
-                             const clipList& rClipList,
+                             const std::list< Rectangle >& rClipList,
                              ControlState nState, const ImplControlValue& aValue,
                              const OUString& rCaption );
     bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
-                            const clipList& rClipList,
+                            const std::list< Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
-                            const clipList& rClipList,
+                            const std::list< Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
 
     bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
-                            const clipList& rClipList,
+                            const std::list< Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
-                            const clipList& rClipList,
+                            const std::list< Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                               const Rectangle& rControlRectangle,
-                              const clipList& rClipList,
+                              const std::list< Rectangle >& rClipList,
                               ControlState nState, const ImplControlValue& aValue,
                               const OUString& rCaption );
     bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
-                            const clipList& rClipList,
+                            const std::list< Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
-                            const clipList& rClipList,
+                            const std::list< Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
-                           const clipList& rClipList,
+                           const std::list< Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
-                            const clipList& rClipList,
+                            const std::list< Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
 };
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index cd59a0fce231..15f6a49daadf 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -148,7 +148,7 @@ public:
     virtual void                    GetGlyphWidths(
                                         const PhysicalFontFace*,
                                         bool bVertical,
-                                        Int32Vector& rWidths,
+                                        std::vector< sal_Int32 >& rWidths,
                                         Ucs2UIntMap& rUnicodeEnc ) override;
 
     virtual bool                    GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) override;
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index 0a698e5eae46..5b24aca02f14 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -31,7 +31,6 @@ class   BitmapColor;
 class   BitmapPalette;
 class   SalGraphics;
 namespace Gdiplus { class Bitmap; }
-typedef std::shared_ptr< Gdiplus::Bitmap > GdiPlusBmpPtr;
 
 class WinSalBitmap : public SalBitmap
 {
@@ -50,7 +49,7 @@ private:
     // evtl. buffered GdiPlusBmp. This is needed since the GdiPlusBmp is a single
     // instance and remembered only on the content-WinSalBitmap, not on the
     // alpha-WinSalBitmap.
-    GdiPlusBmpPtr       maGdiPlusBitmap;
+    std::shared_ptr< Gdiplus::Bitmap >       maGdiPlusBitmap;
     const WinSalBitmap* mpAssociatedAlpha;
 
     sal_uInt16          mnBitCount;
@@ -63,7 +62,7 @@ public:
     HGLOBAL             ImplGethDIB() const { return mhDIB; }
     HBITMAP             ImplGethDDB() const { return mhDDB; }
 
-    GdiPlusBmpPtr ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource = 0) const;
+    std::shared_ptr< Gdiplus::Bitmap > ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource = 0) const;
 
     static HGLOBAL      ImplCreateDIB( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
     static HANDLE       ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB );
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 4ae6278a7172..d87cbbd2d635 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -136,8 +136,7 @@ private:
 
     void                    ReadGsubTable( HDC ) const;
 
-    typedef std::unordered_set<sal_UCS4> UcsHashSet;
-    mutable UcsHashSet      maGsubTable;
+    mutable std::unordered_set<sal_UCS4>      maGsubTable;
     mutable bool            mbGsubRead;
 public:
     bool                    HasGSUBstitutions( HDC ) const;
@@ -442,7 +441,7 @@ public:
     virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) override;
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
-                                            Int32Vector& rWidths,
+                                            std::vector< sal_Int32 >& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc ) override;
             int             GetMinKashidaWidth();