X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=b86b51e7a1244a8e99cdccf117f91a0b5acee742;hp=25b02bc7bd9f1208a7eda2a262743e83d969a843;hb=c8a1817d1843e987794f95f66ef2da93fa75286f;hpb=c85f07cd06593a778046d30809480c9db49c4802

diff --git a/src/common/network.h b/src/common/network.h
index 25b02bc7..b86b51e7 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -138,7 +138,8 @@ public slots:
   void removeSupport(const QString &param);
 
   inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); }
-  void removeIrcUser(QString nick);
+  void removeIrcUser(const QString &nick);
+  void removeIrcChannel(const QString &channel);
   
   //init geters
   QVariantMap initSupports() const;
@@ -164,9 +165,10 @@ public slots:
   void emitConnectionError(const QString &);
 
 private slots:
-  void ircUserDestroyed();
   void channelDestroyed();
   void removeIrcUser(IrcUser *ircuser);
+  void removeIrcChannel(IrcChannel *ircChannel);
+  void removeChansAndUsers();
   void ircUserInitDone();
   void ircChannelInitDone();
 
@@ -194,6 +196,7 @@ signals:
   void ircChannelAdded(IrcChannel *);
 
   void ircUserRemoved(const QString &nick);
+  void ircChannelRemoved(const QString &channel);
 
   // needed for client sync progress
   void ircUserRemoved(QObject *);
@@ -239,9 +242,25 @@ struct NetworkInfo {
   NetworkId networkId;
   QString networkName;
   IdentityId identity;
+
+  bool useCustomEncodings;
   QByteArray codecForEncoding;
   QByteArray codecForDecoding;
+
+  // Server entry: QString "Host", uint "Port", QString "Password", bool "UseSSL"
   QVariantList serverList;
+  bool useRandomServer;
+
+  QStringList perform;
+
+  bool useAutoIdentify;
+  QString autoIdentifyService;
+  QString autoIdentifyPassword;
+
+  bool useAutoReconnect;
+  quint32 autoReconnectInterval;
+  qint16 autoReconnectRetries;  // -1 => Unlimited
+  bool rejoinChannels;
 
   bool operator==(const NetworkInfo &other) const;
   bool operator!=(const NetworkInfo &other) const;