Revert "loplugin:constfields in package..registry"

This reverts commit 31138ff7729cbf179079a5e635d3a823e2971f08.

Now that we know that making fields has negative side effects
like disabling assignment operator generation.

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

21 files changed, 56 insertions, 56 deletions

diff --git a/include/registry/refltype.hxx b/include/registry/refltype.hxx
index 4924edf77178..a9d1da0dcf4d 100644
--- a/include/registry/refltype.hxx
+++ b/include/registry/refltype.hxx
@@ -62,11 +62,11 @@ public:
  */
 struct RTUik
 {
-    sal_uInt32 const m_Data1;
-    sal_uInt16 const m_Data2;
-    sal_uInt16 const m_Data3;
-    sal_uInt32 const m_Data4;
-    sal_uInt32 const m_Data5;
+    sal_uInt32 m_Data1;
+    sal_uInt16 m_Data2;
+    sal_uInt16 m_Data3;
+    sal_uInt32 m_Data4;
+    sal_uInt32 m_Data5;
 };
 
 /// specifies the calling convention for type reader/writer api
diff --git a/package/inc/EncryptionData.hxx b/package/inc/EncryptionData.hxx
index 0eae28d3422a..73408a090faf 100644
--- a/package/inc/EncryptionData.hxx
+++ b/package/inc/EncryptionData.hxx
@@ -46,11 +46,11 @@ class EncryptionData final : public BaseEncryptionData
 {
 public:
     css::uno::Sequence < sal_Int8 > m_aKey;
-    sal_Int32 const m_nEncAlg;
-    sal_Int32 const m_nCheckAlg;
-    sal_Int32 const m_nDerivedKeySize;
-    sal_Int32 const m_nStartKeyGenID;
-    bool const m_bTryWrongSHA1;
+    sal_Int32 m_nEncAlg;
+    sal_Int32 m_nCheckAlg;
+    sal_Int32 m_nDerivedKeySize;
+    sal_Int32 m_nStartKeyGenID;
+    bool m_bTryWrongSHA1;
 
     EncryptionData(const BaseEncryptionData& aData, const css::uno::Sequence< sal_Int8 >& aKey, sal_Int32 nEncAlg, sal_Int32 nCheckAlg, sal_Int32 nDerivedKeySize, sal_Int32 nStartKeyGenID, bool const bTryWrongSHA1)
     : BaseEncryptionData( aData )
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 58755d4ad2c7..3dceb036c3bd 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -62,7 +62,7 @@ class ZipFile
     css::uno::Reference < css::io::XInputStream > xStream;
     const css::uno::Reference < css::uno::XComponentContext > m_xContext;
 
-    bool const bRecoveryMode;
+    bool bRecoveryMode;
 
     // aMediaType parameter is used only for raw stream header creation
     css::uno::Reference < css::io::XInputStream >  createStreamForZipEntry(
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx
index a8fbf1563c16..b7720a5009d8 100644
--- a/package/inc/ZipOutputEntry.hxx
+++ b/package/inc/ZipOutputEntry.hxx
@@ -48,7 +48,7 @@ protected:
     ZipEntry            *m_pCurrentEntry;
     sal_Int16           m_nDigested;
     ZipPackageStream*   m_pCurrentStream;
-    bool const          m_bEncryptCurrentEntry;
+    bool                m_bEncryptCurrentEntry;
 
 public:
     virtual ~ZipOutputEntryBase() = default;
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 8ab74b652b64..636835fdf573 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -37,8 +37,8 @@ typedef std::unordered_map< OUString, OUString > StringHashMap;
 
 struct ManifestScopeEntry
 {
-    OUString const m_aConvertedName;
-    StringHashMap const m_aNamespaces;
+    OUString        m_aConvertedName;
+    StringHashMap   m_aNamespaces;
     bool            m_bValid;
 
     ManifestScopeEntry( const OUString& aConvertedName, const StringHashMap& aNamespaces )
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx
index 58d433d67bfc..c41c2c25f40a 100644
--- a/package/source/xstor/ocompinstream.hxx
+++ b/package/source/xstor/ocompinstream.hxx
@@ -48,7 +48,7 @@ protected:
     std::unique_ptr<::comphelper::OInterfaceContainerHelper2> m_pInterfaceContainer;
     css::uno::Sequence < css::beans::PropertyValue > m_aProperties;
     bool m_bDisposed;
-    sal_Int32 const m_nStorageType;
+    sal_Int32 m_nStorageType;
 
 public:
     OInputCompStream( OWriteStream_Impl& pImpl,
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index d953887748cd..e01108b59d91 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -68,7 +68,7 @@ struct WSInternalData_Impl
     rtl::Reference<comphelper::RefCountedMutex> m_xSharedMutex;
     ::std::unique_ptr< ::cppu::OTypeCollection> m_pTypeCollection;
     ::cppu::OMultiTypeInterfaceContainerHelper m_aListenersContainer; // list of listeners
-    sal_Int32 const m_nStorageType;
+    sal_Int32 m_nStorageType;
 
     // the mutex reference MUST NOT be empty
     WSInternalData_Impl( const rtl::Reference<comphelper::RefCountedMutex>& rMutexRef, sal_Int32 nStorageType )
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 718aea3ac77f..ff1a60ac0934 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -105,7 +105,7 @@ struct OWriteStream_Impl
 
     bool m_bHasInsertedStreamOptimization;
 
-    sal_Int32 const m_nStorageType;
+    sal_Int32 m_nStorageType;
 
     // Relations info related data, stored in *.rels file in OFOPXML format
     css::uno::Reference< css::io::XInputStream > m_xOrigRelInfoStream;
@@ -249,7 +249,7 @@ protected:
     bool m_bInitOnDemand;
     sal_Int64 m_nInitPosition;
 
-    bool const m_bTransacted;
+    bool m_bTransacted;
 
     OWriteStream( OWriteStream_Impl* pImpl, bool bTransacted );
     OWriteStream( OWriteStream_Impl* pImpl, css::uno::Reference< css::io::XStream > const & xStream, bool bTransacted );
diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx
index b1954e2b2605..4aecd337d9eb 100644
--- a/package/source/xstor/selfterminatefilestream.hxx
+++ b/package/source/xstor/selfterminatefilestream.hxx
@@ -32,7 +32,7 @@ class OSelfTerminateFileStream final : public cppu::WeakImplHelper< css::io::XIn
 {
     css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xFileAccess;
 
-    OUString const m_aURL;
+    OUString m_aURL;
 
     css::uno::Reference< css::io::XInputStream > m_xInputStream;
     css::uno::Reference< css::io::XSeekable > m_xSeekable;
diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx
index a62702c593cd..7eac83cbf708 100644
--- a/package/source/xstor/switchpersistencestream.cxx
+++ b/package/source/xstor/switchpersistencestream.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
 
 struct SPStreamData_Impl
 {
-    bool const m_bInStreamBased;
+    bool m_bInStreamBased;
 
     // the streams below are not visible from outside so there is no need to remember position
 
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 3da6d24f55e7..f5afff414feb 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -79,9 +79,9 @@ struct StorInternalData_Impl
     rtl::Reference<comphelper::RefCountedMutex> m_xSharedMutex;
     ::cppu::OMultiTypeInterfaceContainerHelper m_aListenersContainer; // list of listeners
     ::std::unique_ptr< ::cppu::OTypeCollection> m_pTypeCollection;
-    bool const m_bIsRoot;
-    sal_Int32 const m_nStorageType; // the mode in which the storage is used
-    bool const m_bReadOnlyWrap;
+    bool m_bIsRoot;
+    sal_Int32 m_nStorageType; // the mode in which the storage is used
+    bool m_bReadOnlyWrap;
 
     ::rtl::Reference<OChildDispListener_Impl> m_pSubElDispListener;
 
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 0c6cc442acde..21f3131de2e2 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -83,7 +83,7 @@ struct SotElement_Impl
     OUString                m_aOriginalName;
     bool                    m_bIsRemoved;
     bool                    m_bIsInserted;
-    bool const              m_bIsStorage;
+    bool                    m_bIsStorage;
 
     std::unique_ptr<OStorage_Impl> m_xStorage;
     std::unique_ptr<OWriteStream_Impl, o3tl::default_delete<OWriteStream_Impl>> m_xStream;
@@ -122,7 +122,7 @@ struct OStorage_Impl
 
     bool                        m_bCommited;    // sending the streams is coordinated by the root storage of the package
 
-    bool const                  m_bIsRoot;      // marks this storage as root storages that manages all commits and reverts
+    bool                        m_bIsRoot;      // marks this storage as root storages that manages all commits and reverts
     bool                        m_bListCreated;
 
     /// Count of registered modification listeners
@@ -159,7 +159,7 @@ struct OStorage_Impl
 
     SwitchablePersistenceStream* m_pSwitchStream;
 
-    sal_Int32 const m_nStorageType; // the mode in which the storage is used
+    sal_Int32 m_nStorageType; // the mode in which the storage is used
 
     // the _rels substorage that is handled in a special way in embed::StorageFormats::OFOPXML
     SotElement_Impl* m_pRelStorElement;
diff --git a/package/source/zipapi/XBufferedThreadedStream.hxx b/package/source/zipapi/XBufferedThreadedStream.hxx
index 8ad600419f8f..272414c37504 100644
--- a/package/source/zipapi/XBufferedThreadedStream.hxx
+++ b/package/source/zipapi/XBufferedThreadedStream.hxx
@@ -24,7 +24,7 @@ class XBufferedThreadedStream : public cppu::WeakImplHelper< css::io::XInputStre
 private:
     const css::uno::Reference<XInputStream> mxSrcStream;
     sal_Int64 mnPos;                                           /// position in stream
-    sal_Int64 const mnStreamSize;                              /// available size of stream
+    sal_Int64 mnStreamSize;                                    /// available size of stream
 
     Buffer maInUseBuffer;                                   /// Buffer block in use
     int mnOffset;                                           /// position in maInUseBuffer
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index a864de48f2ba..dbd88fea073a 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -59,7 +59,7 @@ class XUnbufferedStream final : public cppu::WeakImplHelper
     sal_Int16 mnHeaderToRead;
     sal_Int64 mnZipCurrent, mnZipEnd, mnZipSize, mnMyCurrent;
     CRC32 maCRC;
-    bool const mbCheckCRC;
+    bool mbCheckCRC;
 
 public:
     XUnbufferedStream(
diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/zippackage/ContentInfo.hxx
index 9ac0802aeed0..a3e34de1434d 100644
--- a/package/source/zippackage/ContentInfo.hxx
+++ b/package/source/zippackage/ContentInfo.hxx
@@ -27,7 +27,7 @@
 struct ZipContentInfo
 {
     css::uno::Reference < css::lang::XUnoTunnel > xTunnel;
-    bool const bFolder;
+    bool bFolder;
     union
     {
         ZipPackageFolder *pFolder;
diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index 3c0fa8f7c6cf..0806fc14e987 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -157,8 +157,8 @@ void Test::test() {
             serviceName(theServiceName),
             defaultConstructor(theDefaultConstructor)
         {}
-        OUString const serviceName;
-        bool const defaultConstructor;
+        OUString serviceName;
+        bool defaultConstructor;
     };
     struct Implementation {
         Implementation(
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index 8af2da85639d..a1ac6fbf92fd 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -335,8 +335,8 @@ class Adapter : public cppu::WeakImplHelper<
     css::script::XInvocation, css::lang::XUnoTunnel >
 {
     PyRef mWrappedObject;
-    PyInterpreterState * const mInterpreter;  // interpreters don't seem to be refcounted !
-    css::uno::Sequence< css::uno::Type > const mTypes;
+    PyInterpreterState *mInterpreter;  // interpreters don't seem to be refcounted !
+    css::uno::Sequence< css::uno::Type > mTypes;
     MethodOutIndexMap m_methodOutIndexMap;
 
 private:
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index cf31c77a91af..3233bcad860a 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -123,11 +123,11 @@ public:
     OUString getFullPath(OUString const & path) const;
 
 private:
-    sal_uInt32              m_refCount;
-    OUString const           m_name;
+    sal_uInt32               m_refCount;
+    OUString                 m_name;
     bool                     m_bDeleted:1;
     bool                     m_bModified:1;
-    ORegistry*              m_pRegistry;
+    ORegistry*               m_pRegistry;
 };
 
 #endif
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 3e3da9d089a2..89c9cbf9c35a 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -222,7 +222,7 @@ class ConstantPool : public BlopObject
 {
 public:
 
-    sal_uInt16 const             m_numOfEntries;
+    sal_uInt16                   m_numOfEntries;
     std::unique_ptr<sal_Int32[]> m_pIndex;           // index values may be < 0 for cached string constants
 
     std::unique_ptr<StringCache> m_pStringCache;
@@ -542,9 +542,9 @@ class FieldList : public BlopObject
 {
 public:
 
-    sal_uInt16 const m_numOfEntries;
+    sal_uInt16      m_numOfEntries;
     size_t          m_FIELD_ENTRY_SIZE;
-    ConstantPool* const m_pCP;
+    ConstantPool*   m_pCP;
 
     FieldList(const sal_uInt8* buffer, sal_uInt32 len, sal_uInt16 numEntries, ConstantPool* pCP)
         : BlopObject(buffer, len)
@@ -729,9 +729,9 @@ class ReferenceList : public BlopObject
 {
 public:
 
-    sal_uInt16 const m_numOfEntries;
+    sal_uInt16      m_numOfEntries;
     size_t          m_REFERENCE_ENTRY_SIZE;
-    ConstantPool* const m_pCP;
+    ConstantPool*   m_pCP;
 
     ReferenceList(const sal_uInt8* buffer, sal_uInt32 len, sal_uInt16 numEntries, ConstantPool* pCP)
         : BlopObject(buffer, len)
@@ -832,10 +832,10 @@ class MethodList : public BlopObject
 {
 public:
 
-    sal_uInt16 const m_numOfEntries;
+    sal_uInt16      m_numOfEntries;
     size_t          m_PARAM_ENTRY_SIZE;
     std::unique_ptr<sal_uInt32[]>  m_pIndex;
-    ConstantPool* const m_pCP;
+    ConstantPool*   m_pCP;
 
     MethodList(const sal_uInt8* buffer, sal_uInt32 len, sal_uInt16 numEntries, ConstantPool* pCP)
         : BlopObject(buffer, len)
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 0d2f7160d472..48d28ab8766b 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -137,8 +137,8 @@ sal_uInt32 writeDouble(sal_uInt8* buffer, double v)
         double v;
         struct
         {
-            sal_uInt32 b1;
-            sal_uInt32 b2;
+            sal_uInt32  b1;
+            sal_uInt32  b2;
         } b;
     } x;
 
@@ -182,7 +182,7 @@ struct CPInfo
         RTConstValueUnion   aConst;
     } m_value;
     struct CPInfo*  m_next;
-    CPInfoTag const m_tag;
+    CPInfoTag       m_tag;
     sal_uInt16      m_index;
 
     CPInfo(CPInfoTag tag, struct CPInfo* prev);
@@ -618,19 +618,19 @@ class TypeWriter
 public:
 
     sal_uInt32          m_refCount;
-    typereg_Version const m_version;
-    RTTypeClass const   m_typeClass;
-    OString const       m_typeName;
-    sal_uInt16 const    m_nSuperTypes;
+    typereg_Version     m_version;
+    RTTypeClass         m_typeClass;
+    OString             m_typeName;
+    sal_uInt16          m_nSuperTypes;
     std::unique_ptr<OString[]>
                         m_superTypeNames;
-    OString const       m_doku;
-    OString const       m_fileName;
-    sal_uInt16 const    m_fieldCount;
+    OString             m_doku;
+    OString             m_fileName;
+    sal_uInt16          m_fieldCount;
     FieldEntry*         m_fields;
-    sal_uInt16 const    m_methodCount;
+    sal_uInt16          m_methodCount;
     MethodEntry*        m_methods;
-    sal_uInt16 const    m_referenceCount;
+    sal_uInt16          m_referenceCount;
     ReferenceEntry*     m_references;
 
     std::unique_ptr<sal_uInt8[]> m_blop;
diff --git a/registry/tools/options.hxx b/registry/tools/options.hxx
index 236ad37a5eb2..a0ae71b499d9 100644
--- a/registry/tools/options.hxx
+++ b/registry/tools/options.hxx
@@ -29,7 +29,7 @@ namespace tools
 {
 class Options
 {
-    std::string const m_program;
+    std::string m_program;
 
     Options (Options const &) = delete;
     Options & operator= (Options const &) = delete;