Syncing my current state, Network settings still not fully functional, so don't use...

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

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index d1ac21e..45be422 100644 (file)
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -26,11 +26,13 @@
 #include <QStringList>
 #include <QVariantMap>
 
+#include "syncableobject.h"
+
 class SignalProxy;
-class NetworkInfo;
+class Network;
 class IrcChannel;
 
-class IrcUser : public QObject {
+class IrcUser : public SyncableObject {
   Q_OBJECT
 
   Q_PROPERTY(QString user READ user WRITE setUser STORED false)
@@ -41,15 +43,14 @@ class IrcUser : public QObject {
   //  Q_PROPERTY(QStringList usermodes READ usermodes WRITE setUsermodes)
 
 public:
-  IrcUser(const QString &hostmask, NetworkInfo *networkInfo);
+  IrcUser(const QString &hostmask, Network *network);
   virtual ~IrcUser();
 
-  bool initialized() const;
-
   QString user() const;
   QString host() const;
   QString nick() const;
   QString hostmask() const;
+  Network *network() const;
 
   QString userModes() const;
 
@@ -85,8 +86,6 @@ public slots:
   // init seters
   void initSetChannels(const QStringList channels);
 
-  void setInitialized();
-
 signals:
   void userSet(QString user);
   void hostSet(QString host);
@@ -106,8 +105,6 @@ signals:
 //   void setUsermodes(const QSet<QString> &usermodes);
 //   QSet<QString> usermodes() const;
 
-  void initDone();
-
 private slots:
   void updateObjectName();
   void channelDestroyed();
@@ -131,7 +128,7 @@ private:
   QSet<IrcChannel *> _channels;
   QString _userModes;
 
-  NetworkInfo *networkInfo;
+  Network *_network;
 
   QTextCodec *_codecForEncoding;
   QTextCodec *_codecForDecoding;