1 files changed, 19 insertions, 1 deletions

diff --git a/noncore/net/opieirc/ircsession.cpp b/noncore/net/opieirc/ircsession.cpp
index ca0df50..80a327a 100644
--- a/noncore/net/opieirc/ircsession.cpp
+++ b/noncore/net/opieirc/ircsession.cpp
@@ -1,26 +1,28 @@
+
 #include "ircsession.h"
 #include "ircmessageparser.h"
+#include "ircchannelperson.h"
 #include "ircversion.h"
 
 IRCSession::IRCSession(IRCServer *server) {
     m_server = server;
     m_connection = new IRCConnection(m_server);
     m_parser     = new IRCMessageParser(this);
     connect(m_connection, SIGNAL(messageArrived(IRCMessage*)), this, SLOT(handleMessage(IRCMessage*)));
     connect(m_parser, SIGNAL(outputReady(IRCOutput)), this, SIGNAL(outputReady(IRCOutput)));
     connect(m_connection, SIGNAL(outputReady(IRCOutput)), this, SIGNAL(outputReady(IRCOutput)));
 }
 
 IRCSession::~IRCSession() {
     /* We want this to get deleted automatically */
     m_channels.setAutoDelete(TRUE);
     m_people.setAutoDelete(TRUE);
         
     delete m_parser;
     delete m_connection;
 }
 
 void IRCSession::beginSession() {
     m_connection->doConnect();
 }
 
@@ -116,49 +118,49 @@ void IRCSession::updateNickname(const QString &oldNickname, const QString &newNi
     IRCOutput output;
     
     if (oldNickname == m_server->nick()) {
         m_server->setNick(newNickname);
         output = IRCOutput(OUTPUT_NICKCHANGE, tr("You are now known as %1").arg(newNickname));
         channels = m_channels;
     }
 
     else {
         IRCPerson *person = getPerson(oldNickname);
         
         if(!person) {
             emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Nickname change of an unknown person")));
             return;
         }
         
         getChannelsByPerson(person, channels);
         output = IRCOutput(OUTPUT_NICKCHANGE, tr("%1 is now known as %2").arg(oldNickname).arg(newNickname));
     }
 
     QListIterator<IRCChannel> it(channels);
     for (;it.current(); ++it) {
         IRCChannelPerson *chanperson = it.current()->getPerson(oldNickname);
         it.current()->removePerson(chanperson);
-        chanperson->person->setNick(newNickname);
+        chanperson->setNick(newNickname);
         it.current()->addPerson(chanperson);
     }
 
     emit updateChannels();
     output.addParam(new QString(newNickname));
     emit outputReady(output);
 }
 
 IRCChannel *IRCSession::getChannel(QString channelname) {
     QListIterator<IRCChannel> it(m_channels);
     for (; it.current(); ++it) {
         if (it.current()->channelname() == channelname) {
             return it.current();
         }
     }
     return 0;
 }
 
 IRCPerson *IRCSession::getPerson(QString nickname) {
     QListIterator<IRCPerson> it(m_people);
     for (; it.current(); ++it) {
         if (it.current()->nick() == nickname) {
             return it.current();
         }
@@ -173,24 +175,40 @@ void IRCSession::getChannelsByPerson(IRCPerson *person, QList<IRCChannel> &chann
             channels.append(it.current());
         }
     }
 }
 
 void IRCSession::addPerson(IRCPerson *person) {
     m_people.append(person);
 }
 
 void IRCSession::addChannel(IRCChannel *channel) {
     m_channels.append(channel);
 }
 
 void IRCSession::removeChannel(IRCChannel *channel) {
     m_channels.remove(channel);
 }
 
 void IRCSession::removePerson(IRCPerson *person) {
     m_people.remove(person);
 }
 
 void IRCSession::handleMessage(IRCMessage *message) {
     m_parser->parse(message);
 }
+
+void IRCSession::whois(const QString &nickname) {
+    m_connection->whois(nickname);
+}
+
+void IRCSession::sendCTCPPing(const QString &nickname) {
+    m_connection->sendCTCPPing(nickname);
+}
+
+void IRCSession::sendCTCPRequest(const QString &nickname, const QString &type, const QString &args) {
+    m_connection->sendCTCPRequest(nickname, type, args);
+}
+
+void IRCSession::sendCTCPReply(const QString &nickname, const QString &type, const QString &args) {
+    m_connection->sendCTCPReply(nickname, type, args);
+}