[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-2/konversation/konversation
From:       İsmail Dönmez <ismail () kde ! org ! tr>
Date:       2005-03-31 19:45:27
Message-ID: 20050331194527.5CE4166E () office ! kde ! org
[Download RAW message or body]

CVS commit by cartman: 

Final battle between good and evil started! Either I will die or server.cpp
will be in a readable shape!


  M +0 -16     server.cpp   1.452
  M +12 -15    server.h   1.198


--- kdeextragear-2/konversation/konversation/server.cpp  #1.451:1.452
@@ -2466,20 +2466,4 @@ void Server::noMorePendingNicks(const QS
 }
 
-void Server::addNickToChannel(const QString &channelName,const QString \
                &nickname,const QString &hostmask,
-                              bool admin,bool owner,bool op,bool halfop,bool voice)
-{
-  Channel* outChannel=getChannelByName(channelName);
-
-  // Update NickInfo.
-  ChannelNickPtr channelNick = addNickToJoinedChannelsList(channelName, nickname);
-  channelNick->setMode(admin,owner,op,halfop,voice);
-  if(outChannel) outChannel->addNickname(channelNick);
-  NickInfoPtr nickInfo = channelNick->getNickInfo();
-  if ((nickInfo->getHostmask() != hostmask) && !hostmask.isEmpty())
-  {
-    nickInfo->setHostmask(hostmask);
-  }
-}
-
 Channel* Server::nickJoinsChannel(const QString &channelName, const QString \
&nickname, const QString &hostmask)  {

--- kdeextragear-2/konversation/konversation/server.h  #1.197:1.198
@@ -1,2 +1,5 @@
+#ifndef SERVER_H
+#define SERVER_H
+
 /*
   This program is free software; you can redistribute it and/or modify
@@ -13,8 +16,4 @@
 */
 
-#ifndef SERVER_H
-#define SERVER_H
-
-
 #include <qtimer.h>
 #include <qdict.h>
@@ -39,8 +36,4 @@
 #include "servergroupsettings.h"
 
-/*
-  @author Dario Abatianni
-*/
-
 class Channel;
 class Query;
@@ -64,5 +57,6 @@ class Server : public QObject
      *  Read in the prefrences to get all the details about the server.
      */   
-    Server(KonversationMainWindow* mainWindow,int number);
+    Server(KonversationMainWindow* mainWindow, int number);
+
     /** Constructor used for a 'fast connect' to a server.
      *  The details are passed in.  Used for example when the user does "/server \
irc.somewhere.net" @@ -82,5 +80,6 @@ class Server : public QObject
     void setAutoJoin(bool on);
     
-    /** This returns true when we have a socket connection.  Not necessarily \
'online' and ready for commands. +    /** This returns true when we have a socket \
connection. +     *  Not necessarily 'online' and ready for commands.
      *  @see connected()
      */
@@ -103,6 +102,4 @@ class Server : public QObject
 
     void addPendingNickList(const QString& channelName,const QStringList& nickList);
-    void addNickToChannel(const QString &channelName,const QString &nickname,const \
                QString &hostmask,
-                          bool admin,bool owner,bool op,bool halfop,bool voice);
     void addHostmaskToNick(const QString &sourceNick, const QString \
                &sourceHostmask);
     Channel* nickJoinsChannel(const QString &channelName, const QString &nickname, \
const QString &hostmask);


[prev in list] [next in list] [prev in thread] [next in thread]