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

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

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index 5bf6804..781dd15 100644 (file)
--- a/src/common/syncableobject.cpp
+++ b/src/common/syncableobject.cpp
@@ -20,18 +20,29 @@
 
 #include <QMetaProperty>
 
+#include <QDebug>
+
 #include "syncableobject.h"
 
 #include "signalproxy.h"
 #include "util.h"
 
 SyncableObject::SyncableObject(QObject *parent) : QObject(parent) {
-
+  _initialized = false;
 }
 
 SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent) : QObject(parent) {
-  Q_UNUSED(other);
+  _initialized = other._initialized;
+
+}
+
+bool SyncableObject::isInitialized() const {
+  return _initialized;
+}
 
+void SyncableObject::setInitialized() {
+  _initialized = true;
+  emit initDone();
 }
 
 QVariantMap SyncableObject::toVariantMap() {
@@ -49,10 +60,15 @@ QVariantMap SyncableObject::toVariantMap() {
   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;
 
-    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);
 
@@ -88,15 +104,10 @@ bool SyncableObject::setInitValue(const QString &property, const QVariant &value
   return QMetaObject::invokeMethod(this, handlername.toAscii(), param);
 }
 
-#include <QDebug>
-QDataStream &operator<<(QDataStream &out, SyncableObject object) {
-  out << object.toVariantMap();
-  return out;
-}
-
-QDataStream &operator>>(QDataStream &in, SyncableObject &object) {
-  QVariantMap map;
-  in >> map;
-  object.fromVariantMap(map);
-  return in;
+void SyncableObject::renameObject(const QString &newName) {
+  const QString oldName = objectName();
+  if(oldName != newName) {
+    setObjectName(newName);
+    emit objectRenamed(newName, oldName);
+  }
 }