X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.h;h=8ffc7da24d3696665f53e6b832efde66e368db57;hp=9c961a9f1e5200457ab390018c2fec76d93a2074;hb=a3aaabf6254c8c5439af8982cc613c4ced3f50ed;hpb=d1b6499b0b848d4287efae89107576548533502c

diff --git a/src/common/identity.h b/src/common/identity.h
index 9c961a9f..8ffc7da2 100644
--- a/src/common/identity.h
+++ b/src/common/identity.h
@@ -32,26 +32,25 @@
 class Identity : public SyncableObject {
   Q_OBJECT
 
-  Q_PROPERTY(IdentityId identityId READ id WRITE setId STORED false);
-  Q_PROPERTY(QString identityName READ identityName WRITE setIdentityName STORED false);
-  Q_PROPERTY(QString realName READ realName WRITE setRealName STORED false);
-  Q_PROPERTY(QStringList nicks READ nicks WRITE setNicks STORED false);
-  Q_PROPERTY(QString awayNick READ awayNick WRITE setAwayNick STORED false);
-  Q_PROPERTY(bool awayNickEnabled READ awayNickEnabled WRITE setAwayNickEnabled STORED false);
-  Q_PROPERTY(QString awayReason READ awayReason WRITE setAwayReason STORED false);
-  Q_PROPERTY(bool awayReasonEnabled READ awayReasonEnabled WRITE setAwayReasonEnabled STORED false);
-  Q_PROPERTY(QString returnMessage READ returnMessage WRITE setReturnMessage STORED false);
-  Q_PROPERTY(bool returnMessageEnabled READ returnMessageEnabled WRITE setReturnMessageEnabled STORED false);
-  Q_PROPERTY(bool autoAwayEnabled READ autoAwayEnabled WRITE setAutoAwayEnabled STORED false);
-  Q_PROPERTY(int autoAwayTime READ autoAwayTime WRITE setAutoAwayTime STORED false);
-  Q_PROPERTY(QString autoAwayReason READ autoAwayReason WRITE setAutoAwayReason STORED false);
-  Q_PROPERTY(bool autoAwayReasonEnabled READ autoAwayReasonEnabled WRITE setAutoAwayReasonEnabled STORED false);
-  Q_PROPERTY(QString autoReturnMessage READ autoReturnMessage WRITE setAutoReturnMessage STORED false);
-  Q_PROPERTY(bool autoReturnMessageEnabled READ autoReturnMessageEnabled WRITE setAutoReturnMessageEnabled STORED false);
-  Q_PROPERTY(QString ident READ ident WRITE setIdent STORED false);
-  Q_PROPERTY(QString kickReason READ kickReason WRITE setKickReason STORED false);
-  Q_PROPERTY(QString partReason READ partReason WRITE setPartReason STORED false);
-  Q_PROPERTY(QString quitReason READ quitReason WRITE setQuitReason STORED false);
+  Q_PROPERTY(IdentityId identityId READ id WRITE setId STORED false)
+  Q_PROPERTY(QString identityName READ identityName WRITE setIdentityName STORED false)
+  Q_PROPERTY(QString realName READ realName WRITE setRealName STORED false)
+  Q_PROPERTY(QStringList nicks READ nicks WRITE setNicks STORED false)
+  Q_PROPERTY(QString awayNick READ awayNick WRITE setAwayNick STORED false)
+  Q_PROPERTY(bool awayNickEnabled READ awayNickEnabled WRITE setAwayNickEnabled STORED false)
+  Q_PROPERTY(QString awayReason READ awayReason WRITE setAwayReason STORED false)
+  Q_PROPERTY(bool awayReasonEnabled READ awayReasonEnabled WRITE setAwayReasonEnabled STORED false)
+  Q_PROPERTY(bool autoAwayEnabled READ autoAwayEnabled WRITE setAutoAwayEnabled STORED false)
+  Q_PROPERTY(int autoAwayTime READ autoAwayTime WRITE setAutoAwayTime STORED false)
+  Q_PROPERTY(QString autoAwayReason READ autoAwayReason WRITE setAutoAwayReason STORED false)
+  Q_PROPERTY(bool autoAwayReasonEnabled READ autoAwayReasonEnabled WRITE setAutoAwayReasonEnabled STORED false)
+  Q_PROPERTY(bool detachAwayEnabled READ detachAwayEnabled WRITE setDetachAwayEnabled STORED false)
+  Q_PROPERTY(QString detachAwayReason READ detachAwayReason WRITE setDetachAwayReason STORED false)
+  Q_PROPERTY(bool detachAwayReasonEnabled READ detachAwayReasonEnabled WRITE setDetachAwayReasonEnabled STORED false)
+  Q_PROPERTY(QString ident READ ident WRITE setIdent STORED false)
+  Q_PROPERTY(QString kickReason READ kickReason WRITE setKickReason STORED false)
+  Q_PROPERTY(QString partReason READ partReason WRITE setPartReason STORED false)
+  Q_PROPERTY(QString quitReason READ quitReason WRITE setQuitReason STORED false)
 
   public:
     Identity(IdentityId id = 0, QObject *parent = 0);
@@ -71,14 +70,13 @@ class Identity : public SyncableObject {
     bool awayNickEnabled() const;
     QString awayReason() const;
     bool awayReasonEnabled() const;
-    QString returnMessage() const;
-    bool returnMessageEnabled() const;
     bool autoAwayEnabled() const;
     int autoAwayTime() const;
     QString autoAwayReason() const;
     bool autoAwayReasonEnabled() const;
-    QString autoReturnMessage() const;
-    bool autoReturnMessageEnabled() const;
+    bool detachAwayEnabled() const;
+    QString detachAwayReason() const;
+    bool detachAwayReasonEnabled() const;
     QString ident() const;
     QString kickReason() const;
     QString partReason() const;
@@ -93,14 +91,13 @@ class Identity : public SyncableObject {
     void setAwayNickEnabled(bool enabled);
     void setAwayReason(const QString &awayReason);
     void setAwayReasonEnabled(bool enabled);
-    void setReturnMessage(const QString &returnMessage);
-    void setReturnMessageEnabled(bool enabled);
     void setAutoAwayEnabled(bool enabled);
     void setAutoAwayTime(int time);
     void setAutoAwayReason(const QString &reason);
     void setAutoAwayReasonEnabled(bool enabled);
-    void setAutoReturnMessage(const QString &message);
-    void setAutoReturnMessageEnabled(bool enabled);
+    void setDetachAwayEnabled(bool enabled);
+    void setDetachAwayReason(const QString &reason);
+    void setDetachAwayReasonEnabled(bool enabled);
     void setIdent(const QString &ident);
     void setKickReason(const QString &reason);
     void setPartReason(const QString &reason);
@@ -117,14 +114,13 @@ class Identity : public SyncableObject {
     void awayNickEnabledSet(bool);
     void awayReasonSet(const QString &awayReason);
     void awayReasonEnabledSet(bool);
-    void returnMessageSet(const QString &returnMessage);
-    void returnMessageEnabledSet(bool);
     void autoAwayEnabledSet(bool);
     void autoAwayTimeSet(int);
     void autoAwayReasonSet(const QString &);
     void autoAwayReasonEnabledSet(bool);
-    void autoReturnMessageSet(const QString &);
-    void autoReturnMessageEnabledSet(bool);
+    void detachAwayEnabledSet(bool);
+    void detachAwayReasonSet(const QString &);
+    void detachAwayReasonEnabledSet(bool);
     void identSet(const QString &);
     void kickReasonSet(const QString &);
     void partReasonSet(const QString &);
@@ -138,14 +134,13 @@ class Identity : public SyncableObject {
     bool _awayNickEnabled;
     QString _awayReason;
     bool _awayReasonEnabled;
-    QString _returnMessage;
-    bool _returnMessageEnabled;
     bool _autoAwayEnabled;
     int _autoAwayTime;
     QString _autoAwayReason;
     bool _autoAwayReasonEnabled;
-    QString _autoReturnMessage;
-    bool _autoReturnMessageEnabled;
+    bool _detachAwayEnabled;
+    QString _detachAwayReason;
+    bool _detachAwayReasonEnabled;
     QString _ident, _kickReason, _partReason, _quitReason;
 
     void init();
@@ -156,6 +151,6 @@ class Identity : public SyncableObject {
 QDataStream &operator<<(QDataStream &out, Identity identity);
 QDataStream &operator>>(QDataStream &in, Identity &identity);
 
-Q_DECLARE_METATYPE(Identity);
+Q_DECLARE_METATYPE(Identity)
 
 #endif