From 6a6857b9d4dbf22402f2871494bdd06cdccdf366 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Wed, 3 Jul 2019 23:28:09 +0900
Subject: Room/Connection: make room aliases work properly

Closes #301.
---
 lib/connection.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib/connection.h')

diff --git a/lib/connection.h b/lib/connection.h
index cc2feed8..f688c10b 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -250,11 +250,13 @@ namespace QMatrixClient
             Q_INVOKABLE Room* roomByAlias(const QString& roomAlias,
                 JoinStates states = JoinState::Invite|JoinState::Join) const;
             /** Update the internal map of room aliases to IDs */
-            /// This is used for internal bookkeeping of rooms. Do NOT use
-            /// it to try change aliases, use Room::setAliases instead
+            /// This is used to maintain the internal index of room aliases.
+            /// It does NOT change aliases on the server,
+            /// \sa Room::setLocalAliases
             void updateRoomAliases(const QString& roomId,
-                const QStringList& previousRoomAliases,
-                const QStringList& roomAliases);
+                                   const QString& aliasServer,
+                                   const QStringList& previousRoomAliases,
+                                   const QStringList& roomAliases);
             Q_INVOKABLE Room* invitation(const QString& roomId) const;
             Q_INVOKABLE User* user(const QString& userId);
             const User* user() const;
-- 
cgit v1.2.3


From fe82533860a327fbbaa0c980188ccd56d8463b1c Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 4 Jul 2019 13:17:36 +0900
Subject: Connection::token() is no more

Use Connection::accessToken() instead.
---
 lib/connection.cpp | 5 -----
 lib/connection.h   | 2 --
 2 files changed, 7 deletions(-)

(limited to 'lib/connection.h')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index 783e12c0..cd02f6d7 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -973,11 +973,6 @@ QString Connection::deviceId() const
     return d->data->deviceId();
 }
 
-QString Connection::token() const
-{
-    return accessToken();
-}
-
 QByteArray Connection::accessToken() const
 {
     return d->data->accessToken();
diff --git a/lib/connection.h b/lib/connection.h
index f688c10b..eca3c5be 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -267,8 +267,6 @@ namespace QMatrixClient
             Q_INVOKABLE SyncJob* syncJob() const;
             Q_INVOKABLE int millisToReconnect() const;
 
-            [[deprecated("Use accessToken() instead")]]
-            Q_INVOKABLE QString token() const;
             Q_INVOKABLE void getTurnServers();
 
             struct SupportedRoomVersion
-- 
cgit v1.2.3


From 5b8079ca3d35360b7d98814654f37885f21bcb7e Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 6 Jul 2019 19:53:23 +0900
Subject: Fix clazy warnings

---
 lib/connection.h          | 2 +-
 lib/events/event.h        | 2 +-
 lib/events/eventcontent.h | 8 +++++++-
 lib/joinstate.h           | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'lib/connection.h')

diff --git a/lib/connection.h b/lib/connection.h
index eca3c5be..4ab8d5ba 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -122,7 +122,7 @@ namespace QMatrixClient
 
             explicit Connection(QObject* parent = nullptr);
             explicit Connection(const QUrl& server, QObject* parent = nullptr);
-            virtual ~Connection();
+            ~Connection() override;
 
             /** Get all Invited and Joined rooms
              * \return a hashmap from a composite key - room name and whether
diff --git a/lib/events/event.h b/lib/events/event.h
index b7bbd83e..5248472c 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -259,7 +259,7 @@ namespace QMatrixClient
             }
 
             template <typename T>
-            T content(const QLatin1String& key) const
+            T content(QLatin1String key) const
             {
                 return fromJson<T>(contentJson()[key]);
             }
diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h
index ab31a75d..254eb9a9 100644
--- a/lib/events/eventcontent.h
+++ b/lib/events/eventcontent.h
@@ -53,6 +53,9 @@ namespace QMatrixClient
                 QJsonObject originalJson;
 
             protected:
+                Base(const Base&) = default;
+                Base(Base&&) = default;
+
                 virtual void fillJson(QJsonObject* o) const = 0;
         };
 
@@ -167,11 +170,14 @@ namespace QMatrixClient
         class TypedBase: public Base
         {
             public:
-                explicit TypedBase(const QJsonObject& o = {}) : Base(o) { }
+                explicit TypedBase(QJsonObject o = {}) : Base(std::move(o)) { }
                 virtual QMimeType type() const = 0;
                 virtual const FileInfo* fileInfo() const { return nullptr; }
                 virtual FileInfo* fileInfo() { return nullptr; }
                 virtual const Thumbnail* thumbnailInfo() const { return nullptr; }
+
+            protected:
+                using Base::Base;
         };
 
         /**
diff --git a/lib/joinstate.h b/lib/joinstate.h
index 379183f6..4ae67de8 100644
--- a/lib/joinstate.h
+++ b/lib/joinstate.h
@@ -41,7 +41,7 @@ namespace QMatrixClient
     inline const char* toCString(JoinState js)
     {
         size_t state = size_t(js), index = 0;
-        while (state >>= 1) ++index;
+        while (state >>= 1u) ++index;
         return JoinStateStrings[index];
     }
 }  // namespace QMatrixClient
-- 
cgit v1.2.3