From e073d7d20c4ce3dfb8ead25ce0a458ad4fe52a1a Mon Sep 17 00:00:00 2001 From: Ievgenii Meshcheriakov Date: Wed, 16 Aug 2023 15:25:51 +0200 Subject: QDBusServer: Delegate construction to two-argument constructor This reduces code duplication. Change-Id: Ia637045f9495d68dba41bc146c9ba807f5619c5d Reviewed-by: Thiago Macieira --- src/dbus/qdbusserver.cpp | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'src/dbus/qdbusserver.cpp') diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index cb3cee3d6b..3d9dff891d 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -51,27 +51,15 @@ QDBusServer::QDBusServer(const QString &address, QObject *parent) localhost (elsewhere). */ QDBusServer::QDBusServer(QObject *parent) - : QObject(parent), d(nullptr) -{ + : QDBusServer( #ifdef Q_OS_UNIX - // Use Unix sockets on Unix systems only - const QString address = QStringLiteral("unix:tmpdir=/tmp"); + // Use Unix sockets on Unix systems only + QStringLiteral("unix:tmpdir=/tmp"), #else - const QString address = QStringLiteral("tcp:"); + QStringLiteral("tcp:"), #endif - - if (!qdbus_loadLibDBus()) - return; - - QDBusConnectionManager *instance = QDBusConnectionManager::instance(); - if (!instance) - return; - - instance->createServer(address, this); - Q_ASSERT(d != nullptr); - - QObject::connect(d, SIGNAL(newServerConnection(QDBusConnectionPrivate*)), - this, SLOT(_q_newConnection(QDBusConnectionPrivate*)), Qt::QueuedConnection); + parent) +{ } /*! -- cgit v1.2.3