X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=d34a2788d8309233a8879ed90ef7863dc277a41a;hp=5d4705e0f07fbe3a2b30542f6d9d071825d737b7;hb=72d25daa2c6cc00c17e79f756ad70bc00b41f9a8;hpb=902c95728306e5ba115de84800fc8d5d239c9d62

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 5d4705e0..d34a2788 100644
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -21,13 +21,13 @@
 
 #include "util.h"
 
-#include "server.h"
-#include "networkinfo.h"
+#include "networkconnection.h"
+#include "network.h"
 #include "ctcphandler.h"
 
 #include <QDebug>
 
-UserInputHandler::UserInputHandler(Server *parent)
+UserInputHandler::UserInputHandler(NetworkConnection *parent)
   : BasicHandler(parent) {
 }
 
@@ -147,16 +147,16 @@ void UserInputHandler::handleSay(QString bufname, QString msg) {
   params << bufname << msg;
   emit putCmd("PRIVMSG", params);
   if(isChannelName(bufname)) {
-    emit displayMsg(Message::Plain, params[0], msg, networkInfo()->myNick(), Message::Self);
+    emit displayMsg(Message::Plain, params[0], msg, network()->myNick(), Message::Self);
   } else {
-    emit displayMsg(Message::Plain, params[0], msg, networkInfo()->myNick(), Message::Self|Message::PrivMsg);
+    emit displayMsg(Message::Plain, params[0], msg, network()->myNick(), Message::Self|Message::PrivMsg);
   }
 }
 
 void UserInputHandler::handleMe(QString bufname, QString msg) {
   if(bufname.isEmpty()) return; // server buffer
   server->ctcpHandler()->query(bufname, "ACTION", msg);
-  emit displayMsg(Message::Action, bufname, msg, networkInfo()->myNick());
+  emit displayMsg(Message::Action, bufname, msg, network()->myNick());
 }
 
 void UserInputHandler::handleTopic(QString bufname, QString msg) {