From 626b2711a49e581babafd179ce362a1c88db8b85 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sun, 19 May 2019 08:54:00 +0900 Subject: Connection: use QScopedPointer instead of unique_ptr While theoretically less robust (no equivalent of make_unique), QScopedPointer is navigable in Qt Creator debug views, unlike unique_ptr. Of course this will eventually be fixed; but given that inability to create an owning pointer object means sure abnormal termination of our code shortly afterwards, having make_unique in this particular case doesn't help in any way at all; so unique_ptr has zero advantages over QScopedPointer in this setting. --- lib/connection.cpp | 3 ++- lib/connection.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/connection.cpp b/lib/connection.cpp index cd0d96f7..e3da3c16 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -141,7 +141,7 @@ class Connection::Private Connection::Connection(const QUrl& server, QObject* parent) : QObject(parent) - , d(std::make_unique(std::make_unique(server))) + , d(new Private(std::make_unique(server))) { d->q = this; // All d initialization should occur before this line } @@ -294,6 +294,7 @@ void Connection::Private::connectWithToken(const QString& user, q->user(); // Creates a User object for the local user data->setToken(accessToken.toLatin1()); data->setDeviceId(deviceId); + q->setObjectName(userId % '/' % deviceId); qCDebug(MAIN) << "Using server" << data->baseUrl().toDisplayString() << "by user" << userId << "from device" << deviceId; emit q->stateChanged(); diff --git a/lib/connection.h b/lib/connection.h index 018c0459..cc2feed8 100644 --- a/lib/connection.h +++ b/lib/connection.h @@ -29,7 +29,6 @@ #include #include -#include namespace QMatrixClient { @@ -744,7 +743,7 @@ namespace QMatrixClient private: class Private; - std::unique_ptr d; + QScopedPointer d; /** * A single entry for functions that need to check whether the -- cgit v1.2.3