diff options
| author | Robin Burchell <robin.burchell@collabora.co.uk> | 2010-08-05 15:45:52 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-05 15:46:15 (GMT) |
| commit | 8155ee1db55893876165936f4e9d551b45c0f35a (patch) | |
| tree | c04935d33d6b547c3eeb2449482828eb25998241 /src | |
| parent | 6ca2fe678740f4830de2388e9b2928813561373c (diff) | |
| download | Qt-8155ee1db55893876165936f4e9d551b45c0f35a.zip Qt-8155ee1db55893876165936f4e9d551b45c0f35a.tar.gz Qt-8155ee1db55893876165936f4e9d551b45c0f35a.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.
Merge-request: 2443
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -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 5cbb8ca..055fead 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 { |