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, 9 insertions, 8 deletions

diff --git a/lib/csapi/logout.cpp b/lib/csapi/logout.cpp
index 36281b79..9583b8ec 100644
--- a/lib/csapi/logout.cpp
+++ b/lib/csapi/logout.cpp
@@ -4,29 +4,30 @@
 
 #include "logout.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
 using namespace Quotient;
 
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
 QUrl LogoutJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/logout");
+    return BaseJob::makeRequestUrl(std::move(baseUrl),
+                                   QStringLiteral("/_matrix/client/r0")
+                                       % "/logout");
 }
 
 LogoutJob::LogoutJob()
-    : BaseJob(HttpVerb::Post, QStringLiteral("LogoutJob"), basePath % "/logout")
+    : BaseJob(HttpVerb::Post, QStringLiteral("LogoutJob"),
+              QStringLiteral("/_matrix/client/r0") % "/logout")
 {}
 
 QUrl LogoutAllJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/logout/all");
+    return BaseJob::makeRequestUrl(std::move(baseUrl),
+                                   QStringLiteral("/_matrix/client/r0")
+                                       % "/logout/all");
 }
 
 LogoutAllJob::LogoutAllJob()
     : BaseJob(HttpVerb::Post, QStringLiteral("LogoutAllJob"),
-              basePath % "/logout/all")
+              QStringLiteral("/_matrix/client/r0") % "/logout/all")
 {}