X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.cpp;h=ac62f0802522f320ec19602fe74aee4bf595d881;hp=b66626d66d1e2da0955f29c3b07aa6e3a06dc4f8;hb=565743a41c93de874cb79fd145b22e2422bb754e;hpb=62b7bed21f011037a34d7a4ea797d79fbdeff687

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index b66626d6..ac62f080 100644
--- a/src/common/syncableobject.cpp
+++ b/src/common/syncableobject.cpp
@@ -105,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) {
@@ -142,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);
 }