From 0e8e1c1881f3f00c76aa47aa1652f4cec343c256 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 22 Aug 2019 10:03:22 +0200 Subject: loplugin:constmethod in svl Change-Id: I9c16689dfeef11b77504106d22aceaaf9ec3df7d Reviewed-on: https://gerrit.libreoffice.org/77945 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/svl/svdde.hxx | 16 ++++++++-------- svl/source/svdde/ddecli.cxx | 6 +++--- svl/source/svdde/ddeimp.hxx | 2 +- svl/unx/source/svdde/ddedummy.cxx | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 469ce90fc807..f27e2135700f 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -98,7 +98,7 @@ protected: public: virtual ~DdeTransaction(); - bool IsBusy() { return bBusy; } + bool IsBusy() const { return bBusy; } const OUString GetName() const; void Execute(); @@ -112,7 +112,7 @@ public: void SetFormat( SotClipboardFormatId nFmt ) { aDdeData.SetFormat( nFmt ); } SotClipboardFormatId GetFormat() const { return aDdeData.GetFormat(); } - long GetError(); + long GetError() const; private: friend class DdeInternal; @@ -179,14 +179,14 @@ public: DdeConnection( SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER const OUString& ); ~DdeConnection(); - long GetError(); + long GetError() const; static const std::vector& GetConnections(); bool IsConnected(); - const OUString GetServiceName(); - const OUString GetTopicName(); + OUString GetServiceName() const; + OUString GetTopicName() const; private: DdeConnection( const DdeConnection& ) = delete; @@ -265,7 +265,7 @@ public: void InsertItem( DdeItem* ); // For own superclasses DdeItem* AddItem( const DdeItem& ); // Will be cloned void RemoveItem( const DdeItem& ); - const OUString& GetCurItem() { return aItem; } + const OUString& GetCurItem() const { return aItem; } const std::vector& GetItems() const { return aItems; } private: @@ -303,7 +303,7 @@ public: DdeService& operator= ( const DdeService& ) = delete; const OUString GetName() const; - short GetError() { return nStatus; } + short GetError() const { return nStatus; } static DdeServices& GetServices(); std::vector& GetTopics() { return aTopics; } @@ -317,7 +317,7 @@ public: }; -inline long DdeTransaction::GetError() +inline long DdeTransaction::GetError() const { return rDde.GetError(); } diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index 0f866689f8f5..29134e5a0767 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -216,12 +216,12 @@ bool DdeConnection::IsConnected() } } -const OUString DdeConnection::GetServiceName() +OUString DdeConnection::GetServiceName() const { return pService->toOUString(); } -const OUString DdeConnection::GetTopicName() + OUString DdeConnection::GetTopicName() const { return pTopic->toOUString(); } @@ -379,7 +379,7 @@ DdeExecute::DdeExecute( DdeConnection& d, const OUString& rData, long n ) nType = XTYP_EXECUTE; } -long DdeConnection::GetError() +long DdeConnection::GetError() const { return pImp->nStatus; } diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index 3e6cf02483b4..4c6a5ce872d8 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -68,7 +68,7 @@ public: bool operator==( HSZ ); HSZ getHSZ(); - OUString toOUString() const { return m_aString; } + const OUString & toOUString() const { return m_aString; } }; diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index c505433a1e98..31cb24aa6c37 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.cxx @@ -83,7 +83,7 @@ void const * DdeData::getData() const struct DdeImp {}; -long DdeConnection::GetError() +long DdeConnection::GetError() const { return 0L; } @@ -98,12 +98,12 @@ DdeConnection::~DdeConnection() { } -const OUString DdeConnection::GetServiceName() +OUString DdeConnection::GetServiceName() const { return OUString(); } -const OUString DdeConnection::GetTopicName() +OUString DdeConnection::GetTopicName() const { return OUString(); } -- cgit