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, 43 insertions, 39 deletions

diff --git a/lib/csapi/capabilities.cpp b/lib/csapi/capabilities.cpp
index 0fb9fbae..9a054fe9 100644
--- a/lib/csapi/capabilities.cpp
+++ b/lib/csapi/capabilities.cpp
@@ -12,43 +12,48 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient {
-    // Converters
-
-    template <>
-    struct JsonObjectConverter<GetCapabilitiesJob::ChangePasswordCapability> {
-        static void
-        fillFrom(const QJsonObject& jo,
-                 GetCapabilitiesJob::ChangePasswordCapability& result)
-        {
-            fromJson(jo.value("enabled"_ls), result.enabled);
-        }
-    };
-
-    template <>
-    struct JsonObjectConverter<GetCapabilitiesJob::RoomVersionsCapability> {
-        static void fillFrom(const QJsonObject& jo,
-                             GetCapabilitiesJob::RoomVersionsCapability& result)
-        {
-            fromJson(jo.value("default"_ls), result.defaultVersion);
-            fromJson(jo.value("available"_ls), result.available);
-        }
-    };
-
-    template <> struct JsonObjectConverter<GetCapabilitiesJob::Capabilities> {
-        static void fillFrom(QJsonObject jo,
-                             GetCapabilitiesJob::Capabilities& result)
-        {
-            fromJson(jo.take("m.change_password"_ls), result.changePassword);
-            fromJson(jo.take("m.room_versions"_ls), result.roomVersions);
-            fromJson(jo, result.additionalProperties);
-        }
-    };
+// Converters
+namespace QMatrixClient
+{
+
+template <>
+struct JsonObjectConverter<GetCapabilitiesJob::ChangePasswordCapability>
+{
+    static void fillFrom(const QJsonObject& jo,
+                         GetCapabilitiesJob::ChangePasswordCapability& result)
+    {
+        fromJson(jo.value("enabled"_ls), result.enabled);
+    }
+};
+
+template <>
+struct JsonObjectConverter<GetCapabilitiesJob::RoomVersionsCapability>
+{
+    static void fillFrom(const QJsonObject& jo,
+                         GetCapabilitiesJob::RoomVersionsCapability& result)
+    {
+        fromJson(jo.value("default"_ls), result.defaultVersion);
+        fromJson(jo.value("available"_ls), result.available);
+    }
+};
+
+template <>
+struct JsonObjectConverter<GetCapabilitiesJob::Capabilities>
+{
+    static void fillFrom(QJsonObject jo,
+                         GetCapabilitiesJob::Capabilities& result)
+    {
+        fromJson(jo.take("m.change_password"_ls), result.changePassword);
+        fromJson(jo.take("m.room_versions"_ls), result.roomVersions);
+        fromJson(jo, result.additionalProperties);
+    }
+};
+
 } // namespace QMatrixClient
 
 class GetCapabilitiesJob::Private
 {
-    public:
+public:
     Capabilities capabilities;
 };
 
@@ -61,11 +66,9 @@ QUrl GetCapabilitiesJob::makeRequestUrl(QUrl baseUrl)
 static const auto GetCapabilitiesJobName = QStringLiteral("GetCapabilitiesJob");
 
 GetCapabilitiesJob::GetCapabilitiesJob()
-    : BaseJob(HttpVerb::Get, GetCapabilitiesJobName,
-              basePath % "/capabilities"),
-      d(new Private)
-{
-}
+    : BaseJob(HttpVerb::Get, GetCapabilitiesJobName, basePath % "/capabilities")
+    , d(new Private)
+{}
 
 GetCapabilitiesJob::~GetCapabilitiesJob() = default;
 
@@ -78,8 +81,9 @@ BaseJob::Status GetCapabilitiesJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("capabilities"_ls))
-        return { JsonParseError,
+        return { IncorrectResponse,
                  "The key 'capabilities' not found in the response" };
     fromJson(json.value("capabilities"_ls), d->capabilities);
+
     return Success;
 }