aboutsummaryrefslogtreecommitdiff
path: root/lib/connection.cpp
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2019-05-19 08:54:00 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2019-05-19 08:54:00 +0900
commit626b2711a49e581babafd179ce362a1c88db8b85 (patch)
treec0752a7efbddb6f769165053aa6d0380748c2839 /lib/connection.cpp
parentbb6d33182269425d98f7aa4e22aa5478cff57550 (diff)
downloadlibquotient-626b2711a49e581babafd179ce362a1c88db8b85.tar.gz
libquotient-626b2711a49e581babafd179ce362a1c88db8b85.zip
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.
Diffstat (limited to 'lib/connection.cpp')
-rw-r--r--lib/connection.cpp3
1 files changed, 2 insertions, 1 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<Private>(std::make_unique<ConnectionData>(server)))
+ , d(new Private(std::make_unique<ConnectionData>(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();