From 1a7cf9d6ba5d3f3bd6b5f3f29606272444ea7743 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sun, 6 Sep 2015 12:03:03 +0200 Subject: [PATCH] CIRCSock: make the message handlers private These should not be called from the outside of the class. --- include/znc/IRCSock.h | 49 ++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/include/znc/IRCSock.h b/include/znc/IRCSock.h index 2ef30974..12edffbb 100644 --- a/include/znc/IRCSock.h +++ b/include/znc/IRCSock.h @@ -48,30 +48,6 @@ public: NoArg = 3 } EChanModeArgs; - // Message Handlers - bool OnAccountMessage(CMessage& Message); - bool OnActionMessage(CActionMessage& Message); - bool OnAwayMessage(CMessage& Message); - bool OnCapabilityMessage(CMessage& Message); - bool OnCTCPMessage(CCTCPMessage& Message); - bool OnErrorMessage(CMessage& Message); - bool OnInviteMessage(CMessage& Message); - bool OnJoinMessage(CJoinMessage& Message); - bool OnKickMessage(CKickMessage& Message); - bool OnModeMessage(CModeMessage& Message); - bool OnNickMessage(CNickMessage& Message); - bool OnNoticeMessage(CNoticeMessage& Message); - bool OnNumericMessage(CNumericMessage& Message); - bool OnPartMessage(CPartMessage& Message); - bool OnPingMessage(CMessage& Message); - bool OnPongMessage(CMessage& Message); - bool OnQuitMessage(CQuitMessage& Message); - bool OnTextMessage(CTextMessage& Message); - bool OnTopicMessage(CTopicMessage& Message); - bool OnWallopsMessage(CMessage& Message); - bool OnServerCapAvailable(const CString& sCap); - // !Message Handlers - void ReadLine(const CString& sData) override; void Connected() override; void Disconnected() override; @@ -133,7 +109,32 @@ public: // TODO move this function to CIRCNetwork and make it non-static? static bool IsFloodProtected(double fRate); + private: + // Message Handlers + bool OnAccountMessage(CMessage& Message); + bool OnActionMessage(CActionMessage& Message); + bool OnAwayMessage(CMessage& Message); + bool OnCapabilityMessage(CMessage& Message); + bool OnCTCPMessage(CCTCPMessage& Message); + bool OnErrorMessage(CMessage& Message); + bool OnInviteMessage(CMessage& Message); + bool OnJoinMessage(CJoinMessage& Message); + bool OnKickMessage(CKickMessage& Message); + bool OnModeMessage(CModeMessage& Message); + bool OnNickMessage(CNickMessage& Message); + bool OnNoticeMessage(CNoticeMessage& Message); + bool OnNumericMessage(CNumericMessage& Message); + bool OnPartMessage(CPartMessage& Message); + bool OnPingMessage(CMessage& Message); + bool OnPongMessage(CMessage& Message); + bool OnQuitMessage(CQuitMessage& Message); + bool OnTextMessage(CTextMessage& Message); + bool OnTopicMessage(CTopicMessage& Message); + bool OnWallopsMessage(CMessage& Message); + bool OnServerCapAvailable(const CString& sCap); + // !Message Handlers + void SetNick(const CString& sNick); void ParseISupport(const CString& sLine); // This is called when we connect and the nick we want is already taken