From ccf2b4dd9d41b39167379669f035b45d656e3633 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 19:46:41 +0900 Subject: jobs: expect application/json by default; set query in constructor body; properly convert numbers to strings in query The query should be set in constructor body because there's no reason to pass non-required parameters into the query. As for numbers to strings conversion - there was an attempt to use QJsonValue(a).toString() for that. That doesn't work; QJsonValue does not turn numbers to strings. --- jobs/generated/directory.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'jobs/generated/directory.cpp') diff --git a/jobs/generated/directory.cpp b/jobs/generated/directory.cpp index ea6d493f..4e61ed74 100644 --- a/jobs/generated/directory.cpp +++ b/jobs/generated/directory.cpp @@ -14,16 +14,12 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0/directory"); SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId) : BaseJob(HttpVerb::Put, "SetRoomAliasJob", - basePath % "/room/" % roomAlias, - Query { } - ) + basePath % "/room/" % roomAlias) { QJsonObject _data; if (!roomId.isEmpty()) _data.insert("room_id", toJson(roomId)); setRequestData(_data); - - addExpectedContentType("application/json"); } class GetRoomIdByAliasJob::Private @@ -35,10 +31,10 @@ class GetRoomIdByAliasJob::Private GetRoomIdByAliasJob::GetRoomIdByAliasJob(const QString& roomAlias) : BaseJob(HttpVerb::Get, "GetRoomIdByAliasJob", - basePath % "/room/" % roomAlias, - Query { }, Data { }, false - ), d(new Private) -{ } + basePath % "/room/" % roomAlias, false) + , d(new Private) +{ +} GetRoomIdByAliasJob::~GetRoomIdByAliasJob() = default; @@ -62,8 +58,7 @@ BaseJob::Status GetRoomIdByAliasJob::parseJson(const QJsonDocument& data) DeleteRoomAliasJob::DeleteRoomAliasJob(const QString& roomAlias) : BaseJob(HttpVerb::Delete, "DeleteRoomAliasJob", - basePath % "/room/" % roomAlias, - Query { } - ) -{ } + basePath % "/room/" % roomAlias) +{ +} -- cgit v1.2.3