X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=1371231b47e880614b1b16c4d6efb5f3b5f049e9;hb=206ce9444661cc7b2f65bdd8c8c0d1c365e6306f;hp=66310436f9f2019078f0eb94af4b2c630ccdba89;hpb=09312db1a755642802ff15595900878fbe76b21a;p=quassel.git

diff --git a/src/common/network.h b/src/common/network.h
index 66310436..1371231b 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -33,10 +33,9 @@
 #include "syncableobject.h"
 
 #include "signalproxy.h"
+#include "ircuser.h"
 #include "ircchannel.h"
 
-class IrcUser;
-
 // defined below!
 struct NetworkInfo;
 
@@ -49,6 +48,7 @@ class Network : public SyncableObject {
   Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName STORED false)
   Q_PROPERTY(QString currentServer READ currentServer WRITE setCurrentServer STORED false)
   Q_PROPERTY(QString myNick READ myNick WRITE setMyNick STORED false)
+  Q_PROPERTY(int latency READ latency WRITE setLatency STORED false)
   Q_PROPERTY(QByteArray codecForServer READ codecForServer WRITE setCodecForServer STORED false)
   Q_PROPERTY(QByteArray codecForEncoding READ codecForEncoding WRITE setCodecForEncoding STORED false)
   Q_PROPERTY(QByteArray codecForDecoding READ codecForDecoding WRITE setCodecForDecoding STORED false)
@@ -98,7 +98,7 @@ public:
   inline void setProxy(SignalProxy *proxy) { _proxy = proxy; }
 
   inline bool isMyNick(const QString &nick) const { return (myNick().toLower() == nick.toLower()); }
-  inline bool isMe(IrcUser *ircuser) const { return (ircuser == me()); }
+  inline bool isMe(IrcUser *ircuser) const { return (ircuser->nick().toLower() == myNick().toLower()); }
 
   bool isChannelName(const QString &channelname) const;
 
@@ -117,6 +117,7 @@ public:
   inline const QString &networkName() const { return _networkName; }
   inline const QString &currentServer() const { return _currentServer; }
   inline const QString &myNick() const { return _myNick; }
+  inline int latency() const { return _latency; }
   inline IrcUser *me() const { return ircUser(myNick()); }
   inline IdentityId identity() const { return _identity; }
   QStringList nicks() const;
@@ -182,6 +183,7 @@ public slots:
   //void setConnectionState(Network::ConnectionState state);
   void setConnectionState(int state);
   void setMyNick(const QString &mynick);
+  void setLatency(int latency);
   void setIdentity(IdentityId);
 
   void setServerList(const QVariantList &serverList);
@@ -211,14 +213,16 @@ public slots:
   //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);
 
@@ -249,6 +253,7 @@ signals:
   void connectionStateSet(int);
   void connectionError(const QString &errorMsg);
   void myNickSet(const QString &mynick);
+  void latencySet(int latency);
   void identitySet(IdentityId);
 
   void serverListSet(QVariantList serverList);
@@ -295,6 +300,7 @@ private:
   IdentityId _identity;
 
   QString _myNick;
+  int _latency;
   QString _networkName;
   QString _currentServer;
   bool _connected;