X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=38561cc8b895ccd2565f745012b28b5220208c5c;hp=1f2c257cc91e208ea4e9d60c6cd51be399385597;hb=fe56ff8c7e311d313c487a8a7578a9de87dcfb77;hpb=257ca0d5f944a8f63d002e1dcaaa3902258d85e0 diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 1f2c257c..38561cc8 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -55,8 +55,22 @@ QVariant NetworkItem::data(int column, int role) const { } } +BufferItem *NetworkItem::findBufferItem(BufferId bufferId) { + BufferItem *bufferItem = 0; + + for(int i = 0; i < childCount(); i++) { + bufferItem = qobject_cast(child(i)); + if(!bufferItem) + continue; + if(bufferItem->bufferId() == bufferId) + return bufferItem; + } + return 0; +} + + BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) { - BufferItem *bufferItem = qobject_cast(childById(qHash(bufferInfo.bufferId()))); + BufferItem *bufferItem = findBufferItem(bufferInfo); if(bufferItem) return bufferItem; @@ -109,7 +123,7 @@ void NetworkItem::attachIrcChannel(IrcChannel *ircChannel) { if(channelItem->bufferName().toLower() == ircChannel->name().toLower()) { channelItem->attachIrcChannel(ircChannel); - break; + return; } } } @@ -279,14 +293,15 @@ QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *pare IrcUser *ircUser = net->ircUser(bufferInfo.bufferName()); if(ircUser) attachIrcUser(ircUser); - } -bool QueryBufferItem::isActive() const { - if(_ircUser) - return !_ircUser->isAway(); - else - return false; +QVariant QueryBufferItem::data(int column, int role) const { + switch(role) { + case NetworkModel::UserAwayRole: + return (bool)_ircUser ? _ircUser->isAway() : false; + default: + return BufferItem::data(column, role); + } } QString QueryBufferItem::toolTip(int column) const { @@ -418,23 +433,22 @@ void ChannelBufferItem::ircChannelDestroyed() { removeAllChilds(); } -void ChannelBufferItem::ircUserDestroyed() { - // PRIVATE - IrcUser *ircUser = static_cast(sender()); - removeUserFromCategory(ircUser); - emit dataChanged(2); -} - void ChannelBufferItem::join(const QList &ircUsers) { addUsersToCategory(ircUsers); + emit dataChanged(2); +} - foreach(IrcUser *ircUser, ircUsers) { - if(!ircUser) +UserCategoryItem *ChannelBufferItem::findCategoryItem(int categoryId) { + UserCategoryItem *categoryItem = 0; + + for(int i = 0; i < childCount(); i++) { + categoryItem = qobject_cast(child(i)); + if(!categoryItem) continue; - connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); + if(categoryItem->categoryId() == categoryId) + return categoryItem; } - - emit dataChanged(2); + return 0; } void ChannelBufferItem::addUserToCategory(IrcUser *ircUser) { @@ -451,7 +465,7 @@ void ChannelBufferItem::addUsersToCategory(const QList &ircUsers) { foreach(IrcUser *ircUser, ircUsers) { categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); - categoryItem = qobject_cast(childById(qHash(categoryId))); + categoryItem = findCategoryItem(categoryId); if(!categoryItem) { categoryItem = new UserCategoryItem(categoryId, this); categories[categoryItem] = QList(); @@ -501,11 +515,12 @@ void ChannelBufferItem::userModeChanged(IrcUser *ircUser) { Q_ASSERT(_ircChannel); int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); - UserCategoryItem *categoryItem = qobject_cast(childById(qHash(categoryId))); + UserCategoryItem *categoryItem = findCategoryItem(categoryId); if(categoryItem) { - if(categoryItem->childById(qHash(ircUser))) + if(categoryItem->findIrcUser(ircUser)) { return; // already in the right category; + } } else { categoryItem = new UserCategoryItem(categoryId, this); newChild(categoryItem); @@ -514,8 +529,9 @@ void ChannelBufferItem::userModeChanged(IrcUser *ircUser) { // find the item that needs reparenting IrcUserItem *ircUserItem = 0; for(int i = 0; i < childCount(); i++) { - UserCategoryItem *categoryItem = qobject_cast(child(i)); - IrcUserItem *userItem = qobject_cast(categoryItem->childById(qHash(ircUser))); + UserCategoryItem *oldCategoryItem = qobject_cast(child(i)); + Q_ASSERT(oldCategoryItem); + IrcUserItem *userItem = oldCategoryItem->findIrcUser(ircUser); if(userItem) { ircUserItem = userItem; break; @@ -540,6 +556,8 @@ UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "categoryName", parent), _category(category) { + setTreeItemFlags(AbstractTreeItem::DeleteOnLastChildRemoved); + setObjectName(parent->data(0, Qt::DisplayRole).toString() + "/" + QString::number(category)); } // caching this makes no sense, since we display the user number dynamically @@ -555,8 +573,17 @@ QString UserCategoryItem::categoryName() const { } } -quint64 UserCategoryItem::id() const { - return qHash(_category); +IrcUserItem *UserCategoryItem::findIrcUser(IrcUser *ircUser) { + IrcUserItem *userItem = 0; + + for(int i = 0; i < childCount(); i++) { + userItem = qobject_cast(child(i)); + if(!userItem) + continue; + if(userItem->ircUser() == ircUser) + return userItem; + } + return 0; } void UserCategoryItem::addUsers(const QList &ircUsers) { @@ -568,9 +595,12 @@ void UserCategoryItem::addUsers(const QList &ircUsers) { } bool UserCategoryItem::removeUser(IrcUser *ircUser) { - bool success = removeChildById(qHash(ircUser)); - if(success) + IrcUserItem *userItem = findIrcUser(ircUser); + bool success = (bool)userItem; + if(success) { + removeChild(userItem); emit dataChanged(0); + } return success; } @@ -607,30 +637,14 @@ QVariant UserCategoryItem::data(int column, int role) const { *****************************************/ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "nickName", parent), - _ircUser(ircUser), - _id(qHash(ircUser)) + _ircUser(ircUser) { - // we don't need to handle the ircUser's destroyed signal since it's automatically removed - // by the IrcChannel::ircUserParted(); - + setObjectName(ircUser->nick()); + connect(ircUser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); connect(ircUser, SIGNAL(nickSet(QString)), this, SIGNAL(dataChanged())); connect(ircUser, SIGNAL(awaySet(bool)), this, SIGNAL(dataChanged())); } -QString IrcUserItem::nickName() const { - if(_ircUser) - return _ircUser->nick(); - else - return QString(); -} - -bool IrcUserItem::isActive() const { - if(_ircUser) - return !_ircUser->isAway(); - else - return false; -} - QVariant IrcUserItem::data(int column, int role) const { switch(role) { case NetworkModel::ItemActiveRole: @@ -679,12 +693,22 @@ QString IrcUserItem::toolTip(int column) const { return QString("

%1

").arg(toolTip.join("
")); } +// void IrcUserItem::ircUserDestroyed() { +// parent()->removeChild(this); +// if(parent()->childCount() == 0) +// parent()->parent()->removeChild(parent()); +// } + /***************************************** * NetworkModel *****************************************/ NetworkModel::NetworkModel(QObject *parent) : TreeModel(NetworkModel::defaultHeader(), parent) { + connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), + this, SLOT(checkForNewBuffers(const QModelIndex &, int, int))); + connect(this, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)), + this, SLOT(checkForRemovedBuffers(const QModelIndex &, int, int))); } QListNetworkModel::defaultHeader() { @@ -704,49 +728,78 @@ Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const { } */ +int NetworkModel::networkRow(NetworkId networkId) { + NetworkItem *netItem = 0; + for(int i = 0; i < rootItem->childCount(); i++) { + netItem = qobject_cast(rootItem->child(i)); + if(!netItem) + continue; + if(netItem->networkId() == networkId) + return i; + } + return -1; +} -// experimental stuff :) QModelIndex NetworkModel::networkIndex(NetworkId networkId) { - return indexById(qHash(networkId)); + int netRow = networkRow(networkId); + if(netRow == -1) + return QModelIndex(); + else + return indexByItem(qobject_cast(rootItem->child(netRow))); } -NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) { - return qobject_cast(rootItem->childById(networkId.toInt())); +NetworkItem *NetworkModel::findNetworkItem(NetworkId networkId) { + int netRow = networkRow(networkId); + if(netRow == -1) + return 0; + else + return qobject_cast(rootItem->child(netRow)); } NetworkItem *NetworkModel::networkItem(NetworkId networkId) { - NetworkItem *netItem = existsNetworkItem(networkId); + NetworkItem *netItem = findNetworkItem(networkId); if(netItem == 0) { netItem = new NetworkItem(networkId, rootItem); rootItem->newChild(netItem); } - - Q_ASSERT(netItem); return netItem; } void NetworkModel::networkRemoved(const NetworkId &networkId) { - rootItem->removeChildById(qHash(networkId)); + int netRow = networkRow(networkId); + if(netRow != -1) { + rootItem->removeChild(netRow); + } } QModelIndex NetworkModel::bufferIndex(BufferId bufferId) { - AbstractTreeItem *netItem, *bufferItem; - for(int i = 0; i < rootItem->childCount(); i++) { - netItem = rootItem->child(i); - if((bufferItem = netItem->childById(qHash(bufferId)))) { - return indexByItem(bufferItem); - } - } - return QModelIndex(); + BufferItem *bufferItem = findBufferItem(bufferId); + if(bufferItem) + return indexByItem(bufferItem); + else + return QModelIndex(); } -BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) { - QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId()); - if(bufferIdx.isValid()) - return static_cast(bufferIdx.internalPointer()); - else +BufferItem *NetworkModel::findBufferItem(const BufferInfo &bufferInfo) { + NetworkItem *netItem = findNetworkItem(bufferInfo.networkId()); + if(!netItem) return 0; + + BufferItem *bufferItem = netItem->findBufferItem(bufferInfo); + return bufferItem; +} + +BufferItem *NetworkModel::findBufferItem(BufferId bufferId) { + NetworkItem *netItem; + BufferItem *bufferItem; + + for(int i = 0; i < rootItem->childCount(); i++) { + netItem = qobject_cast(rootItem->child(i)); + if((bufferItem = netItem->findBufferItem(bufferId))) + return bufferItem; + } + return 0; } BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) { @@ -830,13 +883,15 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in // no self merges (would kill us) if(bufferId == parent.data(BufferIdRole).value()) return false; - - Q_ASSERT(rootItem->childById(qHash(netId))); - Q_ASSERT(rootItem->childById(qHash(netId))->childById(qHash(bufferId))); + + NetworkItem *netItem = findNetworkItem(netId); + Q_ASSERT(netItem); + + BufferItem *bufferItem = netItem->findBufferItem(bufferId); + Q_ASSERT(bufferItem); // source must be a query too - BufferInfo::Type sourceType = (BufferInfo::Type)rootItem->childById(qHash(netId))->childById(qHash(bufferId))->data(0, BufferTypeRole).toInt(); - if(sourceType != BufferInfo::QueryBuffer) + if(bufferItem->bufferType() != BufferInfo::QueryBuffer) return false; // TODO: warn user about buffermerge! @@ -858,14 +913,9 @@ void NetworkModel::bufferUpdated(BufferInfo bufferInfo) { } void NetworkModel::removeBuffer(BufferId bufferId) { - const int numNetworks = rootItem->childCount(); - if(numNetworks == 0) - return; - - for(int i = 0; i < numNetworks; i++) { - if(rootItem->child(i)->removeChildById(qHash(bufferId))) - break; - } + BufferItem *bufferItem = findBufferItem(bufferId); + if(bufferItem) + bufferItem->parent()->removeChild(bufferItem); } /* @@ -905,3 +955,59 @@ const Network *NetworkModel::networkByIndex(const QModelIndex &index) const { return Client::network(networkId); } + + +void NetworkModel::checkForRemovedBuffers(const QModelIndex &parent, int start, int end) { + if(parent.data(ItemTypeRole) != NetworkItemType) + return; + + for(int row = start; row <= end; row++) { + _bufferItemCache.remove(parent.child(row, 0).data(BufferIdRole).value()); + } +} + +void NetworkModel::checkForNewBuffers(const QModelIndex &parent, int start, int end) { + if(parent.data(ItemTypeRole) != NetworkItemType) + return; + + for(int row = start; row <= end; row++) { + QModelIndex child = parent.child(row, 0); + _bufferItemCache[child.data(BufferIdRole).value()] = static_cast(child.internalPointer()); + } +} + +QString NetworkModel::bufferName(BufferId bufferId) { + if(!_bufferItemCache.contains(bufferId)) + return QString(); + + return _bufferItemCache[bufferId]->bufferName(); +} + +NetworkId NetworkModel::networkId(BufferId bufferId) { + if(!_bufferItemCache.contains(bufferId)) + return NetworkId(); + + NetworkItem *netItem = qobject_cast(_bufferItemCache[bufferId]->parent()); + if(netItem) + return netItem->networkId(); + else + return NetworkId(); +} + +QString NetworkModel::networkName(BufferId bufferId) { + if(!_bufferItemCache.contains(bufferId)) + return QString(); + + NetworkItem *netItem = qobject_cast(_bufferItemCache[bufferId]->parent()); + if(netItem) + return netItem->networkName(); + else + return QString(); +} + +BufferInfo::Type NetworkModel::bufferType(BufferId bufferId) { + if(!_bufferItemCache.contains(bufferId)) + return BufferInfo::InvalidBuffer; + + return _bufferItemCache[bufferId]->bufferType(); +}