X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fnicklistwidget.cpp;h=24f07a9ae540ea8c3f6055b931be5bcc8a1912bd;hp=490f9b60468cca94b3bbdedaf8b94275a96155d4;hb=e5ef65b239e9a128a5cf86e6eef9bce1fd098448;hpb=8699dd758516d0ded076811e8ea656adc95e69d0

diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp
index 490f9b60..24f07a9a 100644
--- a/src/qtui/nicklistwidget.cpp
+++ b/src/qtui/nicklistwidget.cpp
@@ -22,30 +22,39 @@
 
 #include "buffer.h"
 #include "nickview.h"
+#include "client.h"
+#include "networkmodel.h"
+#include "nickmodel.h"
 
-NickListWidget::NickListWidget(QWidget *parent) : QWidget(parent) {
+NickListWidget::NickListWidget(QWidget *parent)
+  : QWidget(parent),
+    _currentBuffer(0)
+{
   ui.setupUi(this);
+}
+
 
+BufferId NickListWidget::currentBuffer() const {
+  return _currentBuffer;
 }
 
-void NickListWidget::setBuffer(Buffer *buf) {
-  if(!buf) {
+void NickListWidget::setCurrentBuffer(BufferId bufferId) {
+  QModelIndex bufferIdx = Client::networkModel()->bufferIndex(bufferId);
+  
+  if(bufferIdx.data(NetworkModel::BufferTypeRole) != BufferItem::ChannelType) {
     ui.stackedWidget->setCurrentWidget(ui.emptyPage);
     return;
   }
-  if(buf->bufferType() != Buffer::ChannelType) {
-    ui.stackedWidget->setCurrentWidget(ui.emptyPage);
+
+  if(nickViews.contains(bufferId)) {
+    ui.stackedWidget->setCurrentWidget(nickViews.value(bufferId));
   } else {
-    if(nickViews.contains(buf)) {
-      ui.stackedWidget->setCurrentWidget(nickViews.value(buf));
-    } else {
-      NickView *view = new NickView(this);
-      view->setModel(buf->nickModel());
-      nickViews[buf] = view;
-      ui.stackedWidget->addWidget(view);
-      ui.stackedWidget->setCurrentWidget(view);
-      connect(buf, SIGNAL(destroyed(QObject *)), this, SLOT(bufferDestroyed(QObject *)));
-    }
+    NickView *view = new NickView(this);
+    view->setModel(Client::nickModel());
+    view->setRootIndex(Client::nickModel()->mapFromSource(bufferIdx));
+    nickViews[bufferId] = view;
+    ui.stackedWidget->addWidget(view);
+    ui.stackedWidget->setCurrentWidget(view);
   }
 }
 
@@ -57,10 +66,11 @@ void NickListWidget::reset() {
   nickViews.clear();
 }
 
-void NickListWidget::bufferDestroyed(QObject *buf) {
-  if(nickViews.contains((Buffer *)buf)) {
-    NickView *view = nickViews.take((Buffer *)buf);
-    ui.stackedWidget->removeWidget(view);
-    view->deleteLater();
-  }
+void NickListWidget::removeBuffer(BufferId bufferId) {
+  if(!nickViews.contains(bufferId))
+    return;
+  
+  NickView *view = nickViews.take(bufferId);
+  ui.stackedWidget->removeWidget(view);
+  view->deleteLater();
 }