aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2020-04-15 11:02:03 +0200
committerKitsune Ral <Kitsune-Ral@users.sf.net>2020-04-15 13:07:06 +0200
commitb19a7c8b9786ad506ab208da4f0f5e76ff7daa74 (patch)
treeec9b8484ca0c2a171bba8ead008ea387a515aec5
parent7ecc82079f85a7fa29f122fd2fd78401af0ee799 (diff)
downloadlibquotient-b19a7c8b9786ad506ab208da4f0f5e76ff7daa74.tar.gz
libquotient-b19a7c8b9786ad506ab208da4f0f5e76ff7daa74.zip
Connection: cleanup and reformat
-rw-r--r--lib/connection.cpp4
-rw-r--r--lib/connection.h14
2 files changed, 7 insertions, 11 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 229a6564..db61986a 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -334,8 +334,8 @@ void Connection::loginWithToken(const QByteArray& loginToken,
const QString& deviceId)
{
d->loginToServer(LoginFlows::Token.type,
- makeUserIdentifier(/*user is encoded in loginToken*/ {}),
- /*password*/ "", loginToken, deviceId, initialDeviceName);
+ none /*user is encoded in loginToken*/, "" /*password*/,
+ loginToken, deviceId, initialDeviceName);
}
void Connection::assumeIdentity(const QString& userId,
diff --git a/lib/connection.h b/lib/connection.h
index 32d6df79..c908b58b 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -138,18 +138,14 @@ class Connection : public QObject {
Q_PROPERTY(QString localUserId READ userId NOTIFY stateChanged)
Q_PROPERTY(QString deviceId READ deviceId NOTIFY stateChanged)
Q_PROPERTY(QByteArray accessToken READ accessToken NOTIFY stateChanged)
- Q_PROPERTY(QString defaultRoomVersion READ defaultRoomVersion NOTIFY
- capabilitiesLoaded)
- Q_PROPERTY(QUrl homeserver READ homeserver WRITE setHomeserver NOTIFY
- homeserverChanged)
+ Q_PROPERTY(QString defaultRoomVersion READ defaultRoomVersion NOTIFY capabilitiesLoaded)
+ Q_PROPERTY(QUrl homeserver READ homeserver WRITE setHomeserver NOTIFY homeserverChanged)
Q_PROPERTY(QString domain READ domain NOTIFY homeserverChanged)
- Q_PROPERTY(QVector<Quotient::GetLoginFlowsJob::LoginFlow> loginFlows READ loginFlows NOTIFY loginFlowsChanged)
+ Q_PROPERTY(QVector<GetLoginFlowsJob::LoginFlow> loginFlows READ loginFlows NOTIFY loginFlowsChanged)
Q_PROPERTY(bool supportsSso READ supportsSso NOTIFY loginFlowsChanged)
Q_PROPERTY(bool supportsPasswordAuth READ supportsPasswordAuth NOTIFY loginFlowsChanged)
- Q_PROPERTY(bool cacheState READ cacheState WRITE setCacheState NOTIFY
- cacheStateChanged)
- Q_PROPERTY(bool lazyLoading READ lazyLoading WRITE setLazyLoading NOTIFY
- lazyLoadingChanged)
+ Q_PROPERTY(bool cacheState READ cacheState WRITE setCacheState NOTIFY cacheStateChanged)
+ Q_PROPERTY(bool lazyLoading READ lazyLoading WRITE setLazyLoading NOTIFY lazyLoadingChanged)
public:
using UsersToDevicesToEvents =