diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-04-22 15:05:56 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-01 01:18:03 +0200 |
| commit | a08e0fca276341396d92c63dd4a417cb482de82d (patch) | |
| tree | e5ac78a65f581ded19d4310f80adfd6287d3f55d /src/dbus/qdbusintegrator.cpp | |
| parent | e525957253de61b9f2f7066e222fa8f06a6afacc (diff) | |
Port QtDBus to QMetaMethod-based connectNotify()
The const char *-based API is deprecated and will be removed in Qt5.
Change-Id: I1c7f0e46149964367f42faccfff4b89acbf16511
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusintegrator.cpp')
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 5bdd0ee8d8..35b40a16f9 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -2236,14 +2236,17 @@ void QDBusConnectionPrivate::registerObject(const ObjectTreeNode *node) void QDBusConnectionPrivate::connectRelay(const QString &service, const QString &path, const QString &interface, QDBusAbstractInterface *receiver, - const char *signal) + const QMetaMethod &signal) { // this function is called by QDBusAbstractInterface when one of its signals is connected // we set up a relay from D-Bus into it SignalHook hook; QString key; - if (!prepareHook(hook, key, service, path, interface, QString(), QStringList(), receiver, signal, + QByteArray sig; + sig.append(QSIGNAL_CODE + '0'); + sig.append(signal.methodSignature()); + if (!prepareHook(hook, key, service, path, interface, QString(), QStringList(), receiver, sig, QDBusAbstractInterface::staticMetaObject.methodCount(), true)) return; // don't connect @@ -2267,14 +2270,17 @@ void QDBusConnectionPrivate::connectRelay(const QString &service, void QDBusConnectionPrivate::disconnectRelay(const QString &service, const QString &path, const QString &interface, QDBusAbstractInterface *receiver, - const char *signal) + const QMetaMethod &signal) { // this function is called by QDBusAbstractInterface when one of its signals is disconnected // we remove relay from D-Bus into it SignalHook hook; QString key; - if (!prepareHook(hook, key, service, path, interface, QString(), QStringList(), receiver, signal, + QByteArray sig; + sig.append(QSIGNAL_CODE + '0'); + sig.append(signal.methodSignature()); + if (!prepareHook(hook, key, service, path, interface, QString(), QStringList(), receiver, sig, QDBusAbstractInterface::staticMetaObject.methodCount(), true)) return; // don't connect |