[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/opengl vcl/qa vcl/source vcl/unx vcl/workben
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Mar 16 08:38:59 UTC 2020
include/vcl/BitmapAlphaClampFilter.hxx | 2 -
include/vcl/BitmapColorQuantizationFilter.hxx | 2 -
include/vcl/BitmapDuoToneFilter.hxx | 4 +--
include/vcl/BitmapEmbossGreyFilter.hxx | 4 +--
include/vcl/BitmapGaussianSeparableBlurFilter.hxx | 2 -
include/vcl/BitmapMonochromeFilter.hxx | 2 -
include/vcl/BitmapMosaicFilter.hxx | 4 +--
include/vcl/BitmapSeparableUnsharpenFilter.hxx | 2 -
include/vcl/BitmapSimpleColorQuantizationFilter.hxx | 2 -
include/vcl/BitmapSmoothenFilter.hxx | 2 -
include/vcl/BitmapSolarizeFilter.hxx | 2 -
include/vcl/BitmapTools.hxx | 4 +--
include/vcl/bitmapaccess.hxx | 2 -
include/vcl/builder.hxx | 24 ++++++++++----------
include/vcl/commandevent.hxx | 12 +++++-----
include/vcl/dockwin.hxx | 12 +++++-----
include/vcl/errinf.hxx | 8 +++---
include/vcl/event.hxx | 10 ++++----
include/vcl/evntpost.hxx | 2 -
include/vcl/filter/pdfdocument.hxx | 4 +--
include/vcl/font/Feature.hxx | 2 -
include/vcl/graph.hxx | 8 +++---
include/vcl/graphicfilter.hxx | 4 +--
include/vcl/i18nhelp.hxx | 2 -
include/vcl/metaact.hxx | 6 ++---
include/vcl/pdfwriter.hxx | 2 -
include/vcl/print.hxx | 6 ++---
include/vcl/salctype.hxx | 2 -
include/vcl/salnativewidgets.hxx | 2 -
include/vcl/svapp.hxx | 2 -
include/vcl/textdata.hxx | 4 +--
include/vcl/toolkit/dialog.hxx | 2 -
include/vcl/txtattr.hxx | 4 +--
include/vcl/unohelp2.hxx | 2 -
include/vcl/vclevent.hxx | 2 -
include/vcl/vectorgraphicdata.hxx | 4 +--
include/vcl/weld.hxx | 2 -
vcl/inc/BitmapColorizeFilter.hxx | 2 -
vcl/inc/BitmapFastScaleFilter.hxx | 6 ++---
vcl/inc/BitmapInterpolateScaleFilter.hxx | 4 +--
vcl/inc/BitmapScaleConvolutionFilter.hxx | 4 +--
vcl/inc/BitmapScaleSuperFilter.hxx | 4 +--
vcl/inc/ControlCacheKey.hxx | 8 +++---
vcl/inc/PhysicalFontFamily.hxx | 2 -
vcl/inc/canvasbitmap.hxx | 2 -
vcl/inc/font/FeatureCollector.hxx | 4 +--
vcl/inc/headless/svpframe.hxx | 2 -
vcl/inc/headless/svpvd.hxx | 4 +--
vcl/inc/impanmvw.hxx | 16 ++++++-------
vcl/inc/impfontcharmap.hxx | 2 -
vcl/inc/impfontmetricdata.hxx | 2 -
vcl/inc/implimagetree.hxx | 4 +--
vcl/inc/listbox.hxx | 6 ++---
vcl/inc/opengl/FixedTextureAtlas.hxx | 6 ++---
vcl/inc/opengl/LineRenderUtils.hxx | 6 ++---
vcl/inc/opengl/PackedTextureAtlas.hxx | 4 +--
vcl/inc/opengl/texture.hxx | 2 -
vcl/inc/opengl/zone.hxx | 2 -
vcl/inc/outdev.h | 2 -
vcl/inc/ppdparser.hxx | 2 -
vcl/inc/printdlg.hxx | 8 +++---
vcl/inc/printerinfomanager.hxx | 2 -
vcl/inc/sallayout.hxx | 6 ++---
vcl/inc/salsession.hxx | 6 ++---
vcl/inc/salwtype.hxx | 4 +--
vcl/inc/unx/fc_fontoptions.hxx | 2 -
vcl/inc/unx/freetype_glyphcache.hxx | 4 +--
vcl/inc/unx/gendata.hxx | 2 -
vcl/inc/unx/glyphcache.hxx | 2 -
vcl/inc/unx/gtk/gtkdata.hxx | 2 -
vcl/inc/unx/gtk/gtkgdi.hxx | 2 -
vcl/inc/unx/gtk/gtksalmenu.hxx | 6 ++---
vcl/inc/unx/salbmp.h | 4 +--
vcl/inc/unx/saldisp.hxx | 2 -
vcl/inc/unx/salgdi.h | 4 +--
vcl/inc/unx/wmadaptor.hxx | 2 -
vcl/inc/unx/x11/xrender_peer.hxx | 2 -
vcl/opengl/PackedTextureAtlas.cxx | 2 -
vcl/opengl/x11/gdiimpl.cxx | 2 -
vcl/qa/cppunit/canvasbitmaptest.cxx | 2 -
vcl/qa/cppunit/timer.cxx | 4 +--
vcl/source/app/salvtables.cxx | 2 -
vcl/source/app/svapp.cxx | 2 -
vcl/source/app/svmain.cxx | 4 +--
vcl/source/bitmap/BitmapScaleSuperFilter.cxx | 8 +++---
vcl/source/control/edit.cxx | 4 +--
vcl/source/edit/textdat2.hxx | 8 +++---
vcl/source/edit/textund2.hxx | 14 +++++------
vcl/source/filter/graphicfilter.cxx | 4 +--
vcl/source/filter/igif/decode.hxx | 6 ++---
vcl/source/filter/ixbm/xbmread.cxx | 2 -
vcl/source/filter/ixpm/rgbtable.hxx | 6 ++---
vcl/source/filter/ixpm/xpmread.cxx | 2 -
vcl/source/filter/jpeg/Exif.hxx | 2 -
vcl/source/filter/jpeg/JpegReader.hxx | 4 +--
vcl/source/filter/png/pngread.cxx | 2 -
vcl/source/fontsubset/cff.cxx | 2 -
vcl/source/fontsubset/sft.cxx | 6 ++---
vcl/source/gdi/CommonSalLayout.cxx | 6 ++---
vcl/source/gdi/gdimtf.cxx | 2 -
vcl/source/gdi/impvect.cxx | 6 ++---
vcl/source/gdi/pdfextoutdevdata.cxx | 4 +--
vcl/source/gdi/pdffontcache.hxx | 6 ++---
vcl/source/gdi/pdfwriter_impl.hxx | 8 +++---
vcl/source/gdi/pdfwriter_impl2.cxx | 10 ++++----
vcl/source/gdi/print3.cxx | 2 -
vcl/source/graphic/GraphicObject.cxx | 2 -
vcl/source/opengl/OpenGLHelper.cxx | 2 -
vcl/source/uitest/uno/uiobject_uno.cxx | 4 +--
vcl/source/window/debugevent.cxx | 6 ++---
vcl/source/window/dockmgr.cxx | 4 +--
vcl/source/window/dockwin.cxx | 2 -
vcl/source/window/errinf.cxx | 2 -
vcl/source/window/layout.cxx | 4 +--
vcl/source/window/menuitemlist.hxx | 2 -
vcl/source/window/paint.cxx | 2 -
vcl/source/window/winproc.cxx | 2 -
vcl/unx/generic/app/keysymnames.cxx | 4 +--
vcl/unx/generic/dtrans/X11_clipboard.hxx | 2 -
vcl/unx/generic/dtrans/X11_dndcontext.hxx | 6 ++---
vcl/unx/generic/dtrans/X11_selection.cxx | 2 -
vcl/unx/generic/dtrans/X11_transferable.hxx | 2 -
vcl/unx/generic/fontmanager/fontmanager.cxx | 4 +--
vcl/unx/generic/gdi/cairo_xlib_cairo.hxx | 12 +++++-----
vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 2 -
vcl/unx/generic/print/bitmap_gfx.cxx | 4 +--
vcl/unx/generic/print/genprnpsp.cxx | 4 +--
vcl/unx/generic/print/genpspgraphics.cxx | 2 -
vcl/unx/generic/print/glyphset.hxx | 4 +--
vcl/unx/generic/printer/printerinfomanager.cxx | 4 +--
vcl/unx/gtk3/a11y/atkwrapper.hxx | 2 -
vcl/unx/gtk3/cairo_gtk3_cairo.hxx | 2 -
vcl/unx/gtk3/fpicker/SalGtkPicker.hxx | 2 -
vcl/unx/gtk3/fpicker/resourceprovider.cxx | 2 -
vcl/workben/vcldemo.cxx | 6 ++---
135 files changed, 274 insertions(+), 274 deletions(-)
New commits:
commit 6a7a0ac6aa50d6f90263c72fcfb42a6451fb841a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Mar 16 08:46:20 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Mar 16 09:38:24 2020 +0100
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 at collabora.co.uk>
diff --git a/include/vcl/BitmapAlphaClampFilter.hxx b/include/vcl/BitmapAlphaClampFilter.hxx
index 100eb6bb0726..c8b111d931d1 100644
--- a/include/vcl/BitmapAlphaClampFilter.hxx
+++ b/include/vcl/BitmapAlphaClampFilter.hxx
@@ -26,7 +26,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uInt8 const mcThreshold;
+ sal_uInt8 mcThreshold;
};
#endif
diff --git a/include/vcl/BitmapColorQuantizationFilter.hxx b/include/vcl/BitmapColorQuantizationFilter.hxx
index 0c2f9ad7fbf3..266a384a3cf8 100644
--- a/include/vcl/BitmapColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapColorQuantizationFilter.hxx
@@ -29,7 +29,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uInt16 const mnNewColorCount;
+ sal_uInt16 mnNewColorCount;
struct PopularColorCount
{
diff --git a/include/vcl/BitmapDuoToneFilter.hxx b/include/vcl/BitmapDuoToneFilter.hxx
index 71aabd6ad02e..bb83a121fa52 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 const mnColorOne;
- sal_uLong const mnColorTwo;
+ sal_uLong mnColorOne;
+ sal_uLong mnColorTwo;
};
#endif
diff --git a/include/vcl/BitmapEmbossGreyFilter.hxx b/include/vcl/BitmapEmbossGreyFilter.hxx
index 96b1173dfb9b..2f1d309e0e59 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 const mnAzimuthAngle100;
- sal_uInt16 const mnElevationAngle100;
+ sal_uInt16 mnAzimuthAngle100;
+ sal_uInt16 mnElevationAngle100;
};
#endif
diff --git a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
index 2de99499253d..72b3fdb81f1d 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 const mfRadius;
+ double mfRadius;
static bool convolutionPass(const Bitmap& rBitmap, Bitmap& aNewBitmap,
BitmapReadAccess const* pReadAcc, int aNumberOfContributions,
diff --git a/include/vcl/BitmapMonochromeFilter.hxx b/include/vcl/BitmapMonochromeFilter.hxx
index 8d5773d8896f..81a505e1f7b8 100644
--- a/include/vcl/BitmapMonochromeFilter.hxx
+++ b/include/vcl/BitmapMonochromeFilter.hxx
@@ -35,7 +35,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uInt8 const mcThreshold;
+ sal_uInt8 mcThreshold;
};
#endif
diff --git a/include/vcl/BitmapMosaicFilter.hxx b/include/vcl/BitmapMosaicFilter.hxx
index 9d242eb89c40..6f88b228f1bc 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 const mnTileWidth;
- sal_uLong const mnTileHeight;
+ sal_uLong mnTileWidth;
+ sal_uLong mnTileHeight;
};
#endif
diff --git a/include/vcl/BitmapSeparableUnsharpenFilter.hxx b/include/vcl/BitmapSeparableUnsharpenFilter.hxx
index 3d867619167a..69dcfe3bf9cd 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 const mfRadius;
+ double mfRadius;
};
#endif
diff --git a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
index 88d8adfe5ce6..7e306e051cd5 100644
--- a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
@@ -29,7 +29,7 @@ public:
virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
private:
- sal_uInt16 const mnNewColorCount;
+ sal_uInt16 mnNewColorCount;
};
#endif
diff --git a/include/vcl/BitmapSmoothenFilter.hxx b/include/vcl/BitmapSmoothenFilter.hxx
index 87eccb96b9a8..1a002c960d29 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 const mfRadius;
+ double mfRadius;
};
#endif
diff --git a/include/vcl/BitmapSolarizeFilter.hxx b/include/vcl/BitmapSolarizeFilter.hxx
index 654a52387401..f3e36e10fac5 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 const mcSolarGreyThreshold;
+ sal_uInt8 mcSolarGreyThreshold;
};
#endif
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 6d7c8c930472..b579b8a982a6 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -43,8 +43,8 @@ class VCL_DLLPUBLIC RawBitmap
{
friend BitmapEx VCL_DLLPUBLIC CreateFromData( RawBitmap&& rawBitmap );
std::unique_ptr<sal_uInt8[]> mpData;
- Size const maSize;
- sal_uInt8 const mnBitCount;
+ Size maSize;
+ sal_uInt8 mnBitCount;
public:
RawBitmap(Size const & rSize, sal_uInt8 nBitCount)
: maSize(rSize),
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index 8e916ea16e79..da29fee9ada0 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -145,7 +145,7 @@ protected:
Bitmap maBitmap;
BitmapBuffer* mpBuffer;
ColorMask maColorMask;
- BitmapAccessMode const mnAccessMode;
+ BitmapAccessMode mnAccessMode;
};
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index d9bf965b043d..f98d77c60dc3 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -150,7 +150,7 @@ private:
struct MenuAndId
{
- OString const m_sID;
+ OString m_sID;
VclPtr<Menu> m_pMenu;
MenuAndId(const OString &rId, Menu *pMenu);
};
@@ -158,8 +158,8 @@ private:
struct StringPair
{
- OString const m_sID;
- OString const m_sValue;
+ OString m_sID;
+ OString m_sValue;
StringPair(const OString &rId, const OString &rValue)
: m_sID(rId)
, m_sValue(rValue)
@@ -182,9 +182,9 @@ private:
struct ButtonImageWidgetMap
{
- OString const m_sID;
- OUString const m_sValue;
- bool const m_bRadio;
+ OString m_sID;
+ OUString m_sValue;
+ bool m_bRadio;
ButtonImageWidgetMap(const OString &rId, const OUString &rValue, bool bRadio)
: m_sID(rId)
, m_sValue(rValue)
@@ -200,9 +200,9 @@ private:
struct ComboBoxModelMap
{
- OString const m_sID;
- OUString const m_sValue;
- sal_Int32 const m_nActiveId;
+ OString m_sID;
+ OUString m_sValue;
+ sal_Int32 m_nActiveId;
ComboBoxModelMap(const OString &rId, const OUString &rValue, sal_Int32 nActiveId)
: m_sID(rId)
, m_sValue(rValue)
@@ -302,12 +302,12 @@ private:
OString m_sID;
OString m_sHelpRoot;
- ResHookProc const m_pStringReplace;
+ ResHookProc m_pStringReplace;
VclPtr<vcl::Window> m_pParent;
bool m_bToplevelHasDeferredInit;
bool m_bToplevelHasDeferredProperties;
bool m_bToplevelParentFound;
- bool const m_bLegacy;
+ bool m_bLegacy;
std::unique_ptr<ParserState> m_pParserState;
vcl::Window *get_by_name(const OString& sID);
@@ -322,7 +322,7 @@ private:
bool operator()(const vcl::Window *pA, const vcl::Window *pB) const;
private:
- VclBuilder * const m_pBuilder;
+ VclBuilder *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 bf446e7f4f83..fd834bd822ac 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -95,7 +95,7 @@ public:
class VCL_DLLPUBLIC CommandExtTextInputData
{
private:
- OUString const maText;
+ OUString maText;
std::unique_ptr<ExtTextInputAttr[]> mpTextAttr;
sal_Int32 mnCursorPos;
sal_uInt16 mnCursorFlags;
@@ -207,7 +207,7 @@ enum class ShowDialogId
class VCL_DLLPUBLIC CommandDialogData
{
- ShowDialogId const m_nDialogId;
+ ShowDialogId m_nDialogId;
public:
CommandDialogData( ShowDialogId nDialogId )
: m_nDialogId( nDialogId )
@@ -243,7 +243,7 @@ enum class MediaCommand
class VCL_DLLPUBLIC CommandMediaData
{
- MediaCommand const m_nMediaId;
+ MediaCommand m_nMediaId;
bool m_bPassThroughToOS;
public:
CommandMediaData(MediaCommand nMediaId)
@@ -271,7 +271,7 @@ public:
class VCL_DLLPUBLIC CommandSwipeData
{
- double const mnVelocityX;
+ double mnVelocityX;
public:
CommandSwipeData()
: mnVelocityX(0)
@@ -287,8 +287,8 @@ public:
class VCL_DLLPUBLIC CommandLongPressData
{
- double const mnX;
- double const mnY;
+ double mnX;
+ double mnY;
public:
CommandLongPressData()
: mnX(0)
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index d5c942e4d984..2b628cf66397 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -30,7 +30,7 @@
// data to be sent with docking events
struct DockingData
{
- Point const maMousePos; // in
+ Point maMousePos; // in
tools::Rectangle maTrackRect; // in/out
bool mbFloating; // out
@@ -41,9 +41,9 @@ struct DockingData
struct EndDockingData
{
- tools::Rectangle const maWindowRect; // in
- bool const mbFloating; // in
- bool const mbCancelled; // in
+ tools::Rectangle maWindowRect; // in
+ bool mbFloating; // in
+ bool mbCancelled; // in
EndDockingData( const tools::Rectangle& rRect, bool b, bool bCancelled ) :
maWindowRect( rRect ), mbFloating( b ), mbCancelled( bCancelled )
@@ -52,8 +52,8 @@ struct EndDockingData
struct EndPopupModeData
{
- Point const maFloatingPos; // in
- bool const mbTearoff; // in
+ Point maFloatingPos; // in
+ bool 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 37805b7f710c..6d57954aff2b 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -141,7 +141,7 @@ public:
static std::unique_ptr<ErrorInfo> GetErrorInfo(ErrCode);
private:
- ErrCode const nUserId;
+ ErrCode nUserId;
};
class SAL_WARN_UNUSED VCL_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
@@ -170,7 +170,7 @@ public:
const OUString& GetErrorString() const { return aString; }
private:
- OUString const aString;
+ OUString aString;
};
@@ -185,8 +185,8 @@ public:
const OUString& GetArg2() const { return aArg2; }
private:
- OUString const aArg1;
- OUString const aArg2;
+ OUString aArg1;
+ OUString aArg2;
};
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 177442cb474b..a4b9df4b0a7b 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -194,7 +194,7 @@ namespace o3tl
class VCL_DLLPUBLIC HelpEvent
{
private:
- Point const maPos;
+ Point maPos;
HelpEventMode mnMode;
bool mbKeyboardActivated;
@@ -224,9 +224,9 @@ private:
/// RenderContext to which we should draw - can be a VirtualDevice or anything.
VclPtr<vcl::RenderContext> mpRenderContext;
- tools::Rectangle const maOutRect;
- sal_uInt16 const mnItemId;
- sal_uInt16 const mnStyle;
+ tools::Rectangle maOutRect;
+ sal_uInt16 mnItemId;
+ sal_uInt16 mnStyle;
public:
UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pRenderContext,
@@ -253,7 +253,7 @@ inline UserDrawEvent::UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pR
class VCL_DLLPUBLIC TrackingEvent
{
private:
- MouseEvent const maMEvt;
+ MouseEvent maMEvt;
TrackingEventFlags mnFlags;
public:
diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index 9fdeb16fe8c5..339da3c6105e 100644
--- a/include/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
@@ -29,7 +29,7 @@ namespace vcl
class VCL_DLLPUBLIC EventPoster
{
ImplSVEvent * m_nId;
- Link<LinkParamNone*,void> const m_aLink;
+ Link<LinkParamNone*,void> m_aLink;
DECL_DLLPRIVATE_LINK( DoEvent_Impl, void*, void );
diff --git a/include/vcl/filter/pdfdocument.hxx b/include/vcl/filter/pdfdocument.hxx
index 65e84880c789..ebcabce6e404 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -148,7 +148,7 @@ class VCL_DLLPUBLIC PDFArrayElement : public PDFElement
{
std::vector<PDFElement*> m_aElements;
/// The object that contains this array.
- PDFObjectElement* const m_pObject;
+ PDFObjectElement* m_pObject;
public:
PDFArrayElement(PDFObjectElement* pObject);
@@ -185,7 +185,7 @@ public:
/// Stream object: a byte array with a known length.
class VCL_DLLPUBLIC PDFStreamElement : public PDFElement
{
- size_t const m_nLength;
+ size_t m_nLength;
sal_uInt64 m_nOffset;
/// The byte array itself.
SvMemoryStream m_aMemory;
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index a6d4587dcbce..0b9124f6f728 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -99,7 +99,7 @@ struct Feature
Feature(FeatureID const& rID, FeatureType eType);
FeatureID m_aID;
- FeatureType const m_eType;
+ FeatureType m_eType;
FeatureDefinition m_aDefinition;
};
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 6030f3058a76..b159d4bf3797 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -53,11 +53,11 @@ class GraphicReader;
class SAL_WARN_UNUSED VCL_DLLPUBLIC GraphicConversionParameters
{
private:
- Size const maSizePixel; // default is (0,0)
+ Size maSizePixel; // default is (0,0)
- bool const mbUnlimitedSize : 1; // default is false
- bool const mbAntiAliase : 1; // default is false
- bool const mbSnapHorVerLines : 1; // default is false
+ bool mbUnlimitedSize : 1; // default is false
+ bool mbAntiAliase : 1; // default is false
+ bool mbSnapHorVerLines : 1; // default is false
public:
GraphicConversionParameters(
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 20b8abc935de..040196d70602 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -142,7 +142,7 @@ class VCL_DLLPUBLIC GraphicDescriptor final
sal_uInt16 nBitsPerPixel;
sal_uInt16 nPlanes;
GraphicFileFormat nFormat;
- bool const bOwnStream;
+ bool bOwnStream;
sal_uInt8 mnNumberOfImageComponents;
bool bIsTransparent;
bool bIsAlpha;
@@ -329,7 +329,7 @@ private:
DECL_LINK( FilterCallback, ConvertData&, bool );
std::unique_ptr<FilterErrorEx> pErrorEx;
- bool const bUseConfig;
+ bool bUseConfig;
};
#endif // INCLUDED_VCL_GRAPHICFILTER_HXX
diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx
index b3657afe7da6..38d0232b20b4 100644
--- a/include/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
@@ -47,7 +47,7 @@ namespace vcl
class VCL_DLLPUBLIC I18nHelper
{
::osl::Mutex maMutex;
- LanguageTag const maLanguageTag;
+ LanguageTag 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 220eedff3406..2679020e2fe7 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -64,7 +64,7 @@ struct ImplMetaWriteData
class VCL_DLLPUBLIC MetaAction : public salhelper::SimpleReferenceObject
{
private:
- MetaActionType const mnType;
+ MetaActionType mnType;
protected:
virtual ~MetaAction() override;
@@ -845,7 +845,7 @@ class SAL_DLLPUBLIC_RTTI MetaMaskAction final : public MetaAction
private:
Bitmap maBmp;
- Color const maColor;
+ Color maColor;
Point maPt;
public:
@@ -879,7 +879,7 @@ class SAL_DLLPUBLIC_RTTI MetaMaskScaleAction final : public MetaAction
private:
Bitmap maBmp;
- Color const maColor;
+ Color maColor;
Point maPt;
Size maSz;
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 6527124ea291..71ab441e5765 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -214,7 +214,7 @@ public:
struct VCL_DLLPUBLIC AnyWidget
{
- WidgetType const Type; // primitive RTTI
+ WidgetType 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/print.hxx b/include/vcl/print.hxx
index eff9c983ff5c..0252b2a68551 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -611,9 +611,9 @@ public:
// helper functions for user to create a single control
struct UIControlOptions
{
- OUString const maDependsOnName;
- sal_Int32 const mnDependsOnEntry;
- bool const mbAttachToDependency;
+ OUString maDependsOnName;
+ sal_Int32 mnDependsOnEntry;
+ bool mbAttachToDependency;
OUString maGroupHint;
bool mbInternalOnly;
bool mbEnabled;
diff --git a/include/vcl/salctype.hxx b/include/vcl/salctype.hxx
index c5c2975b338f..409fc5a79993 100644
--- a/include/vcl/salctype.hxx
+++ b/include/vcl/salctype.hxx
@@ -48,7 +48,7 @@ public:
Graphic maGraphic;
SvStream& mrStm;
- ConvertDataFormat const mnFormat;
+ ConvertDataFormat 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 f396b94c5f52..b53331484e96 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -249,7 +249,7 @@ class VCL_DLLPUBLIC ImplControlValue
friend class SalFrame;
private:
- ControlType const mType;
+ ControlType 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 27aa29dc7f06..e6ed7a1f46fc 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -210,7 +210,7 @@ public:
}
private:
- Type const aEvent;
+ Type aEvent;
std::vector<OUString> aData;
};
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index 339c539597d2..2e595fb8995e 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 const mnValue;
+ sal_uLong mnValue;
public:
TextHint( SfxHintId nId );
@@ -126,7 +126,7 @@ public:
struct TEIMEInfos
{
- OUString const aOldTextAfterStartPos;
+ OUString aOldTextAfterStartPos;
std::unique_ptr<ExtTextInputAttr[]> pAttribs;
TextPaM aPos;
sal_Int32 nLen;
diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx
index 96d843441f57..c16d63e4d7f6 100644
--- a/include/vcl/toolkit/dialog.hxx
+++ b/include/vcl/toolkit/dialog.hxx
@@ -54,7 +54,7 @@ private:
bool mbInSyncExecute;
bool mbInClose;
bool mbModalMode;
- InitFlag const mnInitFlag; // used for deferred init
+ InitFlag mnInitFlag; // used for deferred init
VclPtr<VclButtonBox> mpActionArea;
VclPtr<VclBox> mpContentArea;
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index a77ad3c786b6..479cfbe8dccd 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -61,7 +61,7 @@ public:
class VCL_DLLPUBLIC TextAttribFontColor final : public TextAttrib
{
private:
- Color const maColor;
+ Color maColor;
public:
TextAttribFontColor( const Color& rColor );
@@ -77,7 +77,7 @@ public:
class VCL_DLLPUBLIC TextAttribFontWeight final : public TextAttrib
{
private:
- FontWeight const meWeight;
+ FontWeight meWeight;
public:
TextAttribFontWeight( FontWeight eWeight );
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 27ab0973dd37..9f97fd6bd974 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -37,7 +37,7 @@ namespace vcl { namespace unohelper {
public ::cppu::OWeakObject
{
private:
- OUString const maText;
+ OUString maText;
public:
TextDataObject( const OUString& rText );
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 22829b7bc4f2..c1f07e835594 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -205,7 +205,7 @@ class VCL_DLLPUBLIC VclMenuEvent final : public VclSimpleEvent
{
private:
VclPtr<Menu> pMenu;
- sal_uInt16 const mnPos;
+ sal_uInt16 mnPos;
VclMenuEvent(VclMenuEvent const &) = delete;
VclMenuEvent& operator =(VclMenuEvent const &) = delete;
diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx
index b64e79d8d936..b05671852c2c 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -56,7 +56,7 @@ private:
VectorGraphicDataArray maVectorGraphicDataArray;
// The absolute Path if available
- OUString const maPath;
+ OUString maPath;
// on demand created content
bool mbSequenceCreated;
@@ -64,7 +64,7 @@ private:
std::deque< css::uno::Reference< css::graphic::XPrimitive2D > > maSequence;
BitmapEx maReplacement;
size_t mNestedBitmapSize;
- VectorGraphicDataType const meVectorGraphicDataType;
+ VectorGraphicDataType meVectorGraphicDataType;
// extra:
std::unique_ptr<WmfExternal> mpExternalHeader;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 151333203895..861b7d9b9a69 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1783,7 +1783,7 @@ public:
class VCL_DLLPUBLIC TimeSpinButton final
{
- TimeFieldFormat const m_eFormat;
+ TimeFieldFormat m_eFormat;
std::unique_ptr<weld::SpinButton> m_xSpinButton;
Link<TimeSpinButton&, void> m_aValueChangedHdl;
diff --git a/vcl/inc/BitmapColorizeFilter.hxx b/vcl/inc/BitmapColorizeFilter.hxx
index 81b565728490..93e4d92b2261 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 const maColor;
+ Color maColor;
};
#endif
diff --git a/vcl/inc/BitmapFastScaleFilter.hxx b/vcl/inc/BitmapFastScaleFilter.hxx
index f8d56517a1da..09fbdcaebbc6 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 const mfScaleX;
- double const mfScaleY;
- Size const maSize;
+ double mfScaleX;
+ double mfScaleY;
+ Size maSize;
};
#endif
diff --git a/vcl/inc/BitmapInterpolateScaleFilter.hxx b/vcl/inc/BitmapInterpolateScaleFilter.hxx
index 0cb707296b7d..8cbae0601834 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 const mfScaleX;
- double const mfScaleY;
+ double mfScaleX;
+ double mfScaleY;
};
#endif
diff --git a/vcl/inc/BitmapScaleConvolutionFilter.hxx b/vcl/inc/BitmapScaleConvolutionFilter.hxx
index 5a9767c93d31..9bc1bd45ca0c 100644
--- a/vcl/inc/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/BitmapScaleConvolutionFilter.hxx
@@ -40,8 +40,8 @@ protected:
private:
std::unique_ptr<Kernel> mxKernel;
- double const mrScaleX;
- double const mrScaleY;
+ double mrScaleX;
+ double mrScaleY;
};
class VCL_DLLPUBLIC BitmapScaleBilinearFilter final : public BitmapScaleConvolutionFilter
diff --git a/vcl/inc/BitmapScaleSuperFilter.hxx b/vcl/inc/BitmapScaleSuperFilter.hxx
index 26853b964143..47e48eb1ad27 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 const mrScaleX;
- double const mrScaleY;
+ double mrScaleX;
+ double mrScaleY;
};
diff --git a/vcl/inc/ControlCacheKey.hxx b/vcl/inc/ControlCacheKey.hxx
index 06a1ff97bd8d..9c8f467ee5d4 100644
--- a/vcl/inc/ControlCacheKey.hxx
+++ b/vcl/inc/ControlCacheKey.hxx
@@ -27,10 +27,10 @@
class ControlCacheKey
{
public:
- ControlType const mnType;
- ControlPart const mnPart;
- ControlState const mnState;
- Size const maSize;
+ ControlType mnType;
+ ControlPart mnPart;
+ ControlState mnState;
+ Size 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 130973c3c006..b8468a6e4580 100644
--- a/vcl/inc/PhysicalFontFamily.hxx
+++ b/vcl/inc/PhysicalFontFamily.hxx
@@ -83,7 +83,7 @@ private:
std::vector< rtl::Reference<PhysicalFontFace> > maFontFaces;
OUString maFamilyName; // original font family name
- OUString const maSearchName; // normalized font family name
+ OUString 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 6770ab953aa5..e49f3f43ab41 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -37,7 +37,7 @@ namespace unotools
css::rendering::XIntegerBitmapColorSpace >
{
private:
- BitmapEx const m_aBmpEx;
+ BitmapEx 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 505a0874d52c..bae9e3c56b0c 100644
--- a/vcl/inc/font/FeatureCollector.hxx
+++ b/vcl/inc/font/FeatureCollector.hxx
@@ -22,9 +22,9 @@ namespace font
class FeatureCollector
{
private:
- hb_face_t* const m_pHbFace;
+ hb_face_t* m_pHbFace;
std::vector<vcl::font::Feature>& m_rFontFeatures;
- LanguageType const m_eLanguageType;
+ LanguageType 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 3869f25a3442..7245a31d5c8c 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -40,7 +40,7 @@ class SvpSalFrame : public SalFrame
SvpSalInstance* m_pInstance;
SvpSalFrame* m_pParent; // pointer to parent frame
std::list< SvpSalFrame* > m_aChildren; // List of child frames
- SalFrameStyleFlags const m_nStyle;
+ SalFrameStyleFlags 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 9f83026c77db..7ec66670957e 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -31,8 +31,8 @@ typedef struct _cairo_surface cairo_surface_t;
class VCL_DLLPUBLIC SvpSalVirtualDevice : public SalVirtualDevice
{
- DeviceFormat const m_eFormat;
- cairo_surface_t* const m_pRefSurface;
+ DeviceFormat m_eFormat;
+ cairo_surface_t* m_pRefSurface;
cairo_surface_t* m_pSurface;
bool m_bOwnsSurface; // nearly always true, except for edge case of tdf#127529
basegfx::B2IVector m_aFrameSize;
diff --git a/vcl/inc/impanmvw.hxx b/vcl/inc/impanmvw.hxx
index a9f5e959ee58..b4e634071279 100644
--- a/vcl/inc/impanmvw.hxx
+++ b/vcl/inc/impanmvw.hxx
@@ -47,13 +47,13 @@ private:
friend class Animation;
- Animation* const mpParent;
+ Animation* mpParent;
VclPtr<OutputDevice> mpRenderContext;
- long const mnExtraData;
- Point const maPt;
- Point maDispPt;
- Point maRestPt;
- Size const maSz;
+ long mnExtraData;
+ Point maPt;
+ Point maDispPt;
+ Point maRestPt;
+ Size maSz;
Size maSzPix;
Size maDispSz;
Size maRestSz;
@@ -64,8 +64,8 @@ private:
Disposal meLastDisposal;
bool mbIsPaused;
bool mbIsMarked;
- bool const mbIsMirroredHorizontally;
- bool const mbIsMirroredVertically;
+ bool mbIsMirroredHorizontally;
+ bool mbIsMirroredVertically;
public:
~ImplAnimView();
diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx
index 297cd5fa359a..eaa99dbe2d4d 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 const mnRangeCount;
+ int mnRangeCount;
int mnCharCount; // covered codepoints
};
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx
index 6250c9155436..d801b9e41c13 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/impfontmetricdata.hxx
@@ -99,7 +99,7 @@ private:
bool ShouldUseWinMetrics(const vcl::TTGlobalFontInfo& rInfo);
// font instance attributes from the font request
- long const mnHeight; // Font size
+ long 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 40dde5a94cdb..f5ae99ba7d11 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -40,10 +40,10 @@ namespace com { namespace sun { namespace star { namespace container {
struct ImageRequestParameters
{
OUString msName;
- OUString const msStyle;
+ OUString msStyle;
BitmapEx& mrBitmap;
bool mbLocalized;
- ImageLoadFlags const meFlags;
+ ImageLoadFlags meFlags;
bool mbWriteImageToCache;
sal_Int32 mnScalePercentage;
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 0f4c593e5b57..64d8b24e06df 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -49,9 +49,9 @@ enum LB_EVENT_TYPE
struct ImplEntryType
{
- OUString const maStr;
- SalLayoutGlyphs maStrGlyphs;
- Image const maImage;
+ OUString maStr;
+ SalLayoutGlyphs maStrGlyphs;
+ Image maImage;
void* mpUserData;
bool mbIsSelected;
ListBoxEntryFlags mnFlags;
diff --git a/vcl/inc/opengl/FixedTextureAtlas.hxx b/vcl/inc/opengl/FixedTextureAtlas.hxx
index 0523403b2b2a..e576fcb54f0b 100644
--- a/vcl/inc/opengl/FixedTextureAtlas.hxx
+++ b/vcl/inc/opengl/FixedTextureAtlas.hxx
@@ -20,9 +20,9 @@ class FixedTextureAtlasManager final
{
std::vector<std::unique_ptr<FixedTexture>> maFixedTextures;
- int const mWidthFactor;
- int const mHeightFactor;
- int const mSubTextureSize;
+ int mWidthFactor;
+ int mHeightFactor;
+ int mSubTextureSize;
void CreateNewTexture();
diff --git a/vcl/inc/opengl/LineRenderUtils.hxx b/vcl/inc/opengl/LineRenderUtils.hxx
index aa8d8e637902..8d97fa3ee9dc 100644
--- a/vcl/inc/opengl/LineRenderUtils.hxx
+++ b/vcl/inc/opengl/LineRenderUtils.hxx
@@ -21,9 +21,9 @@ private:
std::vector<Vertex>& mrVertices;
std::vector<GLuint>& mrIndices;
GLubyte mR, mG, mB, mA;
- GLfloat const mfLineWidth;
- GLfloat const mfLineWidthAndAA;
- size_t const mnInitialIndexSize;
+ GLfloat mfLineWidth;
+ GLfloat mfLineWidthAndAA;
+ size_t mnInitialIndexSize;
bool mbIncomplete;
public:
diff --git a/vcl/inc/opengl/PackedTextureAtlas.hxx b/vcl/inc/opengl/PackedTextureAtlas.hxx
index 6dadcc59e0ad..7a283aa4517b 100644
--- a/vcl/inc/opengl/PackedTextureAtlas.hxx
+++ b/vcl/inc/opengl/PackedTextureAtlas.hxx
@@ -30,8 +30,8 @@ class VCL_DLLPUBLIC PackedTextureAtlasManager final
{
std::vector<std::unique_ptr<PackedTexture>> maPackedTextures;
- int const mnTextureWidth;
- int const mnTextureHeight;
+ int mnTextureWidth;
+ int mnTextureHeight;
void CreateNewTexture();
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index 384e2a879097..0438b9af1541 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 const mnHeight;
+ int mnHeight;
GLenum mnFilter;
GLuint mnOptStencil;
diff --git a/vcl/inc/opengl/zone.hxx b/vcl/inc/opengl/zone.hxx
index 621ee4289b27..4bcdf15dcf79 100644
--- a/vcl/inc/opengl/zone.hxx
+++ b/vcl/inc/opengl/zone.hxx
@@ -30,7 +30,7 @@ public:
/// Create this to not only enter the zone, but set VCL context.
class OpenGLVCLContextZone {
- OpenGLZone const aZone;
+ OpenGLZone aZone;
public:
OpenGLVCLContextZone();
};
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 6f9a0a6d56c6..27f8dc5481db 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -86,7 +86,7 @@ struct ImplFontSubstEntry
{
OUString maSearchName;
OUString maSearchReplaceName;
- AddFontSubstituteFlags const mnFlags;
+ AddFontSubstituteFlags mnFlags;
ImplFontSubstEntry( const OUString& rFontName, const OUString& rSubstFontName, AddFontSubstituteFlags nSubstFlags );
};
diff --git a/vcl/inc/ppdparser.hxx b/vcl/inc/ppdparser.hxx
index a0a59c4a8d80..b5bf309ed917 100644
--- a/vcl/inc/ppdparser.hxx
+++ b/vcl/inc/ppdparser.hxx
@@ -65,7 +65,7 @@ class PPDKey
typedef std::unordered_map< OUString, PPDValue > hash_type;
typedef std::vector< PPDValue* > value_type;
- OUString const m_aKey;
+ OUString m_aKey;
hash_type m_aValues;
value_type m_aOrderedValues;
const PPDValue* m_pDefaultValue;
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 4b6772a17eb8..7c6c1005fd12 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -190,13 +190,13 @@ namespace vcl
std::unique_ptr<weld::Expander> mxLayoutExpander;
std::unique_ptr<weld::Widget> mxCustom;
- OUString const maPrintToFileText;
+ OUString maPrintToFileText;
OUString maPrintText;
- OUString const maDefPrtText;
+ OUString maDefPrtText;
OUString maPageStr;
- OUString const maNoPageStr;
- OUString const maNoPreviewStr;
+ OUString maNoPageStr;
+ OUString maNoPreviewStr;
sal_Int32 mnCurPage;
sal_Int32 mnCachedPages;
diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx
index 020365b8be0a..2286158d66af 100644
--- a/vcl/inc/printerinfomanager.hxx
+++ b/vcl/inc/printerinfomanager.hxx
@@ -109,7 +109,7 @@ protected:
std::unique_ptr<SystemQueueInfo>
m_pQueueInfo;
- Type const m_eType;
+ Type m_eType;
bool m_bUseIncludeFeature;
bool m_bUseJobPatch;
OUString m_aSystemDefaultPaper;
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index be66bafd87e3..e94b4c20531e 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -76,11 +76,11 @@ class VCL_DLLPUBLIC ImplLayoutArgs
{
public:
// string related inputs
- LanguageTag const maLanguageTag;
+ LanguageTag maLanguageTag;
SalLayoutFlags mnFlags;
const OUString& mrStr;
- int const mnMinCharPos;
- int const mnEndCharPos;
+ int mnMinCharPos;
+ int mnEndCharPos;
// performance hack
vcl::TextLayoutCache const* m_pTextLayoutCache;
diff --git a/vcl/inc/salsession.hxx b/vcl/inc/salsession.hxx
index f065343e8e2a..fb9763bb6882 100644
--- a/vcl/inc/salsession.hxx
+++ b/vcl/inc/salsession.hxx
@@ -32,7 +32,7 @@ enum SalSessionEventType
struct SalSessionEvent
{
- SalSessionEventType const m_eType;
+ SalSessionEventType m_eType;
SalSessionEvent( SalSessionEventType eType )
: m_eType( eType )
@@ -41,7 +41,7 @@ struct SalSessionEvent
struct SalSessionInteractionEvent : public SalSessionEvent
{
- bool const m_bInteractionGranted;
+ bool m_bInteractionGranted;
SalSessionInteractionEvent( bool bGranted )
: SalSessionEvent( Interaction ),
@@ -51,7 +51,7 @@ struct SalSessionInteractionEvent : public SalSessionEvent
struct SalSessionSaveRequestEvent : public SalSessionEvent
{
- bool const m_bShutdown;
+ bool m_bShutdown;
SalSessionSaveRequestEvent( bool bShutdown )
: SalSessionEvent( SaveRequest ),
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 3585c018ba52..fc8aeb4976c0 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -201,8 +201,8 @@ struct SalSurroundingTextRequestEvent
struct SalSurroundingTextSelectionChangeEvent
{
- sal_uLong const mnStart; // The beginning index of selected range
- sal_uLong const mnEnd; // The end index of selected range
+ sal_uLong mnStart; // The beginning index of selected range
+ sal_uLong 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 a3e26197b05f..fe1bbef20452 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -34,7 +34,7 @@ public:
FcPattern* GetPattern() const;
static void cairo_font_options_substitute(FcPattern* pPattern);
private:
- FcPattern* const mpPattern;
+ FcPattern* mpPattern;
};
diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx
index 6e9f5f627877..c3b6342b61e7 100644
--- a/vcl/inc/unx/freetype_glyphcache.hxx
+++ b/vcl/inc/unx/freetype_glyphcache.hxx
@@ -84,7 +84,7 @@ private:
const int mnFaceNum;
const int mnFaceVariation;
int mnRefCount;
- sal_IntPtr const mnFontId;
+ sal_IntPtr mnFontId;
FontAttributes maDevFontAttributes;
FontCharMapRef mxFontCharMap;
@@ -93,7 +93,7 @@ private:
class FreetypeFontFace : public PhysicalFontFace
{
private:
- FreetypeFontInfo* const mpFreetypeFontInfo;
+ FreetypeFontInfo* mpFreetypeFontInfo;
public:
FreetypeFontFace( FreetypeFontInfo*, const FontAttributes& );
diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index 8cf4cfa90103..5efb34a8f73f 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -39,7 +39,7 @@ enum GenericUnixSalDataType
class VCL_DLLPUBLIC GenericUnixSalData : public SalData
{
private:
- GenericUnixSalDataType const m_eType;
+ GenericUnixSalDataType 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 a9a7e5709e71..d2352a4ffd44 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -198,7 +198,7 @@ private:
long mnSin;
int mnWidth;
- int const mnPrioAntiAlias;
+ int 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 3ee22e90f1b7..6c5dd46fc0b6 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -98,7 +98,7 @@ class GtkSalFrame;
class GtkSalDisplay : public SalGenericDisplay
{
GtkSalSystem* m_pSys;
- GdkDisplay* const m_pGdkDisplay;
+ GdkDisplay* 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 022a72321873..5e259767152c 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -138,7 +138,7 @@ public:
GtkStyleContext* createOldContext(GtkControlPart ePart);
GtkStyleContext* makeContext(GtkWidgetPath *pPath, GtkStyleContext *pParent);
private:
- GtkWidget * const mpWindow;
+ GtkWidget *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 ddef9ef42310..4bac1fe53d62 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -36,7 +36,7 @@ private:
Idle maUpdateMenuBarIdle;
bool mbInActivateCallback;
- bool const mbMenuBar;
+ bool mbMenuBar;
bool mbNeedsUpdate;
bool mbReturnFocusToDocument;
bool mbAddedGrab;
@@ -141,8 +141,8 @@ public:
GtkSalMenu* mpParentMenu; // The menu into which this menu item is inserted
GtkSalMenu* mpSubMenu; // Submenu of this item (if defined)
- MenuItemType const mnType; // Item type
- sal_uInt16 const mnId; // Item ID
+ MenuItemType mnType; // Item type
+ sal_uInt16 mnId; // Item ID
bool mbVisible; // Item visibility.
};
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 78b9c9c7a09c..fc84501294fd 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -156,8 +156,8 @@ private:
Pixmap maPixmap;
SalTwoRect maTwoRect;
- long const mnDepth;
- SalX11Screen const mnXScreen;
+ long mnDepth;
+ SalX11Screen mnXScreen;
static void ImplDraw(
Drawable aSrcDrawable,
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index d779916a77c4..b5bed8e60b54 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -278,7 +278,7 @@ protected:
SalX11Screen m_nXDefaultScreen;
std::vector< ScreenData > m_aScreens;
- ScreenData const m_aInvalidScreenData;
+ ScreenData m_aInvalidScreenData;
Pair aResolution_; // [dpi]
sal_uLong nMaxRequestSize_; // [byte]
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 01e5fffaf66a..19abfa0b8133 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -314,8 +314,8 @@ private:
bool bWindow_ : 1; // is Window
bool bVirDev_ : 1; // is VirDev
- bool const m_bOpenGL : 1;
- bool const m_bSkia : 1;
+ bool m_bOpenGL : 1;
+ bool m_bSkia : 1;
private:
std::unique_ptr<SalGraphicsImpl> mxImpl;
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index 797d312faced..1739053a0d41 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -126,7 +126,7 @@ public:
static const int decoration_All = 0x10000000;
protected:
- SalDisplay* const m_pSalDisplay; // Display to use
+ SalDisplay* m_pSalDisplay; // Display to use
Display* m_pDisplay; // X Display of SalDisplay
OUString m_aWMName;
Atom m_aWMAtoms[ NetAtomMax];
diff --git a/vcl/inc/unx/x11/xrender_peer.hxx b/vcl/inc/unx/x11/xrender_peer.hxx
index bbf51c9ea709..e1006f88ed44 100644
--- a/vcl/inc/unx/x11/xrender_peer.hxx
+++ b/vcl/inc/unx/x11/xrender_peer.hxx
@@ -37,7 +37,7 @@ private:
XRenderPeer();
void InitRenderLib();
- Display* const mpDisplay;
+ Display* mpDisplay;
XRenderPictFormat* mpStandardFormatA8;
public:
diff --git a/vcl/opengl/PackedTextureAtlas.cxx b/vcl/opengl/PackedTextureAtlas.cxx
index e56e7207bfa2..8508bbe3ca18 100644
--- a/vcl/opengl/PackedTextureAtlas.cxx
+++ b/vcl/opengl/PackedTextureAtlas.cxx
@@ -22,7 +22,7 @@ namespace {
struct Node
{
- tools::Rectangle const mRectangle;
+ tools::Rectangle mRectangle;
std::unique_ptr<Node> mLeftNode;
std::unique_ptr<Node> mRightNode;
bool mOccupied;
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 8b6cbd3d30c8..c00ff76e8eaa 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -78,7 +78,7 @@ private:
{
private:
errorHandler oldErrorHandler;
- Display* const mdpy;
+ Display* mdpy;
public:
TempErrorHandler(Display* dpy, errorHandler newErrorHandler)
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 34ddd8825e60..511874a0c2df 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -243,7 +243,7 @@ class TestBitmap : public cppu::WeakImplHelper< rendering::XIntegerReadOnlyBitma
rendering::XIntegerBitmapColorSpace >
{
private:
- geometry::IntegerSize2D const maSize;
+ geometry::IntegerSize2D maSize;
uno::Sequence<sal_Int8> maComponentTags;
uno::Sequence<sal_Int32> maComponentBitCounts;
rendering::IntegerBitmapLayout maLayout;
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index a7f5044bb11e..4071cd0fdc3b 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -32,7 +32,7 @@ namespace {
/// Avoid our timer tests just wedging the build if they fail.
class WatchDog : public osl::Thread
{
- sal_Int32 const mnSeconds;
+ sal_Int32 mnSeconds;
public:
explicit WatchDog(sal_Int32 nSeconds) :
Thread(),
@@ -469,7 +469,7 @@ namespace {
class IdleSerializer : public Idle
{
- sal_uInt32 const mnPosition;
+ sal_uInt32 mnPosition;
sal_uInt32 &mrProcesed;
public:
IdleSerializer(const char *pDebugName, TaskPriority ePrio,
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)
diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
index e1d112adad22..742ebef20997 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -43,7 +43,7 @@ namespace vcl_sal {
struct KeysymNameReplacement
{
- KeySym const aSymbol;
+ KeySym aSymbol;
const char* pName;
};
@@ -51,7 +51,7 @@ namespace vcl_sal {
{
const char* pLangName;
const KeysymNameReplacement* pReplacements;
- int const nReplacements;
+ int nReplacements;
};
}
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index 4827c2e4cb41..4092d3f67a55 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -41,7 +41,7 @@ namespace x11 {
rtl::Reference<SelectionManager> m_xSelectionManager;
::std::vector< css::uno::Reference< css::datatransfer::clipboard::XClipboardListener > > m_aListeners;
- Atom const m_aSelection;
+ Atom m_aSelection;
X11Clipboard( SelectionManager& rManager, Atom aSelection );
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index ec4412488a9d..18c33666b8d5 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -35,7 +35,7 @@ namespace x11 {
class DropTargetDropContext :
public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDropTargetDropContext>
{
- ::Window const m_aDropWindow;
+ ::Window m_aDropWindow;
rtl::Reference<SelectionManager> m_xManager;
public:
DropTargetDropContext( ::Window, SelectionManager& );
@@ -50,7 +50,7 @@ namespace x11 {
class DropTargetDragContext :
public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDropTargetDragContext>
{
- ::Window const m_aDropWindow;
+ ::Window m_aDropWindow;
rtl::Reference<SelectionManager> m_xManager;
public:
DropTargetDragContext( ::Window, SelectionManager& );
@@ -64,7 +64,7 @@ namespace x11 {
class DragSourceContext :
public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDragSourceContext>
{
- ::Window const m_aDropWindow;
+ ::Window m_aDropWindow;
rtl::Reference<SelectionManager> m_xManager;
public:
DragSourceContext( ::Window, SelectionManager& );
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index b42f672a4260..c98df363daec 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -113,7 +113,7 @@ struct NativeTypeEntry
Atom nAtom;
const char* pType; // Mime encoding on our side
const char* pNativeType; // string corresponding to nAtom for the case of nAtom being uninitialized
- int const nFormat; // the corresponding format
+ int nFormat; // the corresponding format
};
}
diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx
index a0a896b6bd91..0de101f6d354 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.hxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.hxx
@@ -30,7 +30,7 @@ namespace x11 {
class X11Transferable : public ::cppu::WeakImplHelper< css::datatransfer::XTransferable >
{
SelectionManager& m_rManager;
- Atom const m_aSelection;
+ Atom m_aSelection;
public:
X11Transferable( SelectionManager& rManager, Atom selection );
virtual ~X11Transferable() override;
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 3370f829916e..a7ed0c4e1082 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -842,8 +842,8 @@ FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily )
{
struct family_t {
const char* mpName;
- sal_uInt16 const mnLength;
- FontFamily const meType;
+ sal_uInt16 mnLength;
+ FontFamily meType;
};
#define InitializeClass( p, a ) p, sizeof(p) - 1, a
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
index 0f280e6b764e..8b67c5951667 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
@@ -38,8 +38,8 @@ namespace cairo {
explicit X11SysData( const SystemEnvData& );
void* pDisplay; // the relevant display connection
- long const hDrawable; // a drawable
- void* const pVisual; // the visual in use
+ long hDrawable; // a drawable
+ void* pVisual; // the visual in use
int nScreen; // the current screen of the drawable
void* pRenderFormat; // render format for drawable
};
@@ -47,8 +47,8 @@ namespace cairo {
/// RAII wrapper for a pixmap
struct X11Pixmap
{
- void* const mpDisplay; // the relevant display connection
- long const mhDrawable; // a drawable
+ void* mpDisplay; // the relevant display connection
+ long mhDrawable; // a drawable
X11Pixmap( long hDrawable, void* pDisplay ) :
mpDisplay(pDisplay),
@@ -63,8 +63,8 @@ namespace cairo {
class X11Surface : public Surface
{
const X11SysData maSysData;
- X11PixmapSharedPtr const mpPixmap;
- CairoSurfaceSharedPtr const mpSurface;
+ X11PixmapSharedPtr mpPixmap;
+ CairoSurfaceSharedPtr mpSurface;
X11Surface( const X11SysData& rSysData, const X11PixmapSharedPtr& rPixmap, const CairoSurfaceSharedPtr& pSurface );
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 956ce000a6b8..7408b5f780d4 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -735,7 +735,7 @@ private:
mpFlagAry;
FT_Vector maPosition;
- sal_uInt16 const mnMaxPoints;
+ sal_uInt16 mnMaxPoints;
sal_uInt16 mnPoints;
sal_uInt16 mnPoly;
bool bHasOffline;
diff --git a/vcl/unx/generic/print/bitmap_gfx.cxx b/vcl/unx/generic/print/bitmap_gfx.cxx
index b70a1e9ce981..b559b9b1325f 100644
--- a/vcl/unx/generic/print/bitmap_gfx.cxx
+++ b/vcl/unx/generic/print/bitmap_gfx.cxx
@@ -66,7 +66,7 @@ class HexEncoder : public ByteEncoder
{
private:
- osl::File* const mpFile;
+ osl::File* mpFile;
sal_uInt32 mnColumn;
sal_uInt32 mnOffset;
OStringBuffer mpFileBuffer;
@@ -136,7 +136,7 @@ class Ascii85Encoder : public ByteEncoder
{
private:
- osl::File* const mpFile;
+ osl::File* mpFile;
sal_uInt32 mnByte;
sal_uInt8 mpByteBuffer[4];
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 7b985ff425bc..012a30e1b254 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -938,8 +938,8 @@ struct PDFNewJobParameters
struct PDFPrintFile
{
- OUString const maTmpURL;
- PDFNewJobParameters const maParameters;
+ OUString maTmpURL;
+ PDFNewJobParameters maParameters;
PDFPrintFile( const OUString& i_rURL, const PDFNewJobParameters& i_rNewParameters )
: maTmpURL( i_rURL )
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index e0a6778f76ba..f9bb988047c5 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -539,7 +539,7 @@ namespace {
class ImplPspFontData : public FreetypeFontFace
{
private:
- sal_IntPtr const mnFontId;
+ sal_IntPtr mnFontId;
public:
explicit ImplPspFontData( const psp::FastPrintFontInfo& );
diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx
index 0185559ee165..272825933beb 100644
--- a/vcl/unx/generic/print/glyphset.hxx
+++ b/vcl/unx/generic/print/glyphset.hxx
@@ -39,8 +39,8 @@ class GlyphSet
{
private:
- sal_Int32 const mnFontID;
- bool const mbVertical;
+ sal_Int32 mnFontID;
+ bool mbVertical;
OString maBaseName;
typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t;
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 8e96c41e0f9a..c866267246ae 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -694,8 +694,8 @@ struct SystemCommandParameters
const char* pPrintCommand;
const char* pForeToken;
const char* pAftToken;
- unsigned int const nForeTokenCount;
- tokenHandler const pHandler;
+ unsigned int nForeTokenCount;
+ tokenHandler pHandler;
};
}
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.hxx b/vcl/unx/gtk3/a11y/atkwrapper.hxx
index 7ae0379de9c3..97ea5997ad4a 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.hxx
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star { namespace accessibility {
struct AtkObjectWrapper
{
- AtkObject const aParent;
+ AtkObject aParent;
AtkObject* mpOrig; //if we're a GtkDrawingArea acting as a custom LibreOffice widget, this is the toolkit default impl
css::uno::Reference<css::accessibility::XAccessible> mpAccessible;
diff --git a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
index 54444d8997c6..59ed1437f1b6 100644
--- a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
+++ b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
@@ -22,7 +22,7 @@ namespace cairo {
class Gtk3Surface : public Surface
{
const GtkSalGraphics* mpGraphics;
- cairo_t* const cr;
+ cairo_t* cr;
CairoSurfaceSharedPtr mpSurface;
public:
/// takes over ownership of passed cairo_surface
diff --git a/vcl/unx/gtk3/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk3/fpicker/SalGtkPicker.hxx
index 0eb8720f771a..46d6d9278b63 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkPicker.hxx
@@ -81,7 +81,7 @@ class RunDialog :
{
private:
osl::Mutex maLock;
- GtkWidget * const mpDialog;
+ GtkWidget *mpDialog;
bool mbTerminateDesktop;
css::uno::Reference<css::awt::XExtendedToolkit> mxToolkit;
css::uno::Reference<css::frame::XDesktop> mxDesktop;
diff --git a/vcl/unx/gtk3/fpicker/resourceprovider.cxx b/vcl/unx/gtk3/fpicker/resourceprovider.cxx
index 178374de6186..5ad801a6ea95 100644
--- a/vcl/unx/gtk3/fpicker/resourceprovider.cxx
+++ b/vcl/unx/gtk3/fpicker/resourceprovider.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
static const struct
{
- sal_Int32 const ctrlId;
+ sal_Int32 ctrlId;
const char *resId;
} CtrlIdToResIdTable[] = {
{ CHECKBOX_AUTOEXTENSION, STR_FPICKER_AUTO_EXTENSION },
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index a6ce87ac7a48..35e9bdd13641 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -359,9 +359,9 @@ public:
aToplevelRegions[2].BottomRight());
DemoRenderer::clearRects(rDev,aSubRegions);
static struct {
- bool const mbClip;
- bool const mbArabicText;
- bool const mbRotate;
+ bool mbClip;
+ bool mbArabicText;
+ bool mbRotate;
} const aRenderData[] = {
{ false, false, false },
{ false, true, false },
More information about the Libreoffice-commits
mailing list