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>

4 files changed, 23 insertions, 23 deletions

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;