This branch introduces a new sync method which should use less bandwidth and might...

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

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index d09605f..2c2a038 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -27,7 +27,6 @@
 #include "signalproxy.h"
 #include "network.h"
 #include "ircchannel.h"
-#include "ircuser.h"
 
 #include "buffersettings.h"
 
@@ -137,10 +136,8 @@ void BufferItem::attachIrcChannel(IrcChannel *ircChannel) {
   connect(ircChannel, SIGNAL(ircUserModeRemoved(IrcUser *, QString)),
          this, SLOT(userModeChanged(IrcUser *)));
 
-  if(!ircChannel->ircUsers().isEmpty()) {
-    qWarning() << "Channel" << ircChannel->name() << "has already users which is quite surprising :)";
+  if(!ircChannel->ircUsers().isEmpty())
     join(ircChannel->ircUsers());
-  }
   
   emit dataChanged();
 }
@@ -262,16 +259,16 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
     }
   }
 
-  if(!success) {
-    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));
-      categoryItem->dumpChildList();
-    }
-    qDebug() << "==== End Of Childlist for Item:" << this << id() << bufferName() << "====";
-  }
-  Q_ASSERT(success);
+//   if(!success) {
+//     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));
+//       categoryItem->dumpChildList();
+//     }
+//     qDebug() << "==== End Of Childlist for Item:" << this << id() << bufferName() << "====";
+//   }
+//   Q_ASSERT(success);
 }
 
 void BufferItem::userModeChanged(IrcUser *ircUser) {
@@ -570,14 +567,6 @@ bool IrcUserItem::isActive() const {
     return false;
 }
 
-IrcUser *IrcUserItem::ircUser() {
-  return _ircUser;
-}
-
-quint64 IrcUserItem::id() const {
-  return _id;
-}
-
 QVariant IrcUserItem::data(int column, int role) const {
   switch(role) {
   case NetworkModel::ItemActiveRole: