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, 28 insertions, 27 deletions

diff --git a/lib/connectiondata.h b/lib/connectiondata.h
index fcb67e2d..6f9f090c 100644
--- a/lib/connectiondata.h
+++ b/lib/connectiondata.h
@@ -24,31 +24,32 @@
 
 class QNetworkAccessManager;
 
-namespace QMatrixClient {
-    class ConnectionData
-    {
-        public:
-        explicit ConnectionData(QUrl baseUrl);
-        virtual ~ConnectionData();
-
-        QByteArray accessToken() const;
-        QUrl baseUrl() const;
-        const QString& deviceId() const;
-
-        QNetworkAccessManager* nam() const;
-        void setBaseUrl(QUrl baseUrl);
-        void setToken(QByteArray accessToken);
-        void setHost(QString host);
-        void setPort(int port);
-        void setDeviceId(const QString& deviceId);
-
-        QString lastEvent() const;
-        void setLastEvent(QString identifier);
-
-        QByteArray generateTxnId() const;
-
-        private:
-        struct Private;
-        std::unique_ptr<Private> d;
-    };
+namespace QMatrixClient
+{
+class ConnectionData
+{
+public:
+    explicit ConnectionData(QUrl baseUrl);
+    virtual ~ConnectionData();
+
+    QByteArray accessToken() const;
+    QUrl baseUrl() const;
+    const QString& deviceId() const;
+
+    QNetworkAccessManager* nam() const;
+    void setBaseUrl(QUrl baseUrl);
+    void setToken(QByteArray accessToken);
+    void setHost(QString host);
+    void setPort(int port);
+    void setDeviceId(const QString& deviceId);
+
+    QString lastEvent() const;
+    void setLastEvent(QString identifier);
+
+    QByteArray generateTxnId() const;
+
+private:
+    struct Private;
+    std::unique_ptr<Private> d;
+};
 } // namespace QMatrixClient