loplugin:constfields in stoc..svgio

Change-Id: Icfd936fe9b83e0e122af5b09f7ed6dde2ead4400
Reviewed-on: https://gerrit.libreoffice.org/61512
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

14 files changed, 78 insertions, 99 deletions

diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index 7c02a09edaf0..23c68aa83583 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -144,8 +144,8 @@ class IdlClassImpl
     rtl::Reference<IdlReflectionServiceImpl>
                                  m_xReflection;
 
-    OUString                    _aName;
-    css::uno::TypeClass         _eTypeClass;
+    OUString const               _aName;
+    css::uno::TypeClass const    _eTypeClass;
 
     typelib_TypeDescription *   _pTypeDescr;
 
@@ -325,7 +325,7 @@ class IdlMemberImpl
 {
     rtl::Reference<IdlReflectionServiceImpl>
                                 m_xReflection;
-    OUString                    _aName;
+    OUString const              _aName;
 
     typelib_TypeDescription *   _pTypeDescr;
     typelib_TypeDescription *   _pDeclTypeDescr;
diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx
index acfcf765bb2e..26e0c8ecf8ad 100644
--- a/stoc/source/corereflection/crcomp.cxx
+++ b/stoc/source/corereflection/crcomp.cxx
@@ -39,7 +39,7 @@ class IdlCompFieldImpl
     , public XIdlField
     , public XIdlField2
 {
-    sal_Int32                   _nOffset;
+    sal_Int32 const             _nOffset;
 
 public:
     IdlCompFieldImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName,
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index dd8997e5673b..f3c686f776c4 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -68,43 +68,28 @@ using namespace osl;
 
 namespace {
 
-struct StringPool
-{
-    OUString slash_UNO_slash_REGISTRY_LINKS;
-    OUString slash_IMPLEMENTATIONS;
-    OUString slash_UNO;
-    OUString slash_UNO_slash_SERVICES;
-    OUString slash_UNO_slash_SINGLETONS;
-    OUString slash_SERVICES;
-    OUString slash_UNO_slash_LOCATION;
-    OUString slash_UNO_slash_ACTIVATOR;
-    OUString colon_old;
-    OUString com_sun_star_registry_SimpleRegistry;
-    OUString Registry;
-    StringPool()
-        : slash_UNO_slash_REGISTRY_LINKS( "/UNO/REGISTRY_LINKS")
-        , slash_IMPLEMENTATIONS( "/IMPLEMENTATIONS" )
-        , slash_UNO( "/UNO")
-        , slash_UNO_slash_SERVICES( "/UNO/SERVICES")
-        , slash_UNO_slash_SINGLETONS( "/UNO/SINGLETONS")
-        , slash_SERVICES( "/SERVICES/" )
-        , slash_UNO_slash_LOCATION( "/UNO/LOCATION" )
-        , slash_UNO_slash_ACTIVATOR( "/UNO/ACTIVATOR" )
-        , colon_old( ":old")
-        , com_sun_star_registry_SimpleRegistry("com.sun.star.registry.SimpleRegistry" )
-        , Registry( "Registry" )
-        {}
-    StringPool(const StringPool&) = delete;
-    StringPool& operator=(const StringPool&) = delete;
-};
-
-const StringPool &spool()
-{
-    static StringPool s_pool;
-
-    return s_pool;
-}
-
+static constexpr OUStringLiteral slash_UNO_slash_REGISTRY_LINKS
+        = "/UNO/REGISTRY_LINKS";
+static constexpr OUStringLiteral slash_IMPLEMENTATIONS
+        =  "/IMPLEMENTATIONS";
+static constexpr OUStringLiteral slash_UNO
+        = "/UNO";
+static constexpr OUStringLiteral slash_UNO_slash_SERVICES
+        = "/UNO/SERVICES";
+static constexpr OUStringLiteral slash_UNO_slash_SINGLETONS
+        = "/UNO/SINGLETONS";
+static constexpr OUStringLiteral slash_SERVICES
+        = "/SERVICES/";
+static constexpr OUStringLiteral slash_UNO_slash_LOCATION
+        = "/UNO/LOCATION";
+static constexpr OUStringLiteral slash_UNO_slash_ACTIVATOR
+        = "/UNO/ACTIVATOR";
+static constexpr OUStringLiteral colon_old
+        = ":old";
+static constexpr OUStringLiteral com_sun_star_registry_SimpleRegistry
+        = "com.sun.star.registry.SimpleRegistry";
+static constexpr OUStringLiteral Registry
+        = "Registry";
 
 //  static deleteAllLinkReferences()
 
@@ -113,7 +98,7 @@ void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
     // throw ( InvalidRegistryException, RuntimeException )
 {
     Reference < XRegistryKey > xKey = xSource->openKey(
-        spool().slash_UNO_slash_REGISTRY_LINKS );
+        slash_UNO_slash_REGISTRY_LINKS );
 
     if (xKey.is() && (xKey->getValueType() == RegistryValueType_ASCIILIST))
     {
@@ -241,13 +226,12 @@ OUString searchImplForLink(
     const OUString& implName )
     // throw ( InvalidRegistryException, RuntimeException )
 {
-    const StringPool & pool = spool();
-    Reference < XRegistryKey > xKey = xRootKey->openKey( pool.slash_IMPLEMENTATIONS );
+    Reference < XRegistryKey > xKey = xRootKey->openKey( slash_IMPLEMENTATIONS );
     if (xKey.is())
     {
         Sequence< Reference < XRegistryKey > > subKeys( xKey->openKeys() );
         const Reference < XRegistryKey > * pSubKeys = subKeys.getConstArray();
-        OUString key_name( pool.slash_UNO + linkName );
+        OUString key_name( slash_UNO + linkName );
 
         for (sal_Int32 i = 0; i < subKeys.getLength(); i++)
         {
@@ -282,8 +266,7 @@ OUString searchLinkTargetForImpl(const Reference < XRegistryKey >& xRootKey,
 {
 //      try
 //      {
-        const StringPool & pool = spool();
-        Reference < XRegistryKey > xKey = xRootKey->openKey( pool.slash_IMPLEMENTATIONS );
+        Reference < XRegistryKey > xKey = xRootKey->openKey( slash_IMPLEMENTATIONS );
 
         if (xKey.is())
         {
@@ -297,7 +280,7 @@ OUString searchLinkTargetForImpl(const Reference < XRegistryKey >& xRootKey,
                 xImplKey = pSubKeys[i];
 
                 OUString tmpImplName = xImplKey->getKeyName().copy(strlen("/IMPLEMENTATIONS/"));
-                OUString qualifiedLinkName( pool.slash_UNO );
+                OUString qualifiedLinkName( slash_UNO );
                 qualifiedLinkName += linkName;
                 if (tmpImplName == implName &&
                     xImplKey->getKeyType( qualifiedLinkName ) == RegistryKeyType_LINK)
@@ -437,7 +420,7 @@ void prepareUserLink(const Reference < XSimpleRegistry >& xDest,
         if (!oldImplName.isEmpty())
         {
             createUniqueSubEntry(xDest->getRootKey()->createKey(
-                linkName + spool().colon_old ), oldImplName);
+                linkName + colon_old ), oldImplName);
         }
     }
 
@@ -493,7 +476,7 @@ void deleteUserLink(const Reference < XRegistryKey >& xRootKey,
     }
 
     Reference < XRegistryKey > xOldKey = xRootKey->openKey(
-        linkName + spool().colon_old );
+        linkName + colon_old );
     if (xOldKey.is())
     {
         if (xOldKey->getValueType() == RegistryValueType_ASCIILIST)
@@ -667,12 +650,11 @@ void deleteAllImplementations(   const Reference < XSimpleRegistry >& xReg,
         Reference < XRegistryKey > xImplKey;
         bool hasLocationUrl = false;
 
-        const StringPool &pool = spool();
         for (sal_Int32 i = 0; i < subKeys.getLength(); i++)
         {
             xImplKey = pSubKeys[i];
             Reference < XRegistryKey > xKey = xImplKey->openKey(
-                pool.slash_UNO_slash_LOCATION );
+                slash_UNO_slash_LOCATION );
 
             if (xKey.is() && (xKey->getValueType() == RegistryValueType_ASCII))
             {
@@ -690,7 +672,7 @@ void deleteAllImplementations(   const Reference < XSimpleRegistry >& xReg,
 
                     deleteAllLinkReferences(xReg, xImplKey);
 
-                    xKey = xImplKey->openKey( pool.slash_UNO );
+                    xKey = xImplKey->openKey( slash_UNO );
                     if (xKey.is())
                     {
                         Sequence< Reference < XRegistryKey > > subKeys2 = xKey->openKeys();
@@ -701,11 +683,11 @@ void deleteAllImplementations(   const Reference < XSimpleRegistry >& xReg,
 
                             for (sal_Int32 j = 0; j < subKeys2.getLength(); j++)
                             {
-                                if (pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_SERVICES ) &&
-                                    pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_REGISTRY_LINKS ) &&
-                                    pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_ACTIVATOR ) &&
-                                    pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_SINGLETONS ) &&
-                                    pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_LOCATION) )
+                                if (pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + slash_UNO_slash_SERVICES ) &&
+                                    pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + slash_UNO_slash_REGISTRY_LINKS ) &&
+                                    pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + slash_UNO_slash_ACTIVATOR ) &&
+                                    pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + slash_UNO_slash_SINGLETONS ) &&
+                                    pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + slash_UNO_slash_LOCATION) )
                                 {
                                     prepareUserKeys(xReg, xKey, pSubKeys2[j], implName, false);
                                 }
@@ -1031,8 +1013,6 @@ void prepareRegistry(
             "prepareRegistry(): source registry is empty" );
     }
 
-    const StringPool & pool = spool();
-
     const Reference < XRegistryKey >* pSubKeys = subKeys.getConstArray();
     Reference < XRegistryKey > xImplKey;
 
@@ -1041,7 +1021,7 @@ void prepareRegistry(
         xImplKey = pSubKeys[i];
 
         Reference < XRegistryKey >  xKey = xImplKey->openKey(
-            pool.slash_UNO_slash_SERVICES );
+            slash_UNO_slash_SERVICES );
 
         if (xKey.is())
         {
@@ -1063,11 +1043,11 @@ void prepareRegistry(
 
                 createUniqueSubEntry(
                     xDest->getRootKey()->createKey(
-                        pool.slash_SERVICES + serviceName ),
+                        slash_SERVICES + serviceName ),
                     implName);
             }
 
-            xKey = xImplKey->openKey( pool.slash_UNO );
+            xKey = xImplKey->openKey( slash_UNO );
             if (xKey.is())
             {
                 Sequence< Reference < XRegistryKey > > subKeys2 = xKey->openKeys();
@@ -1078,9 +1058,9 @@ void prepareRegistry(
 
                     for (sal_Int32 j = 0; j < subKeys2.getLength(); j++)
                     {
-                        if (pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_SERVICES) &&
-                            pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_REGISTRY_LINKS ) &&
-                            pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + pool.slash_UNO_slash_SINGLETONS ))
+                        if (pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + slash_UNO_slash_SERVICES) &&
+                            pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + slash_UNO_slash_REGISTRY_LINKS ) &&
+                            pSubKeys2[j]->getKeyName() != (xImplKey->getKeyName() + slash_UNO_slash_SINGLETONS ))
                         {
                             prepareUserKeys(xDest, xKey, pSubKeys2[j], implName, true);
                         }
@@ -1090,7 +1070,7 @@ void prepareRegistry(
         }
 
         // update LOCATION entry
-        xKey = xImplKey->createKey( pool.slash_UNO_slash_LOCATION );
+        xKey = xImplKey->createKey( slash_UNO_slash_LOCATION );
 
         if (xKey.is())
         {
@@ -1098,14 +1078,14 @@ void prepareRegistry(
         }
 
         // update ACTIVATOR entry
-        xKey = xImplKey->createKey( pool.slash_UNO_slash_ACTIVATOR );
+        xKey = xImplKey->createKey( slash_UNO_slash_ACTIVATOR );
 
         if (xKey.is())
         {
             xKey->setAsciiValue(implementationLoaderUrl);
         }
 
-        xKey = xImplKey->openKey( pool.slash_UNO_slash_SERVICES );
+        xKey = xImplKey->openKey( slash_UNO_slash_SERVICES );
 
         if (xKey.is() && (xKey->getValueType() == RegistryValueType_ASCIILIST))
         {
@@ -1136,7 +1116,7 @@ void findImplementations(    const Reference < XRegistryKey > & xSource,
     try
     {
         Reference < XRegistryKey > xKey = xSource->openKey(
-            spool().slash_UNO_slash_SERVICES );
+            slash_UNO_slash_SERVICES );
 
         if (xKey.is() && (xKey->getKeyNames().getLength() > 0))
         {
@@ -1285,7 +1265,7 @@ Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceM
 
         try {  // the implementation does not support XIntrospectionAccess !
 
-            Any aAny = xPropSet->getPropertyValue( spool().Registry );
+            Any aAny = xPropSet->getPropertyValue( Registry );
 
             if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE ) {
                 aAny >>= xRegistry;
@@ -1486,7 +1466,7 @@ sal_Bool ImplementationRegistration::revokeImplementation(const OUString& locati
         Reference < XPropertySet > xPropSet( m_xSMgr, UNO_QUERY );
         if( xPropSet.is() ) {
             try {
-                Any aAny = xPropSet->getPropertyValue( spool().Registry );
+                Any aAny = xPropSet->getPropertyValue( Registry );
 
                 if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE )
                 {
@@ -1554,7 +1534,7 @@ Sequence< OUString > ImplementationRegistration::getImplementations(
                     Reference < XRegistryKey > xImpl;
 
                     { // only necessary for deleting the temporary variable of rootkey
-                        xImpl = xReg->getRootKey()->createKey( spool().slash_IMPLEMENTATIONS );
+                        xImpl = xReg->getRootKey()->createKey( slash_IMPLEMENTATIONS );
                     }
                     if (xAct->writeRegistryInfo(xImpl, implementationLoaderUrl, locationUrl))
                     {
@@ -1607,17 +1587,16 @@ void ImplementationRegistration::doRevoke(
     {
         std::vector<OUString> aNames;
 
-        const StringPool &pool = spool();
         Reference < XRegistryKey > xRootKey( xDest->getRootKey() );
 
         Reference < XRegistryKey > xKey =
-            xRootKey->openKey( pool.slash_IMPLEMENTATIONS );
+            xRootKey->openKey( slash_IMPLEMENTATIONS );
         if (xKey.is() && xKey->isValid())
         {
             deleteAllImplementations(xDest, xKey, locationUrl, aNames);
         }
 
-        xKey = xRootKey->openKey( pool.slash_SERVICES );
+        xKey = xRootKey->openKey( slash_SERVICES );
         if (xKey.is())
         {
             for (auto const& name : aNames)
@@ -1662,7 +1641,7 @@ void ImplementationRegistration::doRegister(
             xReg->open(OUString() /* in mem */, false, true);
 
             { // only necessary for deleting the temporary variable of rootkey
-                xSourceKey = xReg->getRootKey()->createKey( spool().slash_IMPLEMENTATIONS );
+                xSourceKey = xReg->getRootKey()->createKey( slash_IMPLEMENTATIONS );
             }
 
             bool bSuccess =
@@ -1706,7 +1685,7 @@ Reference< XSimpleRegistry > ImplementationRegistration::createTemporarySimpleRe
 
     Reference < XSimpleRegistry > xReg(
         rSMgr->createInstanceWithContext(
-            spool().com_sun_star_registry_SimpleRegistry,   xCtx ),
+            com_sun_star_registry_SimpleRegistry,   xCtx ),
         UNO_QUERY);
     OSL_ASSERT( xReg.is() );
     return xReg;
diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx
index fd4368fbadc6..b6768dcc7b60 100644
--- a/stoc/source/implementationregistration/mergekeys.cxx
+++ b/stoc/source/implementationregistration/mergekeys.cxx
@@ -36,8 +36,8 @@ namespace stoc_impreg
 
 struct Link
 {
-    OUString m_name;
-    OUString m_target;
+    OUString const m_name;
+    OUString const m_target;
 
     Link( OUString const & name, OUString const & target )
         : m_name( name )
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 551687c6f4ab..d0608528b909 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -663,7 +663,7 @@ class ImplIntrospectionAccess : public IntrospectionAccessHelper
     friend class Implementation;
 
     // Object under examination
-    Any maInspectedObject;
+    Any const maInspectedObject;
 
     // As interface
     Reference<XInterface> mxIface;
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 3fef7146355a..5ab63c36b7d7 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -215,7 +215,7 @@ private:
 
     Reference<XExactName>               _xENDirect, _xENIntrospection;
 
-    bool                                mbFromOLE;
+    bool const                          mbFromOLE;
 };
 
 
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index c353729f3e6c..83a99da39f66 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -129,7 +129,7 @@ struct AdapterImpl
 {
     oslInterlockedCount         m_nRef;
     FactoryImpl *               m_pFactory;
-    void *                      m_key; // map key
+    void * const                m_key; // map key
     uno_Interface *             m_pReceiver; // XInvocation receiver
 
     std::vector<InterfaceAdapterImpl>  m_vInterfaces;
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index 67a506769327..0f1789a4746f 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -55,7 +55,7 @@ private:
 
     virtual ~InteractionRequest() override;
 
-    css::uno::Any m_aRequest;
+    css::uno::Any const m_aRequest;
     css::uno::Sequence< css::uno::Reference<
         css::task::XInteractionContinuation > > m_aContinuations;
     rtl::Reference< RetryContinuation > m_xRetryContinuation;
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index 122497928295..0e3d35937b15 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -178,8 +178,8 @@ struct binuno_Proxy : public uno_Interface
 {
     oslInterlockedCount m_nRefCount;
     ::rtl::Reference< ProxyRoot > m_root;
-    UnoInterfaceReference m_target;
-    OUString m_oid;
+    UnoInterfaceReference const m_target;
+    OUString const m_oid;
     TypeDescription m_typeDescr;
 
     inline binuno_Proxy(
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index e720cafbf85f..1cb12c38a45a 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -137,7 +137,7 @@ Sequence< Any > FilePolicy::getDefaultPermissions()
 
 class PolicyReader
 {
-    OUString m_fileName;
+    OUString const m_fileName;
     oslFileHandle m_file;
 
     sal_Int32 m_linepos;
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 7c10fc26a4b0..fdf97cb0817b 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -109,7 +109,7 @@ class SocketPermission : public Permission
     mutable OUString m_ip;
     mutable bool m_resolveErr;
     mutable bool m_resolvedHost;
-    bool m_wildCardHost;
+    bool const m_wildCardHost;
 
     inline bool resolveHost() const;
 
@@ -268,10 +268,10 @@ OUString SocketPermission::toString() const
 class FilePermission : public Permission
 {
     static char const * s_actions [];
-    sal_Int32 m_actions;
+    sal_Int32 const m_actions;
 
     OUString m_url;
-    bool m_allFiles;
+    bool const m_allFiles;
 
 public:
     FilePermission(
@@ -418,7 +418,7 @@ OUString FilePermission::toString() const
 
 class RuntimePermission : public Permission
 {
-    OUString m_name;
+    OUString const m_name;
 
 public:
     RuntimePermission(
diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h
index 7e25d440b696..507c28f3dd56 100644
--- a/stoc/source/security/permissions.h
+++ b/stoc/source/security/permissions.h
@@ -35,7 +35,7 @@ class Permission : public ::salhelper::SimpleReferenceObject
 public:
     ::rtl::Reference< Permission > m_next;
     // mode
-    enum t_type { ALL, RUNTIME, SOCKET, FILE } m_type;
+    enum t_type { ALL, RUNTIME, SOCKET, FILE } const m_type;
 
     Permission(
         t_type type,
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index a20fa8de7ed5..d8447a88750a 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -194,7 +194,7 @@ Any ServiceEnumeration_Impl::nextElement()
 
 class PropertySetInfo_Impl : public WeakImplHelper< beans::XPropertySetInfo >
 {
-    Sequence< beans::Property > m_properties;
+    Sequence< beans::Property > const m_properties;
 
 public:
     explicit PropertySetInfo_Impl( Sequence< beans::Property > const & properties )
diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx
index b117b5710955..0c60636a8e56 100644
--- a/stoc/source/uriproc/UriReference.hxx
+++ b/stoc/source/uriproc/UriReference.hxx
@@ -89,14 +89,14 @@ public:
     void clearFragment();
 
     osl::Mutex m_mutex;
-    OUString m_scheme;
-    OUString m_authority;
+    OUString const m_scheme;
+    OUString const m_authority;
     OUString m_path;
-    OUString m_query;
+    OUString const m_query;
     OUString m_fragment;
-    bool m_isHierarchical;
-    bool m_hasAuthority;
-    bool m_hasQuery;
+    bool const m_isHierarchical;
+    bool const m_hasAuthority;
+    bool const m_hasQuery;
     bool m_hasFragment;
 
 private: