Add QSyncable::assign(QVariantMap&, QObject*) - Assign properties fro…

…m source object to the dest object

qsdiffrunner.h

@@ -9,6 +9,7 @@
 
 #include "qspatch.h"
 #include "qspatchable.h"
+#include "qsyncablefunctions.h"
 
 class QSDiffRunner
 {

qslistmodel.h

@@ -11,6 +11,7 @@
 #include <QPointer>
 #include <QSharedPointer>
 #include "qspatchable.h"
+#include "qsyncablefunctions.h"
 
 class QSListModel : public QAbstractListModel, public QSPatchable
 {

qsyncable.pri

@@ -11,7 +11,8 @@ HEADERS += \
     $$PWD/priv/qstreenode.h \
     $$PWD/qsjsonlistmodel.h \
     $$PWD/QSDiffRunner \
-    $$PWD/QSListModel
+    $$PWD/QSListModel \
+    $$PWD/qsyncablefunctions.h
 
 SOURCES += \
     $$PWD/qsdiffrunner.cpp \
@@ -22,4 +23,5 @@ SOURCES += \
     $$PWD/qstree.cpp \
     $$PWD/qstreenode.cpp \
     $$PWD/qsjsonlistmodel.cpp \
-    $$PWD/qsyncableqmltypes.cpp
+    $$PWD/qsyncableqmltypes.cpp \
+    $$PWD/qsyncablefunctions.cpp

qsyncablefunctions.cpp

@@ -0,0 +1,23 @@
+#include <QMetaProperty>
+#include <QtQml>
+#include "qsyncablefunctions.h"
+
+void QSyncable::assign(QVariantMap &dest, const QObject *source)
+{
+
+    const QMetaObject* meta = source->metaObject();
+
+    for (int i = 0 ; i < meta->propertyCount(); i++) {
+        const QMetaProperty property = meta->property(i);
+        QVariant value = source->property(property.name());
+
+        if (value.canConvert<QObject*>()) {
+            QVariantMap map;
+            assign(map, value.value<QObject*>());
+            value = map;
+        }
+
+        dest[property.name()] = value;
+    }
+
+}

qsyncablefunctions.h

@@ -0,0 +1,14 @@
+#ifndef QSYNCABLEFUNCTIONS_H
+#define QSYNCABLEFUNCTIONS_H
+
+#include <QObject>
+
+namespace QSyncable {
+
+    /// Assign properties from source object to the destination objec
+    void assign(QVariantMap& dest,
+                const QObject* source);
+
+}
+
+#endif // QSYNCABLEFUNCTIONS_H

tests/qsyncableunittests/integrationtests.cpp

@@ -2,6 +2,8 @@
 #include <QSListModel>
 #include <QSortFilterProxyModel>
 #include <QSDiffRunner>
+#include "QQmlApplicationEngine"
+#include "automator.h"
 #include "integrationtests.h"
 
 IntegrationTests::IntegrationTests(QObject *parent) : QObject(parent)
@@ -68,3 +70,30 @@ void IntegrationTests::sortFilterProxyModel()
     QCOMPARE(proxyModel.data(proxyModel.index(0,0),roles.key("id")).toInt(), 4);
 
 }
+
+
+void IntegrationTests::test_assign()
+{
+    QQmlApplicationEngine engine;
+
+    engine.load(QUrl(QString(SRCDIR) + "/test_Assign.qml"));
+    Automator automator(&engine);
+
+    QObject* root = automator.findObject("Root");
+    QVERIFY(root);
+
+    QVariantMap data;
+    QSyncable::assign(data, root);
+
+    QVERIFY(data["objectName"] == "Root");
+    QVERIFY(data["value1"].toInt() == 1);
+    QVERIFY(data["value2"].toString() == "2");
+    QVERIFY(data["value3"].toBool());
+
+    QVERIFY(data["value4"].type() == QVariant::Map);
+    QVERIFY(data["value4"].toMap()["value1"].toInt() == 5);
+
+
+}
+
+

tests/qsyncableunittests/integrationtests.h

@@ -3,6 +3,7 @@
 
 #include <QObject>
 
+/// Test integration with other component
 class IntegrationTests : public QObject
 {
     Q_OBJECT
@@ -14,7 +15,9 @@ class IntegrationTests : public QObject
 public slots:
 
 private slots:
+
     void sortFilterProxyModel();
+    void test_assign();
 };
 
 #endif // INTEGRATIONTESTS_H

tests/qsyncableunittests/qsyncableunittests.pro

@@ -34,4 +34,5 @@ include(../../qsyncable.pri)
 DISTFILES += \
     tst_jsonModel.qml \
     tst_uuid.qml \
-    ../../README.md
+    ../../README.md \
+    test_Assign.qml

tests/qsyncableunittests/test_Assign.qml

@@ -0,0 +1,18 @@
+import QtQuick 2.0
+
+QtObject {
+    id: root
+    objectName: "Root"
+
+    property int value1 : 1
+
+    property string value2: "2"
+
+    property bool value3 : true
+
+    // Nested object
+    property var value4: QtObject {
+        property var value1 : 4 + 1
+    }
+
+}