X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fircuser.h;h=45be422035185eb653ec8acc523c97369c0e1e26;hb=9d4fbba1e7390f7cbc60aed962bf9d36ac111263;hp=33dd143262ea5bd15af20eb8699f567ce4bb342b;hpb=e008cd12ef319c4b5f9fe5a8cc1524829551771d;p=quassel.git diff --git a/src/common/ircuser.h b/src/common/ircuser.h index 33dd1432..45be4220 100644 --- a/src/common/ircuser.h +++ b/src/common/ircuser.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -26,11 +26,13 @@ #include #include +#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 &usermodes); // QSet usermodes() const; - void initDone(); - private slots: void updateObjectName(); void channelDestroyed(); @@ -131,7 +128,7 @@ private: QSet _channels; QString _userModes; - NetworkInfo *networkInfo; + Network *_network; QTextCodec *_codecForEncoding; QTextCodec *_codecForDecoding;