X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.cpp;h=3ce1d10e9341482ee53de6f2c668b283c495d8a1;hp=c2fdeaf52ba174d00f7b034323f9716e099b31cb;hb=dcba0652ac1275877b98b06d6482924ee6df0cd1;hpb=21d8d7f0a79eeeb541664aa80ce481fdbfc41f09

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index c2fdeaf5..3ce1d10e 100644
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -23,12 +23,12 @@
 
 #include "identity.h"
 
-Identity::Identity(IdentityId id, QObject *parent) : QObject(parent), _identityId(id) {
+Identity::Identity(IdentityId id, QObject *parent) : SyncableObject(parent), _identityId(id) {
   init();
   setToDefaults();
 }
 
-Identity::Identity(const Identity &other, QObject *parent) : QObject(parent),
+Identity::Identity(const Identity &other, QObject *parent) : SyncableObject(parent),
             _identityId(other.id()),
             _identityName(other.identityName()),
             _realName(other.realName()),
@@ -55,12 +55,11 @@ Identity::Identity(const Identity &other, QObject *parent) : QObject(parent),
 }
 
 void Identity::init() {
-  _initialized = false;
-  setObjectName(QString::number(id()));
+  setObjectName(QString::number(id().toInt()));
 }
 
 void Identity::setToDefaults() {
-  setIdentityName(tr("Default Identity"));
+  setIdentityName(tr("<empty>"));
   setRealName(tr("Quassel IRC User"));
   QStringList n;
   n << QString("quassel%1").arg(qrand() & 0xff); // FIXME provide more sensible default nicks
@@ -81,19 +80,10 @@ void Identity::setToDefaults() {
   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);
-}
-
-bool Identity::initialized() const {
-  return _initialized;
-}
-
-void Identity::setInitialized() {
-  _initialized = true;
+  return (id().toInt() > 0);
 }
 
 IdentityId Identity::id() const {
@@ -180,7 +170,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);
 }
 
@@ -296,8 +286,8 @@ bool Identity::operator==(const Identity &other) {
     QMetaProperty metaProp = metaObject()->property(idx);
     Q_ASSERT(metaProp.isValid());
     QVariant v1 = this->property(metaProp.name());
-    QVariant v2 = other.property(metaProp.name()); //qDebug() << v1 << v2;
-    // QVariant cannot compare custom types, so we need to check for this case
+    QVariant v2 = other.property(metaProp.name()); // qDebug() << v1 << v2;
+    // QVariant cannot compare custom types, so we need to check for this special case
     if(QString(v1.typeName()) == "IdentityId") {
       if(v1.value<IdentityId>() != v2.value<IdentityId>()) return false;
     } else {
@@ -313,56 +303,17 @@ bool Identity::operator!=(const Identity &other) {
 
 ///////////////////////////////
 
-// we use a hash, so we can easily extend identities without breaking saved ones
-QDataStream &operator<<(QDataStream &out, const Identity &id) {
-  QVariantMap i;
-  i["IdentityId"] = id.id();
-  i["IdentityName"] = id.identityName();
-  i["RealName"] = id.realName();
-  i["Nicks"] = id.nicks();
-  i["AwayNick"] = id.awayNick();
-  i["AwayNickEnabled"] = id.awayNickEnabled();
-  i["AwayReason"] = id.awayReason();
-  i["AwayReasonEnabled"] = id.awayReasonEnabled();
-  i["ReturnMessage"] = id.returnMessage();
-  i["ReturnMessageEnabled"] = id.returnMessageEnabled();
-  i["AutoAwayEnabled"] = id.autoAwayEnabled();
-  i["AutoAwayTime"] = id.autoAwayTime();
-  i["AutoAwayReason"] = id.autoAwayReason();
-  i["AutoAwayReasonEnabled"] = id.autoAwayReasonEnabled();
-  i["AutoReturnMessage"] = id.autoReturnMessage();
-  i["AutoReturnMessageEnabled"] = id.autoReturnMessageEnabled();
-  i["Ident"] = id.ident();
-  i["KickReason"] = id.kickReason();
-  i["PartReason"] = id.partReason();
-  i["QuitReason"] = id.quitReason();
-  out << i;
+QDataStream &operator<<(QDataStream &out, Identity id) {
+  out << id.toVariantMap();
   return out;
 }
 
+
 QDataStream &operator>>(QDataStream &in, Identity &id) {
   QVariantMap i;
   in >> i;
-  id._identityId = i["IdentityId"].toUInt();
-  id.setIdentityName(i["IdentityName"].toString());
-  id.setRealName(i["RealName"].toString());
-  id.setNicks(i["Nicks"].toStringList());
-  id.setAwayNick(i["AwayNick"].toString());
-  id.setAwayNickEnabled(i["AwayNickEnabled"].toBool());
-  id.setAwayReason(i["AwayReason"].toString());
-  id.setAwayReasonEnabled(i["AwayReasonEnabled"].toBool());
-  id.setReturnMessage(i["ReturnMessage"].toString());
-  id.setReturnMessageEnabled(i["ReturnMessageEnabled"].toBool());
-  id.setAutoAwayEnabled(i["AutoAwayEnabled"].toBool());
-  id.setAutoAwayTime(i["AutoAwayTime"].toInt());
-  id.setAutoAwayReason(i["AutoAwayReason"].toString());
-  id.setAutoAwayReasonEnabled(i["AutoAwayReasonEnabled"].toBool());
-  id.setAutoReturnMessage(i["AutoReturnMessage"].toString());
-  id.setAutoReturnMessageEnabled(i["AutoReturnMessageEnabled"].toBool());
-  id.setIdent(i["Ident"].toString());
-  id.setKickReason(i["KickReason"].toString());
-  id.setPartReason(i["PartReason"].toString());
-  id.setQuitReason(i["QuitReason"].toString());
+  id.fromVariantMap(i);
   return in;
 }
 
+