X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebasichandler.cpp;h=f12b6422a3f461b500c7bd7fa49005f83e7b4c5e;hp=44fdc7b4f05cd7aaf98e6768eefacec1b9447f17;hb=5b686746c880e5cda6d5de3e08180ea4332ff222;hpb=c238c56e7a5f040522c1675a5a630411eaa0da4f

diff --git a/src/core/corebasichandler.cpp b/src/core/corebasichandler.cpp
index 44fdc7b4..f12b6422 100644
--- a/src/core/corebasichandler.cpp
+++ b/src/core/corebasichandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,117 +15,148 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
+
 #include "corebasichandler.h"
 
 #include "util.h"
 #include "logger.h"
 
 CoreBasicHandler::CoreBasicHandler(CoreNetwork *parent)
-  : BasicHandler(parent),
+    : BasicHandler(parent),
     _network(parent)
 {
-  connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)),
-         network(), SLOT(displayMsg(Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)));
+    connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)),
+        network(), SLOT(displayMsg(Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)));
 
-  connect(this, SIGNAL(putCmd(QString, const QList<QByteArray> &, const QByteArray &)),
-    network(), SLOT(putCmd(QString, const QList<QByteArray> &, const QByteArray &)));
+    connect(this, SIGNAL(putCmd(QString, const QList<QByteArray> &, const QByteArray &)),
+        network(), SLOT(putCmd(QString, const QList<QByteArray> &, const QByteArray &)));
 
-  connect(this, SIGNAL(putRawLine(const QByteArray &)),
-          network(), SLOT(putRawLine(const QByteArray &)));
+    connect(this, SIGNAL(putRawLine(const QByteArray &)),
+        network(), SLOT(putRawLine(const QByteArray &)));
 }
 
-QString CoreBasicHandler::serverDecode(const QByteArray &string) {
-  return network()->serverDecode(string);
+
+QString CoreBasicHandler::serverDecode(const QByteArray &string)
+{
+    return network()->serverDecode(string);
 }
 
-QStringList CoreBasicHandler::serverDecode(const QList<QByteArray> &stringlist) {
-  QStringList list;
-  foreach(QByteArray s, stringlist) list << network()->serverDecode(s);
-  return list;
+
+QStringList CoreBasicHandler::serverDecode(const QList<QByteArray> &stringlist)
+{
+    QStringList list;
+    foreach(QByteArray s, stringlist) list << network()->serverDecode(s);
+    return list;
 }
 
-QString CoreBasicHandler::channelDecode(const QString &bufferName, const QByteArray &string) {
-  return network()->channelDecode(bufferName, string);
+
+QString CoreBasicHandler::channelDecode(const QString &bufferName, const QByteArray &string)
+{
+    return network()->channelDecode(bufferName, string);
 }
 
-QStringList CoreBasicHandler::channelDecode(const QString &bufferName, const QList<QByteArray> &stringlist) {
-  QStringList list;
-  foreach(QByteArray s, stringlist) list << network()->channelDecode(bufferName, s);
-  return list;
+
+QStringList CoreBasicHandler::channelDecode(const QString &bufferName, const QList<QByteArray> &stringlist)
+{
+    QStringList list;
+    foreach(QByteArray s, stringlist) list << network()->channelDecode(bufferName, s);
+    return list;
 }
 
-QString CoreBasicHandler::userDecode(const QString &userNick, const QByteArray &string) {
-  return network()->userDecode(userNick, string);
+
+QString CoreBasicHandler::userDecode(const QString &userNick, const QByteArray &string)
+{
+    return network()->userDecode(userNick, string);
 }
 
-QStringList CoreBasicHandler::userDecode(const QString &userNick, const QList<QByteArray> &stringlist) {
-  QStringList list;
-  foreach(QByteArray s, stringlist) list << network()->userDecode(userNick, s);
-  return list;
+
+QStringList CoreBasicHandler::userDecode(const QString &userNick, const QList<QByteArray> &stringlist)
+{
+    QStringList list;
+    foreach(QByteArray s, stringlist) list << network()->userDecode(userNick, s);
+    return list;
 }
 
+
 /*** ***/
 
-QByteArray CoreBasicHandler::serverEncode(const QString &string) {
-  return network()->serverEncode(string);
+QByteArray CoreBasicHandler::serverEncode(const QString &string)
+{
+    return network()->serverEncode(string);
 }
 
-QList<QByteArray> CoreBasicHandler::serverEncode(const QStringList &stringlist) {
-  QList<QByteArray> list;
-  foreach(QString s, stringlist) list << network()->serverEncode(s);
-  return list;
+
+QList<QByteArray> CoreBasicHandler::serverEncode(const QStringList &stringlist)
+{
+    QList<QByteArray> list;
+    foreach(QString s, stringlist) list << network()->serverEncode(s);
+    return list;
 }
 
-QByteArray CoreBasicHandler::channelEncode(const QString &bufferName, const QString &string) {
-  return network()->channelEncode(bufferName, string);
+
+QByteArray CoreBasicHandler::channelEncode(const QString &bufferName, const QString &string)
+{
+    return network()->channelEncode(bufferName, string);
 }
 
-QList<QByteArray> CoreBasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist) {
-  QList<QByteArray> list;
-  foreach(QString s, stringlist) list << network()->channelEncode(bufferName, s);
-  return list;
+
+QList<QByteArray> CoreBasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist)
+{
+    QList<QByteArray> list;
+    foreach(QString s, stringlist) list << network()->channelEncode(bufferName, s);
+    return list;
 }
 
-QByteArray CoreBasicHandler::userEncode(const QString &userNick, const QString &string) {
-  return network()->userEncode(userNick, string);
+
+QByteArray CoreBasicHandler::userEncode(const QString &userNick, const QString &string)
+{
+    return network()->userEncode(userNick, string);
 }
 
-QList<QByteArray> CoreBasicHandler::userEncode(const QString &userNick, const QStringList &stringlist) {
-  QList<QByteArray> list;
-  foreach(QString s, stringlist) list << network()->userEncode(userNick, s);
-  return list;
+
+QList<QByteArray> CoreBasicHandler::userEncode(const QString &userNick, const QStringList &stringlist)
+{
+    QList<QByteArray> list;
+    foreach(QString s, stringlist) list << network()->userEncode(userNick, s);
+    return list;
 }
 
+
 // ====================
 //  protected:
 // ====================
-BufferInfo::Type CoreBasicHandler::typeByTarget(const QString &target) const {
-  if(target.isEmpty())
-    return BufferInfo::StatusBuffer;
+BufferInfo::Type CoreBasicHandler::typeByTarget(const QString &target) const
+{
+    if (target.isEmpty())
+        return BufferInfo::StatusBuffer;
 
-  if(network()->isChannelName(target))
-    return BufferInfo::ChannelBuffer;
+    if (network()->isChannelName(target))
+        return BufferInfo::ChannelBuffer;
 
-  return BufferInfo::QueryBuffer;
+    return BufferInfo::QueryBuffer;
 }
 
-void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray &param, const QByteArray &prefix) {
-  QList<QByteArray> list;
-  list << param;
-  emit putCmd(cmd, list, prefix);
+
+void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray &param, const QByteArray &prefix)
+{
+    QList<QByteArray> list;
+    list << param;
+    emit putCmd(cmd, list, prefix);
 }
 
-void CoreBasicHandler::displayMsg(Message::Type msgType, QString target, const QString &text, const QString &sender, Message::Flags flags) {
-  IrcChannel *channel = network()->ircChannel(target);
-  if(!channel) {
-    if(!target.isEmpty() && network()->prefixes().contains(target[0]))
-      target = target.mid(1);
 
-    if(target.startsWith('$') || target.startsWith('#'))
-      target = nickFromMask(sender);
-  }
+void CoreBasicHandler::displayMsg(Message::Type msgType, QString target, const QString &text, const QString &sender, Message::Flags flags)
+{
+    IrcChannel *channel = network()->ircChannel(target);
+    if (!channel) {
+        if (!target.isEmpty() && network()->prefixes().contains(target[0]))
+            target = target.mid(1);
+
+        if (target.startsWith('$') || target.startsWith('#'))
+            target = nickFromMask(sender);
+    }
 
-  emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
+    emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
 }