From 7387a65d84ac121e59690dcbcd2df947b30ddcaf Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 31 Oct 2017 09:57:44 +0300 Subject: Fix Connection::deviceId(): Q_INVOKABLE is incompatible with references --- connection.cpp | 2 +- connection.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/connection.cpp b/connection.cpp index fdcfa680..41160bd2 100644 --- a/connection.cpp +++ b/connection.cpp @@ -290,7 +290,7 @@ QString Connection::userId() const return d->userId; } -const QString& Connection::deviceId() const +QString Connection::deviceId() const { return d->data->deviceId(); } diff --git a/connection.h b/connection.h index 2a107b43..76e4f3c2 100644 --- a/connection.h +++ b/connection.h @@ -100,7 +100,7 @@ namespace QMatrixClient Q_INVOKABLE User* user(const QString& userId); Q_INVOKABLE User* user(); Q_INVOKABLE QString userId() const; - Q_INVOKABLE const QString& deviceId() const; + Q_INVOKABLE QString deviceId() const; /** @deprecated Use accessToken() instead. */ Q_INVOKABLE QString token() const; Q_INVOKABLE QString accessToken() const; -- cgit v1.2.3