X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=4f4603dd9c3c5df61f868a859afe632c7f3cef8b;hp=e3739ae617e835e67541c6142e5f168a1e51c88d;hb=9d4fbba1e7390f7cbc60aed962bf9d36ac111263;hpb=d28b9ec38b6ea0bc473200fc2f1e65abd1b56bd6 diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index e3739ae6..4f4603dd 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -59,7 +59,7 @@ const BufferInfo &BufferItem::bufferInfo() const { } quint64 BufferItem::id() const { - return bufferInfo().uid(); + return bufferInfo().uid().toInt(); } bool BufferItem::isStatusBuffer() const { @@ -94,9 +94,11 @@ QVariant BufferItem::data(int column, int role) const { case NetworkModel::ItemTypeRole: return NetworkModel::BufferItemType; case NetworkModel::BufferIdRole: - return bufferInfo().uid(); + return qVariantFromValue(bufferInfo().uid()); case NetworkModel::NetworkIdRole: - return bufferInfo().networkId(); + return qVariantFromValue(bufferInfo().networkId()); + case NetworkModel::BufferInfoRole: + return qVariantFromValue(bufferInfo()); case NetworkModel::BufferTypeRole: return int(bufferType()); case NetworkModel::ItemActiveRole: @@ -132,10 +134,7 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) { void BufferItem::ircChannelDestroyed() { emit dataChanged(); - for(int i = 0; i < childCount(); i++) { - emit childDestroyed(i); - removeChild(i); - } + removeAllChilds(); } QString BufferItem::bufferName() const { @@ -174,35 +173,60 @@ void BufferItem::join(IrcUser *ircUser) { void BufferItem::addUserToCategory(IrcUser *ircUser) { Q_ASSERT(_ircChannel); - + UserCategoryItem *categoryItem; int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); if(!(categoryItem = qobject_cast(childById(qHash(categoryId))))) { categoryItem = new UserCategoryItem(categoryId, this); - emit newChild(categoryItem); + newChild(categoryItem); } - categoryItem->addUser(ircUser); + + int totalusers = 0; + for(int i = 0; i < childCount(); i++) { + totalusers += child(i)->childCount(); + } } void BufferItem::part(IrcUser *ircUser) { - Q_UNUSED(ircUser); + if(!ircUser) { + qWarning() << bufferName() << "BufferItem::part(): unknown User" << ircUser; + return; + } + + removeUserFromCategory(ircUser); emit dataChanged(2); } void BufferItem::removeUserFromCategory(IrcUser *ircUser) { + Q_ASSERT(_ircChannel); + + bool success = false; UserCategoryItem *categoryItem = 0; - IrcUserItem *userItem; for(int i = 0; i < childCount(); i++) { categoryItem = qobject_cast(child(i)); - if((userItem = qobject_cast(categoryItem->childById((quint64)ircUser)))) { - userItem->deleteLater(); - return; + if(success = categoryItem->removeChildById((quint64)ircUser)) { + if(categoryItem->childCount() == 0) + removeChild(i); + break; } } + Q_ASSERT(success); + + int totalusers = 0; + for(int i = 0; i < childCount(); i++) { + totalusers += child(i)->childCount(); + } } void BufferItem::userModeChanged(IrcUser *ircUser) { + Q_ASSERT(_ircChannel); + + UserCategoryItem *categoryItem; + int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser)); + if((categoryItem = qobject_cast(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser))) + return; // already in the right category; + removeUserFromCategory(ircUser); addUserToCategory(ircUser); } @@ -220,7 +244,7 @@ NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent) QVariant NetworkItem::data(int column, int role) const { switch(role) { case NetworkModel::NetworkIdRole: - return _networkId; + return qVariantFromValue(_networkId); case NetworkModel::ItemTypeRole: return NetworkModel::NetworkItemType; case NetworkModel::ItemActiveRole: @@ -231,7 +255,7 @@ QVariant NetworkItem::data(int column, int role) const { } quint64 NetworkItem::id() const { - return _networkId; + return _networkId.toInt(); } bool NetworkItem::isActive() const { @@ -308,19 +332,18 @@ void NetworkItem::setCurrentServer(const QString &serverName) { *****************************************/ // we hardcode this even though we have PREFIX in network... but that wouldn't help with mapping modes to // category strings anyway. -const QList UserCategoryItem::categories = QList() << UserCategoryItem::Category('q', "Owners") - << UserCategoryItem::Category('a', "Admins") - << UserCategoryItem::Category('a', "Admins") - << UserCategoryItem::Category('o', "Operators") - << UserCategoryItem::Category('h', "Half-Ops") - << UserCategoryItem::Category('v', "Voiced"); +const QList UserCategoryItem::categories = QList() + << UserCategoryItem::Category('q', "Owners") + << UserCategoryItem::Category('a', "Admins") + << UserCategoryItem::Category('a', "Admins") + << UserCategoryItem::Category('o', "Operators") + << UserCategoryItem::Category('h', "Half-Ops") + << UserCategoryItem::Category('v', "Voiced"); UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "categoryId", parent), _category(category) { - connect(this, SIGNAL(childDestroyed(int)), - this, SLOT(checkNoChilds())); } QString UserCategoryItem::categoryId() { @@ -330,17 +353,12 @@ QString UserCategoryItem::categoryId() { return QString("Users"); } -void UserCategoryItem::checkNoChilds() { - if(childCount() == 0) - deleteLater(); -} - quint64 UserCategoryItem::id() const { return qHash(_category); } void UserCategoryItem::addUser(IrcUser *ircUser) { - emit newChild(new IrcUserItem(ircUser, this)); + newChild(new IrcUserItem(ircUser, this)); } int UserCategoryItem::categoryFromModes(const QString &modes) { @@ -358,14 +376,14 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent) : PropertyMapItem(QStringList() << "nickName", parent), _ircUser(ircUser) { - connect(ircUser, SIGNAL(destroyed()), - this, SLOT(ircUserDestroyed())); + // we don't need to handle the ircUser's destroyed signal since it's automatically removed + // by the IrcChannel::ircUserParted(); connect(ircUser, SIGNAL(nickSet(QString)), this, SLOT(setNick(QString))); } -QString IrcUserItem::nickName() { +QString IrcUserItem::nickName() const { return _ircUser->nick(); } @@ -377,13 +395,17 @@ quint64 IrcUserItem::id() const { return (quint64)_ircUser; } +QVariant IrcUserItem::data(int column, int role) const { + if(role != Qt::ToolTipRole) + return PropertyMapItem::data(column, role); + + return "

" + nickName() + "
" + _ircUser->hostmask() + "

"; +} + void IrcUserItem::setNick(QString newNick) { Q_UNUSED(newNick); emit dataChanged(0); } -void IrcUserItem::ircUserDestroyed() { - deleteLater(); -} /***************************************** * NetworkModel @@ -413,11 +435,11 @@ Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const { // experimental stuff :) QModelIndex NetworkModel::networkIndex(NetworkId networkId) { - return indexById(networkId); + return indexById(networkId.toInt()); } NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) { - return qobject_cast(rootItem->childById(networkId)); + return qobject_cast(rootItem->childById(networkId.toInt())); } NetworkItem *NetworkModel::networkItem(NetworkId networkId) { @@ -425,7 +447,7 @@ NetworkItem *NetworkModel::networkItem(NetworkId networkId) { if(netItem == 0) { netItem = new NetworkItem(networkId, rootItem); - appendChild(rootItem, netItem); + rootItem->newChild(netItem); } Q_ASSERT(netItem); @@ -436,7 +458,7 @@ QModelIndex NetworkModel::bufferIndex(BufferId bufferId) { AbstractTreeItem *netItem, *bufferItem; for(int i = 0; i < rootItem->childCount(); i++) { netItem = rootItem->child(i); - if((bufferItem = netItem->childById(bufferId))) { + if((bufferItem = netItem->childById(bufferId.toInt()))) { return indexById(bufferItem->id(), networkIndex(netItem->id())); } } @@ -456,7 +478,7 @@ BufferItem *NetworkModel::bufferItem(const BufferInfo &bufferInfo) { if(bufItem == 0) { NetworkItem *netItem = networkItem(bufferInfo.networkId()); bufItem = new BufferItem(bufferInfo, netItem); - appendChild(netItem, bufItem); + netItem->newChild(bufItem); } Q_ASSERT(bufItem); @@ -502,8 +524,8 @@ QMimeData *NetworkModel::mimeData(const QModelIndexList &indexes) const { QStringList bufferlist; QString netid, uid, bufferid; foreach(QModelIndex index, indexes) { - netid = QString::number(index.data(NetworkIdRole).value()); - uid = QString::number(index.data(BufferIdRole).value()); + netid = QString::number(index.data(NetworkIdRole).value().toInt()); + uid = QString::number(index.data(BufferIdRole).value().toInt()); bufferid = QString("%1:%2").arg(netid).arg(uid); if(!bufferlist.contains(bufferid)) bufferlist << bufferid; @@ -540,11 +562,11 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in if(bufferId == parent.data(BufferIdRole).value()) return false; - Q_ASSERT(rootItem->childById(netId)); - Q_ASSERT(rootItem->childById(netId)->childById(bufferId)); + Q_ASSERT(rootItem->childById(netId.toInt())); + Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt())); // source must be a query too - BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId)->childById(bufferId)->data(0, BufferTypeRole).toInt(); + BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId.toInt())->childById(bufferId.toInt())->data(0, BufferTypeRole).toInt(); if(sourceType != BufferItem::QueryType) return false;