Merge branch 'master' into clang-format

# Conflicts:
#	CMakeLists.txt
#	lib/avatar.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/connectiondata.cpp
#	lib/csapi/account-data.cpp
#	lib/csapi/account-data.h
#	lib/csapi/capabilities.cpp
#	lib/csapi/capabilities.h
#	lib/csapi/content-repo.cpp
#	lib/csapi/create_room.cpp
#	lib/csapi/filter.cpp
#	lib/csapi/joining.cpp
#	lib/csapi/keys.cpp
#	lib/csapi/list_joined_rooms.cpp
#	lib/csapi/notifications.cpp
#	lib/csapi/openid.cpp
#	lib/csapi/presence.cpp
#	lib/csapi/pushrules.cpp
#	lib/csapi/registration.cpp
#	lib/csapi/room_upgrades.cpp
#	lib/csapi/room_upgrades.h
#	lib/csapi/search.cpp
#	lib/csapi/users.cpp
#	lib/csapi/versions.cpp
#	lib/csapi/whoami.cpp
#	lib/csapi/{{base}}.cpp.mustache
#	lib/events/accountdataevents.h
#	lib/events/eventcontent.h
#	lib/events/roommemberevent.cpp
#	lib/events/stateevent.cpp
#	lib/jobs/basejob.cpp
#	lib/jobs/basejob.h
#	lib/networkaccessmanager.cpp
#	lib/networksettings.cpp
#	lib/room.cpp
#	lib/room.h
#	lib/settings.cpp
#	lib/settings.h
#	lib/syncdata.cpp
#	lib/user.cpp
#	lib/user.h
#	lib/util.cpp

1 files changed, 34 insertions, 33 deletions

diff --git a/lib/avatar.h b/lib/avatar.h
index 2ca2c987..37991192 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -24,37 +24,38 @@
 #include <functional>
 #include <memory>
 
-namespace QMatrixClient {
-    class Connection;
-
-    class Avatar
-    {
-        public:
-        explicit Avatar();
-        explicit Avatar(QUrl url);
-        Avatar(Avatar&&);
-        ~Avatar();
-        Avatar& operator=(Avatar&&);
-
-        using get_callback_t = std::function<void()>;
-        using upload_callback_t = std::function<void(QString)>;
-
-        QImage get(Connection* connection, int dimension,
-                   get_callback_t callback) const;
-        QImage get(Connection* connection, int w, int h,
-                   get_callback_t callback) const;
-
-        bool upload(Connection* connection, const QString& fileName,
-                    upload_callback_t callback) const;
-        bool upload(Connection* connection, QIODevice* source,
-                    upload_callback_t callback) const;
-
-        QString mediaId() const;
-        QUrl url() const;
-        bool updateUrl(const QUrl& newUrl);
-
-        private:
-        class Private;
-        std::unique_ptr<Private> d;
-    };
+namespace QMatrixClient
+{
+class Connection;
+
+class Avatar
+{
+public:
+    explicit Avatar();
+    explicit Avatar(QUrl url);
+    Avatar(Avatar&&);
+    ~Avatar();
+    Avatar& operator=(Avatar&&);
+
+    using get_callback_t = std::function<void()>;
+    using upload_callback_t = std::function<void(QString)>;
+
+    QImage get(Connection* connection, int dimension,
+               get_callback_t callback) const;
+    QImage get(Connection* connection, int w, int h,
+               get_callback_t callback) const;
+
+    bool upload(Connection* connection, const QString& fileName,
+                upload_callback_t callback) const;
+    bool upload(Connection* connection, QIODevice* source,
+                upload_callback_t callback) const;
+
+    QString mediaId() const;
+    QUrl url() const;
+    bool updateUrl(const QUrl& newUrl);
+
+private:
+    class Private;
+    std::unique_ptr<Private> d;
+};
 } // namespace QMatrixClient