summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
de7b3d6)
We also have ClientUserInputHandler, so let's deconfuzzle developers.
19 files changed:
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="113"/>
<source>sending CTCP-%1 request</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="113"/>
<source>sending CTCP-%1 request</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="63"/>
<source>away</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="63"/>
<source>away</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="131"/>
<source>sending CTCP-%1 request</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="131"/>
<source>sending CTCP-%1 request</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="132"/>
<source>sending CTCP-%1 request</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="132"/>
<source>sending CTCP-%1 request</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="63"/>
<source>away</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="63"/>
<source>away</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="132"/>
<source>sending CTCP-%1 request</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="132"/>
<source>sending CTCP-%1 request</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="134"/>
<source>sending CTCP-%1 request</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="134"/>
<source>sending CTCP-%1 request</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="63"/>
<source>away</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="63"/>
<source>away</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="69"/>
<source>away</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="69"/>
<source>away</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="138"/>
<source>sending CTCP-%1 request</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="138"/>
<source>sending CTCP-%1 request</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="69"/>
<source>away</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="69"/>
<source>away</source>
</message>
</context>
<context>
</message>
</context>
<context>
- <name>UserInputHandler</name>
+ <name>CoreUserInputHandler</name>
<message>
<location filename="../src/core/userinputhandler.cpp" line="130"/>
<source>sending CTCP-%1 request</source>
<message>
<location filename="../src/core/userinputhandler.cpp" line="130"/>
<source>sending CTCP-%1 request</source>
corenetworkconfig.cpp
coresession.cpp
coresettings.cpp
corenetworkconfig.cpp
coresession.cpp
coresettings.cpp
+ coreuserinputhandler.cpp
coreusersettings.cpp
ctcphandler.cpp
ircserverhandler.cpp
coreusersettings.cpp
ctcphandler.cpp
ircserverhandler.cpp
postgresqlstorage.cpp
sessionthread.cpp
sqlitestorage.cpp
postgresqlstorage.cpp
sessionthread.cpp
sqlitestorage.cpp
- storage.cpp
- userinputhandler.cpp)
set(MOC_HDRS
abstractsqlstorage.h
set(MOC_HDRS
abstractsqlstorage.h
corenetwork.h
corenetworkconfig.h
coresession.h
corenetwork.h
corenetworkconfig.h
coresession.h
ctcphandler.h
ircserverhandler.h
netsplit.h
postgresqlstorage.h
sqlitestorage.h
storage.h
ctcphandler.h
ircserverhandler.h
netsplit.h
postgresqlstorage.h
sqlitestorage.h
storage.h
- sessionthread.h
- userinputhandler.h)
set(HEADERS
coresettings.h
set(HEADERS
coresettings.h
#include "coreirclisthelper.h"
#include "corenetwork.h"
#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) {
INIT_SYNCABLE_OBJECT(CoreIrcListHelper)
QVariantList CoreIrcListHelper::requestChannelList(const NetworkId &netId, const QStringList &channelFilters) {
#include "corenetworkconfig.h"
#include "ircserverhandler.h"
#include "corenetworkconfig.h"
#include "ircserverhandler.h"
-#include "userinputhandler.h"
+#include "coreuserinputhandler.h"
#include "ctcphandler.h"
INIT_SYNCABLE_OBJECT(CoreNetwork)
#include "ctcphandler.h"
INIT_SYNCABLE_OBJECT(CoreNetwork)
: Network(networkid, session),
_coreSession(session),
_ircServerHandler(new IrcServerHandler(this)),
: 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),
_ctcpHandler(new CtcpHandler(this)),
_autoReconnectCount(0),
_quitRequested(false),
class CoreIdentity;
class IrcServerHandler;
class CoreIdentity;
class IrcServerHandler;
+class CoreUserInputHandler;
class CtcpHandler;
class CoreNetwork : public Network {
class CtcpHandler;
class CoreNetwork : public Network {
inline CoreNetworkConfig *networkConfig() const { return coreSession()->networkConfig(); }
inline IrcServerHandler *ircServerHandler() const { return _ircServerHandler; }
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.
inline CtcpHandler *ctcpHandler() const { return _ctcpHandler; }
//! Decode a string using the server (network) decoding.
#endif
IrcServerHandler *_ircServerHandler;
#endif
IrcServerHandler *_ircServerHandler;
- UserInputHandler *_userInputHandler;
+ CoreUserInputHandler *_userInputHandler;
CtcpHandler *_ctcpHandler;
QHash<QString, QString> _channelKeys; // stores persistent channels and their passwords, if any
CtcpHandler *_ctcpHandler;
QHash<QString, QString> _channelKeys; // stores persistent channels and their passwords, if any
#include "core.h"
#include "coresession.h"
#include "core.h"
#include "coresession.h"
-#include "userinputhandler.h"
+#include "coreuserinputhandler.h"
#include "signalproxy.h"
#include "corebuffersyncer.h"
#include "corebacklogmanager.h"
#include "signalproxy.h"
#include "corebuffersyncer.h"
#include "corebacklogmanager.h"
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include "userinputhandler.h"
+#include "coreuserinputhandler.h"
#include <QDebug>
#include <QRegExp>
#include <QDebug>
#include <QRegExp>
-UserInputHandler::UserInputHandler(CoreNetwork *parent)
+CoreUserInputHandler::CoreUserInputHandler(CoreNetwork *parent)
: BasicHandler(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;
if(msg.isEmpty())
return;
// ====================
// Public Slots
// ====================
// ====================
// 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;
Q_UNUSED(bufferInfo)
QString awayMsg = msg;
putCmd("AWAY", serverEncode(awayMsg));
}
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);
}
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);
}
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;
QString banChannel;
QString banUser;
emit putRawLine(serverEncode(banMsg));
}
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);
Q_UNUSED(bufferInfo)
QString nick = msg.section(' ', 0, 0);
emit displayMsg(Message::Action, BufferInfo::StatusBuffer, "", verboseMessage, network()->myNick());
}
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;
QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'o';
QStringList params;
emit putCmd("MODE", serverEncode(params));
}
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;
QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
QString m = "-"; for(int i = 0; i < nicks.count(); i++) m += 'v';
QStringList params;
emit putCmd("MODE", serverEncode(params));
}
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));
}
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
Q_UNUSED(bufferInfo);
// trim spaces before chans or keys
-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())
QString nick = msg.section(' ', 0, 0, QString::SectionSkipEmpty);
QString reason = msg.section(' ', 1, -1, QString::SectionSkipEmpty).trimmed();
if(reason.isEmpty())
emit putCmd("KICK", params);
}
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);
Q_UNUSED(bufferInfo)
QString nick = msg.section(' ', 0, 0, QString::SectionSkipEmpty);
QString pass = msg.section(' ', 1, -1, QString::SectionSkipEmpty);
-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)));
}
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);
}
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);
Q_UNUSED(bufferInfo)
QStringList params = msg.split(' ', QString::SkipEmptyParts);
-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;
Q_UNUSED(bufferInfo);
if(!msg.contains(' '))
return;
putPrivmsg(target, userEncode(target, msg.section(' ', 1)));
}
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));
}
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<QByteArray> params;
QString bufferName = msg.section(' ', 0, 0);
QString payload = msg.section(' ', 1);
QList<QByteArray> params;
emit displayMsg(Message::Notice, bufferName, payload, network()->myNick(), Message::Self);
}
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;
QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'o';
QStringList params;
emit putCmd("MODE", serverEncode(params));
}
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)));
}
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<QByteArray> params;
QString partReason;
QList<QByteArray> params;
QString partReason;
emit putCmd("PART", params);
}
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;
Q_UNUSED(bufferInfo)
QString param = msg;
}
// TODO: implement queries
}
// 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);
Q_UNUSED(bufferInfo)
QString target = msg.section(' ', 0, 0);
QString message = msg.section(' ', 1);
handleMsg(bufferInfo, msg);
}
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);
}
Q_UNUSED(bufferInfo)
network()->disconnectFromIrc(true, msg);
}
-void UserInputHandler::issueQuit(const QString &reason) {
+void CoreUserInputHandler::issueQuit(const QString &reason) {
emit putCmd("QUIT", serverEncode(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));
}
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);
}
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<QByteArray> params;
params << serverEncode(bufferInfo.bufferName());
if(bufferInfo.bufferName().isEmpty()) return;
QList<QByteArray> params;
params << serverEncode(bufferInfo.bufferName());
emit putCmd("TOPIC", params);
}
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;
QStringList nicks = msg.split(' ', QString::SkipEmptyParts);
QString m = "+"; for(int i = 0; i < nicks.count(); i++) m += 'v';
QStringList params;
emit putCmd("MODE", serverEncode(params));
}
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;
int splitPos = msg.indexOf(';');
if(splitPos <= 0)
return;
_delayedCommands[startTimer(delay)] = Command(bufferInfo, command);
}
_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(' ')));
}
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(' ')));
}
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(' ')));
}
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));
}
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<QByteArray>() << target << message);
if(overrun) {
static const char *cmd = "PRIVMSG";
int overrun = lastParamOverrun(cmd, QList<QByteArray>() << target << message);
if(overrun) {
}
// returns 0 if the message will not be chopped by the irc server or number of chopped bytes if message is too long
}
// 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<QByteArray> ¶ms) {
+int CoreUserInputHandler::lastParamOverrun(const QString &cmd, const QList<QByteArray> ¶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"
// 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"
-void UserInputHandler::timerEvent(QTimerEvent *event) {
+void CoreUserInputHandler::timerEvent(QTimerEvent *event) {
if(!_delayedCommands.contains(event->timerId())) {
QObject::timerEvent(event);
return;
if(!_delayedCommands.contains(event->timerId())) {
QObject::timerEvent(event);
return;
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 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;
#include "basichandler.h"
class Server;
-class UserInputHandler : public BasicHandler {
+class CoreUserInputHandler : public BasicHandler {
- UserInputHandler(CoreNetwork *parent = 0);
+ CoreUserInputHandler(CoreNetwork *parent = 0);
void handleUserInput(const BufferInfo &bufferInfo, const QString &text);
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);
public slots:
void handleAway(const BufferInfo &bufferInfo, const QString &text);
void handleBan(const BufferInfo &bufferInfo, const QString &text);
QHash<int, Command> _delayedCommands;
};
QHash<int, Command> _delayedCommands;
};