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

List:       kde-commits
Subject:    kdeextragear-2/konversation/konversation
From:       Peter Simonsson <psn () linux ! se>
Date:       2004-10-07 17:29:49
Message-ID: 20041007172949.1823A99BC () office ! kde ! org
[Download RAW message or body]

CVS commit by psn: 

Don't depend on a deprecated reply


  M +7 -6      inputfilter.cpp   1.155
  M +13 -9     server.cpp   1.349
  M +1 -0      server.h   1.161


--- kdeextragear-2/konversation/konversation/inputfilter.cpp  #1.154:1.155
@@ -94,4 +94,5 @@ void InputFilter::parseLine(const QStrin
   // Are there parameters left in the string?
   QStringList parameterList;
+  
   if(pos!=-1)
   {
@@ -101,10 +102,13 @@ void InputFilter::parseLine(const QStrin
     parameterList=QStringList::split(" ",incomingLine);
   }
+  
   Q_ASSERT(server);
+  
   // Server command, if no "!" was found in prefix
-  if(prefix.find('!')==-1 && prefix!=server->getNickname())
+  if(prefix.find('!')==-1 && prefix!=server->getNickname()) {
     parseServerCommand(prefix,command,parameterList,trailing);
-  else
+  } else {
     parseClientCommand(prefix,command,parameterList,trailing, mainWindow);
+  }
 }
 
@@ -1279,11 +1283,8 @@ void InputFilter::parseServerCommand(con
           break;
         }
-      case RPL_LISTSTART:
+      case RPL_LISTSTART: //FIXME This reply is obsolete!!!
         {
           if(getAutomaticRequest()==0) {
             server->appendStatusMessage(i18n("List"),i18n("List of channels:"));
-          } else {
-            emit addChannelListPanel();
-            //kdDebug() << "Start of channel list... " << \
QTime::currentTime().toString() << endl;  }
           break;

--- kdeextragear-2/konversation/konversation/server.cpp  #1.348:1.349
@@ -357,8 +357,8 @@ void Server::connectSignals()
   connect(&inputFilter,SIGNAL(topicAuthor(const QString&,const QString&)),
                   this,SLOT  (setTopicAuthor(const QString&,const QString&)) );
-  connect(&inputFilter,SIGNAL(addChannelListPanel()),
-                  this,SLOT  (addChannelListPanel()) );
   connect(&inputFilter,SIGNAL(invitation(const QString&,const QString&)),
                   this,SLOT  (invitation(const QString&,const QString&)) );
+  connect(&inputFilter, SIGNAL(addToChannelList(const QString&, int, const QString& \
)), +    this, SLOT(addToChannelList(const QString&, int, const QString& )));
 
   connect(&inputFilter,SIGNAL (away()),this,SLOT (away()) );
@@ -2878,15 +2879,18 @@ void Server::addChannelListPanel()
   if(!channelListPanel)
   {
-    channelListPanel=getMainWindow()->addChannelListPanel(this);
-
-    connect(channelListPanel,SIGNAL (refreshChannelList()),this,SLOT \
                (requestChannelList()) );
-    connect(channelListPanel,SIGNAL (joinChannel(const QString&)),this,SLOT \
                (sendJoinCommand(const QString&)) );
-    connect(this,SIGNAL (serverOnline(bool)),channelListPanel,SLOT \
(serverOnline(bool)) ); +    channelListPanel = \
getMainWindow()->addChannelListPanel(this);  
-    connect(&inputFilter,SIGNAL (addToChannelList(const QString&,int,const \
                QString&)),
-          channelListPanel,SLOT (addToChannelList(const QString&,int,const \
QString&)) ); +    connect(channelListPanel, SIGNAL(refreshChannelList()), this, \
SLOT(requestChannelList())); +    connect(channelListPanel, SIGNAL(joinChannel(const \
QString&)), this, SLOT(sendJoinCommand(const QString&))); +    connect(this, \
SIGNAL(serverOnline(bool)), channelListPanel, SLOT(serverOnline(bool)));  }
 }
 
+void Server::addToChannelList(const QString& channel, int users, const QString& \
topic) +{
+  addChannelListPanel();
+  channelListPanel->addToChannelList(channel, users, topic);
+}
+
 ChannelListPanel* Server::getChannelListPanel() const { return channelListPanel; }
 

--- kdeextragear-2/konversation/konversation/server.h  #1.160:1.161
@@ -361,4 +361,5 @@ class Server : public QObject
     void closeRawLog();
     void addChannelListPanel();
+    void addToChannelList(const QString& channel, int users, const QString& topic);
     void closeChannelListPanel();
     void updateChannelQuickButtons();


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