Revert "loplugin:constfields in vcl"

This reverts commit 59887868da3499c68d5f259cfa48178354397448.

Change-Id: I0f3f6a7680c78103a559a0f881badc8211b97ace
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90544
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

36 files changed, 77 insertions, 77 deletions

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 9af055b9535c..0e4908e8fdb6 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -676,7 +676,7 @@ class SalInstanceMenu : public weld::Menu
 private:
     VclPtr<PopupMenu> m_xMenu;
 
-    bool const m_bTakeOwnership;
+    bool       m_bTakeOwnership;
     sal_uInt16 m_nLastId;
 
     DECL_LINK(SelectMenuHdl, ::Menu*, bool);
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 1f9a0e1da9d1..1f422e33617a 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -119,7 +119,7 @@ extern "C" {
 
 struct ImplPostEventData
 {
-    VclEventId const    mnEvent;
+    VclEventId      mnEvent;
     VclPtr<vcl::Window> mpWin;
     ImplSVEvent *   mnEventId;
     KeyEvent        maKeyEvent;
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index baa881d84e06..ec8dbca95d0c 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -611,8 +611,8 @@ namespace {
 // only one call is allowed
 struct WorkerThreadData
 {
-    oslWorkerFunction const   pWorker;
-    void * const              pThreadData;
+    oslWorkerFunction   pWorker;
+    void *              pThreadData;
     WorkerThreadData( oslWorkerFunction pWorker_, void * pThreadData_ )
         : pWorker( pWorker_ )
         , pThreadData( pThreadData_ )
diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index ed10a76a82a9..ff808ddcdc3c 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -48,7 +48,7 @@ constexpr sal_uInt8 MAP(sal_uInt8 cVal0, sal_uInt8 cVal1, BilinearWeightType nFr
 
 struct ScaleContext
 {
-    BitmapReadAccess* const mpSrc;
+    BitmapReadAccess*  mpSrc;
     BitmapWriteAccess* mpDest;
     long mnDestW;
     bool mbHMirr;
@@ -102,10 +102,10 @@ typedef void (*ScaleRangeFn)(ScaleContext &rContext, long nStartY, long nEndY);
 
 class ScaleTask : public comphelper::ThreadTask
 {
-    ScaleRangeFn const mpScaleRangeFunction;
+    ScaleRangeFn mpScaleRangeFunction;
     ScaleContext& mrContext;
-    const long mnStartY;
-    const long mnEndY;
+    long mnStartY;
+    long mnEndY;
 
 public:
     explicit ScaleTask(const std::shared_ptr<comphelper::ThreadTaskTag>& pTag,
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 7045a0c45673..49ae5be42405 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -108,10 +108,10 @@ struct DDInfo
 
 struct Impl_IMEInfos
 {
-    OUString const aOldTextAfterStartPos;
+    OUString      aOldTextAfterStartPos;
     std::unique_ptr<ExtTextInputAttr[]>
                   pAttribs;
-    sal_Int32 const nPos;
+    sal_Int32     nPos;
     sal_Int32     nLen;
     bool          bCursor;
     bool          bWasCursorOverwrite;
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 70396be8435e..b5f2fc1de84f 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -99,9 +99,9 @@ public:
 
 struct TEWritingDirectionInfo
 {
-    bool const         bLeftToRight;
-    sal_Int32 const    nStartPos;
-    sal_Int32 const    nEndPos;
+    bool         bLeftToRight;
+    sal_Int32    nStartPos;
+    sal_Int32    nEndPos;
     TEWritingDirectionInfo( bool LeftToRight, sal_Int32 Start, sal_Int32 End )
         : bLeftToRight {LeftToRight}
         , nStartPos {Start}
@@ -170,7 +170,7 @@ inline bool TextLine::operator == ( const TextLine& rLine ) const
 class TEParaPortion
 {
 private:
-    TextNode* const         mpNode;
+    TextNode*               mpNode;
 
     std::vector<TextLine>   maLines;
     TETextPortionList       maTextPortions;
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 299ae7161e11..729a130ad456 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -26,7 +26,7 @@ class TextUndoDelPara : public TextUndo
 {
 private:
     bool            mbDelObject;
-    sal_uInt32 const mnPara;
+    sal_uInt32      mnPara;
     TextNode*       mpNode; // points at the valid not-destroyed object
 
 public:
@@ -42,8 +42,8 @@ public:
 class TextUndoConnectParas : public TextUndo
 {
 private:
-    sal_uInt32 const          mnPara;
-    sal_Int32 const           mnSepPos;
+    sal_uInt32          mnPara;
+    sal_Int32           mnSepPos;
 
 public:
                     TextUndoConnectParas( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nSepPos );
@@ -58,8 +58,8 @@ public:
 class TextUndoSplitPara : public TextUndo
 {
 private:
-    sal_uInt32 const          mnPara;
-    sal_Int32 const           mnSepPos;
+    sal_uInt32          mnPara;
+    sal_Int32           mnSepPos;
 
 public:
                     TextUndoSplitPara( TextEngine* pTextEngine, sal_uInt32 nPara, sal_Int32 nSepPos );
@@ -91,8 +91,8 @@ public:
 class TextUndoRemoveChars : public TextUndo
 {
 private:
-    TextPaM const         maTextPaM;
-    OUString const        maText;
+    TextPaM         maTextPaM;
+    OUString        maText;
 
 public:
                     TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr );
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 5f993934fbfa..0cc0e3abf80c 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -610,8 +610,8 @@ struct ImpFilterLibCacheEntry
 #ifndef DISABLE_DYNLOADING
     osl::Module             maLibrary;
 #endif
-    OUString const          maFiltername;
-    OUString const          maFormatName;
+    OUString                maFiltername;
+    OUString                maFormatName;
     PFilterCall             mpfnImport;
 
     ImpFilterLibCacheEntry(const OUString& rPathname, const OUString& rFiltername, const OUString& rFormatName);
diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx
index a230e7c13150..6e16730a36ff 100644
--- a/vcl/source/filter/igif/decode.hxx
+++ b/vcl/source/filter/igif/decode.hxx
@@ -37,11 +37,11 @@ class GIFLZWDecompressor
     sal_uInt8*              pBlockBuf;
     sal_uLong               nInputBitsBuf;
     bool                    bEOIFound;
-    sal_uInt8 const         nDataSize;
+    sal_uInt8               nDataSize;
     sal_uInt8               nBlockBufSize;
     sal_uInt8               nBlockBufPos;
-    sal_uInt16 const        nClearCode;
-    sal_uInt16 const        nEOICode;
+    sal_uInt16              nClearCode;
+    sal_uInt16              nEOICode;
     sal_uInt16              nTableSize;
     sal_uInt16              nCodeSize;
     sal_uInt16              nOldCode;
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index 11ab30d1a7b6..9b16c901b762 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -51,7 +51,7 @@ class XBMReader : public GraphicReader
                         pHexTable;
     BitmapColor         aWhite;
     BitmapColor         aBlack;
-    long const          nLastPos;
+    long                nLastPos;
     long                nWidth;
     long                nHeight;
     bool                bStatus;
diff --git a/vcl/source/filter/ixpm/rgbtable.hxx b/vcl/source/filter/ixpm/rgbtable.hxx
index 1c47a891f356..bff3f0d844b2 100644
--- a/vcl/source/filter/ixpm/rgbtable.hxx
+++ b/vcl/source/filter/ixpm/rgbtable.hxx
@@ -25,9 +25,9 @@
 struct XPMRGBTab
 {
     const char* name;
-    sal_uInt8 const  red;
-    sal_uInt8 const  green;
-    sal_uInt8 const  blue;
+    sal_uInt8  red;
+    sal_uInt8  green;
+    sal_uInt8  blue;
 };
 
 static const XPMRGBTab pRGBTable[] = {
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index efbf2b7f1fcd..fa71bfa3cb75 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -68,7 +68,7 @@ private:
     BitmapScopedWriteAccess     mpAcc;
     Bitmap                      maMaskBmp;
     BitmapScopedWriteAccess     mpMaskAcc;
-    long const                  mnLastPos;
+    long                        mnLastPos;
 
     sal_uLong               mnWidth;
     sal_uLong               mnHeight;
diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index 07fdd9ab95e3..47c34e427810 100644
--- a/vcl/source/filter/jpeg/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
@@ -57,7 +57,7 @@ private:
     };
 
     struct TiffHeader {
-        sal_uInt16 const byteOrder;
+        sal_uInt16 byteOrder;
         sal_uInt16 tagAlign;
         sal_uInt32 offset;
     };
diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx
index 41fb0fdb5c59..c6a8ef9275af 100644
--- a/vcl/source/filter/jpeg/JpegReader.hxx
+++ b/vcl/source/filter/jpeg/JpegReader.hxx
@@ -51,9 +51,9 @@ class JPEGReader : public GraphicReader
     std::unique_ptr<Bitmap> mpBitmap;
     std::unique_ptr<Bitmap> mpIncompleteAlpha;
 
-    long const          mnLastPos;
+    long                mnLastPos;
     long                mnLastLines;
-    bool const          mbSetLogSize;
+    bool                mbSetLogSize;
 
     Graphic CreateIntermediateGraphic(long nLines);
 
diff --git a/vcl/source/filter/png/pngread.cxx b/vcl/source/filter/png/pngread.cxx
index 2aa4f9a6610f..d68f7f09a9e1 100644
--- a/vcl/source/filter/png/pngread.cxx
+++ b/vcl/source/filter/png/pngread.cxx
@@ -134,7 +134,7 @@ private:
     bool                mbIDATComplete : 1; // true if finished with enough IDAT chunks
     bool                mbpHYs : 1;         // true if physical size of pixel available
     bool                mbIgnoreGammaChunk : 1;
-    bool const          mbIgnoreCRC : 1; // skip checking CRCs while fuzzing
+    bool                mbIgnoreCRC : 1; // skip checking CRCs while fuzzing
 
 #if OSL_DEBUG_LEVEL > 0
     // do some checks in debug mode
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index b46beb79d55d..98f0101f047f 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1600,7 +1600,7 @@ public:
     char*       mpPtr;
 
     char        maSubsetName[256];
-    bool const  mbPfbSubset;
+    bool        mbPfbSubset;
     int         mnHexLineCol;
 };
 
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 249c8b7c8ce4..cd3e6bbd2a2c 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1046,9 +1046,9 @@ static sal_uInt32 getGlyph0(const sal_uInt8* cmap, sal_uInt32, sal_uInt32 c) {
 namespace {
 
 struct subHeader2 {
-    sal_uInt16 const firstCode;
-    sal_uInt16 const entryCount;
-    sal_uInt16 const idDelta;
+    sal_uInt16 firstCode;
+    sal_uInt16 entryCount;
+    sal_uInt16 idDelta;
     sal_uInt16 idRangeOffset;
 };
 
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 38c4760a9ec2..d5ce806fa747 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -97,9 +97,9 @@ namespace vcl {
 
     struct Run
     {
-        int32_t const nStart;
-        int32_t const nEnd;
-        UScriptCode const nCode;
+        int32_t nStart;
+        int32_t nEnd;
+        UScriptCode nCode;
         Run(int32_t nStart_, int32_t nEnd_, UScriptCode nCode_)
             : nStart(nStart_)
             , nEnd(nEnd_)
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 31a8c6d43661..2353af9e0d39 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2601,7 +2601,7 @@ namespace
     {
     private:
         ImplMetaReadData& m_rData;
-        rtl_TextEncoding const m_eOrigCharSet;
+        rtl_TextEncoding m_eOrigCharSet;
     public:
         DepthGuard(ImplMetaReadData& rData, SvStream const & rIStm)
             : m_rData(rData)
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 8f268d06f5fa..73179fc8e11e 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -196,10 +196,10 @@ class ImplVectMap
 {
 private:
 
-    Scanline const        mpBuf;
+    Scanline        mpBuf;
     Scanline*       mpScan;
-    long const            mnWidth;
-    long const            mnHeight;
+    long            mnWidth;
+    long            mnHeight;
 
 public:
 
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index e46396e73f7a..b067475c7620 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -865,8 +865,8 @@ bool PDFExtOutDevData::HasAdequateCompression( const Graphic &rGraphic,
                                rGraphic.GetGfxLink().GetDataSize();
 
     static const struct {
-        sal_Int32 const mnQuality;
-        sal_Int32 const mnRatio;
+        sal_Int32 mnQuality;
+        sal_Int32 mnRatio;
     } aRatios[] = { // minimum tolerable compression ratios
         { 100, 400 }, { 95, 700 }, { 90, 1000 }, { 85, 1200 },
         { 80, 1500 }, { 75, 1700 }
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index 79d6e96f37d6..6eb8e782329d 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -32,9 +32,9 @@ namespace vcl
     {
         struct FontIdentifier
         {
-            sal_IntPtr const      m_nFontId;
-            bool const            m_bVertical;
-            std::type_info* const m_typeFontFace;
+            sal_IntPtr      m_nFontId;
+            bool            m_bVertical;
+            std::type_info* m_typeFontFace;
 
             FontIdentifier( const PhysicalFontFace*, bool bVertical );
 
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 78800ccd9b39..155ca74be58b 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -112,10 +112,10 @@ constexpr sal_Int32 g_nInheritedPageHeight = 842; // default A4 in inch/72
 
 struct PDFPage
 {
-    VclPtr<PDFWriterImpl>             m_pWriter;
-    double const                      m_nPageWidth;           // in inch/72
-    double const                      m_nPageHeight;          // in inch/72
-    PDFWriter::Orientation const      m_eOrientation;
+    VclPtr<PDFWriterImpl>       m_pWriter;
+    double                      m_nPageWidth;           // in inch/72
+    double                      m_nPageHeight;          // in inch/72
+    PDFWriter::Orientation      m_eOrientation;
     sal_Int32                   m_nPageObject;
     std::vector<sal_Int32>      m_aStreamObjects;
     sal_Int32                   m_nStreamLengthObject;
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 9ad0be6083b3..309b631af745 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1671,9 +1671,9 @@ namespace {
 
 struct PixelCode
 {
-    sal_uInt32 const      mnEncodedPixels;
-    sal_uInt32 const      mnCodeBits;
-    sal_uInt32 const      mnCode;
+    sal_uInt32      mnEncodedPixels;
+    sal_uInt32      mnCodeBits;
+    sal_uInt32      mnCode;
 };
 
 }
@@ -1948,8 +1948,8 @@ void PDFWriterImpl::writeG4Stream( BitmapReadAccess const * i_pBitmap )
                 {   // vertical coding
                     static const struct
                     {
-                        sal_uInt32 const mnCodeBits;
-                        sal_uInt32 const mnCode;
+                        sal_uInt32 mnCodeBits;
+                        sal_uInt32 mnCode;
                     } VerticalCodes[7] = {
                         { 7, 0x03 },    // 0000 011
                         { 6, 0x03 },    // 0000 11
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index dc8409ecd55a..5ed1f4ca33ca 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -280,7 +280,7 @@ namespace {
 struct PrintJobAsync
 {
     std::shared_ptr<PrinterController>  mxController;
-    JobSetup const                      maInitSetup;
+    JobSetup                            maInitSetup;
 
     PrintJobAsync(const std::shared_ptr<PrinterController>& i_xController,
                   const JobSetup& i_rInitSetup)
diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx
index 40f1033b372b..b9395a14363e 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -289,7 +289,7 @@ void lclImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, GraphicAdju
 struct GrfSimpleCacheObj
 {
     Graphic     maGraphic;
-    GraphicAttr const maAttr;
+    GraphicAttr maAttr;
 
                 GrfSimpleCacheObj( const Graphic& rGraphic, const GraphicAttr& rAttr ) :
                     maGraphic( rGraphic ), maAttr( rAttr ) {}
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index ece8e9d6c440..93f606930b99 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -604,7 +604,7 @@ BitmapEx OpenGLHelper::ConvertBufferToBitmapEx(const sal_uInt8* const pBuffer, l
 const char* OpenGLHelper::GLErrorString(GLenum errorCode)
 {
     static const struct {
-        GLenum const code;
+        GLenum code;
         const char *string;
     } errors[]=
     {
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx
index 3a0b3bc7bac3..593f4a4c11fe 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -53,8 +53,8 @@ namespace {
 
 class ExecuteWrapper
 {
-    std::function<void()> const mFunc;
-    Link<Timer*, void> const mHandler;
+    std::function<void()> mFunc;
+    Link<Timer*, void> mHandler;
     volatile bool mbSignal;
 
 public:
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index f6fa5d8c0882..c28cd84f8d2f 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -133,7 +133,7 @@ void DebugEventInjector::InjectTextEvent()
     {
         static struct {
             sal_uInt16 nCodeStart, nCodeEnd;
-            char const aCharStart;
+            char aCharStart;
         } const nTextCodes[] = {
             { KEY_0, KEY_9, '0' },
             { KEY_A, KEY_Z, 'a' }
@@ -186,8 +186,8 @@ void DebugEventInjector::InjectKeyNavEdit()
     vcl::Window *pWindow = ChooseWindow();
 
     static struct {
-        double const     mnProb;
-        sal_uInt16 const mnKey;
+        double     mnProb;
+        sal_uInt16 mnKey;
     } const nWeights[] = {
         // edit / escape etc. - 50%
         { 0.20, KEY_SPACE },
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index b81741108d28..4cd3482cd7b7 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -41,7 +41,7 @@ class ImplDockFloatWin2 : public FloatingWindow
 {
 private:
     ImplDockingWindowWrapper*  mpDockWin;
-    sal_uInt64 const mnLastTicks;
+    sal_uInt64      mnLastTicks;
     Timer           m_aDockTimer;
     Timer           m_aEndDockTimer;
     Point           maDockPos;
@@ -408,7 +408,7 @@ tools::Rectangle DockingManager::GetPosSizePixel( const vcl::Window *pWindow )
 class ImplPopupFloatWin : public FloatingWindow
 {
 private:
-    bool const mbToolBox;
+    bool mbToolBox;
 
 public:
     ImplPopupFloatWin( vcl::Window* pParent, bool bToolBox );
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 411de5bfc526..8fc7937d6ec4 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -56,7 +56,7 @@ class ImplDockFloatWin : public FloatingWindow
 {
 private:
     VclPtr<DockingWindow> mpDockWin;
-    sal_uInt64 const      mnLastTicks;
+    sal_uInt64      mnLastTicks;
     Idle            maDockIdle;
     Point           maDockPos;
     tools::Rectangle       maDockRect;
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index 1f4a60f70dca..5307d60df716 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -229,7 +229,7 @@ private:
     static std::unique_ptr<ErrorInfo> GetDynamicErrorInfo(ErrCode nId);
 
     ErrCode                     nErrId;
-    DialogMask const            nMask;
+    DialogMask                  nMask;
 
 };
 
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 75a6171f5b50..c8817699d39a 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -692,7 +692,7 @@ namespace {
 struct ButtonOrder
 {
     const char* m_aType;
-    int const m_nPriority;
+    int m_nPriority;
 };
 
 }
@@ -744,7 +744,7 @@ namespace {
 
 class sortButtons
 {
-    bool const m_bVerticalContainer;
+    bool m_bVerticalContainer;
 public:
     explicit sortButtons(bool bVerticalContainer)
         : m_bVerticalContainer(bVerticalContainer)
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx
index 5f8ad813b3cf..8ca4b415980f 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -53,7 +53,7 @@ struct MenuItemData
     bool            bIsTemporary;           // Temporary inserted ('No selection possible')
     bool            bHiddenOnGUI;
     Size            aSz;                    // only temporarily valid
-    OUString const  aAccessibleName;        // accessible name
+    OUString        aAccessibleName;        // accessible name
 
     std::unique_ptr<SalMenuItem> pSalMenuItem; // access to native menu
 
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 9f110e600a31..33cddf352ce4 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -169,7 +169,7 @@ private:
     tools::Rectangle m_aSelectionRect;
     tools::Rectangle m_aPaintRect;
     vcl::Region m_aPaintRegion;
-    ImplPaintFlags const m_nPaintFlags;
+    ImplPaintFlags m_nPaintFlags;
     bool m_bPop : 1;
     bool m_bRestoreCursor : 1;
     bool m_bStartedBufferedPaint : 1; ///< This PaintHelper started a buffered paint, and should paint it on the screen when being destructed.
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index a9e4503024fc..e0fad45bf34f 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1338,7 +1338,7 @@ class HandleGestureEventBase
 protected:
     ImplSVData* m_pSVData;
     VclPtr<vcl::Window> m_pWindow;
-    Point const m_aMousePos;
+    Point m_aMousePos;
 
 public:
     HandleGestureEventBase(vcl::Window *pWindow, const Point &rMousePos)