kit/Kit.cpp | 2 +- net/Socket.hpp | 4 ++-- net/WebSocketHandler.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 3d082ad4513421e31f126f35889cde2b5663d8bc Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Tue Sep 15 09:08:21 2020 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Tue Sep 15 09:34:18 2020 +0200 Mark processInputEnabled() as const Change-Id: I98222269b20e01ba50166d696d1f6846c06d8764 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102703 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/kit/Kit.cpp b/kit/Kit.cpp index 87335ecaa..c955a3339 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -1391,7 +1391,7 @@ private: public: void enableProcessInput(bool enable = true){ _inputProcessingEnabled = enable; } - bool processInputEnabled() { return _inputProcessingEnabled; } + bool processInputEnabled() const { return _inputProcessingEnabled; } bool hasQueueItems() const { diff --git a/net/Socket.hpp b/net/Socket.hpp index 7ec78f00a..4c2ba13eb 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -371,7 +371,7 @@ public: /// Enable/disable processing of incoming data at socket level. virtual void enableProcessInput(bool /*enable*/){}; - virtual bool processInputEnabled(){ return true; }; + virtual bool processInputEnabled() const { return true; }; /// Called after successful socket reads. virtual void handleIncomingMessage(SocketDisposition &disposition) = 0; @@ -1063,7 +1063,7 @@ public: return _incomingFD; } - bool processInputEnabled(){ return _inputProcessingEnabled; } + bool processInputEnabled() const { return _inputProcessingEnabled; } void enableProcessInput(bool enable = true){ _inputProcessingEnabled = enable; } protected: diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp index 9cab57118..7fb38c86d 100644 --- a/net/WebSocketHandler.hpp +++ b/net/WebSocketHandler.hpp @@ -826,7 +826,7 @@ protected: socket->enableProcessInput(enable); } - virtual bool processInputEnabled() override + virtual bool processInputEnabled() const override { std::shared_ptr<StreamSocket> socket = _socket.lock(); if (socket) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits