X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fctcphandler.cpp;fp=src%2Fcore%2Fctcphandler.cpp;h=a944c02220aca5a93962f8d403a197ee24b9d79d;hp=a864fe6494d4e4675a5bfc5c618db6c086bbb3aa;hb=5c6804f291a63f978e328aeddcc8448e3443b45e;hpb=85b55cf023c96f4dbd61ec415a15214f99e281b3 diff --git a/src/core/ctcphandler.cpp b/src/core/ctcphandler.cpp index a864fe64..a944c022 100644 --- a/src/core/ctcphandler.cpp +++ b/src/core/ctcphandler.cpp @@ -19,10 +19,10 @@ ***************************************************************************/ #include "ctcphandler.h" -#include "global.h" -#include "util.h" #include "message.h" #include "network.h" +#include "quassel.h" +#include "util.h" CtcpHandler::CtcpHandler(NetworkConnection *parent) : BasicHandler(parent), @@ -44,7 +44,7 @@ QByteArray CtcpHandler::dequote(const QByteArray &message) { QByteArray dequotedMessage; QByteArray messagepart; QHash::iterator ctcpquote; - + // copy dequote Message for(int i = 0; i < message.size(); i++) { messagepart = message.mid(i,1); @@ -86,14 +86,14 @@ QByteArray CtcpHandler::xdelimDequote(const QByteArray &message) { void CtcpHandler::parse(Message::Type messageType, const QString &prefix, const QString &target, const QByteArray &message) { QByteArray ctcp; - + //lowlevel message dequote QByteArray dequotedMessage = dequote(message); CtcpType ctcptype = messageType == Message::Notice ? CtcpReply : CtcpQuery; - + Message::Flags flags = (messageType == Message::Notice && !network()->isChannelName(target)) ? Message::Redirected : Message::None; @@ -129,7 +129,7 @@ void CtcpHandler::parse(Message::Type messageType, const QString &prefix, const handle(ctcpcmd, Q_ARG(CtcpType, ctcptype), Q_ARG(QString, prefix), Q_ARG(QString, target), Q_ARG(QString, ctcpparam)); } - + if(!dequotedMessage.isEmpty()) displayMsg(messageType, target, userDecode(target, dequotedMessage), prefix, flags); }