UnoControls/source/inc/OConnectionPointHelper.hxx | 2 +- include/tools/multisel.hxx | 10 +++++----- include/tools/stream.hxx | 2 +- include/tools/vcompat.hxx | 2 +- include/tools/zcodec.hxx | 4 ++-- include/ucbhelper/interactionrequest.hxx | 18 +++++++++--------- include/ucbhelper/resultsethelper.hxx | 2 +- tools/source/fsys/urlobj.cxx | 20 ++++++++++---------- tools/source/inet/inetmime.cxx | 14 +++++++------- tools/source/reversemap/bestreversemap.cxx | 2 +- tools/source/xml/XmlWriter.cxx | 2 +- ucbhelper/source/client/proxydecider.cxx | 2 +- ucbhelper/source/provider/resultset.cxx | 6 +++--- 13 files changed, 43 insertions(+), 43 deletions(-)
New commits: commit 12a8fa0d656f3f8bad7c9f85e4f760b5201d5f75 Author: Noel Grandin <[email protected]> AuthorDate: Fri Mar 13 21:12:38 2020 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sun Mar 15 16:28:14 2020 +0100 Revert "loplugin:constfields in ucbhelper" This reverts commit 64035391ebe8810520a214a3ae0aeb4c1b039819. Change-Id: Icfde3e984f9ebf93a423d101aee385182f65dea5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90518 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx index 3de932caa765..9cd5a7907396 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -98,7 +98,7 @@ private: css::uno::WeakReference< css::lang::XConnectionPointContainer > m_oContainerWeakReference; // Reference to container-class!. Don't use Reference<...> // It is a ring-reference => and must be a wekreference! OConnectionPointContainerHelper* m_pContainerImplementation; - css::uno::Type const m_aInterfaceType; + css::uno::Type m_aInterfaceType; css::uno::Reference< css::uno::XInterface > m_xLock; }; diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index b7f40c8f176f..facd9342363a 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -292,21 +292,21 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication final : public css::lang::XTypeProvider, public css::ucb::XInteractionSupplyAuthentication2 { - css::uno::Sequence< css::ucb::RememberAuthentication > const + css::uno::Sequence< css::ucb::RememberAuthentication > m_aRememberPasswordModes; - css::uno::Sequence< css::ucb::RememberAuthentication > const + css::uno::Sequence< css::ucb::RememberAuthentication > m_aRememberAccountModes; OUString m_aRealm; OUString m_aUserName; OUString m_aPassword; css::ucb::RememberAuthentication m_eRememberPasswordMode; - css::ucb::RememberAuthentication const m_eDefaultRememberPasswordMode; - css::ucb::RememberAuthentication const m_eDefaultRememberAccountMode; - bool const m_bCanSetRealm : 1; - bool const m_bCanSetUserName : 1; - bool const m_bCanSetPassword : 1; - bool const m_bCanSetAccount : 1; - bool const m_bCanUseSystemCredentials : 1; + css::ucb::RememberAuthentication m_eDefaultRememberPasswordMode; + css::ucb::RememberAuthentication m_eDefaultRememberAccountMode; + bool m_bCanSetRealm : 1; + bool m_bCanSetUserName : 1; + bool m_bCanSetPassword : 1; + bool m_bCanSetAccount : 1; + bool m_bCanUseSystemCredentials : 1; bool m_bUseSystemCredentials : 1; public: diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index b297ebcebc82..eed2ef6355ac 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -61,7 +61,7 @@ class UCBHELPER_DLLPUBLIC ResultSetImplHelper : protected: osl::Mutex m_aMutex; - css::ucb::OpenCommandArgument2 const m_aCommand; + css::ucb::OpenCommandArgument2 m_aCommand; css::uno::Reference< css::uno::XComponentContext > m_xContext; // Resultset #1 css::uno::Reference< css::sdbc::XResultSet > m_xResultSet1; diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 062dd64b2887..a8ffd9599f34 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -68,7 +68,7 @@ namespace { class WildCard { private: - OString const m_aWildString; + OString m_aWildString; public: explicit WildCard( const OUString& rWildCard ) diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 468bf2392a80..6cb1536675b8 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -43,8 +43,8 @@ namespace { struct PropertyInfo { const char* pName; - sal_Int32 const nHandle; - sal_Int16 const nAttributes; + sal_Int32 nHandle; + sal_Int16 nAttributes; const uno::Type& (*pGetCppuType)(); }; @@ -152,7 +152,7 @@ struct ResultSet_Impl uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; uno::Reference< beans::XPropertySetInfo > m_xPropSetInfo; uno::Reference< sdbc::XResultSetMetaData > m_xMetaData; - uno::Sequence< beans::Property > const m_aProperties; + uno::Sequence< beans::Property > m_aProperties; rtl::Reference< ResultSetDataSupplier > m_xDataSupplier; osl::Mutex m_aMutex; std::unique_ptr<cppu::OInterfaceContainerHelper> m_pDisposeEventListeners; commit c42cf09f17e683d7487b8b298bd2f5ff3587bf00 Author: Noel Grandin <[email protected]> AuthorDate: Fri Mar 13 20:49:04 2020 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sun Mar 15 16:28:03 2020 +0100 Revert "loplugin:constfields in tools" This reverts commit 833c4965fc0941ea997852e3d99dcd7688e58c14. Change-Id: I130a91538627f9e83d94615e2ddd48da5a075d4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90517 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx index feb96abd2760..3e06a3dce239 100644 --- a/include/tools/multisel.hxx +++ b/include/tools/multisel.hxx @@ -77,16 +77,16 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC StringRangeEnumerator { struct Range { - sal_Int32 const nFirst; - sal_Int32 const nLast; + sal_Int32 nFirst; + sal_Int32 nLast; Range( sal_Int32 i_nFirst, sal_Int32 i_nLast ) : nFirst( i_nFirst ), nLast( i_nLast ) {} }; std::vector< StringRangeEnumerator::Range > maSequence; sal_Int32 mnCount; - sal_Int32 const mnMin; - sal_Int32 const mnMax; - sal_Int32 const mnOffset; + sal_Int32 mnMin; + sal_Int32 mnMax; + sal_Int32 mnOffset; bool mbValidInput; bool setRange( const OUString& i_rNewRange ); diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 2e8fbc6771b5..4cbe1a3e930c 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -98,7 +98,7 @@ struct SvLockBytesStat class TOOLS_DLLPUBLIC SvLockBytes: public virtual SvRefBase { SvStream * m_pStream; - bool const m_bOwner; + bool m_bOwner; bool m_bSync; protected: diff --git a/include/tools/vcompat.hxx b/include/tools/vcompat.hxx index 3fbf4afaa5b2..edf61c7dd9b1 100644 --- a/include/tools/vcompat.hxx +++ b/include/tools/vcompat.hxx @@ -39,7 +39,7 @@ class UNLESS_MERGELIBS(TOOLS_DLLPUBLIC) VersionCompat SvStream* mpRWStm; sal_uInt32 mnCompatPos; sal_uInt32 mnTotalSize; - StreamMode const mnStmMode; + StreamMode mnStmMode; sal_uInt16 mnVersion; VersionCompat( const VersionCompat& ) = delete; diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx index ecffc67d87bf..23922e197f91 100644 --- a/include/tools/zcodec.hxx +++ b/include/tools/zcodec.hxx @@ -40,11 +40,11 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ZCodec bool mbStatus; bool mbFinish; sal_uInt8* mpInBuf; - size_t const mnInBufSize; + size_t mnInBufSize; size_t mnInToRead; SvStream* mpOStm; sal_uInt8* mpOutBuf; - size_t const mnOutBufSize; + size_t mnOutBufSize; int mnCompressLevel; bool mbGzLib; diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index be9dadeb8043..8818f548da29 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -291,14 +291,14 @@ struct INetURLObject::SchemeInfo { char const * m_pScheme; char const * m_pPrefix; - bool const m_bAuthority; - bool const m_bUser; - bool const m_bAuth; - bool const m_bPassword; - bool const m_bHost; - bool const m_bPort; - bool const m_bHierarchical; - bool const m_bQuery; + bool m_bAuthority; + bool m_bUser; + bool m_bAuth; + bool m_bPassword; + bool m_bHost; + bool m_bPort; + bool m_bHierarchical; + bool m_bQuery; }; struct INetURLObject::PrefixInfo @@ -307,8 +307,8 @@ struct INetURLObject::PrefixInfo char const * m_pPrefix; char const * m_pTranslatedPrefix; - INetProtocol const m_eScheme; - Kind const m_eKind; + INetProtocol m_eScheme; + Kind m_eKind; }; // static diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index cc9d0c1e94fc..fd00fe3a4603 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -252,12 +252,12 @@ void appendISO88591(OUStringBuffer & rText, char const * pBegin, struct Parameter { - OString const m_aAttribute; - OString const m_aCharset; - OString const m_aLanguage; - OString const m_aValue; - sal_uInt32 const m_nSection; - bool const m_bExtended; + OString m_aAttribute; + OString m_aCharset; + OString m_aLanguage; + OString m_aValue; + sal_uInt32 m_nSection; + bool m_bExtended; bool operator<(const Parameter& rhs) const // is used by std::list<Parameter>::sort { @@ -741,7 +741,7 @@ bool equalIgnoreCase(const char * pBegin1, struct EncodingEntry { char const * m_aName; - rtl_TextEncoding const m_eEncoding; + rtl_TextEncoding m_eEncoding; }; // The source for the following table is <ftp://ftp.iana.org/in-notes/iana/ diff --git a/tools/source/reversemap/bestreversemap.cxx b/tools/source/reversemap/bestreversemap.cxx index e2b51bf5c000..02a81932b3f2 100644 --- a/tools/source/reversemap/bestreversemap.cxx +++ b/tools/source/reversemap/bestreversemap.cxx @@ -17,7 +17,7 @@ namespace { struct Encoder { - rtl_UnicodeToTextConverter const m_aConverter; + rtl_UnicodeToTextConverter m_aConverter; bool m_bCapable; const char *m_pEncoding; Encoder(rtl_TextEncoding nEncoding, const char *pEncoding) diff --git a/tools/source/xml/XmlWriter.cxx b/tools/source/xml/XmlWriter.cxx index a314eed6e940..eaea3d9c15e4 100644 --- a/tools/source/xml/XmlWriter.cxx +++ b/tools/source/xml/XmlWriter.cxx @@ -40,7 +40,7 @@ struct XmlWriterImpl { } - SvStream* const mpStream; + SvStream* mpStream; xmlTextWriterPtr mpWriter; bool mbWriteXmlHeader; }; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
