[Libreoffice-commits] online.git: kit/ChildSession.hpp kit/Kit.cpp test/WhiteBoxTests.cpp tools/map.cpp wsd/Storage.cpp wsd/Storage.hpp

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Mon Dec 16 08:24:28 UTC 2019


 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(-)

New commits:
commit d0fee8c6addf0cb8d3e0680af303e519c612ed2c
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Dec 16 08:33:16 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Dec 16 09:24:08 2019 +0100

    These can be made const
    
    Change-Id: I952a7566176bda727f8c2e9618d41bfb7bb1240f
    Reviewed-on: https://gerrit.libreoffice.org/85197
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

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<int, UserInfo> 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.


More information about the Libreoffice-commits mailing list