The Networksettings are now stored purely in the Database.

[quassel.git] / src / client / networkmodel.cpp

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 61b269f..755a2c6 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -60,7 +60,7 @@ const BufferInfo &BufferItem::bufferInfo() const {
 }
 
 quint64 BufferItem::id() const {
-  return bufferInfo().bufferId().toInt();
+  return qHash(bufferInfo().bufferId());
 }
 
 bool BufferItem::isStatusBuffer() const {
@@ -179,6 +179,13 @@ QString BufferItem::topic() 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();
@@ -196,6 +203,8 @@ void BufferItem::join(IrcUser *ircUser) {
     return;
 
   addUserToCategory(ircUser);
+  connect(ircUser, SIGNAL(destroyed()),
+         this, SLOT(ircUserDestroyed()));
   emit dataChanged(2);
 }
 
@@ -222,6 +231,7 @@ void BufferItem::part(IrcUser *ircUser) {
     return;
   }
 
+  disconnect(ircUser, 0, this, 0);
   removeUserFromCategory(ircUser);
   emit dataChanged(2);
 }
@@ -241,7 +251,7 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
   }
 
   if(!success) {
-    qDebug() << "didn't find User:" << ircUser << (quint64)ircUser;
+    qDebug() << "didn't find User:" << ircUser << qHash(ircUser);
     qDebug() << "==== Childlist for Item:" << this << id() << bufferName() << "====";
     for(int i = 0; i < childCount(); i++) {
       categoryItem = qobject_cast<UserCategoryItem *>(child(i));
@@ -262,7 +272,7 @@ void BufferItem::userModeChanged(IrcUser *ircUser) {
 
   UserCategoryItem *categoryItem;
   int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
+  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser)))
     return; // already in the right category;
   
   removeUserFromCategory(ircUser);
@@ -275,6 +285,9 @@ void BufferItem::setLastMsgInsert(QDateTime msgDate) {
 }
 
 bool BufferItem::setLastSeen() {
+  if(_lastSeen > _lastMsgInsert)
+    return false;
+  
   _lastSeen = _lastMsgInsert;
   BufferSettings(bufferInfo().bufferId()).setLastSeen(_lastSeen);
   return true;
@@ -308,7 +321,7 @@ QVariant NetworkItem::data(int column, int role) const {
 }
 
 quint64 NetworkItem::id() const {
-  return _networkId.toInt();
+  return qHash(_networkId);
 }
 
 void NetworkItem::setActive(bool connected) {
@@ -426,7 +439,7 @@ void UserCategoryItem::addUser(IrcUser *ircUser) {
 }
 
 bool UserCategoryItem::removeUser(IrcUser *ircUser) {
-  return removeChildById((quint64)ircUser);
+  return removeChildById(qHash(ircUser));
 }
 
 int UserCategoryItem::categoryFromModes(const QString &modes) {
@@ -460,7 +473,8 @@ QVariant UserCategoryItem::data(int column, int role) const {
 *****************************************/
 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();
@@ -470,7 +484,17 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
 }
 
 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() {
@@ -478,13 +502,13 @@ 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:
@@ -568,7 +592,7 @@ Buffer *NetworkModel::getBufferByIndex(const QModelIndex &index) const {
 
 // experimental stuff :)
 QModelIndex NetworkModel::networkIndex(NetworkId networkId) {
-  return indexById(networkId.toInt());
+  return indexById(qHash(networkId));
 }
 
 NetworkItem *NetworkModel::existsNetworkItem(NetworkId networkId) {
@@ -587,12 +611,16 @@ NetworkItem *NetworkModel::networkItem(NetworkId networkId) {
   return netItem;
 }
 
+void NetworkModel::networkRemoved(const NetworkId &networkId) {
+  rootItem->removeChildById(qHash(networkId));
+}
+
 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.toInt()))) {
-      return indexById(bufferItem->id(), networkIndex(netItem->id()));
+    if((bufferItem = netItem->childById(qHash(bufferId)))) {
+      return indexByItem(bufferItem);
     }
   }
   return QModelIndex();
@@ -695,11 +723,11 @@ bool NetworkModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
   if(bufferId == parent.data(BufferIdRole).value<BufferId>())
     return false; 
   
-  Q_ASSERT(rootItem->childById(netId.toInt()));
-  Q_ASSERT(rootItem->childById(netId.toInt())->childById(bufferId.toInt()));
+  Q_ASSERT(rootItem->childById(qHash(netId)));
+  Q_ASSERT(rootItem->childById(qHash(netId))->childById(qHash(bufferId)));
 
   // source must be a query too
-  BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(netId.toInt())->childById(bufferId.toInt())->data(0, BufferTypeRole).toInt();
+  BufferItem::Type sourceType = (BufferItem::Type)rootItem->childById(qHash(netId))->childById(qHash(bufferId))->data(0, BufferTypeRole).toInt();
   if(sourceType != BufferItem::QueryType)
     return false;
     
@@ -734,9 +762,8 @@ void NetworkModel::updateBufferActivity(const Message &msg) {
   if(msg.type() == Message::Plain || msg.type() == Message::Notice)
     level |= BufferItem::NewMessage;
 
-  const Network *net = Client::network(msg.bufferInfo().networkId());
-  if(net && msg.text().contains(net->myNick()))
-    level |= BufferItem::Highlight;
+  if(msg.flags() & Message::Highlight) 
+      level |= BufferItem::Highlight;
 
   bufferItem(msg.bufferInfo())->updateActivity(level);
 }
@@ -749,3 +776,4 @@ const Network *NetworkModel::networkByIndex(const QModelIndex &index) const {
   NetworkId networkId = netVariant.value<NetworkId>();
   return Client::network(networkId);
 }
+