Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 6 insertions, 33 deletions

diff --git a/lib/csapi/wellknown.cpp b/lib/csapi/wellknown.cpp
index a6107f86..1aa0a90b 100644
--- a/lib/csapi/wellknown.cpp
+++ b/lib/csapi/wellknown.cpp
@@ -4,45 +4,18 @@
 
 #include "wellknown.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/.well-known");
-
-class GetWellknownJob::Private
-{
-    public:
-        DiscoveryInformation data;
-};
+using namespace Quotient;
 
 QUrl GetWellknownJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-            basePath % "/matrix/client");
+                                   QStringLiteral("/.well-known")
+                                       % "/matrix/client");
 }
 
-static const auto GetWellknownJobName = QStringLiteral("GetWellknownJob");
-
 GetWellknownJob::GetWellknownJob()
-    : BaseJob(HttpVerb::Get, GetWellknownJobName,
-        basePath % "/matrix/client", false)
-    , d(new Private)
-{
-}
-
-GetWellknownJob::~GetWellknownJob() = default;
-
-const DiscoveryInformation& GetWellknownJob::data() const
-{
-    return d->data;
-}
-
-BaseJob::Status GetWellknownJob::parseJson(const QJsonDocument& data)
-{
-    fromJson(data, d->data);
-    return Success;
-}
-
+    : BaseJob(HttpVerb::Get, QStringLiteral("GetWellknownJob"),
+              QStringLiteral("/.well-known") % "/matrix/client", false)
+{}