}
quint64 BufferItem::id() const {
- return bufferInfo().bufferId().toInt();
+ return qHash(bufferInfo().bufferId());
}
bool BufferItem::isStatusBuffer() const {
return QString();
}
+void BufferItem::ircUserDestroyed() {
+ // PRIVATE
+ IrcUser *ircUser = static_cast<IrcUser *>(sender());
+ removeUserFromCategory(ircUser);
+ emit dataChanged(2);
+}
+
int BufferItem::nickCount() const {
if(_ircChannel)
return _ircChannel->ircUsers().count();
return;
addUserToCategory(ircUser);
+ connect(ircUser, SIGNAL(destroyed()),
+ this, SLOT(ircUserDestroyed()));
emit dataChanged(2);
}
return;
}
+ disconnect(ircUser, 0, this, 0);
removeUserFromCategory(ircUser);
emit dataChanged(2);
}
}
bool BufferItem::setLastSeen() {
+ if(_lastSeen > _lastMsgInsert)
+ return false;
+
_lastSeen = _lastMsgInsert;
BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
return true;
}
quint64 NetworkItem::id() const {
- return _networkId.toInt();
+ return qHash(_networkId);
}
void NetworkItem::setActive(bool connected) {
*****************************************/
IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
: PropertyMapItem(QStringList() << "nickName", parent),
- _ircUser(ircUser)
+ _ircUser(ircUser),
+ _id(qHash(ircUser))
{
// we don't need to handle the ircUser's destroyed signal since it's automatically removed
// by the IrcChannel::ircUserParted();
}
QString IrcUserItem::nickName() const {
- return _ircUser->nick();
+ if(_ircUser)
+ return _ircUser->nick();
+ else
+ return QString();
+}
+
+bool IrcUserItem::isActive() const {
+ if(_ircUser)
+ return !_ircUser->isAway();
+ else
+ return false;
}
IrcUser *IrcUserItem::ircUser() {
}
quint64 IrcUserItem::id() const {
- return (quint64)_ircUser;
+ return _id;
}
QVariant IrcUserItem::data(int column, int role) const {
switch(role) {
case NetworkModel::ItemActiveRole:
- return !_ircUser->isAway();
+ return isActive();
case NetworkModel::ItemTypeRole:
return NetworkModel::IrcUserItemType;
case NetworkModel::BufferIdRole:
level |= BufferItem::NewMessage;
const Network *net = Client::network(msg.bufferInfo().networkId());
- if(net && msg.text().contains(net->myNick()))
+ if(net && (msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && msg.text().contains(net->myNick()))
level |= BufferItem::Highlight;
bufferItem(msg.bufferInfo())->updateActivity(level);