1 files changed, 53 insertions, 47 deletions

diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp
index 664959f4..90877a95 100644
--- a/lib/csapi/pusher.cpp
+++ b/lib/csapi/pusher.cpp
@@ -8,59 +8,60 @@
 
 #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<GetPushersJob::PusherData>
+template <>
+struct JsonObjectConverter<GetPushersJob::PusherData>
+{
+    static void fillFrom(const QJsonObject& jo,
+                         GetPushersJob::PusherData& result)
     {
-        static void fillFrom(const QJsonObject& jo, GetPushersJob::PusherData& result)
-        {
-            fromJson(jo.value("url"_ls), result.url);
-            fromJson(jo.value("format"_ls), result.format);
-        }
-    };
-
-    template <> struct JsonObjectConverter<GetPushersJob::Pusher>
+        fromJson(jo.value("url"_ls), result.url);
+        fromJson(jo.value("format"_ls), result.format);
+    }
+};
+
+template <>
+struct JsonObjectConverter<GetPushersJob::Pusher>
+{
+    static void fillFrom(const QJsonObject& jo, GetPushersJob::Pusher& result)
     {
-        static void fillFrom(const QJsonObject& jo, GetPushersJob::Pusher& result)
-        {
-            fromJson(jo.value("pushkey"_ls), result.pushkey);
-            fromJson(jo.value("kind"_ls), result.kind);
-            fromJson(jo.value("app_id"_ls), result.appId);
-            fromJson(jo.value("app_display_name"_ls), result.appDisplayName);
-            fromJson(jo.value("device_display_name"_ls), result.deviceDisplayName);
-            fromJson(jo.value("profile_tag"_ls), result.profileTag);
-            fromJson(jo.value("lang"_ls), result.lang);
-            fromJson(jo.value("data"_ls), result.data);
-        }
-    };
-} // namespace QMatrixClient
+        fromJson(jo.value("pushkey"_ls), result.pushkey);
+        fromJson(jo.value("kind"_ls), result.kind);
+        fromJson(jo.value("app_id"_ls), result.appId);
+        fromJson(jo.value("app_display_name"_ls), result.appDisplayName);
+        fromJson(jo.value("device_display_name"_ls), result.deviceDisplayName);
+        fromJson(jo.value("profile_tag"_ls), result.profileTag);
+        fromJson(jo.value("lang"_ls), result.lang);
+        fromJson(jo.value("data"_ls), result.data);
+    }
+};
+
+} // namespace Quotient
 
 class GetPushersJob::Private
 {
-    public:
-        QVector<Pusher> pushers;
+public:
+    QVector<Pusher> pushers;
 };
 
 QUrl GetPushersJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/pushers");
+    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/pushers");
 }
 
 static const auto GetPushersJobName = QStringLiteral("GetPushersJob");
 
 GetPushersJob::GetPushersJob()
-    : BaseJob(HttpVerb::Get, GetPushersJobName,
-        basePath % "/pushers")
+    : BaseJob(HttpVerb::Get, GetPushersJobName, basePath % "/pushers")
     , d(new Private)
-{
-}
+{}
 
 GetPushersJob::~GetPushersJob() = default;
 
@@ -73,28 +74,34 @@ BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     fromJson(json.value("pushers"_ls), d->pushers);
+
     return Success;
 }
 
-namespace QMatrixClient
+// Converters
+namespace Quotient
 {
-    // Converters
 
-    template <> struct JsonObjectConverter<PostPusherJob::PusherData>
+template <>
+struct JsonObjectConverter<PostPusherJob::PusherData>
+{
+    static void dumpTo(QJsonObject& jo, const PostPusherJob::PusherData& pod)
     {
-        static void dumpTo(QJsonObject& jo, const PostPusherJob::PusherData& pod)
-        {
-            addParam<IfNotEmpty>(jo, QStringLiteral("url"), pod.url);
-            addParam<IfNotEmpty>(jo, QStringLiteral("format"), pod.format);
-        }
-    };
-} // namespace QMatrixClient
+        addParam<IfNotEmpty>(jo, QStringLiteral("url"), pod.url);
+        addParam<IfNotEmpty>(jo, QStringLiteral("format"), pod.format);
+    }
+};
+
+} // namespace Quotient
 
 static const auto PostPusherJobName = QStringLiteral("PostPusherJob");
 
-PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, Omittable<bool> append)
-    : BaseJob(HttpVerb::Post, PostPusherJobName,
-        basePath % "/pushers/set")
+PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind,
+                             const QString& appId, const QString& appDisplayName,
+                             const QString& deviceDisplayName,
+                             const QString& lang, const PusherData& data,
+                             const QString& profileTag, Omittable<bool> append)
+    : BaseJob(HttpVerb::Post, PostPusherJobName, basePath % "/pushers/set")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("pushkey"), pushkey);
@@ -108,4 +115,3 @@ PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const
     addParam<IfNotEmpty>(_data, QStringLiteral("append"), append);
     setRequestData(_data);
 }
-