X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=49c45f4cd7597df83840fbfae2ee6c41a94aeab4;hp=fe8484482ba00b39b4e973725f49ad3617047690;hb=cbecee60fe1b842f2896a118bce0fe19ab1b67c6;hpb=2e6dc76ae100a6b8e1b1661e422995f90083500e

diff --git a/src/client/client.cpp b/src/client/client.cpp
index fe848448..49c45f4c 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -26,7 +26,7 @@
 #include "ircchannel.h"
 #include "ircuser.h"
 #include "message.h"
-#include "networkinfo.h"
+#include "network.h"
 #include "networkmodel.h"
 #include "buffermodel.h"
 #include "quasselui.h"
@@ -70,15 +70,10 @@ void Client::init() {
   blockSize = 0;
 
   _networkModel = new NetworkModel(this);
-  _bufferModel = new BufferModel(_networkModel);
+  connect(this, SIGNAL(bufferUpdated(BufferInfo)),
+          _networkModel, SLOT(bufferUpdated(BufferInfo)));
 
-  connect(this, SIGNAL(bufferSelected(Buffer *)),
-          _bufferModel, SLOT(selectBuffer(Buffer *)));
-  
-  connect(this, SIGNAL(bufferUpdated(Buffer *)),
-          _networkModel, SLOT(bufferUpdated(Buffer *)));
-  connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)),
-          _networkModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
+  _bufferModel = new BufferModel(_networkModel);
 
   SignalProxy *p = signalProxy();
   p->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)),
@@ -123,13 +118,13 @@ void Client::init() {
 /*** public static methods ***/
 
 
-QList<NetworkInfo *> Client::networkInfos() {
-  return instance()->_networkInfo.values();
+QList<Network *> Client::networks() {
+  return instance()->_network.values();
 }
 
-NetworkInfo *Client::networkInfo(uint networkid) {
-  if(instance()->_networkInfo.contains(networkid))
-    return instance()->_networkInfo[networkid];
+Network *Client::network(uint networkid) {
+  if(instance()->_network.contains(networkid))
+    return instance()->_network[networkid];
   else
     return 0;
 }
@@ -162,34 +157,15 @@ Buffer *Client::buffer(BufferInfo id) {
 
     connect(buff, SIGNAL(userInput(BufferInfo, QString)),
 	    client, SLOT(userInput(BufferInfo, QString)));
-    connect(buff, SIGNAL(bufferUpdated(Buffer *)),
-	    client, SIGNAL(bufferUpdated(Buffer *)));
     connect(buff, SIGNAL(destroyed()),
 	    client, SLOT(bufferDestroyed()));
     client->_buffers[id.uid()] = buff;
-    emit client->bufferUpdated(buff);
+    emit client->bufferUpdated(id);
   }
   Q_ASSERT(buff);
   return buff;
 }
 
-// FIXME switch to netids!
-// WHEN IS THIS NEEDED ANYHOW!?
-// ...only for finding the Buffer for a channel, I guess...
-BufferInfo Client::bufferInfo(QString net, QString buf) {
-  foreach(Buffer *buffer_, buffers()) {
-    BufferInfo bufferInfo = buffer_->bufferInfo();
-    if(!bufferInfo.network().compare(net, Qt::CaseInsensitive) && !bufferInfo.buffer().compare(buf, Qt::CaseInsensitive))
-      return bufferInfo;
-  }
-  Q_ASSERT(false);  // should never happen!
-  return BufferInfo();
-}
-
-BufferInfo Client::statusBufferInfo(QString net) {
-  return bufferInfo(net, "");
-}
-
 NetworkModel *Client::networkModel() {
   return instance()->_networkModel;
 }
@@ -338,14 +314,14 @@ void Client::coreSocketDisconnected() {
   Q_ASSERT(_buffers.isEmpty());
 
 
-  QHash<NetworkId, NetworkInfo*>::iterator netIter = _networkInfo.begin();
-  while(netIter != _networkInfo.end()) {
-    NetworkInfo *net = netIter.value();
+  QHash<NetworkId, Network*>::iterator netIter = _network.begin();
+  while(netIter != _network.end()) {
+    Network *net = netIter.value();
     disconnect(net, SIGNAL(destroyed()), this, 0);
-    netIter = _networkInfo.erase(netIter);
+    netIter = _network.erase(netIter);
     net->deleteLater();
   }
-  Q_ASSERT(_networkInfo.isEmpty());
+  Q_ASSERT(_network.isEmpty());
 
   QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
   while(idIter != _identities.end()) {
@@ -396,7 +372,7 @@ void Client::syncToCore(const QVariant &coreState) {
     buffer(vid.value<BufferInfo>()); // create all buffers, so we see them in the network views
   }
 
-  // create networkInfo objects
+  // create network objects
   QVariantList networkids = sessionState["Networks"].toList();
   foreach(QVariant networkid, networkids) {
     networkConnected(networkid.toUInt());
@@ -413,7 +389,7 @@ void Client::updateCoreConnectionProgress() {
   // 2.) channels
   // 3.) ircusers
 
-  int numNets = networkInfos().count();
+  int numNets = networks().count();
   int numNetsWaiting = 0;
 
   int numIrcUsers = 0;
@@ -422,7 +398,7 @@ void Client::updateCoreConnectionProgress() {
   int numChannels = 0;
   int numChannelsWaiting = 0;
 
-  foreach(NetworkInfo *net, networkInfos()) {
+  foreach(Network *net, networks()) {
     if(! net->initialized())
       numNetsWaiting++;
 
@@ -460,7 +436,7 @@ void Client::updateCoreConnectionProgress() {
   emit coreConnectionProgress(1,1);
   emit connected();
   emit coreConnectionStateChanged(true);
-  foreach(NetworkInfo *net, networkInfos()) {
+  foreach(Network *net, networks()) {
     disconnect(net, 0, this, SLOT(updateCoreConnectionProgress()));
   }
 
@@ -520,74 +496,67 @@ void Client::networkConnected(uint netid) {
   //Buffer *b = buffer(id);
   //b->setActive(true);
 
-  NetworkInfo *netinfo = new NetworkInfo(netid, this);
+  Network *netinfo = new Network(netid, this);
   netinfo->setProxy(signalProxy());
-  networkModel()->attachNetworkInfo(netinfo);
+  networkModel()->attachNetwork(netinfo);
   
   if(!isConnected()) {
     connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
     connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress()));
     connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress()));
   }
-  connect(netinfo, SIGNAL(ircChannelAdded(QString)), this, SLOT(ircChannelAdded(QString)));
-  connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkInfoDestroyed()));
-  _networkInfo[netid] = netinfo;
+  connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkDestroyed()));
+  _network[netid] = netinfo;
 }
 
 void Client::networkDisconnected(uint networkid) {
-  foreach(Buffer *buffer, buffers()) {
-    if(buffer->bufferInfo().networkId() != networkid)
-      continue;
-
-    //buffer->displayMsg(Message(bufferid, Message::Server, tr("Server disconnected."))); FIXME
-    buffer->setActive(false);
+  if(!_network.contains(networkid)) {
+    qWarning() << "Client::networkDisconnected(uint): unknown Network" << networkid;
+    return;
   }
 
-  Q_ASSERT(networkInfo(networkid));
-  if(!networkInfo(networkid)->initialized()) {
+  Network *net = _network.take(networkid);
+  if(!net->initialized()) {
     qDebug() << "Network" << networkid << "disconnected while not yet initialized!";
     updateCoreConnectionProgress();
   }
-}
-
-void Client::ircChannelAdded(QString chanName) {
-  NetworkInfo *netInfo = qobject_cast<NetworkInfo*>(sender());
-  Q_ASSERT(netInfo);
-  Buffer *buf = buffer(bufferInfo(netInfo->networkName(), chanName));
-  Q_ASSERT(buf);
-  buf->setIrcChannel(netInfo->ircChannel(chanName));
-
+  net->deleteLater();
 }
 
 void Client::updateBufferInfo(BufferInfo id) {
-  buffer(id)->updateBufferInfo(id);
+  emit bufferUpdated(id);
 }
 
 void Client::bufferDestroyed() {
   Buffer *buffer = static_cast<Buffer *>(sender());
-  uint bufferUid = buffer->uid();
-  if(_buffers.contains(bufferUid))
-    _buffers.remove(bufferUid);
+  QHash<BufferId, Buffer *>::iterator iter = _buffers.begin();
+  while(iter != _buffers.end()) {
+    if(iter.value() == buffer) {
+      iter = _buffers.erase(iter);
+      break;
+    }
+    iter++;
+  }
 }
 
-void Client::networkInfoDestroyed() {
-  NetworkInfo *netinfo = static_cast<NetworkInfo *>(sender());
+void Client::networkDestroyed() {
+  Network *netinfo = static_cast<Network *>(sender());
   uint networkId = netinfo->networkId();
-  if(_networkInfo.contains(networkId))
-    _networkInfo.remove(networkId);
+  if(_network.contains(networkId))
+    _network.remove(networkId);
 }
 
 void Client::recvMessage(const Message &msg) {
   Buffer *b = buffer(msg.buffer());
 
-  Buffer::ActivityLevel level = Buffer::OtherActivity;
-  if(msg.type() == Message::Plain || msg.type() == Message::Notice){
-    level |= Buffer::NewMessage;
-  }
-  if(msg.flags() & Message::Highlight){
-    level |= Buffer::Highlight;
-  }
-  emit bufferActivity(level, b);
+//   Buffer::ActivityLevel level = Buffer::OtherActivity;
+//   if(msg.type() == Message::Plain || msg.type() == Message::Notice){
+//     level |= Buffer::NewMessage;
+//   }
+//   if(msg.flags() & Message::Highlight){
+//     level |= Buffer::Highlight;
+//   }
+//   emit bufferActivity(level, b);
 
   b->appendMsg(msg);
 }