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::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);
}
-
categoryItem->addUser(ircUser);
}
void BufferItem::part(IrcUser *ircUser) {
- Q_UNUSED(ircUser);
+ if(!ircUser)
+ return;
+
+ removeUserFromCategory(ircUser);
emit dataChanged(2);
}
void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
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;
- }
+ categoryItem->removeChildById((quint64)ircUser);
+ if(categoryItem->childCount() == 0)
+ removeChild(i);
}
}
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:
: 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);
}
emit dataChanged(0);
}
void IrcUserItem::ircUserDestroyed() {
- deleteLater();
+ parent()->removeChildById(id());
+ // deleteLater();
}
/*****************************************