Fix compile warnings

[quassel.git] / src / common / identity.cpp

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index eff5021..43ddac1 100644 (file)
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -86,10 +86,10 @@ void Identity::setToDefaults() {
 
 /*** setters ***/
 
-// NOTE: DO NOT USE ON SYNCHRONIZED OBJECTS!
 void Identity::setId(IdentityId _id) {
   _identityId = _id;
-  setObjectName(QString::number(id().toInt()));
+  emit idSet(_id);
+  renameObject(QString::number(id().toInt()));
 }
 
 void Identity::setIdentityName(const QString &identityName) {
@@ -184,9 +184,9 @@ void Identity::setQuitReason(const QString &reason) {
 
 /***  ***/
 
-void Identity::update(const Identity &other) {
-for(int idx = metaObject()->propertyOffset(); idx < metaObject()->propertyCount(); idx++) {
-    QMetaProperty metaProp = metaObject()->property(idx);
+void Identity::copyFrom(const Identity &other) {
+  for(int idx = staticMetaObject.propertyOffset(); idx < staticMetaObject.propertyCount(); idx++) {
+    QMetaProperty metaProp = staticMetaObject.property(idx);
     Q_ASSERT(metaProp.isValid());
     if(this->property(metaProp.name()) != other.property(metaProp.name())) {
       setProperty(metaProp.name(), other.property(metaProp.name()));
@@ -194,9 +194,9 @@ for(int idx = metaObject()->propertyOffset(); idx < metaObject()->propertyCount(
   }
 }
 
-bool Identity::operator==(const Identity &other) {
-  for(int idx = metaObject()->propertyOffset(); idx < metaObject()->propertyCount(); idx++) {
-    QMetaProperty metaProp = metaObject()->property(idx);
+bool Identity::operator==(const Identity &other) const {
+  for(int idx = staticMetaObject.propertyOffset(); idx < staticMetaObject.propertyCount(); idx++) {
+    QMetaProperty metaProp = staticMetaObject.property(idx);
     Q_ASSERT(metaProp.isValid());
     QVariant v1 = this->property(metaProp.name());
     QVariant v2 = other.property(metaProp.name()); // qDebug() << v1 << v2;
@@ -210,7 +210,7 @@ bool Identity::operator==(const Identity &other) {
   return true;
 }
 
-bool Identity::operator!=(const Identity &other) {
+bool Identity::operator!=(const Identity &other) const {
   return !(*this == other);
 }
 
@@ -228,3 +228,4 @@ QDataStream &operator>>(QDataStream &in, Identity &id) {
   id.fromVariantMap(i);
   return in;
 }
+