X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=90e508eb5a1a7a357d397482dfbec2269fdffb52;hb=44a3dfc31a3461f3a507df324cd9397253c92eb3;hp=e41234fe2b05bba07f0ca2cb6121fa579c8c3e6c;hpb=8699dd758516d0ded076811e8ea656adc95e69d0;p=quassel.git

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index e41234fe..90e508eb 100644
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -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) {
 }
 
@@ -92,6 +92,13 @@ void UserInputHandler::handleList(QString bufname, QString msg) {
   emit putCmd("LIST", msg.split(' ', QString::SkipEmptyParts));
 }
 
+
+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, network()->myNick());
+}
+
 void UserInputHandler::handleMode(QString bufname, QString msg) {
   emit putCmd("MODE", msg.split(' ', QString::SkipEmptyParts));
 }
@@ -127,7 +134,10 @@ void UserInputHandler::handlePart(QString bufname, QString msg) {
 
 // TODO: implement queries
 void UserInputHandler::handleQuery(QString bufname, QString msg) {
-  QString nick = msg.section(' ', 0, 0);
+  // QString nick = msg.section(' ', 0, 0);
+  
+  handleMsg(bufname, msg);
+  
   // TODO: usenetworkids
 //   if(!nick.isEmpty())
 //     emit queryRequested(network, nick);
@@ -141,23 +151,19 @@ void UserInputHandler::handleQuote(QString bufname, QString msg) {
   emit putRawLine(msg);
 }
 
+
 void UserInputHandler::handleSay(QString bufname, QString msg) {
   if(bufname.isEmpty()) return;  // server buffer
   QStringList params;
   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());
-}
 
 void UserInputHandler::handleTopic(QString bufname, QString msg) {
   if(bufname.isEmpty()) return;
@@ -175,9 +181,22 @@ void UserInputHandler::handleVoice(QString bufname, QString msg) {
 }
 
 
+void UserInputHandler::handleWho(QString bufname, QString msg) {
+  emit putCmd("WHO", QStringList(msg));
+}
+
+
+void UserInputHandler::handleWhois(QString bufname, QString msg) {
+  emit putCmd("WHOIS", QStringList(msg));
+}
+
+
+void UserInputHandler::handleWhowas(QString bufname, QString msg) {
+  emit putCmd("WHOWAS", QStringList(msg));
+}
+
 void UserInputHandler::defaultHandler(QString cmd, QString bufname, QString msg) {
   emit displayMsg(Message::Error, "", QString("Error: %1 %2").arg(cmd).arg(msg));
-
 }