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

[quassel.git] / src / common / network.h

diff --git a/src/common/network.h b/src/common/network.h
index 9704646..2ff0a36 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -204,21 +204,22 @@ public slots:
 
   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);
 
   //init geters
   QVariantMap initSupports() const;
   inline QVariantList initServerList() const { return serverList(); }
-  QStringList initIrcUsers() const;
-  QStringList initIrcChannels() const;
+  virtual QVariantMap initIrcUsersAndChannels() const;
+//   QStringList initIrcUsers() const;
+//   QStringList initIrcChannels() const;
   
   //init seters
   void initSetSupports(const QVariantMap &supports);
   inline void initSetServerList(const QVariantList &serverList) { setServerList(serverList); }
-  void initSetIrcUsers(const QStringList &hostmasks);
-  void initSetIrcChannels(const QStringList &channels);
+  virtual void initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels);
+//   void initSetIrcUsers(const QStringList &hostmasks);
+//   void initSetIrcChannels(const QStringList &channels);
   
   IrcUser *updateNickFromMask(const QString &mask);
 
@@ -275,7 +276,6 @@ signals:
   void ircChannelAdded(const QString &channelname);
   void ircChannelAdded(IrcChannel *);
 
-  void deletedIrcUserRemoved(const QString &username);
   void ircUserRemoved(const QString &nick);
   void ircChannelRemoved(const QString &channel);