Fixes #510 - Network item shows wrong buffer

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 5663738..01b6cde 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -37,7 +37,8 @@
 *****************************************/
 NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
   : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),
 *****************************************/
 NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
   : PropertyMapItem(QList<QString>() << "networkName" << "currentServer" << "nickCount", parent),

-    _networkId(netid)
+    _networkId(netid),
+    _statusBufferItem(0)

 {
   // DO NOT EMIT dataChanged() DIRECTLY IN NetworkItem
   // use networkDataChanged() instead. Otherwise you will end up in a infinite loop
 {
   // DO NOT EMIT dataChanged() DIRECTLY IN NetworkItem
   // use networkDataChanged() instead. Otherwise you will end up in a infinite loop


@@ -52,8 +53,8 @@ QVariant NetworkItem::data(int column, int role) const {
   case NetworkModel::BufferInfoRole:
   case NetworkModel::BufferTypeRole:
   case NetworkModel::BufferActivityRole:
   case NetworkModel::BufferInfoRole:
   case NetworkModel::BufferTypeRole:
   case NetworkModel::BufferActivityRole:

-    if(childCount())
-      return child(0)->data(column, role);
+    if(_statusBufferItem)
+      return _statusBufferItem->data(column, role);

     else
       return QVariant();
   case NetworkModel::NetworkIdRole:
     else
       return QVariant();
   case NetworkModel::NetworkIdRole:


@@ -88,7 +89,8 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
 
   switch(bufferInfo.type()) {
   case BufferInfo::StatusBuffer:
 
   switch(bufferInfo.type()) {
   case BufferInfo::StatusBuffer:

-    bufferItem = new StatusBufferItem(bufferInfo, this);
+    _statusBufferItem = new StatusBufferItem(bufferInfo, this);
+    bufferItem = _statusBufferItem;

     disconnect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int)));
     connect(this, SIGNAL(networkDataChanged(int)), bufferItem, SIGNAL(dataChanged(int)));
     connect(bufferItem, SIGNAL(dataChanged(int)), this, SIGNAL(dataChanged(int)));
     disconnect(this, SIGNAL(networkDataChanged(int)), this, SIGNAL(dataChanged(int)));
     connect(this, SIGNAL(networkDataChanged(int)), bufferItem, SIGNAL(dataChanged(int)));
     connect(bufferItem, SIGNAL(dataChanged(int)), this, SIGNAL(dataChanged(int)));


@@ -182,6 +184,16 @@ QString NetworkItem::toolTip(int column) const {
   return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
 }
 
   return QString("<p> %1 </p>").arg(toolTip.join("<br />"));
 }
 

+void NetworkItem::onBeginRemoveChilds(int start, int end) {
+  for(int i = start; i <= end; i++) {
+    StatusBufferItem *statusBufferItem = qobject_cast<StatusBufferItem *>(child(i));
+    if(statusBufferItem) {
+      _statusBufferItem = 0;
+      break;
+    }
+  }
+}
+

 /*****************************************
 *  Fancy Buffer Items
 *****************************************/
 /*****************************************
 *  Fancy Buffer Items
 *****************************************/

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 840f1aa..868de0b 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -28,6 +28,7 @@
 #include "treemodel.h"
 
 class BufferItem;
 #include "treemodel.h"
 
 class BufferItem;

+class StatusBufferItem;

 
 /*****************************************
  *  Network Items
 
 /*****************************************
  *  Network Items


@@ -67,8 +68,12 @@ public slots:
 signals:
   void networkDataChanged(int column = -1);
 
 signals:
   void networkDataChanged(int column = -1);
 

+private slots:
+  void onBeginRemoveChilds(int start, int end);
+  

 private:
   NetworkId _networkId;
 private:
   NetworkId _networkId;

+  StatusBufferItem *_statusBufferItem;

 
   QPointer<Network> _network;
 };
 
   QPointer<Network> _network;
 };