projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Implemented: Settings option to enable/disable sender auto coloring
[quassel.git]
/
src
/
core
/
basichandler.cpp
diff --git
a/src/core/basichandler.cpp
b/src/core/basichandler.cpp
index
a00966d
..
d9cb124
100644
(file)
--- a/
src/core/basichandler.cpp
+++ b/
src/core/basichandler.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-22,22
+22,22
@@
#include <QMetaMethod>
#include "util.h"
#include <QMetaMethod>
#include "util.h"
-#include "
networkconnection
.h"
+#include "
logger
.h"
-BasicHandler::BasicHandler(
NetworkConnection
*parent)
+BasicHandler::BasicHandler(
CoreNetwork
*parent)
: QObject(parent),
defaultHandler(-1),
: QObject(parent),
defaultHandler(-1),
- _network
Connection
(parent),
+ _network(parent),
initDone(false)
{
connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)),
initDone(false)
{
connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)),
- network
Connection
(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)));
+ network(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)));
- connect(this, SIGNAL(putCmd(QString, const Q
VariantList
&, const QByteArray &)),
- network
Connection(), SLOT(putCmd(QString, const QVariantList
&, const QByteArray &)));
+ connect(this, SIGNAL(putCmd(QString, const Q
List<QByteArray>
&, const QByteArray &)),
+ network
(), SLOT(putCmd(QString, const QList<QByteArray>
&, const QByteArray &)));
connect(this, SIGNAL(putRawLine(const QByteArray &)),
connect(this, SIGNAL(putRawLine(const QByteArray &)),
- network
Connection
(), SLOT(putRawLine(const QByteArray &)));
+ network(), SLOT(putRawLine(const QByteArray &)));
}
QStringList BasicHandler::providesHandlers() {
}
QStringList BasicHandler::providesHandlers() {
@@
-94,79
+94,70
@@
void BasicHandler::handle(const QString &member, QGenericArgument val0,
}
QString BasicHandler::serverDecode(const QByteArray &string) {
}
QString BasicHandler::serverDecode(const QByteArray &string) {
- return network
Connection
()->serverDecode(string);
+ return network()->serverDecode(string);
}
QStringList BasicHandler::serverDecode(const QList<QByteArray> &stringlist) {
QStringList list;
}
QStringList BasicHandler::serverDecode(const QList<QByteArray> &stringlist) {
QStringList list;
- foreach(QByteArray s, stringlist) list << network
Connection
()->serverDecode(s);
+ foreach(QByteArray s, stringlist) list << network()->serverDecode(s);
return list;
}
QString BasicHandler::channelDecode(const QString &bufferName, const QByteArray &string) {
return list;
}
QString BasicHandler::channelDecode(const QString &bufferName, const QByteArray &string) {
- return network
Connection
()->channelDecode(bufferName, string);
+ return network()->channelDecode(bufferName, string);
}
QStringList BasicHandler::channelDecode(const QString &bufferName, const QList<QByteArray> &stringlist) {
QStringList list;
}
QStringList BasicHandler::channelDecode(const QString &bufferName, const QList<QByteArray> &stringlist) {
QStringList list;
- foreach(QByteArray s, stringlist) list << network
Connection
()->channelDecode(bufferName, s);
+ foreach(QByteArray s, stringlist) list << network()->channelDecode(bufferName, s);
return list;
}
QString BasicHandler::userDecode(const QString &userNick, const QByteArray &string) {
return list;
}
QString BasicHandler::userDecode(const QString &userNick, const QByteArray &string) {
- return network
Connection
()->userDecode(userNick, string);
+ return network()->userDecode(userNick, string);
}
QStringList BasicHandler::userDecode(const QString &userNick, const QList<QByteArray> &stringlist) {
QStringList list;
}
QStringList BasicHandler::userDecode(const QString &userNick, const QList<QByteArray> &stringlist) {
QStringList list;
- foreach(QByteArray s, stringlist) list << network
Connection
()->userDecode(userNick, s);
+ foreach(QByteArray s, stringlist) list << network()->userDecode(userNick, s);
return list;
}
/*** ***/
QByteArray BasicHandler::serverEncode(const QString &string) {
return list;
}
/*** ***/
QByteArray BasicHandler::serverEncode(const QString &string) {
- return network
Connection
()->serverEncode(string);
+ return network()->serverEncode(string);
}
QList<QByteArray> BasicHandler::serverEncode(const QStringList &stringlist) {
QList<QByteArray> list;
}
QList<QByteArray> BasicHandler::serverEncode(const QStringList &stringlist) {
QList<QByteArray> list;
- foreach(QString s, stringlist) list << network
Connection
()->serverEncode(s);
+ foreach(QString s, stringlist) list << network()->serverEncode(s);
return list;
}
QByteArray BasicHandler::channelEncode(const QString &bufferName, const QString &string) {
return list;
}
QByteArray BasicHandler::channelEncode(const QString &bufferName, const QString &string) {
- return network
Connection
()->channelEncode(bufferName, string);
+ return network()->channelEncode(bufferName, string);
}
QList<QByteArray> BasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist) {
QList<QByteArray> list;
}
QList<QByteArray> BasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist) {
QList<QByteArray> list;
- foreach(QString s, stringlist) list << network
Connection
()->channelEncode(bufferName, s);
+ foreach(QString s, stringlist) list << network()->channelEncode(bufferName, s);
return list;
}
QByteArray BasicHandler::userEncode(const QString &userNick, const QString &string) {
return list;
}
QByteArray BasicHandler::userEncode(const QString &userNick, const QString &string) {
- return network
Connection
()->userEncode(userNick, string);
+ return network()->userEncode(userNick, string);
}
QList<QByteArray> BasicHandler::userEncode(const QString &userNick, const QStringList &stringlist) {
QList<QByteArray> list;
}
QList<QByteArray> BasicHandler::userEncode(const QString &userNick, const QStringList &stringlist) {
QList<QByteArray> list;
- foreach(QString s, stringlist) list << network
Connection
()->userEncode(userNick, s);
+ foreach(QString s, stringlist) list << network()->userEncode(userNick, s);
return list;
}
// ====================
// protected:
// ====================
return list;
}
// ====================
// protected:
// ====================
-
-Network *BasicHandler::network() const {
- return networkConnection()->network();
-}
-
-NetworkConnection *BasicHandler::networkConnection() const {
- return _networkConnection;
-}
-
BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const {
if(target.isEmpty())
return BufferInfo::StatusBuffer;
BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const {
if(target.isEmpty())
return BufferInfo::StatusBuffer;
@@
-178,18
+169,15
@@
BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const {
}
void BasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix) {
}
void BasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix) {
- Q
VariantList
list;
+ Q
List<QByteArray>
list;
list << param;
emit putCmd(cmd, list, prefix);
}
list << param;
emit putCmd(cmd, list, prefix);
}
-void BasicHandler::putCmd(const QString &cmd, const QList<QByteArray> ¶ms, const QByteArray &prefix) {
- QVariantList list;
- foreach(QByteArray param, params) list << param;
- emit putCmd(cmd, list, prefix);
-}
-
void BasicHandler::displayMsg(Message::Type msgType, QString target, QString text, QString sender, Message::Flags flags) {
void BasicHandler::displayMsg(Message::Type msgType, QString target, QString text, QString sender, Message::Flags flags) {
+ if(!target.isEmpty() && network()->prefixes().contains(target[0]))
+ target = target.mid(1);
+
IrcChannel *channel = network()->ircChannel(target);
if(!channel && (target.startsWith('$') || target.startsWith('#')))
target = nickFromMask(sender);
IrcChannel *channel = network()->ircChannel(target);
if(!channel && (target.startsWith('$') || target.startsWith('#')))
target = nickFromMask(sender);