X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.cpp;h=eff50215611f2f3df17cc68f5cedf75f8226d19a;hp=d7bcbdcf2ef85f3a375b61395c4c1433f9d9eb3d;hb=5d05ab030c24ff57b0e5d00d9d66869c2f934a49;hpb=d1b6499b0b848d4287efae89107576548533502c

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index d7bcbdcf..eff50215 100644
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -23,39 +23,42 @@
 
 #include "identity.h"
 
-Identity::Identity(IdentityId id, QObject *parent) : SyncableObject(parent), _identityId(id) {
+Identity::Identity(IdentityId id, QObject *parent)
+  : SyncableObject(parent),
+    _identityId(id)
+{
   init();
   setToDefaults();
 }
 
-Identity::Identity(const Identity &other, QObject *parent) : SyncableObject(parent),
-            _identityId(other.id()),
-            _identityName(other.identityName()),
-            _realName(other.realName()),
-            _nicks(other.nicks()),
-            _awayNick(other.awayNick()),
-            _awayNickEnabled(other.awayNickEnabled()),
-            _awayReason(other.awayReason()),
-            _awayReasonEnabled(other.awayReasonEnabled()),
-            _returnMessage(other.returnMessage()),
-            _returnMessageEnabled(other.returnMessageEnabled()),
-            _autoAwayEnabled(other.autoAwayEnabled()),
-            _autoAwayTime(other.autoAwayTime()),
-            _autoAwayReason(other.autoAwayReason()),
-            _autoAwayReasonEnabled(other.autoAwayReasonEnabled()),
-            _autoReturnMessage(other.autoReturnMessage()),
-            _autoReturnMessageEnabled(other.autoReturnMessageEnabled()),
-            _ident(other.ident()),
-            _kickReason(other.kickReason()),
-            _partReason(other.partReason()),
-            _quitReason(other.quitReason())
-
+Identity::Identity(const Identity &other, QObject *parent)
+  : SyncableObject(parent),
+    _identityId(other.id()),
+    _identityName(other.identityName()),
+    _realName(other.realName()),
+    _nicks(other.nicks()),
+    _awayNick(other.awayNick()),
+    _awayNickEnabled(other.awayNickEnabled()),
+    _awayReason(other.awayReason()),
+    _awayReasonEnabled(other.awayReasonEnabled()),
+    _autoAwayEnabled(other.autoAwayEnabled()),
+    _autoAwayTime(other.autoAwayTime()),
+    _autoAwayReason(other.autoAwayReason()),
+    _autoAwayReasonEnabled(other.autoAwayReasonEnabled()),
+    _detachAwayEnabled(other.detachAwayEnabled()),
+    _detachAwayReason(other.detachAwayReason()),
+    _detachAwayReasonEnabled(other.detachAwayReasonEnabled()),
+    _ident(other.ident()),
+    _kickReason(other.kickReason()),
+    _partReason(other.partReason()),
+    _quitReason(other.quitReason())
 {
   init();
 }
 
 void Identity::init() {
-  setObjectName(QString::number(id()));
+  setObjectName(QString::number(id().toInt()));
+  setAllowClientUpdates(true);
 }
 
 void Identity::setToDefaults() {
@@ -68,110 +71,25 @@ void Identity::setToDefaults() {
   setAwayNickEnabled(false);
   setAwayReason(tr("Gone fishing."));
   setAwayReasonEnabled(true);
-  setReturnMessage(tr("Brought fish."));
-  setReturnMessageEnabled(false);
   setAutoAwayEnabled(false);
   setAutoAwayTime(10);
   setAutoAwayReason(tr("Not here. No, really. not here!"));
   setAutoAwayReasonEnabled(false);
-  setAutoReturnMessage(tr("Back in action again!"));
-  setAutoReturnMessageEnabled(false);
+  setDetachAwayEnabled(false);
+  setDetachAwayReason(tr("All Quassel clients vanished from the face of the earth..."));
+  setDetachAwayReasonEnabled(false);
   setIdent("quassel");
   setKickReason(tr("Kindergarten is elsewhere!"));
   setPartReason(tr("http://quassel-irc.org - Chat comfortably. Anywhere."));
   setQuitReason(tr("http://quassel-irc.org - Chat comfortably. Anywhere."));
 }
 
-bool Identity::isValid() const {
-  return (id() > 0);
-}
-
-IdentityId Identity::id() const {
-  return _identityId;
-}
-
-QString Identity::identityName() const {
-  return _identityName;
-}
-
-QString Identity::realName() const {
-  return _realName;
-}
-
-QStringList Identity::nicks() const {
-  return _nicks;
-}
-
-QString Identity::awayNick() const {
-  return _awayNick;
-}
-
-bool Identity::awayNickEnabled() const {
-  return _awayNickEnabled;
-}
-
-QString Identity::awayReason() const {
-  return _awayReason;
-}
-
-bool Identity::awayReasonEnabled() const {
-  return _awayReasonEnabled;
-}
-
-QString Identity::returnMessage() const {
-  return _returnMessage;
-}
-
-bool Identity::returnMessageEnabled() const {
-  return _returnMessageEnabled;
-}
-
-bool Identity::autoAwayEnabled() const {
-  return _autoAwayEnabled;
-}
-
-int Identity::autoAwayTime() const {
-  return _autoAwayTime;
-}
-
-QString Identity::autoAwayReason() const {
-  return _autoAwayReason;
-}
-
-bool Identity::autoAwayReasonEnabled() const {
-  return _autoAwayReasonEnabled;
-}
-
-QString Identity::autoReturnMessage() const {
-  return _autoReturnMessage;
-}
-
-bool Identity::autoReturnMessageEnabled() const {
-  return _autoReturnMessageEnabled;
-}
-
-QString Identity::ident() const {
-  return _ident;
-}
-
-QString Identity::kickReason() const {
-  return _kickReason;
-}
-
-QString Identity::partReason() const
-{return _partReason;}
-
-QString Identity::quitReason() const {
-  return _quitReason;
-}
-
 /*** setters ***/
 
 // NOTE: DO NOT USE ON SYNCHRONIZED OBJECTS!
 void Identity::setId(IdentityId _id) {
   _identityId = _id;
-  setObjectName(QString::number(id()));
-  //emit idSet(id);
+  setObjectName(QString::number(id().toInt()));
 }
 
 void Identity::setIdentityName(const QString &identityName) {
@@ -199,11 +117,6 @@ void Identity::setAwayReason(const QString &reason) {
   emit awayReasonSet(reason);
 }
 
-void Identity::setReturnMessage(const QString &message) {
-  _returnMessage = message;
-  emit returnMessageSet(message);
-}
-
 void Identity::setAwayNickEnabled(bool enabled) {
   _awayNickEnabled = enabled;
   emit awayNickEnabledSet(enabled);
@@ -214,11 +127,6 @@ void Identity::setAwayReasonEnabled(bool enabled) {
   emit awayReasonEnabledSet(enabled);
 }
 
-void Identity::setReturnMessageEnabled(bool enabled) {
-  _returnMessageEnabled = enabled;
-  emit returnMessageEnabledSet(enabled);
-}
-
 void Identity::setAutoAwayEnabled(bool enabled) {
   _autoAwayEnabled = enabled;
   emit autoAwayEnabledSet(enabled);
@@ -229,7 +137,7 @@ void Identity::setAutoAwayTime(int time) {
   emit autoAwayTimeSet(time);
 }
 
-void Identity::setAutoAwayReason(const QString & reason) {
+void Identity::setAutoAwayReason(const QString &reason) {
   _autoAwayReason = reason;
   emit autoAwayReasonSet(reason);
 }
@@ -239,32 +147,37 @@ void Identity::setAutoAwayReasonEnabled(bool enabled) {
   emit autoAwayReasonEnabledSet(enabled);
 }
 
-void Identity::setAutoReturnMessage(const QString & message) {
-  _autoReturnMessage = message;
-  emit autoReturnMessageSet(message);
+void Identity::setDetachAwayEnabled(bool enabled) {
+  _detachAwayEnabled = enabled;
+  emit detachAwayEnabledSet(enabled);
+}
+
+void Identity::setDetachAwayReason(const QString &reason) {
+  _detachAwayReason = reason;
+  emit detachAwayReasonSet(reason);
 }
 
-void Identity::setAutoReturnMessageEnabled(bool enabled) {
-  _autoReturnMessageEnabled = enabled;
-  emit autoReturnMessageEnabledSet(enabled);
+void Identity::setDetachAwayReasonEnabled(bool enabled) {
+  _detachAwayReasonEnabled = enabled;
+  emit detachAwayReasonEnabledSet(enabled);
 }
 
-void Identity::setIdent(const QString & ident) {
+void Identity::setIdent(const QString &ident) {
   _ident = ident;
   emit identSet(ident);
 }
 
-void Identity::setKickReason(const QString & reason) {
+void Identity::setKickReason(const QString &reason) {
   _kickReason = reason;
   emit kickReasonSet(reason);
 }
 
-void Identity::setPartReason(const QString & reason) {
+void Identity::setPartReason(const QString &reason) {
   _partReason = reason;
   emit partReasonSet(reason);
 }
 
-void Identity::setQuitReason(const QString & reason) {
+void Identity::setQuitReason(const QString &reason) {
   _quitReason = reason;
   emit quitReasonSet(reason);
 }
@@ -280,7 +193,7 @@ for(int idx = metaObject()->propertyOffset(); idx < metaObject()->propertyCount(
     }
   }
 }
-#include <QDebug>
+
 bool Identity::operator==(const Identity &other) {
   for(int idx = metaObject()->propertyOffset(); idx < metaObject()->propertyCount(); idx++) {
     QMetaProperty metaProp = metaObject()->property(idx);
@@ -315,5 +228,3 @@ QDataStream &operator>>(QDataStream &in, Identity &id) {
   id.fromVariantMap(i);
   return in;
 }
-
-