X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fidentity.cpp;h=dcec2d92f47f0b1a9778084501a60281e303dbd7;hb=85b55cf023c96f4dbd61ec415a15214f99e281b3;hp=b69f8987243482b6554d55951a37617fb66ff6ea;hpb=2e6dc76ae100a6b8e1b1661e422995f90083500e;p=quassel.git

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index b69f8987..dcec2d92 100644
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -37,14 +37,13 @@ Identity::Identity(const Identity &other, QObject *parent) : SyncableObject(pare
             _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()),
+            _detachAwayEnabled(other.detachAwayEnabled()),
+            _detachAwayReason(other.detachAwayReason()),
+            _detachAwayReasonEnabled(other.detachAwayReasonEnabled()),
             _ident(other.ident()),
             _kickReason(other.kickReason()),
             _partReason(other.partReason()),
@@ -55,8 +54,8 @@ Identity::Identity(const Identity &other, QObject *parent) : SyncableObject(pare
 }
 
 void Identity::init() {
-  _initialized = false;
-  setObjectName(QString::number(id()));
+  setObjectName(QString::number(id().toInt()));
+  setAllowClientUpdates(true);
 }
 
 void Identity::setToDefaults() {
@@ -69,14 +68,13 @@ 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."));
@@ -84,15 +82,7 @@ void Identity::setToDefaults() {
 }
 
 bool Identity::isValid() const {
-  return (id() > 0);
-}
-
-bool Identity::initialized() const {
-  return _initialized;
-}
-
-void Identity::setInitialized() {
-  _initialized = true;
+  return (id().toInt() > 0);
 }
 
 IdentityId Identity::id() const {
@@ -127,14 +117,6 @@ bool Identity::awayReasonEnabled() const {
   return _awayReasonEnabled;
 }
 
-QString Identity::returnMessage() const {
-  return _returnMessage;
-}
-
-bool Identity::returnMessageEnabled() const {
-  return _returnMessageEnabled;
-}
-
 bool Identity::autoAwayEnabled() const {
   return _autoAwayEnabled;
 }
@@ -151,12 +133,16 @@ bool Identity::autoAwayReasonEnabled() const {
   return _autoAwayReasonEnabled;
 }
 
-QString Identity::autoReturnMessage() const {
-  return _autoReturnMessage;
+bool Identity::detachAwayEnabled() const {
+  return _detachAwayEnabled;
+}
+
+QString Identity::detachAwayReason() const {
+  return _detachAwayReason;
 }
 
-bool Identity::autoReturnMessageEnabled() const {
-  return _autoReturnMessageEnabled;
+bool Identity::detachAwayReasonEnabled() const {
+  return _detachAwayReasonEnabled;
 }
 
 QString Identity::ident() const {
@@ -179,7 +165,7 @@ QString Identity::quitReason() const {
 // NOTE: DO NOT USE ON SYNCHRONIZED OBJECTS!
 void Identity::setId(IdentityId _id) {
   _identityId = _id;
-  setObjectName(QString::number(id()));
+  setObjectName(QString::number(id().toInt()));
   //emit idSet(id);
 }
 
@@ -208,11 +194,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);
@@ -223,11 +204,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);
@@ -248,14 +224,19 @@ 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::setAutoReturnMessageEnabled(bool enabled) {
-  _autoReturnMessageEnabled = enabled;
-  emit autoReturnMessageEnabledSet(enabled);
+void Identity::setDetachAwayReason(const QString & reason) {
+  _detachAwayReason = reason;
+  emit detachAwayReasonSet(reason);
+}
+
+void Identity::setDetachAwayReasonEnabled(bool enabled) {
+  _detachAwayReasonEnabled = enabled;
+  emit detachAwayReasonEnabledSet(enabled);
 }
 
 void Identity::setIdent(const QString & ident) {
@@ -289,7 +270,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);
@@ -324,5 +305,3 @@ QDataStream &operator>>(QDataStream &in, Identity &id) {
   id.fromVariantMap(i);
   return in;
 }
-
-