diff options
author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-09-04 14:30:10 +0200 |
---|---|---|
committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-09-11 15:26:56 +0200 |
commit | 4c2f944958e7903ac053593a6357453e7eac712d (patch) | |
tree | 480c7f8d1b823315c985a1196dae1bbfefe281c6 /src/dbus | |
parent | 29eb5d8ace744cd4a946aca3f5f1ffe0f4bd0a1f (diff) |
QDBusConnectionPrivate: Remove parent argument
This class is reference counted, having a parent would
interfere with this reference counting code.
Change-Id: I5ab4fdfa74af94d8b760bd3600bd1f828e3d2b91
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusconnection_p.h | 2 | ||||
-rw-r--r-- | src/dbus/qdbusintegrator.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 93ff91e190..1b79d3911c 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -159,7 +159,7 @@ public: typedef QHash<QString, WatchedServiceData> WatchedServicesHash; // public methods are entry points from other objects - explicit QDBusConnectionPrivate(QObject *parent = nullptr); + QDBusConnectionPrivate(); ~QDBusConnectionPrivate(); void createBusService(); diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 9b185849f7..da5affe7ed 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -301,7 +301,7 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, v if (serverConnection->anonymousAuthenticationAllowed) q_dbus_connection_set_allow_anonymous(connection, true); - QDBusConnectionPrivate *newConnection = new QDBusConnectionPrivate(serverConnection->parent()); + QDBusConnectionPrivate *newConnection = new QDBusConnectionPrivate; manager->addConnection( "QDBusServer-"_L1 + QString::number(reinterpret_cast<qulonglong>(newConnection), 16), @@ -1011,9 +1011,8 @@ void QDBusConnectionPrivate::deliverCall(QObject *object, const QDBusMessage &ms return; } -QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p) - : QObject(p), - ref(1), +QDBusConnectionPrivate::QDBusConnectionPrivate() + : ref(1), mode(InvalidMode), busService(nullptr), connection(nullptr), |