X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=01b6cde047f44313be08f0cf673b1b5cc527ff71;hp=5663738f8a69b149371ba4bf1a28f93690348744;hb=74b71a1dde2e2cab142a641db6e696595cf62493;hpb=4c2ec3f1bd9e2eb17d31585866f2b2d40a699aac diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 5663738f..01b6cde0 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -37,7 +37,8 @@ *****************************************/ NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent) : PropertyMapItem(QList() << "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("

%1

").arg(toolTip.join("
")); } +void NetworkItem::onBeginRemoveChilds(int start, int end) { + for(int i = start; i <= end; i++) { + StatusBufferItem *statusBufferItem = qobject_cast(child(i)); + if(statusBufferItem) { + _statusBufferItem = 0; + break; + } + } +} + /***************************************** * Fancy Buffer Items *****************************************/