diff options
| author | Daniele E. Domenichelli <daniele.domenichelli@gmail.com> | 2011-04-18 16:21:13 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-18 16:26:07 (GMT) |
| commit | a25ec261a52685792527c77e4de0dee28e300bbb (patch) | |
| tree | 85d37f48d4833991017c857e06ba481377cb7113 /src/dbus | |
| parent | 5be6cf0a6e306ed3a51ed5ba89317b1317544eea (diff) | |
| download | Qt-a25ec261a52685792527c77e4de0dee28e300bbb.zip Qt-a25ec261a52685792527c77e4de0dee28e300bbb.tar.gz Qt-a25ec261a52685792527c77e4de0dee28e300bbb.tar.bz2 | |
QtDBus: Fix minor coding style issues
Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 8 | ||||
| -rw-r--r-- | src/dbus/qdbusconnection_p.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index dea7cf9..2384cf3 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -379,7 +379,7 @@ QDBusConnection QDBusConnection::connectToBus(const QString &address, { // Q_ASSERT_X(QCoreApplication::instance(), "QDBusConnection::addConnection", // "Cannot create connection without a Q[Core]Application instance"); - if (!qdbus_loadLibDBus()){ + if (!qdbus_loadLibDBus()) { QDBusConnectionPrivate *d = 0; return QDBusConnection(d); } @@ -422,7 +422,7 @@ QDBusConnection QDBusConnection::connectToPeer(const QString &address, { // Q_ASSERT_X(QCoreApplication::instance(), "QDBusConnection::addConnection", // "Cannot create connection without a Q[Core]Application instance"); - if (!qdbus_loadLibDBus()){ + if (!qdbus_loadLibDBus()) { QDBusConnectionPrivate *d = 0; return QDBusConnection(d); } @@ -459,7 +459,7 @@ void QDBusConnection::disconnectFromBus(const QString &name) if (_q_manager()) { QMutexLocker locker(&_q_manager()->mutex); QDBusConnectionPrivate *d = _q_manager()->connection(name); - if(d && d->mode != QDBusConnectionPrivate::ClientMode) + if (d && d->mode != QDBusConnectionPrivate::ClientMode) return; _q_manager()->removeConnection(name); } @@ -480,7 +480,7 @@ void QDBusConnection::disconnectFromPeer(const QString &name) if (_q_manager()) { QMutexLocker locker(&_q_manager()->mutex); QDBusConnectionPrivate *d = _q_manager()->connection(name); - if(d && d->mode != QDBusConnectionPrivate::PeerMode) + if (d && d->mode != QDBusConnectionPrivate::PeerMode) return; _q_manager()->removeConnection(name); } diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 36f7c53..355a6e6 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -216,7 +216,7 @@ public: inline void serverConnection(const QDBusConnection &connection) { emit newServerConnection(connection); } - + private: void checkThread(); bool handleError(const QDBusErrorInternal &error); |