Revert "this should hopefully fix the dreaded BR #140 (sync to core hangs)" (no longe...

This reverts commit 3439fc6d10d49edb1af23fd2f4ebb688692475d7.

diff --git a/src/common/network.cpp b/src/common/network.cpp
index ead100d..bab066b 100644 (file)
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -208,7 +208,6 @@ void Network::ircUserDestroyed() {
   QHash<QString, IrcUser *>::iterator ircUserIter = _ircUsers.begin();
   while(ircUserIter != _ircUsers.end()) {
     if(ircUser == *ircUserIter) {
   QHash<QString, IrcUser *>::iterator ircUserIter = _ircUsers.begin();
   while(ircUserIter != _ircUsers.end()) {
     if(ircUser == *ircUserIter) {

-      emit deletedIrcUserRemoved(ircUserIter.key());

       ircUserIter = _ircUsers.erase(ircUserIter);
       break;
     }
       ircUserIter = _ircUsers.erase(ircUserIter);
       break;
     }


@@ -216,30 +215,6 @@ void Network::ircUserDestroyed() {
   }
 }
 
   }
 }
 

-void Network::removeDeletedIrcUser(const QString &username) {
-  // DO NOT CALL THIS SLOT EVER!!!
-  
-  // this slots purpose is only to remove deleted users that haven't been synced yet.
-  // Reason:
-  // as a user parting a channel results in it's deletion if it is no longer in any known channel
-  // this action can only be communicated if the slaves are allready in sync.
-  // so if such a deleted user isn't synced in slave mode, we kill and remove it.
-
-  Q_ASSERT(proxy());
-
-  if(!_ircUsers.contains(username))
-    return;
-
-  IrcUser *ircUser = _ircUsers[username];
-
-  if(ircUser->isInitialized())
-    return;
-
-  _ircUsers.remove(username);
-  emit ircUserRemoved(username);
-  emit ircUserRemoved(ircUser);
-}
-

 void Network::removeIrcUser(IrcUser *ircuser) {
   QString nick = _ircUsers.key(ircuser);
   if(nick.isNull())
 void Network::removeIrcUser(IrcUser *ircuser) {
   QString nick = _ircUsers.key(ircuser);
   if(nick.isNull())

diff --git a/src/common/network.h b/src/common/network.h
index e2c5ec8..2ff0a36 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -204,7 +204,6 @@ public slots:
 
   inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); }
   inline void addIrcChannel(const QString &channel) { newIrcChannel(channel); }
 
   inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); }
   inline void addIrcChannel(const QString &channel) { newIrcChannel(channel); }

-  void removeDeletedIrcUser(const QString &username);

   void removeIrcUser(const QString &nick);
   void removeIrcChannel(const QString &channel);
 
   void removeIrcUser(const QString &nick);
   void removeIrcChannel(const QString &channel);
 


@@ -277,7 +276,6 @@ signals:
   void ircChannelAdded(const QString &channelname);
   void ircChannelAdded(IrcChannel *);
 
   void ircChannelAdded(const QString &channelname);
   void ircChannelAdded(IrcChannel *);
 

-  void deletedIrcUserRemoved(const QString &username);

   void ircUserRemoved(const QString &nick);
   void ircChannelRemoved(const QString &channel);
 
   void ircUserRemoved(const QString &nick);
   void ircChannelRemoved(const QString &channel);