summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-03-04 10:11:16 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-04 10:11:16 (GMT)
commit6f974452ec60ec03fd64bb2d12be6544435ae6be (patch)
tree49835f366fb55d4346a057d16721a0b72907481f
parentfa882a7cb91aca4574f0e939068fd37716a923c7 (diff)
downloadQt-6f974452ec60ec03fd64bb2d12be6544435ae6be.zip
Qt-6f974452ec60ec03fd64bb2d12be6544435ae6be.tar.gz
Qt-6f974452ec60ec03fd64bb2d12be6544435ae6be.tar.bz2
Doc: document what the timeout of -1 means in D-Bus
Task-number: QTBUG-8729
-rw-r--r--src/dbus/qdbusconnection.cpp17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index ce3e1a0..abaa486 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -491,6 +491,12 @@ bool QDBusConnection::callWithCallback(const QDBusMessage &message, QObject *rec
its return value, which will be either of type
QDBusMessage::ReplyMessage or QDBusMessage::ErrorMessage.
+ If no reply is received within \a timeout milliseconds, an automatic
+ error will be delivered indicating the expiration of the call.
+ The default \a timeout is -1, which will be replaced with an
+ implementation-defined value that is suitable for inter-process
+ communications (generally, 25 seconds).
+
See the QDBusInterface::call() function for a more friendly way
of placing calls.
@@ -526,9 +532,14 @@ QDBusMessage QDBusConnection::call(const QDBusMessage &message, QDBus::CallMode
Sends the \a message over this connection and returns
immediately. This function is suitable for method calls only. It
returns an object of type QDBusPendingCall which can be used to
- track the status of the reply. The \a timeout parameter is used to
- determine when an auto-generated error reply may be emitted and is
- also the upper limit for waiting in QDBusPendingCall::waitForFinished().
+ track the status of the reply.
+
+ If no reply is received within \a timeout milliseconds, an automatic
+ error will be delivered indicating the expiration of the call. The
+ default \a timeout is -1, which will be replaced with an
+ implementation-defined value that is suitable for inter-process
+ communications (generally, 25 seconds). This timeout is also the
+ upper limit for waiting in QDBusPendingCall::waitForFinished().
See the QDBusInterface::asyncCall() function for a more friendly way
of placing calls.