Merge lp:~mzanetti/autopilot-qt/marshalling-fix into lp:autopilot-qt

[Michael Zanetti]

Don't try to marshall signal arguments of type QObject*

Marshalling a pointer through DBus makes no sense as its just an address to protected memory
Marshalling a QObject (without pointer) is not possible because of QObjects no-copy-nature

Removing the argument at least lets the signal itself pass through DBus

Don't try to marshall signal arguments of type QObject*

Marshalling a pointer through DBus makes no sense as its just an address to protected memory
Marshalling a QObject (without pointer) is not possible because of QObjects no-copy-nature

Removing the argument at least lets the signal itself pass through DBus

[lp:~mzanetti/autopilot-qt/marshalling-fix]

36. By Michael Zanetti on 2012-10-25

remove leftover qDebug from testing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://s-jenkins:8080/job/autopilot-qt-ci/26/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/autopilot-qt-ci/./build=pbuilder,distribution=quantal,flavor=amd64/26/console

review: Approve (continuous-integration)

[Juhapekka Piiroinen (juhapekka-piiroinen)]

review: Approve

=== modified file 'lib/dbus_object.cpp'
--- lib/dbus_object.cpp	2012-10-09 13:31:48 +0000
+++ lib/dbus_object.cpp	2012-10-25 15:10:24 +0000
@@ -94,15 +94,22 @@
     {
         SignalSpyPtr signal_spy = signal_watchers_[signal];
         QList<QVariant> signal_emit_list;
-        qDebug() << "Signal emissionss" << *signal_spy;
+        qDebug() << "Signal emissions" << signal_spy.data()->length() << signal_spy.data();
         for (int i = 0; i < signal_spy->length(); ++i)
         {
-            QList<QVariant> signal_emission = signal_spy->at(i);
-            qDebug() << "Packing" << signal_emission << "Into QVariant";
+            QList<QVariant> signal_emission;
+            foreach(const QVariant &arg, signal_spy->at(i)) {
+
+                // We cannot marshall QObject* or QObject:
+                // Marshalling a pointer through DBus makes no sense as its just an address to protected memory
+                // Marshalling a QObject (without pointer) is not possible because of QObjects no-copy-nature
+                if((int)arg.type() != (int)QMetaType::QObjectStar) {
+                    signal_emission.append(arg);
+                }
+            }
+
             signal_emit_list.append(QVariant(signal_emission));
         }
-
-        qDebug() << "Packing" << signal_emit_list << "into DBus reply.";
         reply << QVariant(signal_emit_list);
     }
     else