aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2017-10-31 09:57:44 +0300
committerKitsune Ral <Kitsune-Ral@users.sf.net>2017-10-31 09:57:44 +0300
commit7387a65d84ac121e59690dcbcd2df947b30ddcaf (patch)
tree4ef5ded1f66b4c558da86976b3041051c3e46d76
parent53e3ef39af62dc44cfa3984db3cc18b0a5d349b6 (diff)
downloadlibquotient-7387a65d84ac121e59690dcbcd2df947b30ddcaf.tar.gz
libquotient-7387a65d84ac121e59690dcbcd2df947b30ddcaf.zip
Fix Connection::deviceId(): Q_INVOKABLE is incompatible with references
-rw-r--r--connection.cpp2
-rw-r--r--connection.h2
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;