loplugin:constfields in vcl

Change-Id: I1072642be4fdfa720e61f2d7bad3c2701eb81610
Reviewed-on: https://gerrit.libreoffice.org/60430
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

41 files changed, 84 insertions, 84 deletions

diff --git a/vcl/inc/BitmapColorizeFilter.hxx b/vcl/inc/BitmapColorizeFilter.hxx
index 0d2ab8176f93..2795d7a95ad3 100644
--- a/vcl/inc/BitmapColorizeFilter.hxx
+++ b/vcl/inc/BitmapColorizeFilter.hxx
@@ -26,7 +26,7 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    Color maColor;
+    Color const maColor;
 };
 
 #endif
diff --git a/vcl/inc/BitmapFastScaleFilter.hxx b/vcl/inc/BitmapFastScaleFilter.hxx
index 1b156d670b91..1d7d771f3633 100644
--- a/vcl/inc/BitmapFastScaleFilter.hxx
+++ b/vcl/inc/BitmapFastScaleFilter.hxx
@@ -26,9 +26,9 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    double mfScaleX;
-    double mfScaleY;
-    Size maSize;
+    double const mfScaleX;
+    double const mfScaleY;
+    Size const maSize;
 };
 
 #endif
diff --git a/vcl/inc/BitmapInterpolateScaleFilter.hxx b/vcl/inc/BitmapInterpolateScaleFilter.hxx
index 7ab36c94ed1b..37d570997493 100644
--- a/vcl/inc/BitmapInterpolateScaleFilter.hxx
+++ b/vcl/inc/BitmapInterpolateScaleFilter.hxx
@@ -26,8 +26,8 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    double mfScaleX;
-    double mfScaleY;
+    double const mfScaleX;
+    double const mfScaleY;
 };
 
 #endif
diff --git a/vcl/inc/BitmapScaleConvolutionFilter.hxx b/vcl/inc/BitmapScaleConvolutionFilter.hxx
index b3db59065c7c..41edc2acc645 100644
--- a/vcl/inc/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/BitmapScaleConvolutionFilter.hxx
@@ -41,8 +41,8 @@ protected:
 
 private:
     std::unique_ptr<Kernel> mxKernel;
-    double mrScaleX;
-    double mrScaleY;
+    double const mrScaleX;
+    double const mrScaleY;
 };
 
 class VCL_DLLPUBLIC BitmapScaleBilinearFilter : public BitmapScaleConvolutionFilter
diff --git a/vcl/inc/BitmapScaleSuperFilter.hxx b/vcl/inc/BitmapScaleSuperFilter.hxx
index 7fa26f0c769a..879f5a75c46d 100644
--- a/vcl/inc/BitmapScaleSuperFilter.hxx
+++ b/vcl/inc/BitmapScaleSuperFilter.hxx
@@ -31,8 +31,8 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmap) const override;
 
 private:
-    double mrScaleX;
-    double mrScaleY;
+    double const mrScaleX;
+    double const mrScaleY;
 
 };
 
diff --git a/vcl/inc/ControlCacheKey.hxx b/vcl/inc/ControlCacheKey.hxx
index 810d6e19f0f7..11d4ce07d719 100644
--- a/vcl/inc/ControlCacheKey.hxx
+++ b/vcl/inc/ControlCacheKey.hxx
@@ -26,10 +26,10 @@
 class ControlCacheKey
 {
 public:
-    ControlType mnType;
-    ControlPart mnPart;
-    ControlState mnState;
-    Size maSize;
+    ControlType const mnType;
+    ControlPart const mnPart;
+    ControlState const mnState;
+    Size const maSize;
 
     ControlCacheKey(ControlType nType, ControlPart nPart, ControlState nState, const Size& rSize)
         : mnType(nType)
diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx
index 990256590c88..88437a58f8b0 100644
--- a/vcl/inc/PhysicalFontFamily.hxx
+++ b/vcl/inc/PhysicalFontFamily.hxx
@@ -81,7 +81,7 @@ private:
     std::vector< rtl::Reference<PhysicalFontFace> > maFontFaces;
 
     OUString            maFamilyName;       // original font family name
-    OUString            maSearchName;       // normalized font family name
+    OUString const      maSearchName;       // normalized font family name
     OUString            maMapNames;         // fontname aliases
     FontTypeFaces       mnTypeFaces;        // Typeface Flags
     FontFamily          meFamily;
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index e62bbe0af49e..a7c912bfc3c8 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -39,7 +39,7 @@ namespace unotools
                                      css::rendering::XIntegerBitmapColorSpace >
     {
     private:
-        BitmapEx                                       m_aBmpEx;
+        BitmapEx const                                 m_aBmpEx;
         ::Bitmap                                       m_aBitmap;
         ::Bitmap                                       m_aAlpha;
         Bitmap::ScopedReadAccess                       m_pBmpAcc;
diff --git a/vcl/inc/font/FeatureCollector.hxx b/vcl/inc/font/FeatureCollector.hxx
index aa6f51c3d83b..6ad2dfb8b076 100644
--- a/vcl/inc/font/FeatureCollector.hxx
+++ b/vcl/inc/font/FeatureCollector.hxx
@@ -23,9 +23,9 @@ namespace font
 class FeatureCollector
 {
 private:
-    hb_face_t* m_pHbFace;
+    hb_face_t* const m_pHbFace;
     std::vector<vcl::font::Feature>& m_rFontFeatures;
-    LanguageType m_eLanguageType;
+    LanguageType const m_eLanguageType;
 
 public:
     FeatureCollector(hb_face_t* pHbFace, std::vector<vcl::font::Feature>& rFontFeatures,
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 16de568794f8..309a7b5ce523 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -41,7 +41,7 @@ class VCL_DLLPUBLIC SvpSalFrame : public SalFrame
     SvpSalInstance*                     m_pInstance;
     SvpSalFrame*                        m_pParent;       // pointer to parent frame
     std::list< SvpSalFrame* >           m_aChildren;     // List of child frames
-    SalFrameStyleFlags                  m_nStyle;
+    SalFrameStyleFlags const            m_nStyle;
     bool                                m_bVisible;
 #ifndef IOS
     cairo_surface_t*                    m_pSurface;
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index e68680c79901..776cee7cde15 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -29,8 +29,8 @@ typedef struct _cairo_surface cairo_surface_t;
 
 class VCL_DLLPUBLIC SvpSalVirtualDevice : public SalVirtualDevice
 {
-    DeviceFormat                        m_eFormat;
-    cairo_surface_t*                    m_pRefSurface;
+    DeviceFormat const                  m_eFormat;
+    cairo_surface_t* const              m_pRefSurface;
     cairo_surface_t*                    m_pSurface;
     basegfx::B2IVector                  m_aFrameSize;
     std::vector< SvpSalGraphics* >      m_aGraphics;
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 873fc98432dd..1cb0c43cdd72 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -28,7 +28,7 @@
 struct ImplImage
 {
     BitmapChecksum maBitmapChecksum;
-    BitmapEx maBitmapEx;
+    BitmapEx const maBitmapEx;
     BitmapEx maDisabledBitmapEx;
 
     ImplImage(const BitmapEx& rBitmapEx);
diff --git a/vcl/inc/impanmvw.hxx b/vcl/inc/impanmvw.hxx
index 97b5a5333425..702443404ac2 100644
--- a/vcl/inc/impanmvw.hxx
+++ b/vcl/inc/impanmvw.hxx
@@ -46,13 +46,13 @@ private:
 
     friend class Animation;
 
-    Animation*      mpParent;
-    VclPtr<OutputDevice>   mpOut;
-    long            mnExtraData;
-    Point           maPt;
-    Point           maDispPt;
-    Point           maRestPt;
-    Size            maSz;
+    Animation* const      mpParent;
+    VclPtr<OutputDevice>  mpOut;
+    long const            mnExtraData;
+    Point const           maPt;
+    Point                 maDispPt;
+    Point                 maRestPt;
+    Size const            maSz;
     Size            maSzPix;
     Size            maDispSz;
     Size            maRestSz;
@@ -63,8 +63,8 @@ private:
     Disposal        meLastDisposal;
     bool            mbPause;
     bool            mbMarked;
-    bool            mbHMirr;
-    bool            mbVMirr;
+    bool const      mbHMirr;
+    bool const      mbVMirr;
 
 public:
                     ~ImplAnimView();
diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx
index 67ba048153fa..2d3c5ac16c89 100644
--- a/vcl/inc/impfontcharmap.hxx
+++ b/vcl/inc/impfontcharmap.hxx
@@ -47,7 +47,7 @@ private:
     const sal_uInt32*   mpRangeCodes;     // pairs of StartCode/(EndCode+1)
     const int*          mpStartGlyphs;    // range-specific mapper to glyphs
     const sal_uInt16*   mpGlyphIds;       // individual glyphid mappings
-    int                 mnRangeCount;
+    int const           mnRangeCount;
     int                 mnCharCount;      // covered codepoints
 };
 
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx
index 28e0ab3798a2..1c9b14a5098f 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/impfontmetricdata.hxx
@@ -100,7 +100,7 @@ private:
     bool            ShouldUseWinMetrics(vcl::TTGlobalFontInfo& rInfo);
 
     // font instance attributes from the font request
-    long            mnHeight;                   // Font size
+    long const      mnHeight;                   // Font size
     long            mnWidth;                    // Reference Width
     short           mnOrientation;              // Rotation in 1/10 degrees
 
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index e35c9ac6ccfb..3768b04388b3 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -41,10 +41,10 @@ namespace com { namespace sun { namespace star { namespace container {
 struct ImageRequestParameters
 {
     OUString msName;
-    OUString msStyle;
+    OUString const msStyle;
     BitmapEx& mrBitmap;
     bool mbLocalized;
-    ImageLoadFlags meFlags;
+    ImageLoadFlags const meFlags;
     bool mbWriteImageToCache;
 
     ImageRequestParameters(const OUString & rName, const OUString & rStyle, BitmapEx& rBitmap, bool bLocalized, ImageLoadFlags eFlags)
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 5e9b20291c22..44c27b50db06 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -45,9 +45,9 @@ enum LB_EVENT_TYPE
 
 struct ImplEntryType
 {
-    OUString    maStr;
-    SalLayoutGlyphs maStrGlyphs;
-    Image       maImage;
+    OUString const    maStr;
+    SalLayoutGlyphs   maStrGlyphs;
+    Image const       maImage;
     void*       mpUserData;
     bool        mbIsSelected;
     ListBoxEntryFlags mnFlags;
diff --git a/vcl/inc/opengl/FixedTextureAtlas.hxx b/vcl/inc/opengl/FixedTextureAtlas.hxx
index 5d4eff4d0804..c273a5e36c0c 100644
--- a/vcl/inc/opengl/FixedTextureAtlas.hxx
+++ b/vcl/inc/opengl/FixedTextureAtlas.hxx
@@ -20,9 +20,9 @@ class VCL_PLUGIN_PUBLIC FixedTextureAtlasManager
 {
     std::vector<std::unique_ptr<FixedTexture>> maFixedTextures;
 
-    int mWidthFactor;
-    int mHeightFactor;
-    int mSubTextureSize;
+    int const mWidthFactor;
+    int const mHeightFactor;
+    int const mSubTextureSize;
 
     void CreateNewTexture();
 
diff --git a/vcl/inc/opengl/LineRenderUtils.hxx b/vcl/inc/opengl/LineRenderUtils.hxx
index eec665f68edb..4ffeae25dd0a 100644
--- a/vcl/inc/opengl/LineRenderUtils.hxx
+++ b/vcl/inc/opengl/LineRenderUtils.hxx
@@ -22,9 +22,9 @@ private:
     std::vector<Vertex>& mrVertices;
     std::vector<GLuint>& mrIndices;
     GLubyte mR, mG, mB, mA;
-    GLfloat mfLineWidth;
-    GLfloat mfLineWidthAndAA;
-    size_t mnInitialIndexSize;
+    GLfloat const mfLineWidth;
+    GLfloat const mfLineWidthAndAA;
+    size_t const mnInitialIndexSize;
     bool mbIncomplete;
 
 public:
diff --git a/vcl/inc/opengl/PackedTextureAtlas.hxx b/vcl/inc/opengl/PackedTextureAtlas.hxx
index cbe865a4d5a9..8e6def84c9e4 100644
--- a/vcl/inc/opengl/PackedTextureAtlas.hxx
+++ b/vcl/inc/opengl/PackedTextureAtlas.hxx
@@ -30,8 +30,8 @@ class VCL_PLUGIN_PUBLIC PackedTextureAtlasManager
 {
     std::vector<std::unique_ptr<PackedTexture>> maPackedTextures;
 
-    int mnTextureWidth;
-    int mnTextureHeight;
+    int const mnTextureWidth;
+    int const mnTextureHeight;
 
     void CreateNewTexture();
 
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index 470d2c4e343e..98bd79977ff4 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -35,7 +35,7 @@ class ImplOpenGLTexture
 public:
     GLuint mnTexture;
     int    mnWidth;
-    int    mnHeight;
+    int const    mnHeight;
     GLenum mnFilter;
     GLuint mnOptStencil;
 
diff --git a/vcl/inc/opengl/watchdog.hxx b/vcl/inc/opengl/watchdog.hxx
index cbf7e04958ae..d37066e80e0c 100644
--- a/vcl/inc/opengl/watchdog.hxx
+++ b/vcl/inc/opengl/watchdog.hxx
@@ -20,7 +20,7 @@ struct WatchdogTimingsValues
 {
     /// delays to take various actions in 1/4 of a second increments.
     int mnDisableEntries;
-    int mnAbortAfter;
+    int const mnAbortAfter;
 };
 
 enum class WatchdogTimingMode
diff --git a/vcl/inc/opengl/zone.hxx b/vcl/inc/opengl/zone.hxx
index 75ebad915b60..50fd04598193 100644
--- a/vcl/inc/opengl/zone.hxx
+++ b/vcl/inc/opengl/zone.hxx
@@ -43,7 +43,7 @@ public:
 
 /// Create this to not only enter the zone, but set VCL context.
 class OpenGLVCLContextZone {
-    OpenGLZone aZone;
+    OpenGLZone const aZone;
 public:
     OpenGLVCLContextZone();
 };
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index f0ea310b1788..7d5f471cd434 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -86,7 +86,7 @@ struct ImplFontSubstEntry
 {
     OUString                  maSearchName;
     OUString                  maSearchReplaceName;
-    AddFontSubstituteFlags    mnFlags;
+    AddFontSubstituteFlags const mnFlags;
 
     ImplFontSubstEntry(  const OUString& rFontName, const OUString& rSubstFontName, AddFontSubstituteFlags nSubstFlags );
 };
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 3aae7dd89103..626e3ccd9403 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -46,7 +46,7 @@ namespace vcl
             sal_Int32           mnDPIY;
             BitmapEx            maPreviewBitmap;
             OUString            maReplacementString;
-            OUString            maToolTipString;
+            OUString const      maToolTipString;
             bool                mbGreyscale;
             VclPtr<FixedLine>   maHorzDim;
             VclPtr<FixedLine>   maVertDim;
@@ -145,8 +145,8 @@ namespace vcl
             VclPtr<FixedImage>                      mpCollateImage;
             VclPtr<CheckBox>                        mpReverseOrderBox;
 
-            BitmapEx                                maCollateBmp;
-            BitmapEx                                maNoCollateBmp;
+            BitmapEx const                          maCollateBmp;
+            BitmapEx const                          maNoCollateBmp;
 
             long                                    mnCollateUIMode;
 
@@ -187,7 +187,7 @@ namespace vcl
         VclPtr<HelpButton>                      mpHelpButton;
 
         OUString                                maPageStr;
-        OUString                                maNoPageStr;
+        OUString const                          maNoPageStr;
         sal_Int32                               mnCurPage;
         sal_Int32                               mnCachedPages;
 
@@ -203,9 +203,9 @@ namespace vcl
         /// internal, used for automatic Nup-Portrait/landscape
         Size                                    maFirstPageSize;
 
-        OUString                           maPrintToFileText;
-        OUString                           maPrintText;
-        OUString                           maDefPrtText;
+        OUString const                          maPrintToFileText;
+        OUString                                maPrintText;
+        OUString const                          maDefPrtText;
 
         bool                                mbShowLayoutPage;
 
diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx
index 212d75f47739..dbfb14bec43e 100644
--- a/vcl/inc/printerinfomanager.hxx
+++ b/vcl/inc/printerinfomanager.hxx
@@ -113,7 +113,7 @@ protected:
     std::unique_ptr<SystemQueueInfo>
                                       m_pQueueInfo;
 
-    Type                              m_eType;
+    Type const                        m_eType;
     bool                              m_bUseIncludeFeature;
     bool                              m_bUseJobPatch;
     OUString                     m_aSystemDefaultPaper;
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index a6505eb92d35..a9dc45b78d44 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -77,11 +77,11 @@ class ImplLayoutArgs
 {
 public:
     // string related inputs
-    LanguageTag         maLanguageTag;
+    LanguageTag const   maLanguageTag;
     SalLayoutFlags      mnFlags;
     const OUString&     mrStr;
-    int                 mnMinCharPos;
-    int                 mnEndCharPos;
+    int const           mnMinCharPos;
+    int const           mnEndCharPos;
 
     // performance hack
     vcl::TextLayoutCache const* m_pTextLayoutCache;
diff --git a/vcl/inc/salsession.hxx b/vcl/inc/salsession.hxx
index fb9763bb6882..f065343e8e2a 100644
--- a/vcl/inc/salsession.hxx
+++ b/vcl/inc/salsession.hxx
@@ -32,7 +32,7 @@ enum SalSessionEventType
 
 struct SalSessionEvent
 {
-    SalSessionEventType         m_eType;
+    SalSessionEventType const         m_eType;
 
     SalSessionEvent( SalSessionEventType eType )
             : m_eType( eType )
@@ -41,7 +41,7 @@ struct SalSessionEvent
 
 struct SalSessionInteractionEvent : public SalSessionEvent
 {
-    bool                        m_bInteractionGranted;
+    bool const                        m_bInteractionGranted;
 
     SalSessionInteractionEvent( bool bGranted )
             : SalSessionEvent( Interaction ),
@@ -51,7 +51,7 @@ struct SalSessionInteractionEvent : public SalSessionEvent
 
 struct SalSessionSaveRequestEvent : public SalSessionEvent
 {
-    bool                        m_bShutdown;
+    bool const                        m_bShutdown;
 
     SalSessionSaveRequestEvent( bool bShutdown )
             : SalSessionEvent( SaveRequest ),
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 4f7c2f6a186f..342f18d3ec85 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -198,8 +198,8 @@ struct SalSurroundingTextRequestEvent
 
 struct SalSurroundingTextSelectionChangeEvent
 {
-    sal_uLong       mnStart;        // The beginning index of selected range
-    sal_uLong       mnEnd;          // The end index of selected range
+    sal_uLong const mnStart;        // The beginning index of selected range
+    sal_uLong const mnEnd;          // The end index of selected range
 };
 
 struct SalQueryCharPositionEvent
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
index 9cbb1cce172b..4e21a4d28c3e 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -38,7 +38,7 @@ public:
     FcPattern*          GetPattern() const;
     static void         cairo_font_options_substitute(FcPattern* pPattern);
 private:
-    FcPattern* mpPattern;
+    FcPattern* const mpPattern;
 };
 
 
diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx
index b1db824ccdd3..3e27aa6592ad 100644
--- a/vcl/inc/unx/freetype_glyphcache.hxx
+++ b/vcl/inc/unx/freetype_glyphcache.hxx
@@ -80,7 +80,7 @@ private:
     FreetypeFontFile* const mpFontFile;
     const int       mnFaceNum;
     int             mnRefCount;
-    sal_IntPtr      mnFontId;
+    sal_IntPtr const mnFontId;
     FontAttributes  maDevFontAttributes;
 
     FontCharMapRef  mxFontCharMap;
@@ -109,7 +109,7 @@ private:
 class FreetypeFontFace : public PhysicalFontFace
 {
 private:
-    FreetypeFontInfo*             mpFreetypeFontInfo;
+    FreetypeFontInfo* const             mpFreetypeFontInfo;
 
 public:
                             FreetypeFontFace( FreetypeFontInfo*, const FontAttributes& );
diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index 0c043c34e023..c2ac8b1b6fa4 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -28,7 +28,7 @@ enum GenericUnixSalDataType { SAL_DATA_GTK, SAL_DATA_GTK3,
 class VCL_DLLPUBLIC GenericUnixSalData : public SalData
 {
  protected:
-    GenericUnixSalDataType m_eType;
+    GenericUnixSalDataType const m_eType;
     SalGenericDisplay *m_pDisplay;
     // cached hostname to avoid slow lookup
     OUString      m_aHostname;
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 203fa031d8db..38e63cbd9b1e 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -88,7 +88,7 @@ private:
     typedef std::unordered_map<rtl::Reference<LogicalFontInstance>,std::unique_ptr<FreetypeFont>,IFSD_Hash,IFSD_Equal > FontList;
 
     FontList                maFontList;
-    sal_uLong               mnMaxSize;      // max overall cache size in bytes
+    sal_uLong const         mnMaxSize;      // max overall cache size in bytes
     mutable sal_uLong       mnBytesUsed;
     mutable long            mnLruIndex;
     mutable int             mnGlyphCount;
@@ -176,7 +176,7 @@ private:
     long                    mnSin;
 
     int                     mnWidth;
-    int                     mnPrioAntiAlias;
+    int const               mnPrioAntiAlias;
     FreetypeFontInfo*       mpFontInfo;
     FT_Int                  mnLoadFlags;
     double                  mfStretch;
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 14330d70fb9e..fc226a0a00d5 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -139,7 +139,7 @@ class GtkSalDisplay : public SalDisplay
 #endif
 {
     GtkSalSystem*                   m_pSys;
-    GdkDisplay*                     m_pGdkDisplay;
+    GdkDisplay* const               m_pGdkDisplay;
     o3tl::enumarray<PointerStyle, GdkCursor*> m_aCursors;
     bool                            m_bStartupCompleted;
     bool                            m_bX11Display;
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index fc896db7f913..107e79babba9 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -100,7 +100,7 @@ typedef void (*gtk_widget_path_iter_set_object_nameFunc)(GtkWidgetPath *, guint,
 
 class GtkSalGraphics : public SvpSalGraphics
 {
-    GtkSalFrame *mpFrame;
+    GtkSalFrame * const mpFrame;
 public:
     GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow );
     virtual bool        drawNativeControl( ControlType nType, ControlPart nPart,
@@ -136,7 +136,7 @@ public:
     GtkStyleContext* createOldContext(GtkControlPart ePart);
     GtkStyleContext* makeContext(GtkWidgetPath *pPath, GtkStyleContext *pParent);
 private:
-    GtkWidget       *mpWindow;
+    GtkWidget       * const mpWindow;
     static GtkStyleContext *mpWindowStyle;
     static GtkStyleContext *mpButtonStyle;
     static GtkStyleContext *mpLinkButtonStyle;
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index b9ac55570f0d..2c287aa93354 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -50,7 +50,7 @@ private:
     Idle                            maUpdateMenuBarIdle;
 
     bool                            mbInActivateCallback;
-    bool                            mbMenuBar;
+    bool const                      mbMenuBar;
     bool                            mbNeedsUpdate;
     bool                            mbReturnFocusToDocument;
     bool                            mbAddedGrab;
@@ -144,8 +144,8 @@ public:
     GtkSalMenuItem( const SalItemParams* );
     virtual ~GtkSalMenuItem() override;
 
-    sal_uInt16          mnId;               // Item ID
-    MenuItemType        mnType;             // Item type
+    sal_uInt16 const    mnId;               // Item ID
+    MenuItemType const  mnType;             // Item type
     bool                mbVisible;          // Item visibility.
     GtkSalMenu*         mpParentMenu;       // The menu into which this menu item is inserted
     GtkSalMenu*         mpSubMenu;          // Submenu of this item (if defined)
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 3bc64fcca34e..3a98941714ee 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -53,7 +53,7 @@ class I18NStatus
 private:
     SalFrame*                       m_pParent;
     VclPtr<StatusWindow>            m_pStatusWindow;
-    OUString                        m_aCurrentIM;
+    OUString const                  m_aCurrentIM;
 
     I18NStatus();
     ~I18NStatus();
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 82ed6c3bd724..5286ee2d984b 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -158,8 +158,8 @@ private:
 
     Pixmap          maPixmap;
     SalTwoRect      maTwoRect;
-    long            mnDepth;
-    SalX11Screen    mnXScreen;
+    long const            mnDepth;
+    SalX11Screen const    mnXScreen;
 
     static void     ImplDraw(
                         Drawable aSrcDrawable,
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 0bef7afb6c52..44fb08b87a91 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -285,7 +285,7 @@ protected:
 
     SalX11Screen                 m_nXDefaultScreen;
     std::vector< ScreenData >    m_aScreens;
-    ScreenData      m_aInvalidScreenData;
+    ScreenData const      m_aInvalidScreenData;
     Pair            aResolution_;       // [dpi]
     sal_uLong       nMaxRequestSize_;   // [byte]
 
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index d6054eae4b4c..94f4a9a00a06 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -344,7 +344,7 @@ protected:
     bool                            bWindow_ : 1;       // is Window
     bool                            bVirDev_ : 1;       // is VirDev
     bool                            bFontGC_ : 1;       // is Font GC valid
-    bool                            m_bOpenGL : 1;
+    bool const                      m_bOpenGL : 1;
 
 private:
     std::unique_ptr<SalGraphicsImpl> mxImpl;
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index ff76cf638987..6ebc983ab768 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -127,7 +127,7 @@ public:
     static const int decoration_All         = 0x10000000;
 
 protected:
-    SalDisplay*             m_pSalDisplay;      // Display to use
+    SalDisplay* const       m_pSalDisplay;      // Display to use
     Display*                m_pDisplay;         // X Display of SalDisplay
     OUString                m_aWMName;
     Atom                    m_aWMAtoms[ NetAtomMax];