X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircuser.h;h=2be27583ca90919ee47cf9d79542185b16809f23;hp=7ec878e71423753bf510d73c4b424f3db3eb0126;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index 7ec878e7..2be27583 100644
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -34,101 +34,102 @@ class SignalProxy;
 class Network;
 class IrcChannel;
 
-class IrcUser : public SyncableObject {
-  SYNCABLE_OBJECT
-  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(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(QString userModes READ userModes WRITE setUserModes)
-
-public:
-  IrcUser(const QString &hostmask, Network *network);
-  virtual ~IrcUser();
-
-  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;
-  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
-  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;
-
-  // only valid on client side, these are not synced!
-  inline QDateTime lastChannelActivity(BufferId id) const { return _lastActivity.value(id); }
-  void setLastChannelActivity(BufferId id, const QDateTime &time);
-  inline QDateTime lastSpokenTo(BufferId id) const { return _lastSpokenTo.value(id); }
-  void setLastSpokenTo(BufferId id, const QDateTime &time);
+class IrcUser : public SyncableObject
+{
+    SYNCABLE_OBJECT
+    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(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(QString userModes READ userModes WRITE setUserModes)
+
+public :
+        IrcUser(const QString &hostmask, Network *network);
+    virtual ~IrcUser();
+
+    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;
+    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
+    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;
+
+    // only valid on client side, these are not synced!
+    inline QDateTime lastChannelActivity(BufferId id) const { return _lastActivity.value(id); }
+    void setLastChannelActivity(BufferId id, const QDateTime &time);
+    inline QDateTime lastSpokenTo(BufferId id) const { return _lastSpokenTo.value(id); }
+    void setLastSpokenTo(BufferId id, const QDateTime &time);
 
 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);
-
-  void joinChannel(IrcChannel *channel);
-  void joinChannel(const QString &channelname);
-  void partChannel(IrcChannel *channel);
-  void partChannel(const QString &channelname);
-  void quit();
-
-  void addUserModes(const QString &modes);
-  void removeUserModes(const QString &modes);
+    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);
+
+    void joinChannel(IrcChannel *channel);
+    void joinChannel(const QString &channelname);
+    void partChannel(IrcChannel *channel);
+    void partChannel(const QString &channelname);
+    void quit();
+
+    void addUserModes(const QString &modes);
+    void removeUserModes(const QString &modes);
 
 signals:
 //   void userSet(QString user);
 //   void hostSet(QString host);
-  void nickSet(QString newnick); // needed in NetworkModel
+    void nickSet(QString newnick); // needed in NetworkModel
 //   void realNameSet(QString realName);
-  void awaySet(bool away); // needed in NetworkModel
+    void awaySet(bool away); // needed in NetworkModel
 //   void awayMessageSet(QString awayMessage);
 //   void idleTimeSet(QDateTime idleTime);
 //   void loginTimeSet(QDateTime loginTime);
@@ -138,58 +139,63 @@ signals:
 //   void whoisServiceReplySet(QString whoisServiceReply);
 //   void suserHostSet(QString suserHost);
 
-  void userModesSet(QString modes);
-  void userModesAdded(QString modes);
-  void userModesRemoved(QString modes);
+    void userModesSet(QString modes);
+    void userModesAdded(QString modes);
+    void userModesRemoved(QString modes);
 
-  // void channelJoined(QString channel);
-  void channelParted(QString channel);
-  void quited();
+    // void channelJoined(QString channel);
+    void channelParted(QString channel);
+    void quited();
 
-  void lastChannelActivityUpdated(BufferId id, const QDateTime &newTime);
-  void lastSpokenToUpdated(BufferId id, const QDateTime &newTime);
+    void lastChannelActivityUpdated(BufferId id, const QDateTime &newTime);
+    void lastSpokenToUpdated(BufferId id, const QDateTime &newTime);
 
 private slots:
-  void updateObjectName();
-  void channelDestroyed();
+    void updateObjectName();
+    void channelDestroyed();
 
 private:
-  inline bool operator==(const IrcUser &ircuser2) {
-    return (_nick.toLower() == ircuser2.nick().toLower());
-  }
-
-  inline bool operator==(const QString &nickname) {
-    return (_nick.toLower() == nickname.toLower());
-  }
-
-  bool _initialized;
-
-  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;
-  QString _userModes;
-
-  Network *_network;
-
-  QTextCodec *_codecForEncoding;
-  QTextCodec *_codecForDecoding;
-
-  QHash<BufferId, QDateTime> _lastActivity;
-  QHash<BufferId, QDateTime> _lastSpokenTo;
+    inline bool operator==(const IrcUser &ircuser2)
+    {
+        return (_nick.toLower() == ircuser2.nick().toLower());
+    }
+
+
+    inline bool operator==(const QString &nickname)
+    {
+        return (_nick.toLower() == nickname.toLower());
+    }
+
+
+    bool _initialized;
+
+    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;
+    QString _userModes;
+
+    Network *_network;
+
+    QTextCodec *_codecForEncoding;
+    QTextCodec *_codecForDecoding;
+
+    QHash<BufferId, QDateTime> _lastActivity;
+    QHash<BufferId, QDateTime> _lastSpokenTo;
 };
 
+
 #endif