X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircuser.h;h=6916f0eb1610aafc5927f319e5d3b47465c59ca8;hp=5fd45944533cfb0a9d2e72d6ed864250008baf4f;hb=a801d1eab5fcb932c88f2e3953e5626083d4ec59;hpb=2d19986a8bafafec55b5d3b0474f7d76eb5f33b2

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index 5fd45944..6916f0eb 100644
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -43,11 +43,13 @@ class IrcUser : public SyncableObject {
   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(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);
@@ -60,9 +62,11 @@ public:
   QString hostmask() const;
   bool isAway() const;
   QString awayMessage() const;
-  QDateTime idleTime() const;
+  QDateTime idleTime();
+  QDateTime loginTime() const;
   QString server() const;
   QString ircOperator() const;
+  int lastAwayMessage() const;
   Network *network() const;
 
   QString userModes() const;
@@ -78,7 +82,7 @@ public:
   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);
@@ -88,8 +92,10 @@ public slots:
   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 updateHostmask(const QString &mask);
 
   void setUserModes(const QString &modes);
@@ -99,11 +105,8 @@ 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 addUserModes(const QString &modes);
+  void removeUserModes(const QString &modes);
 
 signals:
   void userSet(QString user);
@@ -113,22 +116,19 @@ signals:
   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 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 userModesAdded(QString modes);
+  void userModesRemoved(QString modes);
 
 private slots:
   void updateObjectName();
@@ -153,7 +153,10 @@ private:
   bool _away;
   QString _server;
   QDateTime _idleTime;
+  QDateTime _idleTimeSet;
+  QDateTime _loginTime;
   QString _ircOperator;
+  int _lastAwayMessage;
   
   // QSet<QString> _channels;
   QSet<IrcChannel *> _channels;