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

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index 33dd1432..6916f0eb 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  *
@@ -25,31 +25,49 @@
 #include <QString>
 #include <QStringList>
 #include <QVariantMap>
+#include <QDateTime>
+
+#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)
   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(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, NetworkInfo *networkInfo);
+  IrcUser(const QString &hostmask, Network *network);
   virtual ~IrcUser();
 
-  bool initialized() const;
-
   QString user() const;
   QString host() const;
   QString nick() const;
+  QString realName() const; 
   QString hostmask() const;
+  bool isAway() const;
+  QString awayMessage() const;
+  QDateTime idleTime();
+  QDateTime loginTime() const;
+  QString server() const;
+  QString ircOperator() const;
+  int lastAwayMessage() const;
+  Network *network() const;
 
   QString userModes() const;
 
@@ -64,12 +82,20 @@ 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);
   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 updateHostmask(const QString &mask);
 
   void setUserModes(const QString &modes);
@@ -79,34 +105,30 @@ 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 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();
@@ -126,12 +148,21 @@ 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;
+  
   // QSet<QString> _channels;
   QSet<IrcChannel *> _channels;
   QString _userModes;
 
-  NetworkInfo *networkInfo;
+  Network *_network;
 
   QTextCodec *_codecForEncoding;
   QTextCodec *_codecForDecoding;