diff options
Diffstat (limited to 'src/dbus/qdbusabstractinterface.cpp')
-rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 79c607e6b4..ea32e6ead6 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -385,7 +385,7 @@ QDBusError QDBusAbstractInterface::lastError() const } /*! - Sets the timeout in seconds for all future DBus calls to \a timeout. + Sets the timeout in milliseconds for all future DBus calls to \a timeout. -1 means the default DBus timeout (usually 25 seconds). \since 4.8 @@ -396,7 +396,7 @@ void QDBusAbstractInterface::setTimeout(int timeout) } /*! - Returns the current value of the timeout in seconds. + Returns the current value of the timeout in milliseconds. -1 means the default DBus timeout (usually 25 seconds). \since 4.8 @@ -544,7 +544,8 @@ bool QDBusAbstractInterface::callWithCallback(const QString &method, return d->connection.callWithCallback(msg, receiver, returnMethod, - errorMethod); + errorMethod, + d->timeout); } /*! @@ -577,7 +578,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 +586,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 +601,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); |