X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fnicklistwidget.cpp;h=4cfd5b68ec91af21ecb58a97ab0ce4e87df0d7fc;hp=cb9416185712ad78fc5d72fddd50fb538c395516;hb=e9f87d7542d4a9fe0e9c63dec96e93d270667ecd;hpb=89c07686d193fe31e1b3ea45735b3f5a0d1e6cfb

diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp
index cb941618..4cfd5b68 100644
--- a/src/qtui/nicklistwidget.cpp
+++ b/src/qtui/nicklistwidget.cpp
@@ -24,6 +24,7 @@
 #include "nickview.h"
 #include "client.h"
 #include "networkmodel.h"
+#include "buffermodel.h"
 #include "nickviewfilter.h"
 
 NickListWidget::NickListWidget(QWidget *parent)
@@ -60,61 +61,53 @@ void NickListWidget::setSelectionModel(QItemSelectionModel *selectionModel) {
   }
 }
 
-
-void NickListWidget::reset() {
-  NickView *nickView;
-  QHash<BufferId, NickView *>::iterator iter = nickViews.begin();
-  while(iter != nickViews.end()) {
-    nickView = *iter;
-    iter = nickViews.erase(iter);
-    ui.stackedWidget->removeWidget(nickView);
-    nickView->deleteLater();
-  }
-}
-
-
 void NickListWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
-  Q_UNUSED(previous);
-  QVariant variant;
-
-  variant = current.data(NetworkModel::BufferIdRole);
-  if(!variant.isValid())
-    return;
-  setCurrentBuffer(variant.value<BufferId>());
-}
+  BufferInfo::Type bufferType = (BufferInfo::Type)current.data(NetworkModel::BufferTypeRole).toInt();
+  BufferId newBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
+  BufferId oldBufferId = previous.data(NetworkModel::BufferIdRole).value<BufferId>();
 
-
-void NickListWidget::setCurrentBuffer(BufferId bufferId) {
-  QModelIndex bufferIdx = Client::networkModel()->bufferIndex(bufferId);
-  
-  if(bufferIdx.data(NetworkModel::BufferTypeRole) != BufferInfo::ChannelBuffer) {
+  if(bufferType != BufferInfo::ChannelBuffer) {
     ui.stackedWidget->setCurrentWidget(ui.emptyPage);
     return;
   }
 
-  if(nickViews.contains(bufferId)) {
-    ui.stackedWidget->setCurrentWidget(nickViews.value(bufferId));
+  if(newBufferId == oldBufferId)
+    return;
+
+  if(nickViews.contains(newBufferId)) {
+    ui.stackedWidget->setCurrentWidget(nickViews.value(newBufferId));
   } else {
     NickView *view = new NickView(this);
-    NickViewFilter *filter = new NickViewFilter(bufferId, Client::networkModel());
-    filter->setObjectName("Buffer " + QString::number(bufferId.toInt()));
+    NickViewFilter *filter = new NickViewFilter(newBufferId, Client::networkModel());
     view->setModel(filter);
-    view->setRootIndex(filter->mapFromSource(bufferIdx));
+    QModelIndex source_current = Client::bufferModel()->mapToSource(current);
+    view->setRootIndex(filter->mapFromSource(source_current));
     view->expandAll();
-    nickViews[bufferId] = view;
+    nickViews[newBufferId] = view;
     ui.stackedWidget->addWidget(view);
     ui.stackedWidget->setCurrentWidget(view);
   }
 }
 
-
 void NickListWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
   Q_ASSERT(model());
   if(!parent.isValid()) {
     // ok this means that whole networks are about to be removed
     // we can't determine which buffers are affect, so we hope that all nets are removed
     // this is the most common case (for example disconnecting from the core or terminating the clint)
-    reset();
+    NickView *nickView;
+    QHash<BufferId, NickView *>::iterator iter = nickViews.begin();
+    while(iter != nickViews.end()) {
+      nickView = *iter;
+      iter = nickViews.erase(iter);
+      ui.stackedWidget->removeWidget(nickView);
+      QAbstractItemModel *model = nickView->model();
+      nickView->setModel(0);
+      if(QSortFilterProxyModel *filter = qobject_cast<QSortFilterProxyModel *>(model))
+	filter->setSourceModel(0);
+      model->deleteLater();
+      nickView->deleteLater();
+    }
   } else {
     // check if there are explicitly buffers removed
     for(int i = start; i <= end; i++) {
@@ -131,9 +124,14 @@ void NickListWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start,
 void NickListWidget::removeBuffer(BufferId bufferId) {
   if(!nickViews.contains(bufferId))
     return;
-  
+
   NickView *view = nickViews.take(bufferId);
   ui.stackedWidget->removeWidget(view);
+  QAbstractItemModel *model = view->model();
+  view->setModel(0);
+  if(QSortFilterProxyModel *filter = qobject_cast<QSortFilterProxyModel *>(model))
+    filter->setSourceModel(0);
+  model->deleteLater();
   view->deleteLater();
 }