diff options
| author | Robin Burchell <robin.burchell@collabora.co.uk> | 2010-07-27 22:38:54 (GMT) |
|---|---|---|
| committer | Robin Burchell <robin.burchell@collabora.co.uk> | 2010-07-27 22:38:54 (GMT) |
| commit | aafdc4d4c795ee25a0da1087fada999fbe6c47bc (patch) | |
| tree | 96ac39ebb2ab9eb140886918a40a90f8b437a46d | |
| parent | 07f131927faa09402589da7b4bfb516482f59e46 (diff) | |
| download | Qt-aafdc4d4c795ee25a0da1087fada999fbe6c47bc.zip Qt-aafdc4d4c795ee25a0da1087fada999fbe6c47bc.tar.gz Qt-aafdc4d4c795ee25a0da1087fada999fbe6c47bc.tar.bz2 | |
Move note on connectToBus() not actually being able to reconnect to
connectToBus() documentation, where it belongs.
This also fixes some bad English ("make be connected") by means of removing it.
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 4382032..9aa1cc5 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -173,6 +173,9 @@ void QDBusConnectionManager::setConnection(const QString &name, QDBusConnectionP The connection is then torn down using the disconnectFromBus() function. + Once disconnected, calling connectToBus() will not reestablish a + connection, you must create a new QDBusConnection instance. + As a convenience for the two most common connection types, the sessionBus() and systemBus() functions return open connections to the session server daemon and the system server daemon, @@ -853,10 +856,6 @@ QDBusConnectionInterface *QDBusConnection::interface() const /*! Returns true if this QDBusConnection object is connected. - - If it isn't connected, calling connectToBus() on the same - connection name will not make be connected. You need to call the - QDBusConnection constructor again. */ bool QDBusConnection::isConnected() const { |