Merge branch 'master' of https://github.com/quotient-im/libQuotient into

bhat-libqtolm-update

1 files changed, 45 insertions, 35 deletions

diff --git a/lib/csapi/create_room.cpp b/lib/csapi/create_room.cpp
index 3101152a..68741f13 100644
--- a/lib/csapi/create_room.cpp
+++ b/lib/csapi/create_room.cpp
@@ -8,78 +8,88 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
+// Converters
+namespace Quotient
 {
-    // Converters
 
-    template <> struct JsonObjectConverter<CreateRoomJob::Invite3pid>
+template <>
+struct JsonObjectConverter<CreateRoomJob::Invite3pid>
+{
+    static void dumpTo(QJsonObject& jo, const CreateRoomJob::Invite3pid& pod)
     {
-        static void dumpTo(QJsonObject& jo, const CreateRoomJob::Invite3pid& pod)
-        {
-            addParam<>(jo, QStringLiteral("id_server"), pod.idServer);
-            addParam<>(jo, QStringLiteral("medium"), pod.medium);
-            addParam<>(jo, QStringLiteral("address"), pod.address);
-        }
-    };
-
-    template <> struct JsonObjectConverter<CreateRoomJob::StateEvent>
+        addParam<>(jo, QStringLiteral("id_server"), pod.idServer);
+        addParam<>(jo, QStringLiteral("medium"), pod.medium);
+        addParam<>(jo, QStringLiteral("address"), pod.address);
+    }
+};
+
+template <>
+struct JsonObjectConverter<CreateRoomJob::StateEvent>
+{
+    static void dumpTo(QJsonObject& jo, const CreateRoomJob::StateEvent& pod)
     {
-        static void dumpTo(QJsonObject& jo, const CreateRoomJob::StateEvent& pod)
-        {
-            addParam<>(jo, QStringLiteral("type"), pod.type);
-            addParam<IfNotEmpty>(jo, QStringLiteral("state_key"), pod.stateKey);
-            addParam<>(jo, QStringLiteral("content"), pod.content);
-        }
-    };
-} // namespace QMatrixClient
+        addParam<>(jo, QStringLiteral("type"), pod.type);
+        addParam<IfNotEmpty>(jo, QStringLiteral("state_key"), pod.stateKey);
+        addParam<>(jo, QStringLiteral("content"), pod.content);
+    }
+};
+
+} // namespace Quotient
 
 class CreateRoomJob::Private
 {
-    public:
-        QString roomId;
+public:
+    QString roomId;
 };
 
 static const auto CreateRoomJobName = QStringLiteral("CreateRoomJob");
 
-CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QStringList& invite, const QVector<Invite3pid>& invite3pid, const QString& roomVersion, const QJsonObject& creationContent, const QVector<StateEvent>& initialState, const QString& preset, Omittable<bool> isDirect, const QJsonObject& powerLevelContentOverride)
-    : BaseJob(HttpVerb::Post, CreateRoomJobName,
-        basePath % "/createRoom")
+CreateRoomJob::CreateRoomJob(const QString& visibility,
+                             const QString& roomAliasName, const QString& name,
+                             const QString& topic, const QStringList& invite,
+                             const QVector<Invite3pid>& invite3pid,
+                             const QString& roomVersion,
+                             const QJsonObject& creationContent,
+                             const QVector<StateEvent>& initialState,
+                             const QString& preset, Omittable<bool> isDirect,
+                             const QJsonObject& powerLevelContentOverride)
+    : BaseJob(HttpVerb::Post, CreateRoomJobName, basePath % "/createRoom")
     , d(new Private)
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("visibility"), visibility);
-    addParam<IfNotEmpty>(_data, QStringLiteral("room_alias_name"), roomAliasName);
+    addParam<IfNotEmpty>(_data, QStringLiteral("room_alias_name"),
+                         roomAliasName);
     addParam<IfNotEmpty>(_data, QStringLiteral("name"), name);
     addParam<IfNotEmpty>(_data, QStringLiteral("topic"), topic);
     addParam<IfNotEmpty>(_data, QStringLiteral("invite"), invite);
     addParam<IfNotEmpty>(_data, QStringLiteral("invite_3pid"), invite3pid);
     addParam<IfNotEmpty>(_data, QStringLiteral("room_version"), roomVersion);
-    addParam<IfNotEmpty>(_data, QStringLiteral("creation_content"), creationContent);
+    addParam<IfNotEmpty>(_data, QStringLiteral("creation_content"),
+                         creationContent);
     addParam<IfNotEmpty>(_data, QStringLiteral("initial_state"), initialState);
     addParam<IfNotEmpty>(_data, QStringLiteral("preset"), preset);
     addParam<IfNotEmpty>(_data, QStringLiteral("is_direct"), isDirect);
-    addParam<IfNotEmpty>(_data, QStringLiteral("power_level_content_override"), powerLevelContentOverride);
+    addParam<IfNotEmpty>(_data, QStringLiteral("power_level_content_override"),
+                         powerLevelContentOverride);
     setRequestData(_data);
 }
 
 CreateRoomJob::~CreateRoomJob() = default;
 
-const QString& CreateRoomJob::roomId() const
-{
-    return d->roomId;
-}
+const QString& CreateRoomJob::roomId() const { return d->roomId; }
 
 BaseJob::Status CreateRoomJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("room_id"_ls))
         return { IncorrectResponse,
-            "The key 'room_id' not found in the response" };
+                 "The key 'room_id' not found in the response" };
     fromJson(json.value("room_id"_ls), d->roomId);
+
     return Success;
 }
-