From c04a8576f07cb837439959b8bdbb8b620684d508 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 26 Sep 2018 10:06:34 +0200 Subject: loplugin:constfields in unoidl Change-Id: I8d13626322e419d5d21a8e364de446bb6804ffa6 Reviewed-on: https://gerrit.libreoffice.org/60982 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/unoidl/unoidl.hxx | 82 ++++++++++++++++---------------- unoidl/source/legacyprovider.cxx | 2 +- unoidl/source/sourceprovider-scanner.hxx | 10 ++-- unoidl/source/sourcetreeprovider.hxx | 2 +- unoidl/source/unoidl-check.cxx | 2 +- unoidl/source/unoidl-write.cxx | 4 +- unoidl/source/unoidl.cxx | 4 +- unoidl/source/unoidlprovider.cxx | 10 ++-- 8 files changed, 58 insertions(+), 58 deletions(-) diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx index abc54029e6d7..711b220f7e0a 100644 --- a/include/unoidl/unoidl.hxx +++ b/include/unoidl/unoidl.hxx @@ -38,7 +38,7 @@ public: private: void operator =(NoSuchFileException) = delete; - rtl::OUString uri_; + rtl::OUString const uri_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL FileFormatException final { @@ -61,8 +61,8 @@ public: private: void operator =(FileFormatException) = delete; - rtl::OUString uri_; - rtl::OUString detail_; + rtl::OUString const uri_; + rtl::OUString const detail_; }; struct AnnotatedReference { @@ -74,7 +74,7 @@ struct AnnotatedReference { rtl::OUString name; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const 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 sort_; + Sort const 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 published_; + bool const published_; - std::vector< rtl::OUString > annotations_; + std::vector< rtl::OUString > const annotations_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL EnumTypeEntity: public PublishableEntity { @@ -158,7 +158,7 @@ public: sal_Int32 value; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const annotations; }; SAL_DLLPRIVATE EnumTypeEntity( @@ -173,7 +173,7 @@ public: private: virtual SAL_DLLPRIVATE ~EnumTypeEntity() throw () override; - std::vector< Member > members_; + std::vector< Member > const members_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity: public PublishableEntity { @@ -188,7 +188,7 @@ public: rtl::OUString type; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const annotations; }; SAL_DLLPRIVATE PlainStructTypeEntity( @@ -207,8 +207,8 @@ public: private: virtual SAL_DLLPRIVATE ~PlainStructTypeEntity() throw () override; - rtl::OUString directBase_; - std::vector< Member > directMembers_; + rtl::OUString const directBase_; + std::vector< Member > const directMembers_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity: @@ -230,7 +230,7 @@ public: bool parameterized; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const annotations; }; SAL_DLLPRIVATE PolymorphicStructTypeTemplateEntity( @@ -250,8 +250,8 @@ public: private: virtual SAL_DLLPRIVATE ~PolymorphicStructTypeTemplateEntity() throw () override; - std::vector< rtl::OUString > typeParameters_; - std::vector< Member > members_; + std::vector< rtl::OUString > const typeParameters_; + std::vector< Member > const members_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity: public PublishableEntity { @@ -267,7 +267,7 @@ public: rtl::OUString type; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const annotations; }; SAL_DLLPRIVATE ExceptionTypeEntity( @@ -286,8 +286,8 @@ public: private: virtual SAL_DLLPRIVATE ~ExceptionTypeEntity() throw () override; - rtl::OUString directBase_; - std::vector< Member > directMembers_; + rtl::OUString const directBase_; + std::vector< Member > const directMembers_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity: public PublishableEntity { @@ -316,7 +316,7 @@ public: std::vector< rtl::OUString > setExceptions; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const annotations; }; struct Method { @@ -353,7 +353,7 @@ public: std::vector< rtl::OUString > exceptions; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const annotations; }; SAL_DLLPRIVATE InterfaceTypeEntity( @@ -384,10 +384,10 @@ public: private: virtual SAL_DLLPRIVATE ~InterfaceTypeEntity() throw () override; - std::vector< AnnotatedReference > directMandatoryBases_; - std::vector< AnnotatedReference > directOptionalBases_; - std::vector< Attribute > directAttributes_; - std::vector< Method > directMethods_; + std::vector< AnnotatedReference > const directMandatoryBases_; + std::vector< AnnotatedReference > const directOptionalBases_; + std::vector< Attribute > const directAttributes_; + std::vector< Method > const directMethods_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL TypedefEntity: public PublishableEntity { @@ -403,7 +403,7 @@ public: private: virtual SAL_DLLPRIVATE ~TypedefEntity() throw () override; - rtl::OUString type_; + rtl::OUString const type_; }; struct SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ConstantValue { @@ -467,7 +467,7 @@ public: ConstantValue value; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const annotations; }; SAL_DLLPRIVATE ConstantGroupEntity( @@ -482,7 +482,7 @@ public: private: virtual SAL_DLLPRIVATE ~ConstantGroupEntity() throw () override; - std::vector< Member > members_; + std::vector< Member > const members_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL SingleInterfaceBasedServiceEntity: @@ -499,9 +499,9 @@ public: rtl::OUString name; - rtl::OUString type; + rtl::OUString const type; - bool rest; + bool const rest; }; Constructor(): defaultConstructor(true) {} @@ -521,7 +521,7 @@ public: std::vector< rtl::OUString > exceptions; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const annotations; bool defaultConstructor; }; @@ -543,8 +543,8 @@ public: private: virtual SAL_DLLPRIVATE ~SingleInterfaceBasedServiceEntity() throw () override; - rtl::OUString base_; - std::vector< Constructor > constructors_; + rtl::OUString const base_; + std::vector< Constructor > const constructors_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL AccumulationBasedServiceEntity: @@ -576,9 +576,9 @@ public: rtl::OUString type; - Attributes attributes; + Attributes const attributes; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const annotations; }; SAL_DLLPRIVATE AccumulationBasedServiceEntity( @@ -620,11 +620,11 @@ public: private: virtual SAL_DLLPRIVATE ~AccumulationBasedServiceEntity() throw () override; - std::vector< AnnotatedReference > directMandatoryBaseServices_; - std::vector< AnnotatedReference > directOptionalBaseServices_; - std::vector< AnnotatedReference > directMandatoryBaseInterfaces_; - std::vector< AnnotatedReference > directOptionalBaseInterfaces_; - std::vector< Property > directProperties_; + 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_; }; class LO_DLLPUBLIC_UNOIDL InterfaceBasedSingletonEntity: @@ -644,7 +644,7 @@ public: private: virtual SAL_DLLPRIVATE ~InterfaceBasedSingletonEntity() throw () override; - rtl::OUString base_; + rtl::OUString const base_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ServiceBasedSingletonEntity: public PublishableEntity @@ -662,7 +662,7 @@ public: private: virtual SAL_DLLPRIVATE ~ServiceBasedSingletonEntity() throw () override; - rtl::OUString base_; + rtl::OUString const 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 b39c08d806d8..1cd6ffa4b0f4 100644 --- a/unoidl/source/legacyprovider.cxx +++ b/unoidl/source/legacyprovider.cxx @@ -143,7 +143,7 @@ private: { return new Cursor(manager_, ucr_, key_); } rtl::Reference< Manager > manager_; - RegistryKey ucr_; + RegistryKey const ucr_; mutable RegistryKey key_; }; diff --git a/unoidl/source/sourceprovider-scanner.hxx b/unoidl/source/sourceprovider-scanner.hxx index ecf99433ce56..551a21c6843a 100644 --- a/unoidl/source/sourceprovider-scanner.hxx +++ b/unoidl/source/sourceprovider-scanner.hxx @@ -125,7 +125,7 @@ public: }; struct Member { - OUString mandatory; + OUString const mandatory; std::set optional; explicit Member(const OUString & theMandatory): mandatory(theMandatory) {} @@ -143,7 +143,7 @@ public: YYLTYPE location, yyscan_t yyscanner, SourceProviderScannerData * data, OUString const & name); - bool singleBase; + bool const singleBase; std::vector directMandatoryBases; std::vector directOptionalBases; std::vector directAttributes; @@ -204,7 +204,7 @@ public: rtl::OUString name; - SourceProviderType type; + SourceProviderType const type; bool rest; }; @@ -215,13 +215,13 @@ public: name(theName), annotations(theAnnotations) {} - rtl::OUString name; + rtl::OUString const name; std::vector< Parameter > parameters; std::vector< rtl::OUString > exceptions; - std::vector< rtl::OUString > annotations; + std::vector< rtl::OUString > const annotations; }; explicit SourceProviderSingleInterfaceBasedServiceEntityPad( diff --git a/unoidl/source/sourcetreeprovider.hxx b/unoidl/source/sourcetreeprovider.hxx index d12fc9cef7e5..2b9a00100ae2 100644 --- a/unoidl/source/sourcetreeprovider.hxx +++ b/unoidl/source/sourcetreeprovider.hxx @@ -34,7 +34,7 @@ private: virtual ~SourceTreeProvider() throw () override; Manager & manager_; - OUString uri_; + OUString const uri_; mutable std::map< OUString, rtl::Reference > cache_; //TODO: at manager }; diff --git a/unoidl/source/unoidl-check.cxx b/unoidl/source/unoidl-check.cxx index 94f335cd1266..04c75fcf84d4 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 name_; + OUString const name_; }; void checkMap( diff --git a/unoidl/source/unoidl-write.cxx b/unoidl/source/unoidl-write.cxx index 083f7a5b7b1f..73dba8c77652 100644 --- a/unoidl/source/unoidl-write.cxx +++ b/unoidl/source/unoidl-write.cxx @@ -316,8 +316,8 @@ struct ConstItem { dataOffset(0) {} - unoidl::ConstantValue constant; - std::vector< OUString > annotations; + unoidl::ConstantValue const constant; + std::vector< OUString > const annotations; sal_uInt64 nameOffset; sal_uInt64 dataOffset; }; diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx index fb21e87c8ee6..7ab7562292bd 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 name_; + OUString const name_; }; std::vector< OUString > AggregatingModule::getMemberNames() const { @@ -77,7 +77,7 @@ private: void findCursor(); std::vector< rtl::Reference< Provider > > providers_; - OUString name_; + OUString const 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 bfbed9d02dd6..6685f1fe289a 100644 --- a/unoidl/source/unoidlprovider.cxx +++ b/unoidl/source/unoidlprovider.cxx @@ -83,7 +83,7 @@ namespace { // sizeof (Memory16) == 2 struct Memory16 { - unsigned char byte[2]; + unsigned char const 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 byte[4]; + unsigned char const 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 byte[8]; + unsigned char const 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 name; - Memory32 data; + Memory32 const name; + Memory32 const data; }; static bool operator <(const Map& map1, const Map& map2) { -- cgit