X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=7f464c409f8f4f031794e9adf405aef7305293b2;hb=a86c3a08e57e0a23b3e57d0b9ee9d27cc5113d21;hp=0e4a368b988536675eb1fe7262683ed69d48b497;hpb=ec17201104f75eafaddccc174de8709b42b15ccb;p=quassel.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 0e4a368b..7f464c40 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -21,12 +21,12 @@
 #include "client.h"
 
 #include "bufferinfo.h"
-#include "buffertreemodel.h"
 #include "global.h"
 #include "ircchannel.h"
 #include "ircuser.h"
 #include "message.h"
 #include "networkinfo.h"
+#include "networkmodel.h"
 #include "quasselui.h"
 #include "signalproxy.h"
 #include "util.h"
@@ -118,8 +118,8 @@ BufferInfo Client::statusBufferInfo(QString net) {
   return bufferInfo(net, "");
 }
 
-BufferTreeModel *Client::bufferModel() {
-  return instance()->_bufferModel;
+NetworkModel *Client::networkModel() {
+  return instance()->_networkModel;
 }
 
 SignalProxy *Client::signalProxy() {
@@ -134,7 +134,7 @@ Client::Client(QObject *parent)
     socket(0),
     _signalProxy(new SignalProxy(SignalProxy::Client, this)),
     mainUi(0),
-    _bufferModel(0),
+    _networkModel(0),
     connectedToCore(false)
 {
 }
@@ -146,14 +146,14 @@ Client::~Client() {
 void Client::init() {
   blockSize = 0;
 
-  _bufferModel = new BufferTreeModel(this);
+  _networkModel = new NetworkModel(this);
 
   connect(this, SIGNAL(bufferSelected(Buffer *)),
-	  _bufferModel, SLOT(selectBuffer(Buffer *)));
+	  _networkModel, SLOT(selectBuffer(Buffer *)));
   connect(this, SIGNAL(bufferUpdated(Buffer *)),
-	  _bufferModel, SLOT(bufferUpdated(Buffer *)));
+	  _networkModel, SLOT(bufferUpdated(Buffer *)));
   connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)),
-	  _bufferModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
+	  _networkModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
 
   SignalProxy *p = signalProxy();
   p->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)),
@@ -243,7 +243,7 @@ void Client::disconnectFromCore() {
 }
 
 void Client::setCoreConfiguration(const QVariantMap &settings) {
-  writeDataToDevice(socket, settings);
+  SignalProxy::writeDataToDevice(socket, settings);
 }
 
 void Client::coreSocketConnected() {
@@ -253,7 +253,7 @@ void Client::coreSocketConnected() {
   clientInit["GuiProtocol"] = GUI_PROTOCOL;
   clientInit["User"] = coreConnectionInfo["User"].toString();
   clientInit["Password"] = coreConnectionInfo["Password"].toString();
-  writeDataToDevice(socket, clientInit);
+  SignalProxy::writeDataToDevice(socket, clientInit);
 }
 
 void Client::coreSocketDisconnected() {
@@ -263,7 +263,7 @@ void Client::coreSocketDisconnected() {
   blockSize = 0;
 
   /* Clear internal data. Hopefully nothing relies on it at this point. */
-  _bufferModel->clear();
+  _networkModel->clear();
 
   QHash<uint, Buffer *>::iterator bufferIter =  _buffers.begin();
   while(bufferIter != _buffers.end()) {
@@ -418,7 +418,7 @@ void Client::coreSocketError(QAbstractSocket::SocketError) {
 
 void Client::coreHasData() {
   QVariant item;
-  if(readDataFromDevice(socket, blockSize, item)) {
+  if(SignalProxy::readDataFromDevice(socket, blockSize, item)) {
     emit recvPartialItem(1,1);
     QVariantMap msg = item.toMap();
     if (!msg["StartWizard"].toBool()) {
@@ -444,6 +444,7 @@ void Client::networkConnected(uint netid) {
 
   NetworkInfo *netinfo = new NetworkInfo(netid, this);
   netinfo->setProxy(signalProxy());
+  networkModel()->attachNetworkInfo(netinfo);
   
   if(!isConnected()) {
     connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));