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/qdbusabstractinterface.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/qdbusabstractinterface.cpp')
| -rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 79c607e6b4..76089f2c7d 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -577,7 +577,7 @@ bool QDBusAbstractInterface::callWithCallback(const QString &method, \internal Catch signal connections. */ -void QDBusAbstractInterface::connectNotify(const char *signal) +void QDBusAbstractInterface::connectNotify(const QMetaMethod &signal) { // someone connecting to one of our signals Q_D(QDBusAbstractInterface); @@ -585,7 +585,8 @@ void QDBusAbstractInterface::connectNotify(const char *signal) return; // we end up recursing here, so optimize away - if (qstrcmp(signal + 1, "destroyed(QObject*)") == 0) + static const QMetaMethod destroyedSignal = QMetaMethod::fromSignal(&QDBusAbstractInterface::destroyed); + if (signal == destroyedSignal) return; QDBusConnectionPrivate *conn = d->connectionPrivate(); @@ -599,7 +600,7 @@ void QDBusAbstractInterface::connectNotify(const char *signal) \internal Catch signal disconnections. */ -void QDBusAbstractInterface::disconnectNotify(const char *signal) +void QDBusAbstractInterface::disconnectNotify(const QMetaMethod &signal) { // someone disconnecting from one of our signals Q_D(QDBusAbstractInterface); |