From 45cf725071f19107d73b96f8a24b47df1e2f474e Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Fri, 25 Sep 2009 17:44:27 +0200 Subject: [PATCH] Rename UserInputHandler to CoreUserInputHandler We also have ClientUserInputHandler, so let's deconfuzzle developers. --- i18n/quassel.ts | 2 +- i18n/quassel_cs.ts | 2 +- i18n/quassel_da.ts | 2 +- i18n/quassel_de.ts | 2 +- i18n/quassel_fi.ts | 2 +- i18n/quassel_fr.ts | 2 +- i18n/quassel_hu.ts | 2 +- i18n/quassel_it.ts | 2 +- i18n/quassel_nb_NO.ts | 2 +- i18n/quassel_ru.ts | 2 +- i18n/quassel_sl.ts | 2 +- i18n/quassel_tr_TR.ts | 2 +- src/core/CMakeLists.txt | 8 +- src/core/coreirclisthelper.cpp | 2 +- src/core/corenetwork.cpp | 4 +- src/core/corenetwork.h | 6 +- src/core/coresession.cpp | 2 +- ...uthandler.cpp => coreuserinputhandler.cpp} | 78 +++++++++---------- ...rinputhandler.h => coreuserinputhandler.h} | 11 ++- 19 files changed, 67 insertions(+), 68 deletions(-) rename src/core/{userinputhandler.cpp => coreuserinputhandler.cpp} (81%) rename src/core/{userinputhandler.h => coreuserinputhandler.h} (96%) diff --git a/i18n/quassel.ts b/i18n/quassel.ts index 891d0705..cfa1c8da 100644 --- a/i18n/quassel.ts +++ b/i18n/quassel.ts @@ -3539,7 +3539,7 @@ This setting defines the encoding for messages that are not Utf8. - UserInputHandler + CoreUserInputHandler sending CTCP-%1 request diff --git a/i18n/quassel_cs.ts b/i18n/quassel_cs.ts index 5e7489f9..e3ad9160 100644 --- a/i18n/quassel_cs.ts +++ b/i18n/quassel_cs.ts @@ -5702,7 +5702,7 @@ Topic Message - UserInputHandler + CoreUserInputHandler away diff --git a/i18n/quassel_da.ts b/i18n/quassel_da.ts index 4019b652..29daab17 100644 --- a/i18n/quassel_da.ts +++ b/i18n/quassel_da.ts @@ -3734,7 +3734,7 @@ This setting defines the encoding for messages that are not Utf8. - UserInputHandler + CoreUserInputHandler sending CTCP-%1 request diff --git a/i18n/quassel_de.ts b/i18n/quassel_de.ts index 38ec1a30..0b2711c5 100644 --- a/i18n/quassel_de.ts +++ b/i18n/quassel_de.ts @@ -5705,7 +5705,7 @@ Topic Message - UserInputHandler + CoreUserInputHandler sending CTCP-%1 request diff --git a/i18n/quassel_fi.ts b/i18n/quassel_fi.ts index 8a634939..bbd65405 100644 --- a/i18n/quassel_fi.ts +++ b/i18n/quassel_fi.ts @@ -5694,7 +5694,7 @@ Topic Message - UserInputHandler + CoreUserInputHandler away diff --git a/i18n/quassel_fr.ts b/i18n/quassel_fr.ts index acb33b66..1143ca75 100644 --- a/i18n/quassel_fr.ts +++ b/i18n/quassel_fr.ts @@ -8054,7 +8054,7 @@ Click to edit! - UserInputHandler + CoreUserInputHandler sending CTCP-%1 request diff --git a/i18n/quassel_hu.ts b/i18n/quassel_hu.ts index 28e9c59a..7b8d48f6 100644 --- a/i18n/quassel_hu.ts +++ b/i18n/quassel_hu.ts @@ -4887,7 +4887,7 @@ This setting defines the encoding for messages that are not Utf8. - UserInputHandler + CoreUserInputHandler sending CTCP-%1 request diff --git a/i18n/quassel_it.ts b/i18n/quassel_it.ts index 1b21aa51..c79a97c3 100644 --- a/i18n/quassel_it.ts +++ b/i18n/quassel_it.ts @@ -4711,7 +4711,7 @@ A meno che tu non sappia *realmente* cosa stai facendo, lascia questo valore imp - UserInputHandler + CoreUserInputHandler away diff --git a/i18n/quassel_nb_NO.ts b/i18n/quassel_nb_NO.ts index 359b18ce..8630bf55 100644 --- a/i18n/quassel_nb_NO.ts +++ b/i18n/quassel_nb_NO.ts @@ -6599,7 +6599,7 @@ Click to edit! - UserInputHandler + CoreUserInputHandler away diff --git a/i18n/quassel_ru.ts b/i18n/quassel_ru.ts index b0a8f997..070885d1 100644 --- a/i18n/quassel_ru.ts +++ b/i18n/quassel_ru.ts @@ -5867,7 +5867,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1! - UserInputHandler + CoreUserInputHandler sending CTCP-%1 request diff --git a/i18n/quassel_sl.ts b/i18n/quassel_sl.ts index 5f6c088a..92b0fc22 100644 --- a/i18n/quassel_sl.ts +++ b/i18n/quassel_sl.ts @@ -5325,7 +5325,7 @@ Pustite na ISO-8859-1, razen če ste prepričani, kaj počnete! - UserInputHandler + CoreUserInputHandler away diff --git a/i18n/quassel_tr_TR.ts b/i18n/quassel_tr_TR.ts index 02c084a5..1bfeda81 100644 --- a/i18n/quassel_tr_TR.ts +++ b/i18n/quassel_tr_TR.ts @@ -4638,7 +4638,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1! - UserInputHandler + CoreUserInputHandler sending CTCP-%1 request diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f7b3ce11..ccf5aec0 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -25,6 +25,7 @@ set(SOURCES corenetworkconfig.cpp coresession.cpp coresettings.cpp + coreuserinputhandler.cpp coreusersettings.cpp ctcphandler.cpp ircserverhandler.cpp @@ -32,8 +33,7 @@ set(SOURCES postgresqlstorage.cpp sessionthread.cpp sqlitestorage.cpp - storage.cpp - userinputhandler.cpp) + storage.cpp) set(MOC_HDRS abstractsqlstorage.h @@ -53,14 +53,14 @@ set(MOC_HDRS corenetwork.h corenetworkconfig.h coresession.h + coreuserinputhandler.h ctcphandler.h ircserverhandler.h netsplit.h postgresqlstorage.h sqlitestorage.h storage.h - sessionthread.h - userinputhandler.h) + sessionthread.h) set(HEADERS coresettings.h diff --git a/src/core/coreirclisthelper.cpp b/src/core/coreirclisthelper.cpp index 5abb5aad..05454713 100644 --- a/src/core/coreirclisthelper.cpp +++ b/src/core/coreirclisthelper.cpp @@ -21,7 +21,7 @@ #include "coreirclisthelper.h" #include "corenetwork.h" -#include "userinputhandler.h" +#include "coreuserinputhandler.h" INIT_SYNCABLE_OBJECT(CoreIrcListHelper) QVariantList CoreIrcListHelper::requestChannelList(const NetworkId &netId, const QStringList &channelFilters) { diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp index bc7b848a..7c5adb49 100644 --- a/src/core/corenetwork.cpp +++ b/src/core/corenetwork.cpp @@ -26,7 +26,7 @@ #include "corenetworkconfig.h" #include "ircserverhandler.h" -#include "userinputhandler.h" +#include "coreuserinputhandler.h" #include "ctcphandler.h" INIT_SYNCABLE_OBJECT(CoreNetwork) @@ -34,7 +34,7 @@ CoreNetwork::CoreNetwork(const NetworkId &networkid, CoreSession *session) : Network(networkid, session), _coreSession(session), _ircServerHandler(new IrcServerHandler(this)), - _userInputHandler(new UserInputHandler(this)), + _userInputHandler(new CoreUserInputHandler(this)), _ctcpHandler(new CtcpHandler(this)), _autoReconnectCount(0), _quitRequested(false), diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h index d30bb6e7..bb2a07d3 100644 --- a/src/core/corenetwork.h +++ b/src/core/corenetwork.h @@ -37,7 +37,7 @@ class CoreIdentity; class IrcServerHandler; -class UserInputHandler; +class CoreUserInputHandler; class CtcpHandler; class CoreNetwork : public Network { @@ -54,7 +54,7 @@ public: inline CoreNetworkConfig *networkConfig() const { return coreSession()->networkConfig(); } inline IrcServerHandler *ircServerHandler() const { return _ircServerHandler; } - inline UserInputHandler *userInputHandler() const { return _userInputHandler; } + inline CoreUserInputHandler *userInputHandler() const { return _userInputHandler; } inline CtcpHandler *ctcpHandler() const { return _ctcpHandler; } //! Decode a string using the server (network) decoding. @@ -169,7 +169,7 @@ private: #endif IrcServerHandler *_ircServerHandler; - UserInputHandler *_userInputHandler; + CoreUserInputHandler *_userInputHandler; CtcpHandler *_ctcpHandler; QHash _channelKeys; // stores persistent channels and their passwords, if any diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 7f2d808f..58af49a4 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -22,7 +22,7 @@ #include "core.h" #include "coresession.h" -#include "userinputhandler.h" +#include "coreuserinputhandler.h" #include "signalproxy.h" #include "corebuffersyncer.h" #include "corebacklogmanager.h" diff --git a/src/core/userinputhandler.cpp b/src/core/coreuserinputhandler.cpp similarity index 81% rename from src/core/userinputhandler.cpp rename to src/core/coreuserinputhandler.cpp index 31ab7a3f..47b9b89b 100644 --- a/src/core/userinputhandler.cpp +++ b/src/core/coreuserinputhandler.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "userinputhandler.h" +#include "coreuserinputhandler.h" #include "util.h" @@ -28,12 +28,12 @@ #include #include -UserInputHandler::UserInputHandler(CoreNetwork *parent) +CoreUserInputHandler::CoreUserInputHandler(CoreNetwork *parent) : BasicHandler(parent) { } -void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg) { if(msg.isEmpty()) return; @@ -49,7 +49,7 @@ void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QStri // ==================== // Public Slots // ==================== -void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) QString awayMsg = msg; @@ -70,15 +70,15 @@ void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &m putCmd("AWAY", serverEncode(awayMsg)); } -void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &msg) { banOrUnban(bufferInfo, msg, true); } -void UserInputHandler::handleUnban(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleUnban(const BufferInfo &bufferInfo, const QString &msg) { banOrUnban(bufferInfo, msg, false); } -void UserInputHandler::banOrUnban(const BufferInfo &bufferInfo, const QString &msg, bool ban) { +void CoreUserInputHandler::banOrUnban(const BufferInfo &bufferInfo, const QString &msg, bool ban) { QString banChannel; QString banUser; @@ -120,7 +120,7 @@ void UserInputHandler::banOrUnban(const BufferInfo &bufferInfo, const QString &m emit putRawLine(serverEncode(banMsg)); } -void UserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) QString nick = msg.section(' ', 0, 0); @@ -140,7 +140,7 @@ void UserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QString &m emit displayMsg(Message::Action, BufferInfo::StatusBuffer, "", verboseMessage, network()->myNick()); } -void UserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QString &msg) { QStringList nicks = msg.split(' ', QString::SkipEmptyParts); QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'o'; QStringList params; @@ -148,7 +148,7 @@ void UserInputHandler::handleDeop(const BufferInfo &bufferInfo, const QString &m emit putCmd("MODE", serverEncode(params)); } -void UserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString &msg) { QStringList nicks = msg.split(' ', QString::SkipEmptyParts); QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'v'; QStringList params; @@ -156,13 +156,13 @@ void UserInputHandler::handleDevoice(const BufferInfo &bufferInfo, const QString emit putCmd("MODE", serverEncode(params)); } -void UserInputHandler::handleInvite(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleInvite(const BufferInfo &bufferInfo, const QString &msg) { QStringList params; params << msg << bufferInfo.bufferName(); emit putCmd("INVITE", serverEncode(params)); } -void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo); // trim spaces before chans or keys @@ -189,7 +189,7 @@ void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &m } } -void UserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &msg) { QString nick = msg.section(' ', 0, 0, QString::SectionSkipEmpty); QString reason = msg.section(' ', 1, -1, QString::SectionSkipEmpty).trimmed(); if(reason.isEmpty()) @@ -200,7 +200,7 @@ void UserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &m emit putCmd("KICK", params); } -void UserInputHandler::handleKill(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleKill(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) QString nick = msg.section(' ', 0, 0, QString::SectionSkipEmpty); QString pass = msg.section(' ', 1, -1, QString::SectionSkipEmpty); @@ -210,18 +210,18 @@ void UserInputHandler::handleKill(const BufferInfo &bufferInfo, const QString &m } -void UserInputHandler::handleList(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleList(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) emit putCmd("LIST", serverEncode(msg.split(' ', QString::SkipEmptyParts))); } -void UserInputHandler::handleMe(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleMe(const BufferInfo &bufferInfo, const QString &msg) { if(bufferInfo.bufferName().isEmpty()) return; // server buffer network()->ctcpHandler()->query(bufferInfo.bufferName(), "ACTION", msg); emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self); } -void UserInputHandler::handleMode(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleMode(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) QStringList params = msg.split(' ', QString::SkipEmptyParts); @@ -234,7 +234,7 @@ void UserInputHandler::handleMode(const BufferInfo &bufferInfo, const QString &m } // TODO: show privmsgs -void UserInputHandler::handleMsg(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleMsg(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo); if(!msg.contains(' ')) return; @@ -243,13 +243,13 @@ void UserInputHandler::handleMsg(const BufferInfo &bufferInfo, const QString &ms putPrivmsg(target, userEncode(target, msg.section(' ', 1))); } -void UserInputHandler::handleNick(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleNick(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) QString nick = msg.section(' ', 0, 0); emit putCmd("NICK", serverEncode(nick)); } -void UserInputHandler::handleNotice(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleNotice(const BufferInfo &bufferInfo, const QString &msg) { QString bufferName = msg.section(' ', 0, 0); QString payload = msg.section(' ', 1); QList params; @@ -258,7 +258,7 @@ void UserInputHandler::handleNotice(const BufferInfo &bufferInfo, const QString emit displayMsg(Message::Notice, bufferName, payload, network()->myNick(), Message::Self); } -void UserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg) { QStringList nicks = msg.split(' ', QString::SkipEmptyParts); QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'o'; QStringList params; @@ -266,12 +266,12 @@ void UserInputHandler::handleOp(const BufferInfo &bufferInfo, const QString &msg emit putCmd("MODE", serverEncode(params)); } -void UserInputHandler::handleOper(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleOper(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) emit putRawLine(serverEncode(QString("OPER %1").arg(msg))); } -void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &msg) { QList params; QString partReason; @@ -291,7 +291,7 @@ void UserInputHandler::handlePart(const BufferInfo &bufferInfo, const QString &m emit putCmd("PART", params); } -void UserInputHandler::handlePing(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handlePing(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) QString param = msg; @@ -302,7 +302,7 @@ void UserInputHandler::handlePing(const BufferInfo &bufferInfo, const QString &m } // TODO: implement queries -void UserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) QString target = msg.section(' ', 0, 0); QString message = msg.section(' ', 1); @@ -313,28 +313,28 @@ void UserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString & handleMsg(bufferInfo, msg); } -void UserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) network()->disconnectFromIrc(true, msg); } -void UserInputHandler::issueQuit(const QString &reason) { +void CoreUserInputHandler::issueQuit(const QString &reason) { emit putCmd("QUIT", serverEncode(reason)); } -void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) emit putRawLine(serverEncode(msg)); } -void UserInputHandler::handleSay(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleSay(const BufferInfo &bufferInfo, const QString &msg) { if(bufferInfo.bufferName().isEmpty()) return; // server buffer putPrivmsg(serverEncode(bufferInfo.bufferName()), channelEncode(bufferInfo.bufferName(), msg)); emit displayMsg(Message::Plain, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self); } -void UserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QString &msg) { if(bufferInfo.bufferName().isEmpty()) return; QList params; params << serverEncode(bufferInfo.bufferName()); @@ -343,7 +343,7 @@ void UserInputHandler::handleTopic(const BufferInfo &bufferInfo, const QString & emit putCmd("TOPIC", params); } -void UserInputHandler::handleVoice(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleVoice(const BufferInfo &bufferInfo, const QString &msg) { QStringList nicks = msg.split(' ', QString::SkipEmptyParts); QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'v'; QStringList params; @@ -351,7 +351,7 @@ void UserInputHandler::handleVoice(const BufferInfo &bufferInfo, const QString & emit putCmd("MODE", serverEncode(params)); } -void UserInputHandler::handleWait(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleWait(const BufferInfo &bufferInfo, const QString &msg) { int splitPos = msg.indexOf(';'); if(splitPos <= 0) return; @@ -370,27 +370,27 @@ void UserInputHandler::handleWait(const BufferInfo &bufferInfo, const QString &m _delayedCommands[startTimer(delay)] = Command(bufferInfo, command); } -void UserInputHandler::handleWho(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleWho(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) emit putCmd("WHO", serverEncode(msg.split(' '))); } -void UserInputHandler::handleWhois(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleWhois(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) emit putCmd("WHOIS", serverEncode(msg.split(' '))); } -void UserInputHandler::handleWhowas(const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::handleWhowas(const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo) emit putCmd("WHOWAS", serverEncode(msg.split(' '))); } -void UserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &msg) { +void CoreUserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &msg) { Q_UNUSED(bufferInfo); emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", QString("Error: %1 %2").arg(cmd, msg)); } -void UserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message) { +void CoreUserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message) { static const char *cmd = "PRIVMSG"; int overrun = lastParamOverrun(cmd, QList() << target << message); if(overrun) { @@ -412,7 +412,7 @@ void UserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &me } // returns 0 if the message will not be chopped by the irc server or number of chopped bytes if message is too long -int UserInputHandler::lastParamOverrun(const QString &cmd, const QList ¶ms) { +int CoreUserInputHandler::lastParamOverrun(const QString &cmd, const QList ¶ms) { // the server will pass our message trunkated to 512 bytes including CRLF with the following format: // ":prefix COMMAND param0 param1 :lastparam" // where prefix = "nickname!user@host" @@ -440,7 +440,7 @@ int UserInputHandler::lastParamOverrun(const QString &cmd, const QListtimerId())) { QObject::timerEvent(event); return; diff --git a/src/core/userinputhandler.h b/src/core/coreuserinputhandler.h similarity index 96% rename from src/core/userinputhandler.h rename to src/core/coreuserinputhandler.h index 2d207255..0634fa15 100644 --- a/src/core/userinputhandler.h +++ b/src/core/coreuserinputhandler.h @@ -18,21 +18,21 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef USERINPUTHANDLER_H -#define USERINPUTHANDLER_H +#ifndef COREUSERINPUTHANDLER_H +#define COREUSERINPUTHANDLER_H #include "basichandler.h" class Server; -class UserInputHandler : public BasicHandler { +class CoreUserInputHandler : public BasicHandler { Q_OBJECT public: - UserInputHandler(CoreNetwork *parent = 0); + CoreUserInputHandler(CoreNetwork *parent = 0); void handleUserInput(const BufferInfo &bufferInfo, const QString &text); - + public slots: void handleAway(const BufferInfo &bufferInfo, const QString &text); void handleBan(const BufferInfo &bufferInfo, const QString &text); @@ -87,5 +87,4 @@ private: QHash _delayedCommands; }; - #endif -- 2.20.1