Revert "loplugin:constfields in unoidl"

This reverts commit c04a8576f07cb837439959b8bdbb8b620684d508.

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

8 files changed, 58 insertions, 58 deletions

diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index 033e23b94657..9f61b68a4b7e 100644
--- a/include/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
@@ -38,7 +38,7 @@ public:
 private:
     NoSuchFileException& operator =(NoSuchFileException const &) = delete;
 
-    OUString const uri_;
+    OUString uri_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL FileFormatException final {
@@ -61,8 +61,8 @@ public:
 private:
     FileFormatException& operator =(FileFormatException const &) = delete;
 
-    OUString const uri_;
-    OUString const detail_;
+    OUString uri_;
+    OUString detail_;
 };
 
 struct AnnotatedReference {
@@ -74,7 +74,7 @@ struct AnnotatedReference {
 
     OUString name;
 
-    std::vector< OUString > const annotations;
+    std::vector< OUString > annotations;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Entity: public salhelper::SimpleReferenceObject {
@@ -95,7 +95,7 @@ protected:
     virtual SAL_DLLPRIVATE ~Entity() throw () override;
 
 private:
-    Sort const sort_;
+    Sort sort_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL MapCursor: public salhelper::SimpleReferenceObject {
@@ -140,9 +140,9 @@ protected:
     virtual SAL_DLLPRIVATE ~PublishableEntity() throw () override;
 
 private:
-    bool const published_;
+    bool published_;
 
-    std::vector< OUString > const annotations_;
+    std::vector< OUString > annotations_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL EnumTypeEntity final : public PublishableEntity {
@@ -158,7 +158,7 @@ public:
 
         sal_Int32 value;
 
-        std::vector< OUString > const annotations;
+        std::vector< OUString > annotations;
     };
 
     SAL_DLLPRIVATE EnumTypeEntity(
@@ -173,7 +173,7 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~EnumTypeEntity() throw () override;
 
-    std::vector< Member > const members_;
+    std::vector< Member > members_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity final : public PublishableEntity {
@@ -188,7 +188,7 @@ public:
 
         OUString type;
 
-        std::vector< OUString > const annotations;
+        std::vector< OUString > annotations;
     };
 
     SAL_DLLPRIVATE PlainStructTypeEntity(
@@ -207,8 +207,8 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~PlainStructTypeEntity() throw () override;
 
-    OUString const directBase_;
-    std::vector< Member > const directMembers_;
+    OUString directBase_;
+    std::vector< Member > directMembers_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity final :
@@ -230,7 +230,7 @@ public:
 
         bool parameterized;
 
-        std::vector< OUString > const annotations;
+        std::vector< OUString > annotations;
     };
 
     SAL_DLLPRIVATE PolymorphicStructTypeTemplateEntity(
@@ -250,8 +250,8 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~PolymorphicStructTypeTemplateEntity() throw () override;
 
-    std::vector< OUString > const typeParameters_;
-    std::vector< Member > const members_;
+    std::vector< OUString > typeParameters_;
+    std::vector< Member > members_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity final : public PublishableEntity {
@@ -267,7 +267,7 @@ public:
 
         OUString type;
 
-        std::vector< OUString > const annotations;
+        std::vector< OUString > annotations;
     };
 
     SAL_DLLPRIVATE ExceptionTypeEntity(
@@ -286,8 +286,8 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~ExceptionTypeEntity() throw () override;
 
-    OUString const directBase_;
-    std::vector< Member > const directMembers_;
+    OUString directBase_;
+    std::vector< Member > directMembers_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity final : public PublishableEntity {
@@ -316,7 +316,7 @@ public:
 
         std::vector< OUString > setExceptions;
 
-        std::vector< OUString > const annotations;
+        std::vector< OUString > annotations;
     };
 
     struct Method {
@@ -353,7 +353,7 @@ public:
 
         std::vector< OUString > exceptions;
 
-        std::vector< OUString > const annotations;
+        std::vector< OUString > annotations;
     };
 
     SAL_DLLPRIVATE InterfaceTypeEntity(
@@ -384,10 +384,10 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~InterfaceTypeEntity() throw () override;
 
-    std::vector< AnnotatedReference > const directMandatoryBases_;
-    std::vector< AnnotatedReference > const directOptionalBases_;
-    std::vector< Attribute > const directAttributes_;
-    std::vector< Method > const directMethods_;
+    std::vector< AnnotatedReference > directMandatoryBases_;
+    std::vector< AnnotatedReference > directOptionalBases_;
+    std::vector< Attribute > directAttributes_;
+    std::vector< Method > directMethods_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL TypedefEntity final : public PublishableEntity {
@@ -403,7 +403,7 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~TypedefEntity() throw () override;
 
-    OUString const type_;
+    OUString type_;
 };
 
 struct SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ConstantValue {
@@ -467,7 +467,7 @@ public:
 
         ConstantValue value;
 
-        std::vector< OUString > const annotations;
+        std::vector< OUString > annotations;
     };
 
     SAL_DLLPRIVATE ConstantGroupEntity(
@@ -482,7 +482,7 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~ConstantGroupEntity() throw () override;
 
-    std::vector< Member > const members_;
+    std::vector< Member > members_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL SingleInterfaceBasedServiceEntity final :
@@ -499,9 +499,9 @@ public:
 
             OUString name;
 
-            OUString const type;
+            OUString type;
 
-            bool const rest;
+            bool rest;
         };
 
         Constructor():
@@ -522,7 +522,7 @@ public:
 
         std::vector< OUString > exceptions;
 
-        std::vector< OUString > const annotations;
+        std::vector< OUString > annotations;
 
         bool defaultConstructor;
     };
@@ -544,8 +544,8 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~SingleInterfaceBasedServiceEntity() throw () override;
 
-    OUString const base_;
-    std::vector< Constructor > const constructors_;
+    OUString base_;
+    std::vector< Constructor > constructors_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL AccumulationBasedServiceEntity final :
@@ -577,9 +577,9 @@ public:
 
         OUString type;
 
-        Attributes const attributes;
+        Attributes attributes;
 
-        std::vector< OUString > const annotations;
+        std::vector< OUString > annotations;
     };
 
     SAL_DLLPRIVATE AccumulationBasedServiceEntity(
@@ -621,11 +621,11 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~AccumulationBasedServiceEntity() throw () override;
 
-    std::vector< AnnotatedReference > const directMandatoryBaseServices_;
-    std::vector< AnnotatedReference > const directOptionalBaseServices_;
-    std::vector< AnnotatedReference > const directMandatoryBaseInterfaces_;
-    std::vector< AnnotatedReference > const directOptionalBaseInterfaces_;
-    std::vector< Property > const directProperties_;
+    std::vector< AnnotatedReference > directMandatoryBaseServices_;
+    std::vector< AnnotatedReference > directOptionalBaseServices_;
+    std::vector< AnnotatedReference > directMandatoryBaseInterfaces_;
+    std::vector< AnnotatedReference > directOptionalBaseInterfaces_;
+    std::vector< Property > directProperties_;
 };
 
 class LO_DLLPUBLIC_UNOIDL InterfaceBasedSingletonEntity final :
@@ -645,7 +645,7 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~InterfaceBasedSingletonEntity() throw () override;
 
-    OUString const base_;
+    OUString base_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ServiceBasedSingletonEntity final : public PublishableEntity
@@ -663,7 +663,7 @@ public:
 private:
     virtual SAL_DLLPRIVATE ~ServiceBasedSingletonEntity() throw () override;
 
-    OUString const base_;
+    OUString base_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Provider: public salhelper::SimpleReferenceObject {
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index 61e35e8cf952..3b57ee5fdcdc 100644
--- a/unoidl/source/legacyprovider.cxx
+++ b/unoidl/source/legacyprovider.cxx
@@ -142,7 +142,7 @@ private:
     { return new Cursor(manager_, ucr_, key_); }
 
     rtl::Reference< Manager > manager_;
-    RegistryKey const ucr_;
+    RegistryKey ucr_;
     mutable RegistryKey key_;
 };
 
diff --git a/unoidl/source/sourceprovider-scanner.hxx b/unoidl/source/sourceprovider-scanner.hxx
index ad499ce7c5bb..9aca9a4046d3 100644
--- a/unoidl/source/sourceprovider-scanner.hxx
+++ b/unoidl/source/sourceprovider-scanner.hxx
@@ -125,7 +125,7 @@ public:
     };
 
     struct Member {
-        OUString const mandatory;
+        OUString mandatory;
         std::set<OUString> optional;
 
         explicit Member(const OUString & theMandatory): mandatory(theMandatory) {}
@@ -143,7 +143,7 @@ public:
         YYLTYPE location, yyscan_t yyscanner, SourceProviderScannerData * data,
         OUString const & name);
 
-    bool const singleBase;
+    bool singleBase;
     std::vector<DirectBase> directMandatoryBases;
     std::vector<DirectBase> directOptionalBases;
     std::vector<unoidl::InterfaceTypeEntity::Attribute> directAttributes;
@@ -204,7 +204,7 @@ public:
 
             OUString name;
 
-            SourceProviderType const type;
+            SourceProviderType type;
 
             bool rest;
         };
@@ -215,13 +215,13 @@ public:
             name(theName), annotations(theAnnotations)
         {}
 
-        OUString const name;
+        OUString name;
 
         std::vector< Parameter > parameters;
 
         std::vector< OUString > exceptions;
 
-        std::vector< OUString > const annotations;
+        std::vector< OUString > annotations;
     };
 
     explicit SourceProviderSingleInterfaceBasedServiceEntityPad(
diff --git a/unoidl/source/sourcetreeprovider.hxx b/unoidl/source/sourcetreeprovider.hxx
index 2b9a00100ae2..d12fc9cef7e5 100644
--- a/unoidl/source/sourcetreeprovider.hxx
+++ b/unoidl/source/sourcetreeprovider.hxx
@@ -34,7 +34,7 @@ private:
     virtual ~SourceTreeProvider() throw () override;
 
     Manager & manager_;
-    OUString const uri_;
+    OUString uri_;
     mutable std::map< OUString, rtl::Reference<Entity> > cache_; //TODO: at manager
 };
 
diff --git a/unoidl/source/unoidl-check.cxx b/unoidl/source/unoidl-check.cxx
index ff42573f7d1b..6066994f1049 100644
--- a/unoidl/source/unoidl-check.cxx
+++ b/unoidl/source/unoidl-check.cxx
@@ -155,7 +155,7 @@ struct EqualsAnnotation {
     { return ref.name == name_; }
 
 private:
-    OUString const name_;
+    OUString name_;
 };
 
 void checkMap(
diff --git a/unoidl/source/unoidl-write.cxx b/unoidl/source/unoidl-write.cxx
index 3f51b68c07dd..1afca0e218b0 100644
--- a/unoidl/source/unoidl-write.cxx
+++ b/unoidl/source/unoidl-write.cxx
@@ -316,8 +316,8 @@ struct ConstItem {
         dataOffset(0)
     {}
 
-    unoidl::ConstantValue const constant;
-    std::vector< OUString > const annotations;
+    unoidl::ConstantValue constant;
+    std::vector< OUString > annotations;
     sal_uInt64 nameOffset;
     sal_uInt64 dataOffset;
 };
diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx
index cabf575efd3d..e2c3a0f6fe81 100644
--- a/unoidl/source/unoidl.cxx
+++ b/unoidl/source/unoidl.cxx
@@ -45,7 +45,7 @@ private:
     virtual rtl::Reference< MapCursor > createCursor() const override;
 
     std::vector< rtl::Reference< Provider > > providers_;
-    OUString const name_;
+    OUString name_;
 };
 
 std::vector< OUString > AggregatingModule::getMemberNames() const {
@@ -77,7 +77,7 @@ private:
     void findCursor();
 
     std::vector< rtl::Reference< Provider > > providers_;
-    OUString const name_;
+    OUString name_;
     std::vector< rtl::Reference< Provider > >::iterator iterator_;
     rtl::Reference< MapCursor > cursor_;
     std::set< OUString > seen_;
diff --git a/unoidl/source/unoidlprovider.cxx b/unoidl/source/unoidlprovider.cxx
index be59087e3095..8999482195ae 100644
--- a/unoidl/source/unoidlprovider.cxx
+++ b/unoidl/source/unoidlprovider.cxx
@@ -83,7 +83,7 @@ namespace {
 
 // sizeof (Memory16) == 2
 struct Memory16 {
-    unsigned char const byte[2];
+    unsigned char byte[2];
 
     sal_uInt16 getUnsigned16() const {
         return static_cast< sal_uInt16 >(byte[0])
@@ -93,7 +93,7 @@ struct Memory16 {
 
 // sizeof (Memory32) == 4
 struct Memory32 {
-    unsigned char const byte[4];
+    unsigned char byte[4];
 
     sal_uInt32 getUnsigned32() const {
         return static_cast< sal_uInt32 >(byte[0])
@@ -124,7 +124,7 @@ struct Memory32 {
 
 // sizeof (Memory64) == 8
 struct Memory64 {
-    unsigned char const byte[8];
+    unsigned char byte[8];
 
     sal_uInt64 getUnsigned64() const {
         return static_cast< sal_uInt64 >(byte[0])
@@ -452,8 +452,8 @@ OUString MappedFile::readIdxString(
 
 // sizeof (MapEntry) == 8
 struct MapEntry {
-    Memory32 const name;
-    Memory32 const data;
+    Memory32 name;
+    Memory32 data;
 };
 
 static bool operator <(const Map& map1, const Map& map2) {