X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircuser.h;h=00df169cd21f8a5141f39654e6cd188c5093cc7b;hp=0ca81a1712cf34c851312aacba47e6255e3d9db5;hb=b2efa6809ee09b70be19c0f66e0fcd6e57bf64bc;hpb=fd7c2c4a41b5bb9cffcfe7a8f86a28ab7f38ac27

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index 0ca81a17..00df169c 100644
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -25,6 +25,7 @@
 #include <QString>
 #include <QStringList>
 #include <QVariantMap>
+#include <QDateTime>
 
 #include "syncableobject.h"
 
@@ -38,41 +39,69 @@ class IrcUser : public SyncableObject {
   Q_PROPERTY(QString user READ user WRITE setUser STORED false)
   Q_PROPERTY(QString host READ host WRITE setHost STORED false)
   Q_PROPERTY(QString nick READ nick WRITE setNick STORED false)
+  Q_PROPERTY(QString realName READ realName WRITE setRealName STORED false)
+  Q_PROPERTY(bool away READ isAway WRITE setAway STORED false)
+  Q_PROPERTY(QString awayMessage READ awayMessage WRITE setAwayMessage STORED false)
+  Q_PROPERTY(QDateTime idleTime READ idleTime WRITE setIdleTime STORED false)
+  Q_PROPERTY(QDateTime loginTime READ loginTime WRITE setLoginTime STORED false)
+  Q_PROPERTY(QString server READ server WRITE setServer STORED false)
+  Q_PROPERTY(QString ircOperator READ ircOperator WRITE setIrcOperator STORED false)
+  Q_PROPERTY(int lastAwayMessage READ lastAwayMessage WRITE setLastAwayMessage STORED false)
+  Q_PROPERTY(QString whoisServiceReply READ whoisServiceReply WRITE setWhoisServiceReply STORED false)
+  Q_PROPERTY(QString suserHost READ suserHost WRITE setSuserHost STORED false)
 
   Q_PROPERTY(QStringList channels READ channels STORED false)
-  //  Q_PROPERTY(QStringList usermodes READ usermodes WRITE setUsermodes)
+  Q_PROPERTY(QString userModes READ userModes WRITE setUserModes)
 
 public:
   IrcUser(const QString &hostmask, Network *network);
   virtual ~IrcUser();
 
-  bool initialized() const;
-
-  QString user() const;
-  QString host() const;
-  QString nick() const;
+  inline QString user() const { return _user; }
+  inline QString host() const { return _host; }
+  inline QString nick() const { return _nick; }
+  inline QString realName() const { return _realName; }
   QString hostmask() const;
-  Network *network() const;
-
-  QString userModes() const;
+  inline bool isAway() const { return _away; }
+  inline QString awayMessage() const { return _awayMessage; }
+  QDateTime idleTime();
+  inline QDateTime loginTime() const { return _loginTime; }
+  inline QString server() const { return _server; }
+  inline QString ircOperator() const { return _ircOperator; }
+  inline int lastAwayMessage() const { return _lastAwayMessage; }
+  inline QString whoisServiceReply() const { return _whoisServiceReply; }
+  inline QString suserHost() const { return _suserHost; }
+  inline Network *network() const { return _network; }
+
+  inline QString userModes() const { return _userModes; }
 
   QStringList channels() const;
 
   // user-specific encodings
-  QTextCodec *codecForEncoding() const;
-  QTextCodec *codecForDecoding() const;
+  inline QTextCodec *codecForEncoding() const { return _codecForEncoding; }
+  inline QTextCodec *codecForDecoding() const { return _codecForDecoding; }
   void setCodecForEncoding(const QString &codecName);
   void setCodecForEncoding(QTextCodec *codec);
   void setCodecForDecoding(const QString &codecName);
   void setCodecForDecoding(QTextCodec *codec);
 
   QString decodeString(const QByteArray &text) const;
-  QByteArray encodeString(const QString string) const;
+  QByteArray encodeString(const QString &string) const;
 
 public slots:
   void setUser(const QString &user);
   void setHost(const QString &host);
   void setNick(const QString &nick);
+  void setRealName(const QString &realName);
+  void setAway(const bool &away);
+  void setAwayMessage(const QString &awayMessage);
+  void setIdleTime(const QDateTime &idleTime);
+  void setLoginTime(const QDateTime &loginTime);
+  void setServer(const QString &server);
+  void setIrcOperator(const QString &ircOperator);
+  void setLastAwayMessage(const int &lastAwayMessage);
+  void setWhoisServiceReply(const QString &whoisServiceReply);
+  void setSuserHost(const QString &suserHost);
   void updateHostmask(const QString &mask);
 
   void setUserModes(const QString &modes);
@@ -82,34 +111,32 @@ public slots:
   void partChannel(IrcChannel *channel);
   void partChannel(const QString &channelname);
 
-  void addUserMode(const QString &mode);
-  void removeUserMode(const QString &mode);
-
-  // init seters
-  void initSetChannels(const QStringList channels);
-
-  void setInitialized();
+  void addUserModes(const QString &modes);
+  void removeUserModes(const QString &modes);
 
 signals:
   void userSet(QString user);
   void hostSet(QString host);
   void nickSet(QString newnick);
+  void realNameSet(QString realName);
+  void awaySet(bool away);
+  void awayMessageSet(QString awayMessage);
+  void idleTimeSet(QDateTime idleTime);
+  void loginTimeSet(QDateTime loginTime);
+  void serverSet(QString server);
+  void ircOperatorSet(QString ircOperator);
+  void lastAwayMessageSet(int lastAwayMessage);
+  void whoisServiceReplySet(QString whoisServiceReply);
+  void suserHostSet(QString suserHost);
   void hostmaskUpdated(QString mask);
 
   void userModesSet(QString modes);
 
-  void channelJoined(QString channel);
+  // void channelJoined(QString channel);
   void channelParted(QString channel);
 
-  void userModeAdded(QString mode);
-  void userModeRemoved(QString mode);
-
-  void renameObject(QString oldname, QString newname);
-
-//   void setUsermodes(const QSet<QString> &usermodes);
-//   QSet<QString> usermodes() const;
-
-  void initDone();
+  void userModesAdded(QString modes);
+  void userModesRemoved(QString modes);
 
 private slots:
   void updateObjectName();
@@ -129,6 +156,17 @@ private:
   QString _nick;
   QString _user;
   QString _host;
+  QString _realName;
+  QString _awayMessage;
+  bool _away;
+  QString _server;
+  QDateTime _idleTime;
+  QDateTime _idleTimeSet;
+  QDateTime _loginTime;
+  QString _ircOperator;
+  int _lastAwayMessage;
+  QString _whoisServiceReply;
+  QString _suserHost;
 
   // QSet<QString> _channels;
   QSet<IrcChannel *> _channels;