summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-13 20:45:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-15 16:28:40 +0100
commit0116d0b2ca92cffc7c3459ddf07dfcaa9187975f (patch)
tree39bf82ac7b7a44c74d9d5f48d978b33570addcb2 /toolkit
parent12a8fa0d656f3f8bad7c9f85e4f760b5201d5f75 (diff)
Revert "loplugin:constfields in toolkit"
This reverts commit 175834ce6a3ba707a6d34aa8de7351574381f481. Change-Id: I4b524ca1aa9aed2273b5d891a02fc0b360abc94c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90516 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/inc/controls/eventcontainer.hxx2
-rw-r--r--toolkit/inc/helper/msgbox.hxx2
-rw-r--r--toolkit/source/awt/asynccallback.cxx2
-rw-r--r--toolkit/source/awt/stylesettings.cxx2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx10
-rw-r--r--toolkit/source/awt/vclxwindow.cxx2
-rw-r--r--toolkit/source/controls/geometrycontrolmodel.cxx2
-rw-r--r--toolkit/source/controls/unocontrol.cxx2
-rw-r--r--toolkit/source/controls/unocontrolcontainer.cxx2
9 files changed, 13 insertions, 13 deletions
diff --git a/toolkit/inc/controls/eventcontainer.hxx b/toolkit/inc/controls/eventcontainer.hxx
index 460ae6fe256f..4961c16344ee 100644
--- a/toolkit/inc/controls/eventcontainer.hxx
+++ b/toolkit/inc/controls/eventcontainer.hxx
@@ -36,7 +36,7 @@ class ScriptEventContainer final : public ::cppu::WeakImplHelper<
{
std::unordered_map< OUString, css::uno::Any>
mHashMap;
- css::uno::Type const mType;
+ css::uno::Type mType;
ContainerListenerMultiplexer maContainerListeners;
diff --git a/toolkit/inc/helper/msgbox.hxx b/toolkit/inc/helper/msgbox.hxx
index bf2947889ec0..2afb902f2326 100644
--- a/toolkit/inc/helper/msgbox.hxx
+++ b/toolkit/inc/helper/msgbox.hxx
@@ -51,7 +51,7 @@ class MessBox : public ButtonDialog
VclPtr<FixedImage> mpFixedImage;
Image maImage;
bool mbHelpBtn;
- MessBoxStyle const mnMessBoxStyle;
+ MessBoxStyle mnMessBoxStyle;
protected:
OUString maMessText;
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 6934fbcae19f..d017b3e259bb 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -55,7 +55,7 @@ private:
xCallback( rCallback ), aData( rAny ) {}
css::uno::Reference< css::awt::XCallback > xCallback;
- css::uno::Any const aData;
+ css::uno::Any aData;
};
DECL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, void );
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index d2b250894a67..65218b33aa32 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -91,7 +91,7 @@ namespace toolkit
}
private:
- SolarMutexGuard const m_aGuard;
+ SolarMutexGuard m_aGuard;
};
}
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 2f705433c3f3..77935fb7ac41 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -415,7 +415,7 @@ public:
delete this;
}
- sal_Int32 const m_nPauseMilliseconds;
+ sal_Int32 m_nPauseMilliseconds;
};
class VCLXToolkitMutexHelper
@@ -439,8 +439,8 @@ class VCLXToolkit : public VCLXToolkitMutexHelper,
::comphelper::OInterfaceContainerHelper2 m_aTopWindowListeners;
::comphelper::OInterfaceContainerHelper2 m_aKeyHandlers;
::comphelper::OInterfaceContainerHelper2 m_aFocusListeners;
- ::Link<VclSimpleEvent&,void> const m_aEventListenerLink;
- ::Link<VclWindowEvent&,bool> const m_aKeyListenerLink;
+ ::Link<VclSimpleEvent&,void> m_aEventListenerLink;
+ ::Link<VclWindowEvent&,bool> m_aKeyListenerLink;
bool m_bEventListener;
bool m_bKeyListener;
@@ -804,9 +804,9 @@ WindowType ImplGetComponentType( const OUString& rServiceName )
struct MessageBoxTypeInfo
{
- css::awt::MessageBoxType const eType;
+ css::awt::MessageBoxType eType;
const char *pName;
- sal_Int32 const nLen;
+ sal_Int32 nLen;
};
static const MessageBoxTypeInfo aMessageBoxTypeInfo[] =
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index f33daf8eee3e..0a789dc376e3 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -114,7 +114,7 @@ public:
bool mbDisposing : 1;
bool mbDesignMode : 1;
bool mbSynthesizingVCLEvent : 1;
- bool const mbWithDefaultProps : 1;
+ bool mbWithDefaultProps : 1;
sal_uLong mnListenerLockLevel;
sal_Int16 mnWritingMode;
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index fac21963a372..be4e4ffce065 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -575,7 +575,7 @@
struct Int32Equal
{
- sal_Int32 const m_nCompare;
+ sal_Int32 m_nCompare;
explicit Int32Equal( sal_Int32 _nCompare ) : m_nCompare( _nCompare ) { }
bool operator()( sal_Int32 _nLHS )
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index b501abf7eb29..71132338cfbb 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -58,7 +58,7 @@ namespace {
struct LanguageDependentProp
{
const char* pPropName;
- sal_Int32 const nPropNameLength;
+ sal_Int32 nPropNameLength;
};
}
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 956b5d542393..48e69247ba05 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -44,7 +44,7 @@ namespace {
struct UnoControlHolder
{
uno::Reference< awt::XControl > mxControl;
- OUString const msName;
+ OUString msName;
public:
UnoControlHolder( const OUString& rName, const uno::Reference< awt::XControl > & rControl )