From 8a0e29a24e745e98828905542f930fda9f26e5a4 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Mon, 16 Mar 2020 13:45:42 -0700 Subject: [PATCH] removed IRCApplication.h --- ircddb/IRCApplication.h | 31 ------------------------------- ircddb/IRCClient.cpp | 2 +- ircddb/IRCClient.h | 5 ++--- ircddb/IRCDDBApp.h | 35 +++++++++++++++++------------------ ircddb/IRCProtocol.cpp | 3 ++- ircddb/IRCProtocol.h | 7 +++---- 6 files changed, 25 insertions(+), 58 deletions(-) delete mode 100644 ircddb/IRCApplication.h diff --git a/ircddb/IRCApplication.h b/ircddb/IRCApplication.h deleted file mode 100644 index 5e7d6c2..0000000 --- a/ircddb/IRCApplication.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include -#include "IRCMessageQueue.h" - -class IRCApplication -{ -public: - - virtual void userJoin(const std::string& nick, const std::string& name, const std::string& host) = 0; - virtual void userLeave(const std::string& nick) = 0; - virtual void userChanOp(const std::string& nick, bool op) = 0; - virtual void userListReset(void) = 0; - - virtual void msgChannel(IRCMessage * m) = 0; - virtual void msgQuery(IRCMessage * m) = 0; - - virtual void setCurrentNick(const std::string& nick) = 0; - virtual void setTopic(const std::string& topic) = 0; - - virtual void setBestServer(const std::string& ircUser) = 0; - - virtual void setSendQ(IRCMessageQueue *s) = 0; - virtual IRCMessageQueue *getSendQ(void) = 0; - - virtual void putReplyMessage(IRCMessage *m) = 0; - virtual void sendPing(const std::string &to, const std::string &from) = 0; - - virtual ~IRCApplication() {} - -}; diff --git a/ircddb/IRCClient.cpp b/ircddb/IRCClient.cpp index fe72db9..a40db35 100644 --- a/ircddb/IRCClient.cpp +++ b/ircddb/IRCClient.cpp @@ -8,7 +8,7 @@ #include "IRCutils.h" -IRCClient::IRCClient(IRCApplication *app, const std::string &update_channel, const std::string &hostName, unsigned int port, const std::string &callsign, const std::string &password, const std::string &versionInfo) +IRCClient::IRCClient(IRCDDBApp *app, const std::string &update_channel, const std::string &hostName, unsigned int port, const std::string &callsign, const std::string &password, const std::string &versionInfo) { safeStringCopy(host_name, hostName.c_str(), sizeof host_name); diff --git a/ircddb/IRCClient.h b/ircddb/IRCClient.h index e6f58ba..12edf83 100644 --- a/ircddb/IRCClient.h +++ b/ircddb/IRCClient.h @@ -7,12 +7,11 @@ #include "IRCReceiver.h" #include "IRCMessageQueue.h" #include "IRCProtocol.h" -#include "IRCApplication.h" class IRCClient { public: - IRCClient(IRCApplication *app, const std::string &update_channel, const std::string &hostName, unsigned int port, const std::string &callsign, const std::string &password, const std::string &versionInfo); + IRCClient(IRCDDBApp *app, const std::string &update_channel, const std::string &hostName, unsigned int port, const std::string &callsign, const std::string &password, const std::string &versionInfo); virtual ~IRCClient(); bool startWork(); @@ -37,6 +36,6 @@ private: IRCMessageQueue *recvQ; IRCMessageQueue *sendQ; IRCProtocol *proto; - IRCApplication *app; + IRCDDBApp *app; }; diff --git a/ircddb/IRCDDBApp.h b/ircddb/IRCDDBApp.h index 1be0ffd..30b1d88 100644 --- a/ircddb/IRCDDBApp.h +++ b/ircddb/IRCDDBApp.h @@ -4,37 +4,36 @@ #include #include "IRCDDB.h" -#include "IRCApplication.h" +#include "IRCMessageQueue.h" class IRCDDBAppPrivate; -class IRCDDBApp : public IRCApplication +class IRCDDBApp { public: IRCDDBApp(const std::string &update_channel); + ~IRCDDBApp(); - virtual ~IRCDDBApp(); + void userJoin(const std::string &nick, const std::string &name, const std::string &host); - virtual void userJoin(const std::string &nick, const std::string &name, const std::string &host); + void userLeave(const std::string &nick); - virtual void userLeave(const std::string &nick); + void userChanOp(const std::string &nick, bool op); + void userListReset(); - virtual void userChanOp(const std::string &nick, bool op); - virtual void userListReset(); + void msgChannel(IRCMessage *m); + void msgQuery(IRCMessage *m); - virtual void msgChannel(IRCMessage *m); - virtual void msgQuery(IRCMessage *m); + void setCurrentNick(const std::string &nick); + void setTopic(const std::string &topic); - virtual void setCurrentNick(const std::string &nick); - virtual void setTopic(const std::string &topic); + void setBestServer(const std::string &ircUser); - virtual void setBestServer(const std::string &ircUser); + void setSendQ(IRCMessageQueue *s); + IRCMessageQueue *getSendQ(); - virtual void setSendQ(IRCMessageQueue *s); - virtual IRCMessageQueue *getSendQ(); - - virtual void putReplyMessage(IRCMessage *m); - virtual void sendPing(const std::string &to, const std::string &from); + void putReplyMessage(IRCMessage *m); + void sendPing(const std::string &to, const std::string &from); bool startWork(); void stopWork(); @@ -58,7 +57,7 @@ public: void kickWatchdog(const std::string &wdInfo); protected: - virtual void Entry(); + void Entry(); private: void doUpdate(std::string &msg); diff --git a/ircddb/IRCProtocol.cpp b/ircddb/IRCProtocol.cpp index cf7fa2c..24ca516 100644 --- a/ircddb/IRCProtocol.cpp +++ b/ircddb/IRCProtocol.cpp @@ -5,10 +5,11 @@ #include "IRCutils.h" #include "IRCProtocol.h" +#include "IRCMessageQueue.h" #define CIRCDDB_VERSION "2.0.0" -IRCProtocol::IRCProtocol(IRCApplication *app, const std::string &callsign, const std::string &password, const std::string &channel, const std::string &versionInfo) +IRCProtocol::IRCProtocol(IRCDDBApp *app, const std::string &callsign, const std::string &password, const std::string &channel, const std::string &versionInfo) { srand(time(NULL)); this->password = password; diff --git a/ircddb/IRCProtocol.h b/ircddb/IRCProtocol.h index 4e70eca..ab0c599 100644 --- a/ircddb/IRCProtocol.h +++ b/ircddb/IRCProtocol.h @@ -1,12 +1,12 @@ #pragma once +#include "IRCDDBApp.h" #include "IRCMessageQueue.h" -#include "IRCApplication.h" class IRCProtocol { public: - IRCProtocol(IRCApplication * app, const std::string &callsign, const std::string &password, const std::string &channel, const std::string &versionInfo); + IRCProtocol(IRCDDBApp *app, const std::string &callsign, const std::string &password, const std::string &channel, const std::string &versionInfo); ~IRCProtocol(); @@ -30,6 +30,5 @@ private: std::string debugChannel; - IRCApplication *app; - + IRCDDBApp *app; };