- fixed crashes caused by return types of init methods that were unknown to Qt's...

- minor tweaks to the signalproxy

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 411c8da..9078f24 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -951,12 +951,19 @@ QString SignalProxy::methodBaseName(const QMetaMethod &method) {
   QString methodname = QString(method.signature()).section("(", 0, 0);
 
   // determine where we have to chop:
   QString methodname = QString(method.signature()).section("(", 0, 0);
 
   // determine where we have to chop:

+  int upperCharPos;

   if(method.methodType() == QMetaMethod::Slot) {
     // we take evertyhing from the first uppercase char if it's slot
   if(method.methodType() == QMetaMethod::Slot) {
     // we take evertyhing from the first uppercase char if it's slot

-    methodname = methodname.mid(methodname.indexOf(QRegExp("[A-Z]")));
+    upperCharPos = methodname.indexOf(QRegExp("[A-Z]"));
+    if(upperCharPos == -1)
+      return QString();
+    methodname = methodname.mid(upperCharPos);

   } else {
     // and if it's a signal we discard everything from the last uppercase char
   } else {
     // and if it's a signal we discard everything from the last uppercase char

-    methodname = methodname.left(methodname.lastIndexOf(QRegExp("[A-Z]")));
+    upperCharPos = methodname.lastIndexOf(QRegExp("[A-Z]"));
+    if(upperCharPos == -1)
+      return QString();
+    methodname = methodname.left(upperCharPos);

   }
 
   methodname[0] = methodname[0].toUpper();
   }
 
   methodname[0] = methodname[0].toUpper();

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index ee871b8..781dd15 100644 (file)
--- a/src/common/syncableobject.cpp
+++ b/src/common/syncableobject.cpp
@@ -20,6 +20,8 @@
 
 #include <QMetaProperty>
 
 
 #include <QMetaProperty>
 

+#include <QDebug>
+

 #include "syncableobject.h"
 
 #include "signalproxy.h"
 #include "syncableobject.h"
 
 #include "signalproxy.h"


@@ -58,10 +60,15 @@ QVariantMap SyncableObject::toVariantMap() {
   for(int i = 0; i < meta->methodCount(); i++) {
     QMetaMethod method = meta->method(i);
     QString methodname(::methodName(method));
   for(int i = 0; i < meta->methodCount(); i++) {
     QMetaMethod method = meta->method(i);
     QString methodname(::methodName(method));

-    if(!methodname.startsWith("init") || methodname.startsWith("initSet"))
+    if(!methodname.startsWith("init") || methodname.startsWith("initSet") || methodname.startsWith("initDone"))

       continue;
 
       continue;
 

-    QVariant value = QVariant(QVariant::nameToType(method.typeName()));
+    QVariant::Type variantType = QVariant::nameToType(method.typeName());
+    if(variantType == QVariant::Invalid && !QByteArray(method.typeName()).isEmpty()) {
+      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);
     QMetaObject::invokeMethod(this, methodname.toAscii(), genericvalue);
 
     QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), &value);
     QMetaObject::invokeMethod(this, methodname.toAscii(), genericvalue);