Merge pull request #405 from quotient-im/kitsune-basejob-store-json-response

Store JSON response in BaseJob + tweaks to the generated code

1 files changed, 3 insertions, 23 deletions

diff --git a/lib/csapi/voip.cpp b/lib/csapi/voip.cpp
index c98824b3..43170057 100644
--- a/lib/csapi/voip.cpp
+++ b/lib/csapi/voip.cpp
@@ -4,38 +4,18 @@
 
 #include "voip.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
 using namespace Quotient;
 
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-class GetTurnServerJob::Private {
-public:
-    QJsonObject data;
-};
-
 QUrl GetTurnServerJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   basePath % "/voip/turnServer");
+                                   QStringLiteral("/_matrix/client/r0")
+                                       % "/voip/turnServer");
 }
 
 GetTurnServerJob::GetTurnServerJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetTurnServerJob"),
-              basePath % "/voip/turnServer")
-    , d(new Private)
+              QStringLiteral("/_matrix/client/r0") % "/voip/turnServer")
 {}
-
-GetTurnServerJob::~GetTurnServerJob() = default;
-
-const QJsonObject& GetTurnServerJob::data() const { return d->data; }
-
-BaseJob::Status GetTurnServerJob::parseJson(const QJsonDocument& data)
-{
-    fromJson(data, d->data);
-
-    return Success;
-}