case NetworkModel::ItemTypeRole:
return NetworkModel::BufferItemType;
case NetworkModel::BufferIdRole:
- return QVariant::fromValue<BufferId>(bufferInfo().uid());
+ return qVariantFromValue(bufferInfo().uid());
case NetworkModel::NetworkIdRole:
- return QVariant::fromValue<NetworkId>(bufferInfo().networkId());
+ return qVariantFromValue(bufferInfo().networkId());
+ case NetworkModel::BufferInfoRole:
+ return qVariantFromValue(bufferInfo());
case NetworkModel::BufferTypeRole:
return int(bufferType());
case NetworkModel::ItemActiveRole:
void BufferItem::ircChannelDestroyed() {
emit dataChanged();
- for(int i = 0; i < childCount(); i++) {
- emit childDestroyed(i);
- removeChild(i);
- }
+ removeAllChilds();
}
QString BufferItem::bufferName() const {
void BufferItem::addUserToCategory(IrcUser *ircUser) {
Q_ASSERT(_ircChannel);
-
+
UserCategoryItem *categoryItem;
int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
if(!(categoryItem = qobject_cast<UserCategoryItem *>(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<UserCategoryItem *>(child(i));
- if((userItem = qobject_cast<IrcUserItem *>(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<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
+ return; // already in the right category;
+
removeUserFromCategory(ircUser);
addUserToCategory(ircUser);
}
QVariant NetworkItem::data(int column, int role) const {
switch(role) {
case NetworkModel::NetworkIdRole:
- return QVariant::fromValue<NetworkId>(_networkId);
+ return qVariantFromValue(_networkId);
case NetworkModel::ItemTypeRole:
return NetworkModel::NetworkItemType;
case NetworkModel::ItemActiveRole:
*****************************************/
// 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::Category> UserCategoryItem::categories = QList<UserCategoryItem::Category>() << 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::Category> UserCategoryItem::categories = QList<UserCategoryItem::Category>()
+ << 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() {
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) {
}
return categories.count();
}
+
+QVariant UserCategoryItem::data(int column, int role) const {
+ switch(role) {
+ case NetworkModel::ItemTypeRole:
+ return NetworkModel::UserCategoryItemType;
+ case NetworkModel::BufferIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::NetworkIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::BufferInfoRole:
+ return parent()->data(column, role);
+ default:
+ return PropertyMapItem::data(column, role);
+ }
+}
+
/*****************************************
* Irc User Items
: 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();
}
return (quint64)_ircUser;
}
+QVariant IrcUserItem::data(int column, int role) const {
+ switch(role) {
+ case NetworkModel::ItemTypeRole:
+ return NetworkModel::IrcUserItemType;
+ case NetworkModel::BufferIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::NetworkIdRole:
+ return parent()->data(column, role);
+ case NetworkModel::BufferInfoRole:
+ return parent()->data(column, role);
+ default:
+ return PropertyMapItem::data(column, role);
+ }
+}
+
+QString IrcUserItem::toolTip(int column) const {
+ Q_UNUSED(column);
+ return "<p><b>" + nickName() + "</b><br />" + _ircUser->hostmask() + "</p>";
+}
+
void IrcUserItem::setNick(QString newNick) {
Q_UNUSED(newNick);
emit dataChanged(0);
}
-void IrcUserItem::ircUserDestroyed() {
- deleteLater();
-}
/*****************************************
* NetworkModel
if(netItem == 0) {
netItem = new NetworkItem(networkId, rootItem);
- appendChild(rootItem, netItem);
+ rootItem->newChild(netItem);
}
Q_ASSERT(netItem);
if(bufItem == 0) {
NetworkItem *netItem = networkItem(bufferInfo.networkId());
bufItem = new BufferItem(bufferInfo, netItem);
- appendChild(netItem, bufItem);
+ netItem->newChild(bufItem);
}
Q_ASSERT(bufItem);