From d0fee8c6addf0cb8d3e0680af303e519c612ed2c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 16 Dec 2019 08:33:16 +0100 Subject: These can be made const Change-Id: I952a7566176bda727f8c2e9618d41bfb7bb1240f Reviewed-on: https://gerrit.libreoffice.org/85197 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna --- kit/ChildSession.hpp | 2 +- kit/Kit.cpp | 2 +- test/WhiteBoxTests.cpp | 2 +- tools/map.cpp | 2 +- wsd/Storage.cpp | 2 +- wsd/Storage.hpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp index de01fce8e..2f677facd 100644 --- a/kit/ChildSession.hpp +++ b/kit/ChildSession.hpp @@ -61,7 +61,7 @@ public: virtual void notifyViewInfo() = 0; virtual void updateEditorSpeeds(int id, int speed) = 0; - virtual int getEditorId() = 0; + virtual int getEditorId() const = 0; /// Get a view ID <-> UserInfo map. virtual std::map getViewInfo() = 0; diff --git a/kit/Kit.cpp b/kit/Kit.cpp index b46a0785b..4ad74b258 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -1432,7 +1432,7 @@ private: return _tileQueue; } - int getEditorId() override + int getEditorId() const override { return _editorId; } diff --git a/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp index fac27ece7..9fc452622 100644 --- a/test/WhiteBoxTests.cpp +++ b/test/WhiteBoxTests.cpp @@ -530,7 +530,7 @@ public: { } - int getEditorId() override + int getEditorId() const override { return -1; } diff --git a/tools/map.cpp b/tools/map.cpp index d2ebb5d6e..7c36f93d1 100644 --- a/tools/map.cpp +++ b/tools/map.cpp @@ -118,7 +118,7 @@ public: void setName(const std::string& name) { _name = name; } const std::string& getName() const { return _name; } - size_t size() { return _end - _start; } + size_t size() const { return _end - _start; } }; struct StringData { diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp index f14954a6e..51c6969f7 100644 --- a/wsd/Storage.cpp +++ b/wsd/Storage.cpp @@ -486,7 +486,7 @@ bool LockContext::needsRefresh(const std::chrono::steady_clock::time_point &now) (now - _lastLockTime).count() >= refreshSeconds; } -void LockContext::dumpState(std::ostream& os) +void LockContext::dumpState(std::ostream& os) const { if (!_supportsLocks) return; diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp index 1e6eb18d3..7060cd7a4 100644 --- a/wsd/Storage.hpp +++ b/wsd/Storage.hpp @@ -46,7 +46,7 @@ struct LockContext /// do we need to refresh our lock ? bool needsRefresh(const std::chrono::steady_clock::time_point &now) const; - void dumpState(std::ostream& os); + void dumpState(std::ostream& os) const; }; /// Base class of all Storage abstractions. -- cgit v1.2.3