From 16e0442ecd42f6b2315a298063f25b53045bcf1a Mon Sep 17 00:00:00 2001
From: Martin Delille <martin@delille.org>
Date: Tue, 19 Jul 2022 16:45:29 +0200
Subject: [PATCH] Fix files
---
.../resources/cpp-qt-client/api-body.mustache | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache
index 83db65526da..6ba3b082932 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache
@@ -503,7 +503,14 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
input.add_var("{{baseName}}", ::{{cppNamespace}}::toStringValue({{paramName}}{{^required}}.value(){{/required}}));
{{/isFile}}
{{#isFile}}
- input.add_file("{{baseName}}", {{paramName}}{{^required}}.value(){{/required}}.local_filename, {{paramName}}{{^required}}.value(){{/required}}.request_filename, {{paramName}}{{^required}}.value(){{/required}}.mime_type);
+{{^required}}
+ input.add_file("file", file.value().local_filename, file.value().request_filename, file.value().mime_type);
+{{/required}}
+{{#required}}
+ for (auto file : {{paramName}}) {
+ input.add_file("file", file.local_filename, file.request_filename, file.mime_type);
+ }
+{{/required}}
{{/isFile}}
}
{{/formParams}}
@@ -842,7 +849,12 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) {
QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject obj = doc.object();
for (QString key : obj.keys()) {
- {{returnBaseType}} val;
+ {{#returnTypeIsPrimitive}}
+ {{{returnBaseType}}} val;
+ {{/returnTypeIsPrimitive}}
+ {{^returnTypeIsPrimitive}}
+ {{{returnBaseType}}}<QString> val;
+ {{/returnTypeIsPrimitive}}
::{{cppNamespace}}::fromJsonValue(val, obj[key]);
output.insert(key, val);
}
--
GitLab