X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.cpp;h=fe320a9640bda504626faddf387c5f5431fc302d;hb=eedb5d1c659cdc4390915654b2a9f08ae51271fa;hp=248ccc9f45bf58fc05d81101aa6b9ab91fe13fa3;hpb=1b680d1e84bff6c2e6f64dfbda72cb91efa48125;p=quassel.git

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index 248ccc9f..fe320a96 100644
--- a/src/common/syncableobject.cpp
+++ b/src/common/syncableobject.cpp
@@ -34,6 +34,14 @@ SyncableObject::SyncableObject(QObject *parent)
 {
 }
 
+SyncableObject::SyncableObject(const QString &objectName, QObject *parent)
+  : QObject(parent),
+    _initialized(false),
+    _allowClientUpdates(false)
+{
+  setObjectName(objectName);
+}
+
 SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent)
   : QObject(parent),
     _initialized(other._initialized),
@@ -78,7 +86,7 @@ QVariantMap SyncableObject::toVariantMap() {
   // ...as well as methods, which have names starting with "init"
   for(int i = 0; i < meta->methodCount(); i++) {
     QMetaMethod method = meta->method(i);
-    QString methodname(::methodName(method));
+    QString methodname(SignalProxy::ExtendedMetaObject::methodName(method));
     if(!methodname.startsWith("init") || methodname.startsWith("initSet") || methodname.startsWith("initDone"))
       continue;
 
@@ -91,8 +99,7 @@ QVariantMap SyncableObject::toVariantMap() {
     QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), &value);
     QMetaObject::invokeMethod(this, methodname.toAscii(), genericvalue);
 
-    properties[SignalProxy::methodBaseName(method)] = value;
-    // qDebug() << ">>> SYNC:" << methodBaseName(method) << value;
+    properties[SignalProxy::ExtendedMetaObject::methodBaseName(method)] = value;
   }
   // properties["Payload"] = QByteArray(10000000, 'a');  // for testing purposes
   return properties;