diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-05 11:41:59 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-05 11:41:59 (GMT) |
| commit | 1815ad4a6e72ed1996253f0ecb7506ae3e07ca41 (patch) | |
| tree | 4e4e2480c53c470de533112c81386b8b2ca1ccc9 | |
| parent | 3378fe13f8d865463c79f34017a1d82e03cdf147 (diff) | |
| parent | d754440bf7ce91a2f4a56a8873b6bfa546719c08 (diff) | |
| download | Qt-1815ad4a6e72ed1996253f0ecb7506ae3e07ca41.zip Qt-1815ad4a6e72ed1996253f0ecb7506ae3e07ca41.tar.gz Qt-1815ad4a6e72ed1996253f0ecb7506ae3e07ca41.tar.bz2 | |
Merge commit 'refs/merge-requests/2443' of git://gitorious.org/qt/qt into integration
| -rw-r--r-- | doc/src/snippets/sharedemployee/employee.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/doc/src/snippets/sharedemployee/employee.h b/doc/src/snippets/sharedemployee/employee.h index 18b47e0..2c9ba6f 100644 --- a/doc/src/snippets/sharedemployee/employee.h +++ b/doc/src/snippets/sharedemployee/employee.h @@ -48,7 +48,7 @@ class EmployeeData : public QSharedData { public: - EmployeeData() : id(-1) { name.clear(); } + EmployeeData() : id(-1) { } EmployeeData(const EmployeeData &other) : QSharedData(other), id(other.id), name(other.name) { } ~EmployeeData() { } 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 { |