X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=fe8484482ba00b39b4e973725f49ad3617047690;hb=9a6a8478bdd8c7c5bb4ff1fa3de9510863d65a97;hp=1b6e0bba0b133beb9b96493632c85b55104a3a5f;hpb=21d8d7f0a79eeeb541664aa80ce481fdbfc41f09;p=quassel.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 1b6e0bba..fe848448 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -28,6 +28,7 @@
 #include "message.h"
 #include "networkinfo.h"
 #include "networkmodel.h"
+#include "buffermodel.h"
 #include "quasselui.h"
 #include "signalproxy.h"
 #include "util.h"
@@ -52,27 +53,28 @@ void Client::init(AbstractUi *ui) {
 }
 
 Client::Client(QObject *parent)
-    : QObject(parent),
+  : QObject(parent),
     socket(0),
     _signalProxy(new SignalProxy(SignalProxy::Client, this)),
     mainUi(0),
     _networkModel(0),
+    _bufferModel(0),
     connectedToCore(false)
 {
-
 }
 
 Client::~Client() {
-
 }
 
 void Client::init() {
   blockSize = 0;
 
   _networkModel = new NetworkModel(this);
+  _bufferModel = new BufferModel(_networkModel);
 
   connect(this, SIGNAL(bufferSelected(Buffer *)),
-          _networkModel, SLOT(selectBuffer(Buffer *)));
+          _bufferModel, SLOT(selectBuffer(Buffer *)));
+  
   connect(this, SIGNAL(bufferUpdated(Buffer *)),
           _networkModel, SLOT(bufferUpdated(Buffer *)));
   connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)),
@@ -192,6 +194,11 @@ NetworkModel *Client::networkModel() {
   return instance()->_networkModel;
 }
 
+BufferModel *Client::bufferModel() {
+  return instance()->_bufferModel;
+}
+
+
 SignalProxy *Client::signalProxy() {
   return instance()->_signalProxy;
 }
@@ -380,10 +387,6 @@ void Client::syncToCore(const QVariant &coreState) {
   // create identities
   foreach(QVariant vid, sessionState["Identities"].toList()) {
     coreIdentityCreated(vid.value<Identity>());
-    //Identity *id = new Identity(vid.value<Identity>(), this);
-    //_identities[id->id()] = id;
-    //signalProxy()->synchronize(id);
-    //qDebug() << "received identity" << id->identityName();
   }
 
   // store Buffer details