diff options
author | Lars Knoll <lars.knoll@qt.io> | 2019-05-16 09:28:55 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2019-10-07 20:40:51 +0200 |
commit | 4c571032f8763c55526a3d9f6bcb8e1336766bd9 (patch) | |
tree | 39d4d604b71b48aeb8e1bde08c27f0ded0ec9781 /src/dbus/qdbusabstractadaptor_p.h | |
parent | 1acc4448c24784dbf824c78acb862240f938d47a (diff) |
Add support for slots to receive the raw void ** arguments array
This is currently being used by dbus und our state machine framework,
and supported by hand editing moc generated code.
Get rid of that hack, and instead add support to moc to forward
the raw arguments array to the slot.
Change-Id: I0e36626f91eb01041464e6d931dc1d4660de91d2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/dbus/qdbusabstractadaptor_p.h')
-rw-r--r-- | src/dbus/qdbusabstractadaptor_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h index 023b3b1be2..404901381b 100644 --- a/src/dbus/qdbusabstractadaptor_p.h +++ b/src/dbus/qdbusabstractadaptor_p.h @@ -92,7 +92,7 @@ public: class QDBusAdaptorConnector: public QObject { - Q_OBJECT_FAKE + Q_OBJECT public: // typedefs struct AdaptorData @@ -118,12 +118,11 @@ public: // methods void disconnectAllSignals(QObject *object); void relay(QObject *sender, int id, void **); -//public slots: - void relaySlot(void **); +public Q_SLOTS: + void relaySlot(QMethodRawArguments a); void polish(); -protected: -//signals: +Q_SIGNALS: void relaySignal(QObject *obj, const QMetaObject *metaObject, int sid, const QVariantList &args); public: // member variables |