From 6b73b47d63b531105ed36a41ae5d31864ed16cda Mon Sep 17 00:00:00 2001 From: Zofia Abramowska Date: Fri, 21 Jul 2017 19:01:30 +0200 Subject: [PATCH] Fix accessor types of channels methods * Channel : move onAccept, onClose, onReceive, onSend to protected * ServerChannel, ClientChannel : move above methods to private Change-Id: If689984a5de7cc40fb6df4b8c6f79e3328664f3e --- src/ipc/channel.h | 10 +++++----- src/ipc/client-channel.h | 3 +-- src/ipc/server-channel.h | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/ipc/channel.h b/src/ipc/channel.h index 17766ba..82afcdc 100644 --- a/src/ipc/channel.h +++ b/src/ipc/channel.h @@ -54,16 +54,16 @@ public: */ virtual int process(int fd, int mask); - virtual void onAccept(int fd) = 0; - virtual void onClose(int fd) = 0; - virtual int onReceive(int fd, std::vector &¶ms) = 0; - virtual void onSend(int fd) = 0; - protected: void parse(const std::string &data, std::vector &parsedData); void closeConnection(int fd); SocketMap m_sockets; +private: + virtual void onAccept(int fd) = 0; + virtual void onClose(int fd) = 0; + virtual int onReceive(int fd, std::vector &¶ms) = 0; + virtual void onSend(int fd) = 0; }; } // namespace Protocol diff --git a/src/ipc/client-channel.h b/src/ipc/client-channel.h index 7ada552..7f6b2a6 100644 --- a/src/ipc/client-channel.h +++ b/src/ipc/client-channel.h @@ -68,12 +68,11 @@ public: virtual Protocol::RequestId popupRequest(const std::string &privilege); +private: virtual void onAccept(int fd); virtual void onClose(int fd); virtual int onReceive(int fd, std::vector &&message); virtual void onSend(int fd); - -private: void init(); AskUser::Protocol::RequestId generateRequestId(); diff --git a/src/ipc/server-channel.h b/src/ipc/server-channel.h index 59d484a..cb3e2d5 100644 --- a/src/ipc/server-channel.h +++ b/src/ipc/server-channel.h @@ -78,12 +78,11 @@ public: virtual void popupResponse(ConnectionFd fd, RequestId id, int response); +private: virtual void onAccept(int fd); virtual void onClose(int fd); virtual int onReceive(int fd, std::vector &&message); virtual void onSend(int fd); - -private: void init(); ServerCallbacksPtr m_callbacks; -- 2.7.4