X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.cpp;h=ac62f0802522f320ec19602fe74aee4bf595d881;hp=b8c8d5ba492474e600079c927913431e7f838356;hb=4ae8f86c1ce452582d6fe576956c7c1bc1460adf;hpb=27de4d2719454c4deb5f6e24b82bdd8991e45260

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index b8c8d5ba..ac62f080 100644
--- a/src/common/syncableobject.cpp
+++ b/src/common/syncableobject.cpp
@@ -27,6 +27,7 @@
 #include "signalproxy.h"
 #include "util.h"
 
+INIT_SYNCABLE_OBJECT(SyncableObject)
 SyncableObject::SyncableObject(QObject *parent)
   : QObject(parent),
     _initialized(false),
@@ -50,10 +51,11 @@ SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent)
 }
 
 SyncableObject::~SyncableObject() {
-  QList<SignalProxy *> proxies = _signalProxies;
-  _signalProxies.clear();
-  for(int i = 0; i < proxies.count(); i++) {
-    proxies[i]->stopSynchronize(this);
+  QList<SignalProxy *>::iterator proxyIter = _signalProxies.begin();
+  while(proxyIter != _signalProxies.end()) {
+    SignalProxy *proxy = (*proxyIter);
+    proxyIter = _signalProxies.erase(proxyIter);
+    proxy->stopSynchronize(this);
   }
 }
 
@@ -103,15 +105,14 @@ QVariantMap SyncableObject::toVariantMap() {
       qWarning() << "SyncableObject::toVariantMap(): cannot fetch init data for:" << this << method.signature() << "- Returntype is unknown to Qt's MetaSystem:" << QByteArray(method.typeName());
       continue;
     }
-    QVariant value = QVariant(variantType);
-    QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), &value);
+
+    QVariant value(variantType, (const void *) 0);
+    QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), value.data());
     QMetaObject::invokeMethod(this, methodname.toAscii(), genericvalue);
 
     properties[SignalProxy::ExtendedMetaObject::methodBaseName(method)] = value;
   }
-  // properties["Payload"] = QByteArray(10000000, 'a');  // for testing purposes
   return properties;
-
 }
 
 void SyncableObject::fromVariantMap(const QVariantMap &properties) {
@@ -140,6 +141,17 @@ void SyncableObject::fromVariantMap(const QVariantMap &properties) {
 bool SyncableObject::setInitValue(const QString &property, const QVariant &value) {
   QString handlername = QString("initSet") + property;
   handlername[7] = handlername[7].toUpper();
+
+  QString methodSignature = QString("%1(%2)").arg(handlername).arg(value.typeName());
+  int methodIdx = metaObject()->indexOfMethod(methodSignature.toAscii().constData());
+  if(methodIdx <  0) {
+    QByteArray normedMethodName = QMetaObject::normalizedSignature(methodSignature.toAscii().constData());
+    methodIdx = metaObject()->indexOfMethod(normedMethodName.constData());
+  }
+  if(methodIdx < 0) {
+    return false;
+  }
+
   QGenericArgument param(value.typeName(), value.constData());
   return QMetaObject::invokeMethod(this, handlername.toAscii(), param);
 }
@@ -156,14 +168,15 @@ void SyncableObject::renameObject(const QString &newName) {
 
 void SyncableObject::update(const QVariantMap &properties) {
   fromVariantMap(properties);
-  emit updated(properties);
+  SYNC(ARG(properties))
+  emit updated();
 }
 
 void SyncableObject::requestUpdate(const QVariantMap &properties) {
   if(allowClientUpdates()) {
     update(properties);
   }
-  emit updateRequested(properties);
+  REQUEST(ARG(properties))
 }
 
 void SyncableObject::sync_call__(SignalProxy::ProxyMode modeType, const char *funcname, ...) const {