X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=6c2426de3c2cffefadc12e378d121b7e513b58a5;hp=4bad7a0e5ef01efe4e849c9be2b4c2288a10c8ed;hb=fd7c2c4a41b5bb9cffcfe7a8f86a28ab7f38ac27;hpb=9a6a8478bdd8c7c5bb4ff1fa3de9510863d65a97

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 4bad7a0e..6c2426de 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -27,7 +27,7 @@
 #include "bufferinfo.h"
 #include "client.h"
 #include "signalproxy.h"
-#include "networkinfo.h"
+#include "network.h"
 #include "ircchannel.h"
 #include "ircuser.h"
 
@@ -163,15 +163,15 @@ quint64 NetworkItem::id() const {
 }
 
 QString NetworkItem::networkName() const {
-  if(_networkInfo)
-    return _networkInfo->networkName();
+  if(_network)
+    return _network->networkName();
   else
     return _networkName;
 }
 
 QString NetworkItem::currentServer() const {
-  if(_networkInfo)
-    return _networkInfo->currentServer();
+  if(_network)
+    return _network->currentServer();
   else
     return QString();
 }
@@ -188,23 +188,23 @@ int NetworkItem::nickCount() const {
   return count;
 }
 
-void NetworkItem::attachNetworkInfo(NetworkInfo *networkInfo) {
-  if(!networkInfo)
+void NetworkItem::attachNetwork(Network *network) {
+  if(!network)
     return;
   
-  _networkInfo = networkInfo;
+  _network = network;
 
-  connect(networkInfo, SIGNAL(networkNameSet(QString)),
+  connect(network, SIGNAL(networkNameSet(QString)),
 	  this, SLOT(setNetworkName(QString)));
-  connect(networkInfo, SIGNAL(currentServerSet(QString)),
+  connect(network, SIGNAL(currentServerSet(QString)),
 	  this, SLOT(setCurrentServer(QString)));
-  connect(networkInfo, SIGNAL(ircChannelAdded(QString)),
+  connect(network, SIGNAL(ircChannelAdded(QString)),
 	  this, SLOT(attachIrcChannel(QString)));
   // FIXME: connect this and that...
 }
 
 void NetworkItem::attachIrcChannel(const QString &channelName) {
-  IrcChannel *ircChannel = _networkInfo->ircChannel(channelName);
+  IrcChannel *ircChannel = _network->ircChannel(channelName);
   if(!ircChannel) {
     qWarning() << "NetworkItem::attachIrcChannel(): unkown Channel" << channelName;
     return;
@@ -426,13 +426,13 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
   return true;
 }
 
-void NetworkModel::attachNetworkInfo(NetworkInfo *networkInfo) {
-  NetworkItem *networkItem = network(networkInfo->networkId());
+void NetworkModel::attachNetwork(Network *net) {
+  NetworkItem *networkItem = network(net->networkId());
   if(!networkItem) {
-    qWarning() << "NetworkModel::attachNetworkInfo(): network is unknown!";
+    qWarning() << "NetworkModel::attachNetwork(): network is unknown!";
     return;
   }
-  networkItem->attachNetworkInfo(networkInfo);
+  networkItem->attachNetwork(net);
 }
 
 void NetworkModel::bufferUpdated(Buffer *buffer) {