X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=2fad8d652e09a791024cce22293bf26be5eebf9a;hp=5663738f8a69b149371ba4bf1a28f93690348744;hb=f029b6f8d31be1c0d4d7a2b74989bcb61e4d511b;hpb=4c2ec3f1bd9e2eb17d31585866f2b2d40a699aac

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 5663738f..2fad8d65 100644
--- 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),
-    _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
@@ -52,8 +53,8 @@ QVariant NetworkItem::data(int column, int role) const {
   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:
@@ -88,7 +89,8 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
 
   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)));
@@ -182,6 +184,16 @@ QString NetworkItem::toolTip(int column) const {
   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
 *****************************************/
@@ -319,6 +331,8 @@ QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *pare
 
 QVariant QueryBufferItem::data(int column, int role) const {
   switch(role) {
+  case Qt::EditRole:
+    return BufferItem::data(column, Qt::DisplayRole);
   case NetworkModel::IrcUserRole:
     return QVariant::fromValue<QObject *>(_ircUser);
   case NetworkModel::UserAwayRole: