X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=84e86998fcb8f60d47cb1554ce5374e1ee7fe25c;hp=4bbd984bc4b833a4d82c4df34626784ce93efccf;hb=a5dfcc8ecf8b81025d24b3c5c816169e3e030ea4;hpb=3c635083917c68f15c10ec56c4a6a9d01a2593f9

diff --git a/src/common/network.h b/src/common/network.h
index 4bbd984b..84e86998 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -88,6 +88,19 @@ public:
     D_CHANMODE = 0x08
   };
 
+  struct Server {
+    QString host;
+    uint port;
+    QString password;
+    bool useSsl;
+    Server() : port(0), useSsl(false) {}
+    Server(const QString &host, uint port, const QString &password, bool useSsl)
+      : host(host), port(port), password(password), useSsl(useSsl) {}
+
+    static Server fromVariant(const QVariant &variant);
+    QVariant toVariant() const;
+  };
+  typedef QList<Server> ServerList;
 
   Network(const NetworkId &networkid, QObject *parent = 0);
   ~Network();
@@ -122,7 +135,8 @@ public:
   inline IdentityId identity() const { return _identity; }
   QStringList nicks() const;
   inline QStringList channels() const { return _ircChannels.keys(); }
-  inline const QVariantList &serverList() const { return _serverList; }
+  inline const ServerList &serverList() const { return _serverList; }
+  QVariantList variantServerList() const;
   inline bool useRandomServer() const { return _useRandomServer; }
   inline const QStringList &perform() const { return _perform; }
   inline bool useAutoIdentify() const { return _useAutoIdentify; }
@@ -143,14 +157,14 @@ public:
   bool supports(const QString &param) const { return _supports.contains(param); }
   QString support(const QString &param) const;
 
-  IrcUser *newIrcUser(const QString &hostmask);
+  IrcUser *newIrcUser(const QString &hostmask, const QVariantMap &initData = QVariantMap());
   inline IrcUser *newIrcUser(const QByteArray &hostmask) { return newIrcUser(decodeServerString(hostmask)); }
   IrcUser *ircUser(QString nickname) const;
   inline IrcUser *ircUser(const QByteArray &nickname) const { return ircUser(decodeServerString(nickname)); }
   inline QList<IrcUser *> ircUsers() const { return _ircUsers.values(); }
   inline quint32 ircUserCount() const { return _ircUsers.count(); }
 
-  IrcChannel *newIrcChannel(const QString &channelname);
+  IrcChannel *newIrcChannel(const QString &channelname, const QVariantMap &initData = QVariantMap());
   inline IrcChannel *newIrcChannel(const QByteArray &channelname) { return newIrcChannel(decodeServerString(channelname)); }
   IrcChannel *ircChannel(QString channelname) const;
   inline IrcChannel *ircChannel(const QByteArray &channelname) const { return ircChannel(decodeServerString(channelname)); }
@@ -176,16 +190,15 @@ public:
   static void setDefaultCodecForEncoding(const QByteArray &name);
   static void setDefaultCodecForDecoding(const QByteArray &name);
 
-  bool autoAwayActive() const { return _autoAwayActive; }
-  void setAutoAwayActive(bool active) { _autoAwayActive = active; }
+  inline bool autoAwayActive() const { return _autoAwayActive; }
+  inline void setAutoAwayActive(bool active) { _autoAwayActive = active; }
 
 public slots:
   void setNetworkName(const QString &networkName);
   void setCurrentServer(const QString &currentServer);
   void setConnected(bool isConnected);
-  //void setConnectionState(Network::ConnectionState state);
   void setConnectionState(int state);
-  void setMyNick(const QString &mynick);
+  virtual void setMyNick(const QString &mynick);
   void setLatency(int latency);
   void setIdentity(IdentityId);
 
@@ -195,9 +208,9 @@ public slots:
   void setUseAutoIdentify(bool);
   void setAutoIdentifyService(const QString &);
   void setAutoIdentifyPassword(const QString &);
-  void setUseAutoReconnect(bool);
-  void setAutoReconnectInterval(quint32);
-  void setAutoReconnectRetries(quint16);
+  virtual void setUseAutoReconnect(bool);
+  virtual void setAutoReconnectInterval(quint32);
+  virtual void setAutoReconnectRetries(quint16);
   void setUnlimitedReconnectRetries(bool);
   void setRejoinChannels(bool);
 
@@ -210,22 +223,16 @@ public slots:
 
   inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); }
   inline void addIrcChannel(const QString &channel) { newIrcChannel(channel); }
-  void removeIrcUser(const QString &nick);
-  void removeIrcChannel(const QString &channel);
 
   //init geters
   QVariantMap initSupports() const;
-  inline QVariantList initServerList() const { return serverList(); }
+  inline QVariantList initServerList() const { return variantServerList(); }
   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 initSetServerList(const QVariantList &serverList);
   virtual void initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels);
-//   void initSetIrcUsers(const QStringList &hostmasks);
-//   void initSetIrcChannels(const QStringList &channels);
 
   IrcUser *updateNickFromMask(const QString &mask);
 
@@ -240,13 +247,9 @@ 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();
 
 signals:
   void aboutToBeDestroyed();
@@ -284,20 +287,13 @@ signals:
   void ircChannelAdded(const QString &channelname);
   void ircChannelAdded(IrcChannel *);
 
-  void ircUserRemoved(const QString &nick);
-  void ircChannelRemoved(const QString &channel);
-
-  // needed for client sync progress
-  void ircUserRemoved(QObject *);
-  void ircChannelRemoved(QObject *);
-
-  void ircUserInitDone(IrcUser *);
-  void ircChannelInitDone(IrcChannel *);
-
-  void connectRequested(NetworkId id = 0) const;
-  void disconnectRequested(NetworkId id = 0) const;
+  void connectRequested() const;
+  void disconnectRequested() const;
   void setNetworkInfoRequested(const NetworkInfo &) const;
 
+protected:
+  inline virtual IrcChannel *ircChannelFactory(const QString &channelname) { return new IrcChannel(channelname, this); }
+
 private:
   QPointer<SignalProxy> _proxy;
 
@@ -318,7 +314,7 @@ private:
   QHash<QString, IrcChannel *> _ircChannels; // stores all known channels
   QHash<QString, QString> _supports;  // stores results from RPL_ISUPPORT
 
-  QVariantList _serverList;
+  ServerList _serverList;
   bool _useRandomServer;
   QStringList _perform;
 
@@ -343,6 +339,9 @@ private:
   static QTextCodec *_defaultCodecForDecoding;
 
   bool _autoAwayActive; // when this is active handle305 and handle306 don't trigger any output
+
+  friend class IrcUser;
+  friend class IrcChannel;
 };
 
 //! Stores all editable information about a network (as opposed to runtime state).