X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fabstractbuffercontainer.cpp;h=f3ffbf8466da3237c0da95ac5f9ef8b104471494;hb=2a7928256ace73ac40b89b8c327cf08815da882d;hp=78ead2738f8ec9a209974883200e2d76c2eca497;hpb=2684aa5295d12e4f7c66b3011fc8b1819f3d1cbb;p=quassel.git

diff --git a/src/uisupport/abstractbuffercontainer.cpp b/src/uisupport/abstractbuffercontainer.cpp
index 78ead273..f3ffbf84 100644
--- a/src/uisupport/abstractbuffercontainer.cpp
+++ b/src/uisupport/abstractbuffercontainer.cpp
@@ -23,13 +23,13 @@
 #include "client.h"
 #include "networkmodel.h"
 
-AbstractBufferContainer::AbstractBufferContainer(QWidget *parent) : AbstractItemView(parent), _currentBuffer(0)
+AbstractBufferContainer::AbstractBufferContainer(QWidget *parent)
+  : AbstractItemView(parent),
+    _currentBuffer(0)
 {
-
 }
 
 AbstractBufferContainer::~AbstractBufferContainer() {
-
 }
 
 
@@ -42,13 +42,10 @@ void AbstractBufferContainer::rowsAboutToBeRemoved(const QModelIndex &parent, in
     if(model()->rowCount(parent) != end - start + 1)
       return;
 
-    AbstractChatView *chatView;
-    QHash<BufferId, AbstractChatView *>::iterator iter = _chatViews.begin();
-    while(iter != _chatViews.end()) {
-      chatView = *iter;
-      iter = _chatViews.erase(iter);
-      removeChatView(chatView);
+    foreach(BufferId id, _chatViews.keys()) {
+      removeChatView(id);
     }
+    _chatViews.clear();
   } else {
     // check if there are explicitly buffers removed
     for(int i = start; i <= end; i++) {
@@ -63,35 +60,36 @@ void AbstractBufferContainer::rowsAboutToBeRemoved(const QModelIndex &parent, in
 }
 
 void AbstractBufferContainer::removeBuffer(BufferId bufferId) {
+  if(Client::buffer(bufferId)) Client::buffer(bufferId)->setVisible(false);
   if(!_chatViews.contains(bufferId))
     return;
 
-  if(Client::buffer(bufferId)) Client::buffer(bufferId)->setVisible(false);
-  AbstractChatView *chatView = _chatViews.take(bufferId);
-  removeChatView(chatView);
+  removeChatView(bufferId);
+  _chatViews.take(bufferId);
 }
 
 void AbstractBufferContainer::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
   BufferId newBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
   BufferId oldBufferId = previous.data(NetworkModel::BufferIdRole).value<BufferId>();
-  if(newBufferId != oldBufferId)
+  if(newBufferId != oldBufferId) {
     setCurrentBuffer(newBufferId);
+    emit currentChanged(newBufferId);
+  }
 }
 
 void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) {
-  if(!bufferId.isValid()) {
-    showChatView(0);
-    return;
-  }
-
   AbstractChatView *chatView = 0;
-  Buffer *buf = Client::buffer(bufferId);
-  if(!buf) {
-    qWarning() << "AbstractBufferContainer::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId;
-    return;
-  }
   Buffer *prevBuffer = Client::buffer(currentBuffer());
   if(prevBuffer) prevBuffer->setVisible(false);
+
+  Buffer *buf;
+  if(!bufferId.isValid() || !(buf = Client::buffer(bufferId))) {
+    if(bufferId.isValid()) 
+      qWarning() << "AbstractBufferContainer::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId;
+    _currentBuffer = 0;
+    showChatView(0);
+    return;
+  }
   if(_chatViews.contains(bufferId)) {
     chatView = _chatViews[bufferId];
   } else {
@@ -102,7 +100,7 @@ void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) {
     _chatViews[bufferId] = chatView;
   }
   _currentBuffer = bufferId;
-  showChatView(chatView);
+  showChatView(bufferId);
   buf->setVisible(true);
   setFocus();
 }