From 012df68ce8a743a71bfe3beda529a21c02daddb6 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Wed, 15 Aug 2007 12:13:15 +0000 Subject: [PATCH 1/1] Fixing the Bug where a clear of the BufferTreeModel would not result in cleard hashlists. The result is a redesign of Lookupsystem for child items in the tree has been redesigned. --- src/client/buffertreemodel.cpp | 76 +++++++++++++++++++--------------- src/client/buffertreemodel.h | 23 +++++++--- src/client/treemodel.cpp | 38 ++++++++++++++++- src/client/treemodel.h | 10 ++++- 4 files changed, 104 insertions(+), 43 deletions(-) diff --git a/src/client/buffertreemodel.cpp b/src/client/buffertreemodel.cpp index 37fe63bf..e1b52668 100644 --- a/src/client/buffertreemodel.cpp +++ b/src/client/buffertreemodel.cpp @@ -31,6 +31,10 @@ BufferTreeItem::BufferTreeItem(Buffer *buffer, TreeItem *parent) : TreeItem(pare activity = Buffer::NoActivity; } +uint BufferTreeItem::id() const { + return buf->bufferId().uid(); +} + void BufferTreeItem::setActivity(const Buffer::ActivityLevel &level) { activity = level; } @@ -82,6 +86,20 @@ QVariant BufferTreeItem::data(int column, int role) const { } } +/***************************************** +* Network Items +*****************************************/ +NetworkTreeItem::NetworkTreeItem(const QString &network, TreeItem *parent) : TreeItem(parent) { + net = network; + itemData << net << ""; +} + +uint NetworkTreeItem::id() const { + return qHash(net); +} + + + /***************************************** * BufferTreeModel *****************************************/ @@ -115,6 +133,7 @@ Qt::ItemFlags BufferTreeModel::flags(const QModelIndex &index) const { } bool BufferTreeModel::isBufferIndex(const QModelIndex &index) const { + // not so purdy... return parent(index) != QModelIndex(); } @@ -125,42 +144,37 @@ Buffer *BufferTreeModel::getBufferByIndex(const QModelIndex &index) const { QModelIndex BufferTreeModel::getOrCreateNetworkItemIndex(Buffer *buffer) { QString net = buffer->networkName(); + TreeItem *networkItem; - if(networkItem.contains(net)) { - return index(networkItem[net]->row(), 0); - } else { - QList data; - data << net << ""; - + if(not(networkItem = rootItem->childById(qHash(net)))) { int nextRow = rootItem->childCount(); + networkItem = new NetworkTreeItem(net, rootItem); beginInsertRows(QModelIndex(), nextRow, nextRow); - rootItem->appendChild(new TreeItem(data, rootItem)); + rootItem->appendChild(networkItem); endInsertRows(); - - networkItem[net] = rootItem->child(nextRow); - return index(nextRow, 0); } + + Q_ASSERT(networkItem); + return index(networkItem->row(), 0); } QModelIndex BufferTreeModel::getOrCreateBufferItemIndex(Buffer *buffer) { QModelIndex networkItemIndex = getOrCreateNetworkItemIndex(buffer); - - if(bufferItem.contains(buffer)) { - return index(bufferItem[buffer]->row(), 0, networkItemIndex); - } else { - // first we determine the parent of the new Item - TreeItem *networkItem = static_cast(networkItemIndex.internalPointer()); - Q_ASSERT(networkItem); + NetworkTreeItem *networkItem = static_cast(networkItemIndex.internalPointer()); + TreeItem *bufferItem; + + if(not(bufferItem = networkItem->childById(buffer->bufferId().uid()))) { int nextRow = networkItem->childCount(); - + bufferItem = new BufferTreeItem(buffer, networkItem); + beginInsertRows(networkItemIndex, nextRow, nextRow); - networkItem->appendChild(new BufferTreeItem(buffer, networkItem)); + networkItem->appendChild(bufferItem); endInsertRows(); - - bufferItem[buffer] = static_cast(networkItem->child(nextRow)); - return index(nextRow, 0, networkItemIndex); } + + Q_ASSERT(bufferItem); + return index(bufferItem->row(), 0, networkItemIndex); } QStringList BufferTreeModel::mimeTypes() const { @@ -191,12 +205,12 @@ bool BufferTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction /*actio int sourcerow = data->data("application/Quassel/BufferItem/row").toInt(); QString network = QString::fromUtf8(data->data("application/Quassel/BufferItem/network")); - Q_ASSERT(networkItem.contains(network)); + Q_ASSERT(rootItem->childById(qHash(network))); if(parent == QModelIndex()) // can't be a query... return false; - Buffer *sourceBuffer = static_cast(networkItem[network]->child(sourcerow))->buffer(); + Buffer *sourceBuffer = static_cast(rootItem->childById(qHash(network))->child(sourcerow))->buffer(); Buffer *targetBuffer = getBufferByIndex(parent); if(!(sourceBuffer->bufferType() & targetBuffer->bufferType() & Buffer::QueryBuffer)) // only queries can be merged @@ -214,7 +228,6 @@ bool BufferTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction /*actio */ qDebug() << "merging" << sourceBuffer->bufferName() << "with" << targetBuffer->bufferName(); - bufferItem.remove(getBufferByIndex(parent)); removeRow(parent.row(), BufferTreeModel::parent(parent)); return true; @@ -246,10 +259,11 @@ void BufferTreeModel::doubleClickReceived(const QModelIndex &clicked) { } void BufferTreeModel::bufferActivity(Buffer::ActivityLevel level, Buffer *buffer) { - if(bufferItem.contains(buffer) and buffer != currentBuffer) - bufferItem[buffer]->setActivity(level); + BufferTreeItem *bufferItem = static_cast(getOrCreateBufferItemIndex(buffer).internalPointer()); + if(buffer != currentBuffer) + bufferItem->setActivity(level); else - bufferItem[buffer]->setActivity(Buffer::NoActivity); + bufferItem->setActivity(Buffer::NoActivity); bufferUpdated(buffer); } @@ -258,10 +272,4 @@ void BufferTreeModel::selectBuffer(Buffer *buffer) { emit selectionChanged(index); } -// EgS: check if this makes sense! -void BufferTreeModel::clear() { - TreeModel::clear(); - networkItem.clear(); - bufferItem.clear(); -} diff --git a/src/client/buffertreemodel.h b/src/client/buffertreemodel.h index 91fe43d5..3f4e5974 100644 --- a/src/client/buffertreemodel.h +++ b/src/client/buffertreemodel.h @@ -34,6 +34,9 @@ class BufferTreeItem : public TreeItem { public: BufferTreeItem(Buffer *, TreeItem *parent = 0); + + virtual uint id() const; + QVariant data(int column, int role) const; Buffer *buffer() const { return buf; } void setActivity(const Buffer::ActivityLevel &); @@ -46,6 +49,21 @@ protected: Buffer::ActivityLevel activity; }; +/***************************************** + * Network Items + *****************************************/ +class NetworkTreeItem : public TreeItem { + Q_OBJECT + +public: + NetworkTreeItem(const QString &, TreeItem *parent = 0); + + virtual uint id() const; + +private: + QString net; + +}; /***************************************** * BufferTreeModel @@ -66,9 +84,6 @@ public: virtual Qt::ItemFlags flags(const QModelIndex &index) const; -// void clearActivity(Buffer *buffer); - void clear(); // EgS: check this - public slots: void bufferUpdated(Buffer *); void changeCurrent(const QModelIndex &, const QModelIndex &); @@ -92,8 +107,6 @@ private: QMimeData *mimeData(const QModelIndexList &) const; bool dropMimeData(const QMimeData *, Qt::DropAction, int, int, const QModelIndex &); - QHash networkItem; - QHash bufferItem; Buffer *currentBuffer; }; diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index 0d6111fb..6dd7626a 100644 --- a/src/client/treemodel.cpp +++ b/src/client/treemodel.cpp @@ -38,16 +38,35 @@ TreeItem::~TreeItem() { qDeleteAll(childItems); } +uint TreeItem::id() const { + return (uint)this; +} + void TreeItem::appendChild(TreeItem *item) { childItems.append(item); + childHash[item->id()] = item; } void TreeItem::removeChild(int row) { + if(row >= childItems.size()) + return; + TreeItem *treeitem = childItems.value(row); childItems.removeAt(row); + childHash.remove(childHash.key(treeitem)); } -TreeItem *TreeItem::child(int row) { - return childItems.value(row); +TreeItem *TreeItem::child(int row) const { + if(row < childItems.size()) + return childItems.value(row); + else + return 0; +} + +TreeItem *TreeItem::childById(const uint &id) const { + if(childHash.contains(id)) + return childHash.value(id); + else + return 0; } int TreeItem::childCount() const { @@ -106,6 +125,21 @@ QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) con return QModelIndex(); } +QModelIndex TreeModel::indexById(uint id, const QModelIndex &parent) const { + TreeItem *parentItem; + + if(!parent.isValid()) + parentItem = rootItem; + else + parentItem = static_cast(parent.internalPointer()); + + TreeItem *childItem = parentItem->childById(id); + if(childItem) + return createIndex(childItem->row(), 0, childItem); + else + return QModelIndex(); +} + QModelIndex TreeModel::parent(const QModelIndex &index) const { if(!index.isValid()) return QModelIndex(); diff --git a/src/client/treemodel.h b/src/client/treemodel.h index d73b8fcc..27360ba1 100644 --- a/src/client/treemodel.h +++ b/src/client/treemodel.h @@ -23,6 +23,7 @@ #include #include +#include #include /***************************************** @@ -30,6 +31,7 @@ *****************************************/ class TreeItem : public QObject { Q_OBJECT + Q_PROPERTY(uint id READ id) public: TreeItem(const QList &data, TreeItem *parent = 0); @@ -39,7 +41,9 @@ public: void appendChild(TreeItem *child); void removeChild(int row); - TreeItem *child(int row); + virtual uint id() const; + TreeItem *child(int row) const; + TreeItem *childById(const uint &) const; int childCount() const; int columnCount() const; virtual QVariant data(int column, int role) const; @@ -47,7 +51,8 @@ public: TreeItem *parent(); protected: - QList childItems; + QList childItems; + QHash childHash; // uint to be compatible to qHash functions TreeItem *parentItem; QList itemData; }; @@ -67,6 +72,7 @@ public: virtual Qt::ItemFlags flags(const QModelIndex &index) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; + QModelIndex indexById(uint id, const QModelIndex &parent = QModelIndex()) const; QModelIndex parent(const QModelIndex &index) const; int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; -- 2.20.1