Properly register the Network::ConnectionState enum

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

diff --git a/src/common/network.h b/src/common/network.h
index 4e4d60d..6b126d8 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -47,7 +47,7 @@ struct NetworkInfo;
 class Network : public SyncableObject {
   SYNCABLE_OBJECT
   Q_OBJECT
-  Q_ENUMS(ConnectionState Network::ConnectionState)
+  Q_ENUMS(ConnectionState)
 
   Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName STORED false)
   Q_PROPERTY(QString currentServer READ currentServer WRITE setCurrentServer STORED false)
@@ -112,7 +112,7 @@ public:
     Server() : port(6667), useSsl(false), sslVersion(0), useProxy(false), proxyType(QNetworkProxy::Socks5Proxy), proxyHost("localhost"), proxyPort(8080) {}
     Server(const QString &host, uint port, const QString &password, bool useSsl)
       : host(host), port(port), password(password), useSsl(useSsl), sslVersion(0),
-       useProxy(false), proxyType(QNetworkProxy::Socks5Proxy), proxyHost("localhost"), proxyPort(8080) {}
+        useProxy(false), proxyType(QNetworkProxy::Socks5Proxy), proxyHost("localhost"), proxyPort(8080) {}
     bool operator==(const Server &other) const;
     bool operator!=(const Server &other) const;
   };
@@ -135,10 +135,10 @@ public:
   //Network::ConnectionState connectionState() const;
   inline int connectionState() const { return _connectionState; }
 
-  QString prefixToMode(const QString &prefix);
-  inline QString prefixToMode(const QCharRef &prefix) { return prefixToMode(QString(prefix)); }
-  QString modeToPrefix(const QString &mode);
-  inline QString modeToPrefix(const QCharRef &mode) { return modeToPrefix(QString(mode)); }
+  QString prefixToMode(const QString &prefix) const;
+  inline QString prefixToMode(const QCharRef &prefix) const { return prefixToMode(QString(prefix)); }
+  QString modeToPrefix(const QString &mode) const;
+  inline QString modeToPrefix(const QCharRef &mode) const { return modeToPrefix(QString(mode)); }
 
   ChannelModeType channelModeType(const QString &mode);
   inline ChannelModeType channelModeType(const QCharRef &mode) { return channelModeType(QString(mode)); }
@@ -169,8 +169,9 @@ public:
   NetworkInfo networkInfo() const;
   void setNetworkInfo(const NetworkInfo &);
 
-  QString prefixes();
-  QString prefixModes();
+  QString prefixes() const;
+  QString prefixModes() const;
+  void determinePrefixes() const;
 
   bool supports(const QString &param) const { return _supports.contains(param); }
   QString support(const QString &param) const;
@@ -215,10 +216,6 @@ public:
   static QStringList presetDefaultChannels(const QString &networkName);
   static NetworkInfo networkInfoFromPreset(const QString &networkName);
 
-  // Blowfish stuff
-  QByteArray bufferKey(const QString &recipient) const;
-  void setBufferKey(const QString &recipient, const QByteArray &key);
-
 public slots:
   void setNetworkName(const QString &networkName);
   void setCurrentServer(const QString &currentServer);
@@ -275,10 +272,10 @@ public slots:
 
   void emitConnectionError(const QString &);
 
-private slots:
-  void removeIrcUser(IrcUser *ircuser);
-  void removeIrcChannel(IrcChannel *ircChannel);
-  void removeChansAndUsers();
+protected slots:
+  virtual void removeIrcUser(IrcUser *ircuser);
+  virtual void removeIrcChannel(IrcChannel *ircChannel);
+  virtual void removeChansAndUsers();
 
 signals:
   void aboutToBeDestroyed();
@@ -324,6 +321,7 @@ signals:
 
 protected:
   inline virtual IrcChannel *ircChannelFactory(const QString &channelname) { return new IrcChannel(channelname, this); }
+  inline virtual IrcUser *ircUserFactory(const QString &hostmask) { return new IrcUser(hostmask, this); }
 
 private:
   QPointer<SignalProxy> _proxy;
@@ -338,16 +336,13 @@ private:
   bool _connected;
   ConnectionState _connectionState;
 
-  QString _prefixes;
-  QString _prefixModes;
+  mutable QString _prefixes;
+  mutable QString _prefixModes;
 
   QHash<QString, IrcUser *> _ircUsers;  // stores all known nicks for the server
   QHash<QString, IrcChannel *> _ircChannels; // stores all known channels
   QHash<QString, QString> _supports;  // stores results from RPL_ISUPPORT
 
-  // Blowfish key map
-  QHash<QString, QByteArray> _keyHash;
-  
   ServerList _serverList;
   bool _useRandomServer;
   QStringList _perform;
@@ -366,8 +361,6 @@ private:
   bool _unlimitedReconnectRetries;
   bool _rejoinChannels;
 
-  void determinePrefixes();
-
   QTextCodec *_codecForServer;
   QTextCodec *_codecForEncoding;
   QTextCodec *_codecForDecoding;