summaryrefslogtreecommitdiff
path: root/unoidl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-15 13:04:56 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-15 16:28:50 +0100
commitd7fd62cf6805bb4bcfc2fe35e2eff73f66654837 (patch)
tree7f3ca30bf9e1144b9026696f30be12f397c9fe7c /unoidl
parent0116d0b2ca92cffc7c3459ddf07dfcaa9187975f (diff)
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>
Diffstat (limited to 'unoidl')
-rw-r--r--unoidl/source/legacyprovider.cxx2
-rw-r--r--unoidl/source/sourceprovider-scanner.hxx10
-rw-r--r--unoidl/source/sourcetreeprovider.hxx2
-rw-r--r--unoidl/source/unoidl-check.cxx2
-rw-r--r--unoidl/source/unoidl-write.cxx4
-rw-r--r--unoidl/source/unoidl.cxx4
-rw-r--r--unoidl/source/unoidlprovider.cxx10
7 files changed, 17 insertions, 17 deletions
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) {