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, 87 insertions, 87 deletions

diff --git a/include/vcl/BitmapAlphaClampFilter.hxx b/include/vcl/BitmapAlphaClampFilter.hxx
index 39c039cbd02c..f4325b8b9e15 100644
--- a/include/vcl/BitmapAlphaClampFilter.hxx
+++ b/include/vcl/BitmapAlphaClampFilter.hxx
@@ -28,7 +28,7 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    sal_uInt8 mcThreshold;
+    sal_uInt8 const mcThreshold;
 };
 
 #endif
diff --git a/include/vcl/BitmapColorQuantizationFilter.hxx b/include/vcl/BitmapColorQuantizationFilter.hxx
index 170b0d88a471..4be1ff3b9f49 100644
--- a/include/vcl/BitmapColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapColorQuantizationFilter.hxx
@@ -31,7 +31,7 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    sal_uInt16 mnNewColorCount;
+    sal_uInt16 const mnNewColorCount;
 
     struct PopularColorCount
     {
diff --git a/include/vcl/BitmapDuoToneFilter.hxx b/include/vcl/BitmapDuoToneFilter.hxx
index ce29a2c93c6b..3b6ee1523a4e 100644
--- a/include/vcl/BitmapDuoToneFilter.hxx
+++ b/include/vcl/BitmapDuoToneFilter.hxx
@@ -27,8 +27,8 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    sal_uLong mnColorOne;
-    sal_uLong mnColorTwo;
+    sal_uLong const mnColorOne;
+    sal_uLong const mnColorTwo;
 };
 
 #endif
diff --git a/include/vcl/BitmapEmbossGreyFilter.hxx b/include/vcl/BitmapEmbossGreyFilter.hxx
index eebb2d3ecc8e..e81d3e7b7493 100644
--- a/include/vcl/BitmapEmbossGreyFilter.hxx
+++ b/include/vcl/BitmapEmbossGreyFilter.hxx
@@ -27,8 +27,8 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    sal_uInt16 mnAzimuthAngle100;
-    sal_uInt16 mnElevationAngle100;
+    sal_uInt16 const mnAzimuthAngle100;
+    sal_uInt16 const mnElevationAngle100;
 };
 
 #endif
diff --git a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
index fde41c935dc6..b3388cd0990d 100644
--- a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
+++ b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
@@ -34,7 +34,7 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    double mfRadius;
+    double const mfRadius;
 
     bool convolutionPass(Bitmap& rBitmap, Bitmap& aNewBitmap, BitmapReadAccess const* pReadAcc,
                          int aNumberOfContributions, const double* pWeights, int const* pPixels,
diff --git a/include/vcl/BitmapMonochromeFilter.hxx b/include/vcl/BitmapMonochromeFilter.hxx
index 09723b7a4009..0c344b467d94 100644
--- a/include/vcl/BitmapMonochromeFilter.hxx
+++ b/include/vcl/BitmapMonochromeFilter.hxx
@@ -37,7 +37,7 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    sal_uInt8 mcThreshold;
+    sal_uInt8 const mcThreshold;
 };
 
 #endif
diff --git a/include/vcl/BitmapMosaicFilter.hxx b/include/vcl/BitmapMosaicFilter.hxx
index f38e0ac1c6d5..f52a947a151d 100644
--- a/include/vcl/BitmapMosaicFilter.hxx
+++ b/include/vcl/BitmapMosaicFilter.hxx
@@ -31,8 +31,8 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    sal_uLong mnTileWidth;
-    sal_uLong mnTileHeight;
+    sal_uLong const mnTileWidth;
+    sal_uLong const mnTileHeight;
 };
 
 #endif
diff --git a/include/vcl/BitmapSeparableUnsharpenFilter.hxx b/include/vcl/BitmapSeparableUnsharpenFilter.hxx
index 91fcbf479498..daa063aef547 100644
--- a/include/vcl/BitmapSeparableUnsharpenFilter.hxx
+++ b/include/vcl/BitmapSeparableUnsharpenFilter.hxx
@@ -29,7 +29,7 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    double mfRadius;
+    double const mfRadius;
 };
 
 #endif
diff --git a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
index 200e35356b07..5072c3f17cd8 100644
--- a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
@@ -31,7 +31,7 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    sal_uInt16 mnNewColorCount;
+    sal_uInt16 const mnNewColorCount;
 };
 
 #endif
diff --git a/include/vcl/BitmapSmoothenFilter.hxx b/include/vcl/BitmapSmoothenFilter.hxx
index 3403b99ea5ee..90503ef3789d 100644
--- a/include/vcl/BitmapSmoothenFilter.hxx
+++ b/include/vcl/BitmapSmoothenFilter.hxx
@@ -26,7 +26,7 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    double mfRadius;
+    double const mfRadius;
 };
 
 #endif
diff --git a/include/vcl/BitmapSolarizeFilter.hxx b/include/vcl/BitmapSolarizeFilter.hxx
index f91a9fd287aa..ff6b35f328a5 100644
--- a/include/vcl/BitmapSolarizeFilter.hxx
+++ b/include/vcl/BitmapSolarizeFilter.hxx
@@ -26,7 +26,7 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
-    sal_uInt8 mcSolarGreyThreshold;
+    sal_uInt8 const mcSolarGreyThreshold;
 };
 
 #endif
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 75eb6ed53077..90c45fc6ebde 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -35,8 +35,8 @@ class VCL_DLLPUBLIC RawBitmap
 {
 friend BitmapEx VCL_DLLPUBLIC CreateFromData( RawBitmap&& rawBitmap );
     std::unique_ptr<sal_uInt8[]> mpData;
-    Size maSize;
-    sal_uInt8 mnBitCount;
+    Size const maSize;
+    sal_uInt8 const mnBitCount;
 public:
     RawBitmap(Size const & rSize, sal_uInt8 nBitCount)
         : maSize(rSize),
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index 91343e501ea7..9117b57730e4 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -145,7 +145,7 @@ protected:
     Bitmap maBitmap;
     BitmapBuffer* mpBuffer;
     ColorMask maColorMask;
-    BitmapAccessMode mnAccessMode;
+    BitmapAccessMode const mnAccessMode;
 };
 
 
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 25380a6ec5af..0ae018a601dc 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -148,7 +148,7 @@ private:
 
     struct MenuAndId
     {
-        OString m_sID;
+        OString const m_sID;
         VclPtr<PopupMenu> m_pMenu;
         MenuAndId(const OString &rId, PopupMenu *pMenu);
         ~MenuAndId();
@@ -157,8 +157,8 @@ private:
 
     struct StringPair
     {
-        OString m_sID;
-        OString m_sValue;
+        OString const m_sID;
+        OString const m_sValue;
         StringPair(const OString &rId, const OString &rValue)
             : m_sID(rId)
             , m_sValue(rValue)
@@ -181,9 +181,9 @@ private:
 
     struct ButtonImageWidgetMap
     {
-        OString m_sID;
-        OUString m_sValue;
-        bool m_bRadio;
+        OString const m_sID;
+        OUString const m_sValue;
+        bool const m_bRadio;
         ButtonImageWidgetMap(const OString &rId, const OUString &rValue, bool bRadio)
             : m_sID(rId)
             , m_sValue(rValue)
@@ -199,9 +199,9 @@ private:
 
     struct ComboBoxModelMap
     {
-        OString m_sID;
-        OUString m_sValue;
-        sal_Int32 m_nActiveId;
+        OString const m_sID;
+        OUString const m_sValue;
+        sal_Int32 const m_nActiveId;
         ComboBoxModelMap(const OString &rId, const OUString &rValue, sal_Int32 nActiveId)
             : m_sID(rId)
             , m_sValue(rValue)
@@ -297,12 +297,12 @@ private:
 
     OString     m_sID;
     OString     m_sHelpRoot;
-    ResHookProc m_pStringReplace;
+    ResHookProc const m_pStringReplace;
     VclPtr<vcl::Window> m_pParent;
     bool        m_bToplevelHasDeferredInit;
     bool        m_bToplevelHasDeferredProperties;
     bool        m_bToplevelParentFound;
-    bool        m_bLegacy;
+    bool const        m_bLegacy;
     std::unique_ptr<ParserState> m_pParserState;
 
     vcl::Window *get_by_name(const OString& sID);
@@ -317,7 +317,7 @@ private:
         bool    operator()(const vcl::Window *pA, const vcl::Window *pB) const;
 
     private:
-        VclBuilder *m_pBuilder;
+        VclBuilder * const m_pBuilder;
     };
 
     /// XFrame to be able to extract labels and other properties of the UNO commands (like of .uno:Bold).
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx
index 703741051205..d8f20a381be5 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -91,7 +91,7 @@ public:
 class VCL_DLLPUBLIC CommandExtTextInputData
 {
 private:
-    OUString            maText;
+    OUString const       maText;
     std::unique_ptr<ExtTextInputAttr[]> mpTextAttr;
     sal_Int32           mnCursorPos;
     sal_uInt16          mnCursorFlags;
@@ -203,7 +203,7 @@ enum class ShowDialogId
 
 class VCL_DLLPUBLIC CommandDialogData
 {
-    ShowDialogId   m_nDialogId;
+    ShowDialogId const   m_nDialogId;
 public:
     CommandDialogData( ShowDialogId nDialogId )
     : m_nDialogId( nDialogId )
@@ -239,7 +239,7 @@ enum class MediaCommand
 
 class VCL_DLLPUBLIC CommandMediaData
 {
-    MediaCommand m_nMediaId;
+    MediaCommand const m_nMediaId;
     bool m_bPassThroughToOS;
 public:
     CommandMediaData(MediaCommand nMediaId)
@@ -267,7 +267,7 @@ public:
 
 class VCL_DLLPUBLIC CommandSwipeData
 {
-    double mnVelocityX;
+    double const mnVelocityX;
 public:
     CommandSwipeData()
         : mnVelocityX(0)
@@ -283,8 +283,8 @@ public:
 
 class VCL_DLLPUBLIC CommandLongPressData
 {
-    double mnX;
-    double mnY;
+    double const mnX;
+    double const mnY;
 public:
     CommandLongPressData()
         : mnX(0)
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 984330476a1a..1996ac8651e4 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -53,8 +53,8 @@ private:
     bool            mbInClose;
     bool            mbModalMode;
     bool            mbPaintComplete;
-    bool            mbForceBorderWindow;
-    InitFlag        mnInitFlag; // used for deferred init
+    bool const      mbForceBorderWindow;
+    InitFlag const  mnInitFlag; // used for deferred init
 
     VclPtr<VclButtonBox> mpActionArea;
     VclPtr<VclBox>       mpContentArea;
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index a4f99a7e2ffa..d2e6a585d633 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -31,7 +31,7 @@
 // data to be sent with docking events
 struct DockingData
 {
-    Point       maMousePos;     // in
+    Point const       maMousePos;     // in
     tools::Rectangle   maTrackRect;    // in/out
     bool        mbFloating;     // out
 
@@ -42,9 +42,9 @@ struct DockingData
 
 struct EndDockingData
 {
-    tools::Rectangle   maWindowRect;    // in
-    bool        mbFloating;      // in
-    bool        mbCancelled;     // in
+    tools::Rectangle const   maWindowRect;    // in
+    bool const        mbFloating;      // in
+    bool const        mbCancelled;     // in
 
     EndDockingData( const tools::Rectangle& rRect, bool b, bool bCancelled ) :
         maWindowRect( rRect ), mbFloating( b ), mbCancelled( bCancelled )
@@ -53,8 +53,8 @@ struct EndDockingData
 
 struct EndPopupModeData
 {
-    Point       maFloatingPos;    // in
-    bool        mbTearoff;        // in
+    Point const       maFloatingPos;    // in
+    bool const        mbTearoff;        // in
 
     EndPopupModeData( const Point& rPos, bool bTearoff ) :
         maFloatingPos( rPos ), mbTearoff( bTearoff )
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index a7160dfd695d..f34d5624b991 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -149,7 +149,7 @@ public:
     static std::unique_ptr<ErrorInfo> GetErrorInfo(ErrCode);
 
 private:
-    ErrCode                 nUserId;
+    ErrCode const           nUserId;
 };
 
 class SAL_WARN_UNUSED VCL_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
@@ -178,7 +178,7 @@ public:
     const OUString&         GetErrorString() const { return aString; }
 
 private:
-    OUString                aString;
+    OUString const          aString;
 
 };
 
@@ -193,8 +193,8 @@ public:
     const OUString& GetArg2() const { return aArg2; }
 
 private:
-    OUString aArg1;
-    OUString aArg2;
+    OUString const aArg1;
+    OUString const aArg2;
 
 };
 
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 22486490977a..688811746ccc 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -190,7 +190,7 @@ namespace o3tl
 class VCL_DLLPUBLIC HelpEvent
 {
 private:
-    Point           maPos;
+    Point const     maPos;
     HelpEventMode   mnMode;
     bool            mbKeyboardActivated;
 
@@ -220,9 +220,9 @@ private:
     /// RenderContext to which we should draw - can be a VirtualDevice or anything.
     VclPtr<vcl::RenderContext> mpRenderContext;
 
-    tools::Rectangle           maOutRect;
-    sal_uInt16          mnItemId;
-    sal_uInt16          mnStyle;
+    tools::Rectangle const    maOutRect;
+    sal_uInt16 const          mnItemId;
+    sal_uInt16 const          mnStyle;
 
 public:
     UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pRenderContext,
@@ -249,7 +249,7 @@ inline UserDrawEvent::UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pR
 class VCL_DLLPUBLIC TrackingEvent
 {
 private:
-    MouseEvent          maMEvt;
+    MouseEvent const    maMEvt;
     TrackingEventFlags  mnFlags;
 
 public:
diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index bbd11ce2d24d..4650fbc5c6e4 100644
--- a/include/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
@@ -30,7 +30,7 @@ namespace vcl
     class VCL_DLLPUBLIC EventPoster
     {
         ImplSVEvent *             m_nId;
-        Link<LinkParamNone*,void> m_aLink;
+        Link<LinkParamNone*,void> const m_aLink;
 
         DECL_DLLPRIVATE_LINK( DoEvent_Impl, void*, void );
 
diff --git a/include/vcl/filter/pdfdocument.hxx b/include/vcl/filter/pdfdocument.hxx
index 03180fd0597f..7735a52591bd 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -141,7 +141,7 @@ class VCL_DLLPUBLIC PDFArrayElement : public PDFElement
 {
     std::vector<PDFElement*> m_aElements;
     /// The object that contains this array.
-    PDFObjectElement* m_pObject;
+    PDFObjectElement* const m_pObject;
 
 public:
     PDFArrayElement(PDFObjectElement* pObject);
@@ -178,7 +178,7 @@ public:
 /// Stream object: a byte array with a known length.
 class VCL_DLLPUBLIC PDFStreamElement : public PDFElement
 {
-    size_t m_nLength;
+    size_t const m_nLength;
     sal_uInt64 m_nOffset;
     /// The byte array itself.
     SvMemoryStream m_aMemory;
@@ -197,7 +197,7 @@ class VCL_DLLPUBLIC PDFNameElement : public PDFElement
     /// Offset after the '/' token.
     sal_uInt64 m_nLocation = 0;
     /// Length till the next token start.
-    sal_uInt64 m_nLength = 0;
+    sal_uInt64 const m_nLength = 0;
 
 public:
     PDFNameElement();
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index aca557e4e53a..299d0a55a9f2 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -99,7 +99,7 @@ struct VCL_DLLPUBLIC Feature
     Feature(FeatureID const& rID, FeatureType eType);
 
     FeatureID m_aID;
-    FeatureType m_eType;
+    FeatureType const m_eType;
     FeatureDefinition m_aDefinition;
 };
 
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 29e7a0e53c88..5df70b8bc53d 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -60,7 +60,7 @@ private:
         SwapOutData(const OUString &aURL);
         ~SwapOutData();
 
-        OUString maURL; // File is removed in the destructor
+        OUString const maURL; // File is removed in the destructor
 
     };
 
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index ab9713daff9b..3b91a3269478 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -76,11 +76,11 @@ private:
 class VCL_DLLPUBLIC GraphicConversionParameters
 {
 private:
-    Size            maSizePixel;            // default is (0,0)
+    Size const            maSizePixel;            // default is (0,0)
 
-    bool            mbUnlimitedSize : 1;    // default is false
-    bool            mbAntiAliase : 1;       // default is false
-    bool            mbSnapHorVerLines : 1;  // default is false
+    bool const            mbUnlimitedSize : 1;    // default is false
+    bool const            mbAntiAliase : 1;       // default is false
+    bool const            mbSnapHorVerLines : 1;  // default is false
 
 public:
     GraphicConversionParameters(
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 8c5ce93221f2..d14ee7754699 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -143,7 +143,7 @@ class VCL_DLLPUBLIC GraphicDescriptor final
     sal_uInt16          nBitsPerPixel;
     sal_uInt16          nPlanes;
     GraphicFileFormat   nFormat;
-    bool                bOwnStream;
+    bool const          bOwnStream;
     sal_uInt8 mnNumberOfImageComponents;
 
     void                ImpConstruct();
@@ -319,7 +319,7 @@ private:
                     DECL_LINK( FilterCallback, ConvertData&, bool );
 
     std::unique_ptr<FilterErrorEx> pErrorEx;
-    bool                bUseConfig;
+    bool const                     bUseConfig;
 };
 
 #endif // INCLUDED_VCL_GRAPHICFILTER_HXX
diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx
index a18d7fcd4958..8742093ebe36 100644
--- a/include/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
@@ -49,7 +49,7 @@ namespace vcl
 class VCL_DLLPUBLIC I18nHelper
 {
     ::osl::Mutex                    maMutex;
-    LanguageTag                     maLanguageTag;
+    LanguageTag const               maLanguageTag;
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
     std::unique_ptr<LocaleDataWrapper>              mpLocaleDataWrapper;
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index ef582b1f97dd..278e22df9b5f 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -65,7 +65,7 @@ struct ImplMetaWriteData
 class VCL_DLLPUBLIC MetaAction : public salhelper::SimpleReferenceObject
 {
 private:
-    MetaActionType       mnType;
+    MetaActionType const mnType;
 
 protected:
     virtual             ~MetaAction() override;
@@ -847,7 +847,7 @@ class VCL_DLLPUBLIC MetaMaskAction : public MetaAction
 private:
 
     Bitmap              maBmp;
-    Color               maColor;
+    Color const         maColor;
     Point               maPt;
 
 public:
@@ -881,7 +881,7 @@ class VCL_DLLPUBLIC MetaMaskScaleAction : public MetaAction
 private:
 
     Bitmap              maBmp;
-    Color               maColor;
+    Color const         maColor;
     Point               maPt;
     Size                maSz;
 
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index fc4f74b0be1e..a5493c0d6927 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -168,7 +168,7 @@ protected:
     bool mbInitialized;
     int  mnRefCount;
     bool mbRequestLegacyContext;
-    bool mbUseDoubleBufferedRendering;
+    bool const mbUseDoubleBufferedRendering;
     bool mbVCLOnly;
 
     int mnFramebufferCount;
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 9177f99f6cb4..04d3e472e649 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -221,7 +221,7 @@ public:
 
     struct VCL_DLLPUBLIC AnyWidget
     {
-        WidgetType          Type;       // primitive RTTI
+        WidgetType const    Type;       // primitive RTTI
     public:
         OUString            Name;       // a distinct name to identify the control
         OUString            Description;// descriptive text for the control (e.g. for tool tip)
diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 382756b18e9f..ce578c1733c3 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -65,7 +65,7 @@ class VCL_DLLPUBLIC PPDKey
     typedef std::unordered_map< OUString, PPDValue > hash_type;
     typedef std::vector< PPDValue* > value_type;
 
-    OUString            m_aKey;
+    OUString const      m_aKey;
     hash_type           m_aValues;
     value_type          m_aOrderedValues;
     const PPDValue*     m_pDefaultValue;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index a582fe20a119..b6bed16e6243 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -614,9 +614,9 @@ public:
     // helper functions for user to create a single control
     struct UIControlOptions
     {
-        OUString         maDependsOnName;
-        sal_Int32        mnDependsOnEntry;
-        bool             mbAttachToDependency;
+        OUString const   maDependsOnName;
+        sal_Int32 const  mnDependsOnEntry;
+        bool const       mbAttachToDependency;
         OUString         maGroupHint;
         bool             mbInternalOnly;
         bool             mbEnabled;
diff --git a/include/vcl/salctype.hxx b/include/vcl/salctype.hxx
index 893adb4d47e4..73b29b1e97d7 100644
--- a/include/vcl/salctype.hxx
+++ b/include/vcl/salctype.hxx
@@ -49,7 +49,7 @@ public:
 
     Graphic             maGraphic;
     SvStream&           mrStm;
-    ConvertDataFormat   mnFormat;
+    ConvertDataFormat const   mnFormat;
 
                         ConvertData( const Graphic& rGraphic, SvStream& rStm, ConvertDataFormat nFormat ) :
                             maGraphic( rGraphic ), mrStm( rStm ), mnFormat( nFormat ) {}
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 3f27365604b0..47b2255c06af 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -249,7 +249,7 @@ class VCL_DLLPUBLIC ImplControlValue
     friend class SalFrame;
 
     private:
-        ControlType     mType;
+        ControlType const mType;
         ButtonValue     mTristate;    // Tristate value: on, off, mixed
         long            mNumber;      // numeric value
     protected:
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 92a422cb7072..e3c33af5d774 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -219,7 +219,7 @@ public:
     }
 
 private:
-    Type aEvent;
+    Type const aEvent;
     std::vector<OUString> aData;
 };
 
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index 2e595fb8995e..339c539597d2 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -115,7 +115,7 @@ inline bool TextSelection::operator != ( const TextSelection& rSel ) const
 class VCL_DLLPUBLIC TextHint : public SfxHint
 {
 private:
-    sal_uLong   mnValue;
+    sal_uLong const   mnValue;
 
 public:
     TextHint( SfxHintId nId );
@@ -126,7 +126,7 @@ public:
 
 struct TEIMEInfos
 {
-    OUString    aOldTextAfterStartPos;
+    OUString const    aOldTextAfterStartPos;
     std::unique_ptr<ExtTextInputAttr[]> pAttribs;
     TextPaM     aPos;
     sal_Int32   nLen;
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index db8da72f3d47..7754c061e413 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -62,7 +62,7 @@ public:
 class VCL_DLLPUBLIC TextAttribFontColor : public TextAttrib
 {
 private:
-    Color   maColor;
+    Color const   maColor;
 
 public:
                             TextAttribFontColor( const Color& rColor );
@@ -78,7 +78,7 @@ public:
 class VCL_DLLPUBLIC TextAttribFontWeight : public TextAttrib
 {
 private:
-    FontWeight  meWeight;
+    FontWeight const  meWeight;
 
 public:
                             TextAttribFontWeight( FontWeight eWeight );
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index e428d30a0110..6a59541198a0 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -37,7 +37,7 @@ namespace vcl { namespace unohelper {
                             public ::cppu::OWeakObject
     {
     private:
-        OUString        maText;
+        OUString const  maText;
 
     public:
                         TextDataObject( const OUString& rText );
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 8f15df2228c4..9f1d0e802f91 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -209,7 +209,7 @@ class VCL_DLLPUBLIC VclMenuEvent : public VclSimpleEvent
 {
 private:
     VclPtr<Menu> pMenu;
-    sal_uInt16 mnPos;
+    sal_uInt16 const mnPos;
 
     VclMenuEvent(VclMenuEvent &) = delete;
     void operator =(VclMenuEvent) = delete;
diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx
index c258182bc120..ea7615d2bdf6 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -55,7 +55,7 @@ private:
     VectorGraphicDataArray      maVectorGraphicDataArray;
 
     // The absolute Path if available
-    OUString                    maPath;
+    OUString const              maPath;
 
     // on demand created content
     bool                        mbSequenceCreated;
@@ -63,7 +63,7 @@ private:
     std::deque< css::uno::Reference< css::graphic::XPrimitive2D > > maSequence;
     BitmapEx                    maReplacement;
     size_t                      mNestedBitmapSize;
-    VectorGraphicDataType       meVectorGraphicDataType;
+    VectorGraphicDataType const meVectorGraphicDataType;
 
     // extra:
     std::unique_ptr<WmfExternal> mpExternalHeader;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 6f6776f38b57..5c82b6d3dc27 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -741,7 +741,7 @@ public:
 class VCL_DLLPUBLIC TimeSpinButton
 {
 protected:
-    TimeFieldFormat m_eFormat;
+    TimeFieldFormat const m_eFormat;
     std::unique_ptr<weld::SpinButton> m_xSpinButton;
     Link<TimeSpinButton&, void> m_aValueChangedHdl;
 
diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx
index 23b0d05bf336..fc742d9aaa8e 100644
--- a/include/vcl/xtextedt.hxx
+++ b/include/vcl/xtextedt.hxx
@@ -33,7 +33,7 @@ namespace util {
 class VCL_DLLPUBLIC ExtTextEngine : public TextEngine
 {
 private:
-    OUString              maGroupChars;
+    OUString const      maGroupChars;
 
 public:
                         ExtTextEngine();