sigproxy: Actually rename SyncableObjects when requested

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

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index 9fd7704..695ab91 100644 (file)
--- a/src/common/syncableobject.cpp
+++ b/src/common/syncableobject.cpp
@@ -27,20 +27,29 @@
 #include "util.h"
 
 SyncableObject::SyncableObject(QObject* parent)
-    : QObject(parent)
+    : SyncableObject(QString{}, parent)
 {}
 
 SyncableObject::SyncableObject(const QString& objectName, QObject* parent)
     : QObject(parent)
 {
+    _objectName = objectName;
     setObjectName(objectName);
+
+    connect(this, &QObject::objectNameChanged, this, [this](auto&& newName) {
+        for (auto&& proxy : _signalProxies) {
+            proxy->renameObject(this, newName, _objectName);
+        }
+        _objectName = newName;
+    });
 }
 
 SyncableObject::SyncableObject(const SyncableObject& other, QObject* parent)
-    : QObject(parent)
-    , _initialized(other._initialized)
-    , _allowClientUpdates(other._allowClientUpdates)
-{}
+    : SyncableObject(QString{}, parent)
+{
+    _initialized = other._initialized;
+    _allowClientUpdates = other._allowClientUpdates;
+}
 
 SyncableObject::~SyncableObject()
 {
@@ -156,17 +165,6 @@ bool SyncableObject::setInitValue(const QString& property, const QVariant& value
     return QMetaObject::invokeMethod(this, handlername.toLatin1(), param);
 }
 
-void SyncableObject::renameObject(const QString& newName)
-{
-    const QString oldName = objectName();
-    if (oldName != newName) {
-        setObjectName(newName);
-        foreach (SignalProxy* proxy, _signalProxies) {
-            proxy->renameObject(this, newName, oldName);
-        }
-    }
-}
-
 void SyncableObject::update(const QVariantMap& properties)
 {
     fromVariantMap(properties);