diff options
| -rw-r--r-- | src/dbus/qdbusserver.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index b1f9be2c2a..ce55297abb 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE \a parent. */ QDBusServer::QDBusServer(const QString &address, QObject *parent) - : QObject(parent), d(0) + : QObject(parent), d(nullptr) { if (address.isEmpty()) return; @@ -83,7 +83,7 @@ QDBusServer::QDBusServer(const QString &address, QObject *parent) localhost (elsewhere). */ QDBusServer::QDBusServer(QObject *parent) - : QObject(parent) + : QObject(parent), d(nullptr) { #ifdef Q_OS_UNIX // Use Unix sockets on Unix systems only @@ -92,10 +92,8 @@ QDBusServer::QDBusServer(QObject *parent) const QString address = QStringLiteral("tcp:"); #endif - if (!qdbus_loadLibDBus()) { - d = 0; + if (!qdbus_loadLibDBus()) return; - } QDBusConnectionManager *instance = QDBusConnectionManager::instance(); if (!instance) |