[Libreoffice-commits] core.git: include/toolkit toolkit/inc toolkit/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Sep 27 06:30:27 UTC 2018


 include/toolkit/controls/eventcontainer.hxx      |    2 +-
 toolkit/inc/helper/msgbox.hxx                    |    2 +-
 toolkit/source/awt/asynccallback.cxx             |    2 +-
 toolkit/source/awt/stylesettings.cxx             |    2 +-
 toolkit/source/awt/vclxtoolkit.cxx               |   10 +++++-----
 toolkit/source/awt/vclxwindow.cxx                |    2 +-
 toolkit/source/controls/geometrycontrolmodel.cxx |    2 +-
 toolkit/source/controls/unocontrol.cxx           |    2 +-
 toolkit/source/controls/unocontrolcontainer.cxx  |    2 +-
 toolkit/source/helper/vclunohelper.cxx           |    6 +++---
 10 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 175834ce6a3ba707a6d34aa8de7351574381f481
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Sep 26 13:52:39 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Sep 27 08:30:01 2018 +0200

    loplugin:constfields in toolkit
    
    Change-Id: I26254acc84b1bfe71e4addbde51cb6a9ed52c981
    Reviewed-on: https://gerrit.libreoffice.org/60990
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index 65d0418bdc27..cc1d20493e4c 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -38,7 +38,7 @@ class ScriptEventContainer : public ::cppu::WeakImplHelper<
 {
     std::unordered_map< OUString, css::uno::Any>
                    mHashMap;
-    css::uno::Type mType;
+    css::uno::Type const mType;
 
     ContainerListenerMultiplexer maContainerListeners;
 
diff --git a/toolkit/inc/helper/msgbox.hxx b/toolkit/inc/helper/msgbox.hxx
index 0fc7631d93de..f353b2ff9d57 100644
--- a/toolkit/inc/helper/msgbox.hxx
+++ b/toolkit/inc/helper/msgbox.hxx
@@ -50,7 +50,7 @@ class MessBox : public ButtonDialog
     VclPtr<FixedImage> mpFixedImage;
     Image maImage;
     bool mbHelpBtn;
-    MessBoxStyle mnMessBoxStyle;
+    MessBoxStyle const mnMessBoxStyle;
 
 protected:
     OUString maMessText;
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index e9cc75f5f462..c37b20930a71 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -57,7 +57,7 @@ private:
             xCallback( rCallback ), aData( rAny ) {}
 
         css::uno::Reference< css::awt::XCallback > xCallback;
-        css::uno::Any                              aData;
+        css::uno::Any const                        aData;
     };
 
     DECL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, void );
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 556fa8040371..22cce1247cc6 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -87,7 +87,7 @@ namespace toolkit
         }
 
     private:
-        SolarMutexGuard  m_aGuard;
+        SolarMutexGuard const  m_aGuard;
     };
 
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 5e7c9e823c39..737bdc529554 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -415,7 +415,7 @@ public:
         delete this;
     }
 
-    sal_Int32 m_nPauseMilliseconds;
+    sal_Int32 const 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> m_aEventListenerLink;
-    ::Link<VclWindowEvent&,bool> m_aKeyListenerLink;
+    ::Link<VclSimpleEvent&,void> const m_aEventListenerLink;
+    ::Link<VclWindowEvent&,bool> const m_aKeyListenerLink;
     bool m_bEventListener;
     bool m_bKeyListener;
 
@@ -801,9 +801,9 @@ WindowType ImplGetComponentType( const OUString& rServiceName )
 
 struct MessageBoxTypeInfo
 {
-    css::awt::MessageBoxType eType;
+    css::awt::MessageBoxType const eType;
     const sal_Char          *pName;
-    sal_Int32                nLen;
+    sal_Int32 const          nLen;
 };
 
 static const MessageBoxTypeInfo aMessageBoxTypeInfo[] =
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 9edf3ed9086c..eb3df832c972 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -118,7 +118,7 @@ public:
     bool                                mbDisposing             : 1;
     bool                                mbDesignMode            : 1;
     bool                                mbSynthesizingVCLEvent  : 1;
-    bool                                mbWithDefaultProps      : 1;
+    bool const                          mbWithDefaultProps      : 1;
 
     sal_uLong                           mnListenerLockLevel;
     sal_Int16                           mnWritingMode;
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index d8f9045668fc..5fe1a2194d84 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -585,7 +585,7 @@
 
     struct Int32Equal
     {
-        sal_Int32   m_nCompare;
+        sal_Int32 const   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 011aa72e08df..9432f67b78ec 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -60,7 +60,7 @@ using ::com::sun::star::accessibility::XAccessible;
 struct LanguageDependentProp
 {
     const char* pPropName;
-    sal_Int32   nPropNameLength;
+    sal_Int32 const nPropNameLength;
 };
 
 static const LanguageDependentProp aLanguageDependentProp[] =
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index b704b0dd01cb..7311a184ed48 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star;
 struct UnoControlHolder
 {
     uno::Reference< awt::XControl > mxControl;
-    OUString                 msName;
+    OUString const                  msName;
 
 public:
     UnoControlHolder( const OUString& rName, const uno::Reference< awt::XControl > & rControl )
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 904e520fd0ea..d7dfe76e162e 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -360,9 +360,9 @@ namespace
     {
         static struct _unit_table
         {
-            FieldUnit eFieldUnit;
-            sal_Int16 nMeasurementUnit;
-            sal_Int16 nFieldToMeasureFactor;
+            FieldUnit const eFieldUnit;
+            sal_Int16 const nMeasurementUnit;
+            sal_Int16 const nFieldToMeasureFactor;
         } aUnits[] = {
             { FUNIT_NONE,       -1 , -1},
             { FUNIT_MM,         MeasureUnit::MM,            1 },    // must precede MM_10TH


More information about the Libreoffice-commits mailing list