From a0eab1ef08ac6ff7d0d7601bbc3172289c450ef8 Mon Sep 17 00:00:00 2001 From: Marius Dege Date: Fri, 18 Dec 2020 15:18:36 +0100 Subject: [PATCH 01/11] removed depricated functions --- .../HttpFileElement.cpp.mustache | 4 +- .../cpp-qt5-client/HttpRequest.cpp.mustache | 71 ++++++++++--------- .../cpp-qt5-client/HttpRequest.h.mustache | 2 + .../cpp-qt5-client/api-body.mustache | 4 +- 4 files changed, 44 insertions(+), 37 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache index ff515e56989f..a3aac7067f6e 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache @@ -57,7 +57,7 @@ QJsonValue {{prefix}}HttpFileElement::asJsonValue() const { if (!result) { qDebug() << "Error opening file " << local_filename; } - return QJsonDocument::fromBinaryData(bArray.data()).object(); + return QJsonDocument::fromJson(bArray.data()).object(); } bool {{prefix}}HttpFileElement::fromStringValue(const QString &instr) { @@ -82,7 +82,7 @@ bool {{prefix}}HttpFileElement::fromJsonValue(const QJsonValue &jval) { file.remove(); } result = file.open(QIODevice::WriteOnly); - file.write(QJsonDocument(jval.toObject()).toBinaryData()); + file.write(QJsonDocument(jval.toObject()).toJson()); file.close(); if (!result) { qDebug() << "Error creating file " << local_filename; diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache index 57692b69d8a7..f59644d652b1 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache @@ -6,7 +6,12 @@ #include #include #include -#include {{#contentCompression}} +#include +#if QT_VERSION >= 0x060000 + #define SKIP_EMPTY_PARTS Qt::SkipEmptyParts +#else + #define SKIP_EMPTY_PARTS QString::SkipEmptyParts +#endif{{#contentCompression}} #include {{/contentCompression}} #include "{{prefix}}HttpRequest.h" @@ -45,8 +50,8 @@ void {{prefix}}HttpRequestInput::add_file(QString variable_name, QString local_f } {{prefix}}HttpRequestWorker::{{prefix}}HttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager) - : QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) { - qsrand(QDateTime::currentDateTime().toTime_t()); + : QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1), randomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch()) { + if (manager == nullptr) { manager = new QNetworkAccessManager(this); } @@ -205,31 +210,31 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) { // variable layout is MULTIPART boundary = QString("__-----------------------%1%2") - .arg(QDateTime::currentDateTime().toTime_t()) - .arg(qrand()); + .arg(QDateTime::currentDateTime().toSecsSinceEpoch()) + .arg(randomGenerator.generate()); QString boundary_delimiter = "--"; QString new_line = "\r\n"; // add variables foreach (QString key, input->vars.keys()) { // add boundary - request_content.append(boundary_delimiter); - request_content.append(boundary); - request_content.append(new_line); + request_content.append(boundary_delimiter.toUtf8()); + request_content.append(boundary.toUtf8()); + request_content.append(new_line.toUtf8()); // add header request_content.append("Content-Disposition: form-data; "); - request_content.append(http_attribute_encode("name", key)); - request_content.append(new_line); + request_content.append(http_attribute_encode("name", key).toUtf8()); + request_content.append(new_line.toUtf8()); request_content.append("Content-Type: text/plain"); - request_content.append(new_line); + request_content.append(new_line.toUtf8()); // add header to body splitter - request_content.append(new_line); + request_content.append(new_line.toUtf8()); // add variable content - request_content.append(input->vars.value(key)); - request_content.append(new_line); + request_content.append(input->vars.value(key).toUtf8()); + request_content.append(new_line.toUtf8()); } // add files @@ -263,38 +268,38 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) { } // add boundary - request_content.append(boundary_delimiter); - request_content.append(boundary); - request_content.append(new_line); + request_content.append(boundary_delimiter.toUtf8()); + request_content.append(boundary.toUtf8()); + request_content.append(new_line.toUtf8()); // add header request_content.append( - QString("Content-Disposition: form-data; %1; %2").arg(http_attribute_encode("name", file_info->variable_name), http_attribute_encode("filename", file_info->request_filename))); - request_content.append(new_line); + QString("Content-Disposition: form-data; %1; %2").arg(http_attribute_encode("name", file_info->variable_name), http_attribute_encode("filename", file_info->request_filename)).toUtf8()); + request_content.append(new_line.toUtf8()); if (file_info->mime_type != nullptr && !file_info->mime_type.isEmpty()) { request_content.append("Content-Type: "); - request_content.append(file_info->mime_type); - request_content.append(new_line); + request_content.append(file_info->mime_type.toUtf8()); + request_content.append(new_line.toUtf8()); } request_content.append("Content-Transfer-Encoding: binary"); - request_content.append(new_line); + request_content.append(new_line.toUtf8()); // add header to body splitter - request_content.append(new_line); + request_content.append(new_line.toUtf8()); // add file content request_content.append(file.readAll()); - request_content.append(new_line); + request_content.append(new_line.toUtf8()); file.close(); } // add end of body - request_content.append(boundary_delimiter); - request_content.append(boundary); - request_content.append(boundary_delimiter); + request_content.append(boundary_delimiter.toUtf8()); + request_content.append(boundary.toUtf8()); + request_content.append(boundary_delimiter.toUtf8()); } if (input->request_body.size() > 0) { @@ -408,14 +413,14 @@ void {{prefix}}HttpRequestWorker::on_reply_timeout(QNetworkReply *reply) { void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) { if (getResponseHeaders().contains(QString("Content-Disposition"))) { - auto contentDisposition = getResponseHeaders().value(QString("Content-Disposition").toUtf8()).split(QString(";"), QString::SkipEmptyParts); + auto contentDisposition = getResponseHeaders().value(QString("Content-Disposition").toUtf8()).split(QString(";"), Qt::SkipEmptyParts); auto contentType = - getResponseHeaders().contains(QString("Content-Type")) ? getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), QString::SkipEmptyParts).first() : QString(); + getResponseHeaders().contains(QString("Content-Type")) ? getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), Qt::SkipEmptyParts).first() : QString(); if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) { QString filename = QUuid::createUuid().toString(); for (const auto &file : contentDisposition) { if (file.contains(QString("filename"))) { - filename = file.split(QString("="), QString::SkipEmptyParts).at(1); + filename = file.split(QString("="), Qt::SkipEmptyParts).at(1); break; } } @@ -425,14 +430,14 @@ void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) { } } else if (getResponseHeaders().contains(QString("Content-Type"))) { - auto contentType = getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), QString::SkipEmptyParts); + auto contentType = getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), Qt::SkipEmptyParts); if ((contentType.count() > 0) && (contentType.first() == QString("multipart/form-data"))) { // TODO : Handle Multipart responses } else { if(headers.contains("Content-Encoding")){ - auto encoding = headers.value("Content-Encoding").split(QString(";"), QString::SkipEmptyParts); + auto encoding = headers.value("Content-Encoding").split(QString(";"), Qt::SkipEmptyParts); if(encoding.count() > 0){ - auto compressionTypes = encoding.first().split(',', QString::SkipEmptyParts); + auto compressionTypes = encoding.first().split(',', Qt::SkipEmptyParts); if(compressionTypes.contains("gzip", Qt::CaseInsensitive) || compressionTypes.contains("deflate", Qt::CaseInsensitive)){ response = decompress(reply->readAll()); } else if(compressionTypes.contains("identity", Qt::CaseInsensitive)){ diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache index e04b1eeb187b..a1e27ca15959 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache @@ -14,6 +14,7 @@ #include #include #include +#include #include "{{prefix}}HttpFileElement.h" @@ -86,6 +87,7 @@ private: bool isResponseCompressionEnabled; bool isRequestCompressionEnabled; int httpResponseCode; + QRandomGenerator randomGenerator; void on_reply_timeout(QNetworkReply *reply); void on_reply_finished(QNetworkReply *reply); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache index 5e37fc0ba11a..ec444936a953 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache @@ -113,7 +113,7 @@ void {{classname}}::{{nickname}}({{#allParams}}const {{{dataType}}} &{{paramName {{/isBasicBearer}}{{#isBasicBasic}} if(!_username.isEmpty() && !_password.isEmpty()){ QByteArray b64; - b64.append(_username + ":" + _password); + b64.append(_username.toUtf8() + ":" + _password.toUtf8()); addHeaders("Authorization","Basic " + b64.toBase64()); }{{/isBasicBasic}}{{/authMethods}} {{#queryParams}}{{^collectionFormat}} @@ -178,7 +178,7 @@ void {{classname}}::{{nickname}}({{#allParams}}const {{{dataType}}} &{{paramName QString output({{paramName}});{{/isString}}{{#isByteArray}}QString output({{paramName}});{{/isByteArray}}{{^isString}}{{^isByteArray}}{{^isFile}} QString output = {{paramName}}.asJson();{{/isFile}}{{/isByteArray}}{{/isString}}{{#isFile}}{{#hasConsumes}}input.headers.insert("Content-Type", {{#consumes}}{{^-first}}, {{/-first}}"{{mediaType}}"{{/consumes}});{{/hasConsumes}} QByteArray output = {{paramName}}.asByteArray();{{/isFile}} - input.request_body.append(output); + input.request_body.append(output.toUtf8()); {{/isContainer}}{{/bodyParams}}{{#headerParams}} if (!::{{cppNamespace}}::toStringValue({{paramName}}).isEmpty()) { input.headers.insert("{{baseName}}", ::{{cppNamespace}}::toStringValue({{paramName}})); From fd926243324dea77e1fa4715b0482e2f39951467 Mon Sep 17 00:00:00 2001 From: Marius Dege Date: Fri, 18 Dec 2020 15:57:09 +0100 Subject: [PATCH 02/11] using preprocessor variable. Updated samples --- .../cpp-qt5-client/HttpRequest.cpp.mustache | 12 ++-- .../petstore/cpp-qt5/.openapi-generator/FILES | 29 ++++++++ .../cpp-qt5/client/PFXHttpFileElement.cpp | 4 +- .../cpp-qt5/client/PFXHttpRequest.cpp | 69 ++++++++++--------- .../petstore/cpp-qt5/client/PFXHttpRequest.h | 2 + .../petstore/cpp-qt5/client/PFXPetApi.cpp | 4 +- .../petstore/cpp-qt5/client/PFXStoreApi.cpp | 2 +- .../petstore/cpp-qt5/client/PFXUserApi.cpp | 4 +- 8 files changed, 81 insertions(+), 45 deletions(-) create mode 100644 samples/client/petstore/cpp-qt5/.openapi-generator/FILES diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache index f59644d652b1..10edccf79d96 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache @@ -413,14 +413,14 @@ void {{prefix}}HttpRequestWorker::on_reply_timeout(QNetworkReply *reply) { void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) { if (getResponseHeaders().contains(QString("Content-Disposition"))) { - auto contentDisposition = getResponseHeaders().value(QString("Content-Disposition").toUtf8()).split(QString(";"), Qt::SkipEmptyParts); + auto contentDisposition = getResponseHeaders().value(QString("Content-Disposition").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS); auto contentType = - getResponseHeaders().contains(QString("Content-Type")) ? getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), Qt::SkipEmptyParts).first() : QString(); + getResponseHeaders().contains(QString("Content-Type")) ? getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS).first() : QString(); if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) { QString filename = QUuid::createUuid().toString(); for (const auto &file : contentDisposition) { if (file.contains(QString("filename"))) { - filename = file.split(QString("="), Qt::SkipEmptyParts).at(1); + filename = file.split(QString("="), SKIP_EMPTY_PARTS).at(1); break; } } @@ -430,14 +430,14 @@ void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) { } } else if (getResponseHeaders().contains(QString("Content-Type"))) { - auto contentType = getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), Qt::SkipEmptyParts); + auto contentType = getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS); if ((contentType.count() > 0) && (contentType.first() == QString("multipart/form-data"))) { // TODO : Handle Multipart responses } else { if(headers.contains("Content-Encoding")){ - auto encoding = headers.value("Content-Encoding").split(QString(";"), Qt::SkipEmptyParts); + auto encoding = headers.value("Content-Encoding").split(QString(";"), SKIP_EMPTY_PARTS); if(encoding.count() > 0){ - auto compressionTypes = encoding.first().split(',', Qt::SkipEmptyParts); + auto compressionTypes = encoding.first().split(',', SKIP_EMPTY_PARTS); if(compressionTypes.contains("gzip", Qt::CaseInsensitive) || compressionTypes.contains("deflate", Qt::CaseInsensitive)){ response = decompress(reply->readAll()); } else if(compressionTypes.contains("identity", Qt::CaseInsensitive)){ diff --git a/samples/client/petstore/cpp-qt5/.openapi-generator/FILES b/samples/client/petstore/cpp-qt5/.openapi-generator/FILES new file mode 100644 index 000000000000..c92fab2e45d8 --- /dev/null +++ b/samples/client/petstore/cpp-qt5/.openapi-generator/FILES @@ -0,0 +1,29 @@ +README.md +client/CMakeLists.txt +client/PFXApiResponse.cpp +client/PFXApiResponse.h +client/PFXCategory.cpp +client/PFXCategory.h +client/PFXEnum.h +client/PFXHelpers.cpp +client/PFXHelpers.h +client/PFXHttpFileElement.cpp +client/PFXHttpFileElement.h +client/PFXHttpRequest.cpp +client/PFXHttpRequest.h +client/PFXObject.h +client/PFXOrder.cpp +client/PFXOrder.h +client/PFXPet.cpp +client/PFXPet.h +client/PFXPetApi.cpp +client/PFXPetApi.h +client/PFXStoreApi.cpp +client/PFXStoreApi.h +client/PFXTag.cpp +client/PFXTag.h +client/PFXUser.cpp +client/PFXUser.h +client/PFXUserApi.cpp +client/PFXUserApi.h +client/PFXclient.pri diff --git a/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp b/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp index ef9e00ebea03..088836d16c74 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp +++ b/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp @@ -65,7 +65,7 @@ QJsonValue PFXHttpFileElement::asJsonValue() const { if (!result) { qDebug() << "Error opening file " << local_filename; } - return QJsonDocument::fromBinaryData(bArray.data()).object(); + return QJsonDocument::fromJson(bArray.data()).object(); } bool PFXHttpFileElement::fromStringValue(const QString &instr) { @@ -90,7 +90,7 @@ bool PFXHttpFileElement::fromJsonValue(const QJsonValue &jval) { file.remove(); } result = file.open(QIODevice::WriteOnly); - file.write(QJsonDocument(jval.toObject()).toBinaryData()); + file.write(QJsonDocument(jval.toObject()).toJson()); file.close(); if (!result) { qDebug() << "Error creating file " << local_filename; diff --git a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp index e92c99f4f02a..620fc641e75a 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp +++ b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp @@ -17,6 +17,11 @@ #include #include #include +#if QT_VERSION >= 0x060000 + #define SKIP_EMPTY_PARTS Qt::SkipEmptyParts +#else + #define SKIP_EMPTY_PARTS QString::SkipEmptyParts +#endif #include "PFXHttpRequest.h" @@ -52,8 +57,8 @@ void PFXHttpRequestInput::add_file(QString variable_name, QString local_filename } PFXHttpRequestWorker::PFXHttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager) - : QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) { - qsrand(QDateTime::currentDateTime().toTime_t()); + : QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1), randomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch()) { + if (manager == nullptr) { manager = new QNetworkAccessManager(this); } @@ -212,31 +217,31 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { // variable layout is MULTIPART boundary = QString("__-----------------------%1%2") - .arg(QDateTime::currentDateTime().toTime_t()) - .arg(qrand()); + .arg(QDateTime::currentDateTime().toSecsSinceEpoch()) + .arg(randomGenerator.generate()); QString boundary_delimiter = "--"; QString new_line = "\r\n"; // add variables foreach (QString key, input->vars.keys()) { // add boundary - request_content.append(boundary_delimiter); - request_content.append(boundary); - request_content.append(new_line); + request_content.append(boundary_delimiter.toUtf8()); + request_content.append(boundary.toUtf8()); + request_content.append(new_line.toUtf8()); // add header request_content.append("Content-Disposition: form-data; "); - request_content.append(http_attribute_encode("name", key)); - request_content.append(new_line); + request_content.append(http_attribute_encode("name", key).toUtf8()); + request_content.append(new_line.toUtf8()); request_content.append("Content-Type: text/plain"); - request_content.append(new_line); + request_content.append(new_line.toUtf8()); // add header to body splitter - request_content.append(new_line); + request_content.append(new_line.toUtf8()); // add variable content - request_content.append(input->vars.value(key)); - request_content.append(new_line); + request_content.append(input->vars.value(key).toUtf8()); + request_content.append(new_line.toUtf8()); } // add files @@ -270,38 +275,38 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { } // add boundary - request_content.append(boundary_delimiter); - request_content.append(boundary); - request_content.append(new_line); + request_content.append(boundary_delimiter.toUtf8()); + request_content.append(boundary.toUtf8()); + request_content.append(new_line.toUtf8()); // add header request_content.append( - QString("Content-Disposition: form-data; %1; %2").arg(http_attribute_encode("name", file_info->variable_name), http_attribute_encode("filename", file_info->request_filename))); - request_content.append(new_line); + QString("Content-Disposition: form-data; %1; %2").arg(http_attribute_encode("name", file_info->variable_name), http_attribute_encode("filename", file_info->request_filename)).toUtf8()); + request_content.append(new_line.toUtf8()); if (file_info->mime_type != nullptr && !file_info->mime_type.isEmpty()) { request_content.append("Content-Type: "); - request_content.append(file_info->mime_type); - request_content.append(new_line); + request_content.append(file_info->mime_type.toUtf8()); + request_content.append(new_line.toUtf8()); } request_content.append("Content-Transfer-Encoding: binary"); - request_content.append(new_line); + request_content.append(new_line.toUtf8()); // add header to body splitter - request_content.append(new_line); + request_content.append(new_line.toUtf8()); // add file content request_content.append(file.readAll()); - request_content.append(new_line); + request_content.append(new_line.toUtf8()); file.close(); } // add end of body - request_content.append(boundary_delimiter); - request_content.append(boundary); - request_content.append(boundary_delimiter); + request_content.append(boundary_delimiter.toUtf8()); + request_content.append(boundary.toUtf8()); + request_content.append(boundary_delimiter.toUtf8()); } if (input->request_body.size() > 0) { @@ -415,14 +420,14 @@ void PFXHttpRequestWorker::on_reply_timeout(QNetworkReply *reply) { void PFXHttpRequestWorker::process_response(QNetworkReply *reply) { if (getResponseHeaders().contains(QString("Content-Disposition"))) { - auto contentDisposition = getResponseHeaders().value(QString("Content-Disposition").toUtf8()).split(QString(";"), QString::SkipEmptyParts); + auto contentDisposition = getResponseHeaders().value(QString("Content-Disposition").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS); auto contentType = - getResponseHeaders().contains(QString("Content-Type")) ? getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), QString::SkipEmptyParts).first() : QString(); + getResponseHeaders().contains(QString("Content-Type")) ? getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS).first() : QString(); if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) { QString filename = QUuid::createUuid().toString(); for (const auto &file : contentDisposition) { if (file.contains(QString("filename"))) { - filename = file.split(QString("="), QString::SkipEmptyParts).at(1); + filename = file.split(QString("="), SKIP_EMPTY_PARTS).at(1); break; } } @@ -432,14 +437,14 @@ void PFXHttpRequestWorker::process_response(QNetworkReply *reply) { } } else if (getResponseHeaders().contains(QString("Content-Type"))) { - auto contentType = getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), QString::SkipEmptyParts); + auto contentType = getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS); if ((contentType.count() > 0) && (contentType.first() == QString("multipart/form-data"))) { // TODO : Handle Multipart responses } else { if(headers.contains("Content-Encoding")){ - auto encoding = headers.value("Content-Encoding").split(QString(";"), QString::SkipEmptyParts); + auto encoding = headers.value("Content-Encoding").split(QString(";"), SKIP_EMPTY_PARTS); if(encoding.count() > 0){ - auto compressionTypes = encoding.first().split(',', QString::SkipEmptyParts); + auto compressionTypes = encoding.first().split(',', SKIP_EMPTY_PARTS); if(compressionTypes.contains("gzip", Qt::CaseInsensitive) || compressionTypes.contains("deflate", Qt::CaseInsensitive)){ response = decompress(reply->readAll()); } else if(compressionTypes.contains("identity", Qt::CaseInsensitive)){ diff --git a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h index 2b1f1afe07c3..d49a3c437838 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h +++ b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h @@ -24,6 +24,7 @@ #include #include #include +#include #include "PFXHttpFileElement.h" @@ -94,6 +95,7 @@ class PFXHttpRequestWorker : public QObject { bool isResponseCompressionEnabled; bool isRequestCompressionEnabled; int httpResponseCode; + QRandomGenerator randomGenerator; void on_reply_timeout(QNetworkReply *reply); void on_reply_finished(QNetworkReply *reply); diff --git a/samples/client/petstore/cpp-qt5/client/PFXPetApi.cpp b/samples/client/petstore/cpp-qt5/client/PFXPetApi.cpp index d637fddb7fe1..42984fb734cc 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXPetApi.cpp +++ b/samples/client/petstore/cpp-qt5/client/PFXPetApi.cpp @@ -105,7 +105,7 @@ void PFXPetApi::addPet(const PFXPet &body) { PFXHttpRequestInput input(fullPath, "POST"); QString output = body.asJson(); - input.request_body.append(output); + input.request_body.append(output.toUtf8()); foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); } @@ -434,7 +434,7 @@ void PFXPetApi::updatePet(const PFXPet &body) { PFXHttpRequestInput input(fullPath, "PUT"); QString output = body.asJson(); - input.request_body.append(output); + input.request_body.append(output.toUtf8()); foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); } diff --git a/samples/client/petstore/cpp-qt5/client/PFXStoreApi.cpp b/samples/client/petstore/cpp-qt5/client/PFXStoreApi.cpp index 922e1fd5c3db..2cbf97a6cff0 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXStoreApi.cpp +++ b/samples/client/petstore/cpp-qt5/client/PFXStoreApi.cpp @@ -255,7 +255,7 @@ void PFXStoreApi::placeOrder(const PFXOrder &body) { PFXHttpRequestInput input(fullPath, "POST"); QString output = body.asJson(); - input.request_body.append(output); + input.request_body.append(output.toUtf8()); foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); } diff --git a/samples/client/petstore/cpp-qt5/client/PFXUserApi.cpp b/samples/client/petstore/cpp-qt5/client/PFXUserApi.cpp index 683904075305..60bf12e38a1b 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXUserApi.cpp +++ b/samples/client/petstore/cpp-qt5/client/PFXUserApi.cpp @@ -105,7 +105,7 @@ void PFXUserApi::createUser(const PFXUser &body) { PFXHttpRequestInput input(fullPath, "POST"); QString output = body.asJson(); - input.request_body.append(output); + input.request_body.append(output.toUtf8()); foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); } @@ -441,7 +441,7 @@ void PFXUserApi::updateUser(const QString &username, const PFXUser &body) { PFXHttpRequestInput input(fullPath, "PUT"); QString output = body.asJson(); - input.request_body.append(output); + input.request_body.append(output.toUtf8()); foreach (QString key, this->defaultHeaders.keys()) { input.headers.insert(key, this->defaultHeaders.value(key)); } From 851cd59722f641ccd9c9ff49d8ee06ac31d3ea13 Mon Sep 17 00:00:00 2001 From: Marius Dege Date: Mon, 21 Dec 2020 13:04:51 +0100 Subject: [PATCH 03/11] added version check for random functions --- .../cpp-qt5-client/HttpRequest.cpp.mustache | 17 ++++++++++++++--- .../cpp-qt5-client/HttpRequest.h.mustache | 6 +++++- .../petstore/cpp-qt5/client/PFXHttpRequest.cpp | 17 ++++++++++++++--- .../petstore/cpp-qt5/client/PFXHttpRequest.h | 6 +++++- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache index 10edccf79d96..e6ef2e70eeca 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache @@ -50,7 +50,13 @@ void {{prefix}}HttpRequestInput::add_file(QString variable_name, QString local_f } {{prefix}}HttpRequestWorker::{{prefix}}HttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager) - : QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1), randomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch()) { + : QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) { + +#if QT_VERSION >= 0x060000 + randomGenerator = QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch()); +#else + qsrand(QDateTime::currentDateTime().toTime_t()); +#endif if (manager == nullptr) { manager = new QNetworkAccessManager(this); @@ -210,8 +216,13 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) { // variable layout is MULTIPART boundary = QString("__-----------------------%1%2") - .arg(QDateTime::currentDateTime().toSecsSinceEpoch()) - .arg(randomGenerator.generate()); + #if QT_VERSION >= 0x060000 + .arg(QDateTime::currentDateTime().toSecsSinceEpoch()) + .arg(randomGenerator.generate()); + #else + .arg(QDateTime::currentDateTime().toTime_t()) + .arg(qrand()); + #endif QString boundary_delimiter = "--"; QString new_line = "\r\n"; diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache index a1e27ca15959..6446b3aeaada 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache @@ -14,7 +14,9 @@ #include #include #include -#include +#if QT_VERSION >= 0x060000 + #include +#endif #include "{{prefix}}HttpFileElement.h" @@ -87,7 +89,9 @@ private: bool isResponseCompressionEnabled; bool isRequestCompressionEnabled; int httpResponseCode; +#if QT_VERSION >= 0x060000 QRandomGenerator randomGenerator; +#endif void on_reply_timeout(QNetworkReply *reply); void on_reply_finished(QNetworkReply *reply); diff --git a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp index 620fc641e75a..b9f879bd09e9 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp +++ b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp @@ -57,7 +57,13 @@ void PFXHttpRequestInput::add_file(QString variable_name, QString local_filename } PFXHttpRequestWorker::PFXHttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager) - : QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1), randomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch()) { + : QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) { + +#if QT_VERSION >= 0x060000 + randomGenerator = QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch()); +#else + qsrand(QDateTime::currentDateTime().toTime_t()); +#endif if (manager == nullptr) { manager = new QNetworkAccessManager(this); @@ -217,8 +223,13 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { // variable layout is MULTIPART boundary = QString("__-----------------------%1%2") - .arg(QDateTime::currentDateTime().toSecsSinceEpoch()) - .arg(randomGenerator.generate()); + #if QT_VERSION >= 0x060000 + .arg(QDateTime::currentDateTime().toSecsSinceEpoch()) + .arg(randomGenerator.generate()); + #else + .arg(QDateTime::currentDateTime().toTime_t()) + .arg(qrand()); + #endif QString boundary_delimiter = "--"; QString new_line = "\r\n"; diff --git a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h index d49a3c437838..a9c00e75b89e 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h +++ b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h @@ -24,7 +24,9 @@ #include #include #include -#include +#if QT_VERSION >= 0x060000 + #include +#endif #include "PFXHttpFileElement.h" @@ -95,7 +97,9 @@ class PFXHttpRequestWorker : public QObject { bool isResponseCompressionEnabled; bool isRequestCompressionEnabled; int httpResponseCode; +#if QT_VERSION >= 0x060000 QRandomGenerator randomGenerator; +#endif void on_reply_timeout(QNetworkReply *reply); void on_reply_finished(QNetworkReply *reply); From cee09b40104f70c657e7e0272268f86161f192f0 Mon Sep 17 00:00:00 2001 From: Marius Dege Date: Mon, 21 Dec 2020 14:23:16 +0100 Subject: [PATCH 04/11] added another version check to Json functions --- .../cpp-qt5-client/HttpFileElement.cpp.mustache | 10 +++++++++- .../petstore/cpp-qt5/client/PFXHttpFileElement.cpp | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache index a3aac7067f6e..bb02ca5de619 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache @@ -57,9 +57,13 @@ QJsonValue {{prefix}}HttpFileElement::asJsonValue() const { if (!result) { qDebug() << "Error opening file " << local_filename; } +#if QT_VERSION >= 0x060000 return QJsonDocument::fromJson(bArray.data()).object(); +#else + return QJsonDocument::fromBinaryData(bArray.data()).object(); +#endif } - + bool {{prefix}}HttpFileElement::fromStringValue(const QString &instr) { QFile file(local_filename); bool result = false; @@ -82,7 +86,11 @@ bool {{prefix}}HttpFileElement::fromJsonValue(const QJsonValue &jval) { file.remove(); } result = file.open(QIODevice::WriteOnly); +#if QT_VERSION >= 0x060000 file.write(QJsonDocument(jval.toObject()).toJson()); +#else + file.write(QJsonDocument(jval.toObject()).toBinaryData()); +#endif file.close(); if (!result) { qDebug() << "Error creating file " << local_filename; diff --git a/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp b/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp index 088836d16c74..e81dde55d85d 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp +++ b/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp @@ -65,9 +65,13 @@ QJsonValue PFXHttpFileElement::asJsonValue() const { if (!result) { qDebug() << "Error opening file " << local_filename; } +#if QT_VERSION >= 0x060000 return QJsonDocument::fromJson(bArray.data()).object(); +#else + return QJsonDocument::fromBinaryData(bArray.data()).object(); +#endif } - + bool PFXHttpFileElement::fromStringValue(const QString &instr) { QFile file(local_filename); bool result = false; @@ -90,7 +94,11 @@ bool PFXHttpFileElement::fromJsonValue(const QJsonValue &jval) { file.remove(); } result = file.open(QIODevice::WriteOnly); +#if QT_VERSION >= 0x060000 file.write(QJsonDocument(jval.toObject()).toJson()); +#else + file.write(QJsonDocument(jval.toObject()).toBinaryData()); +#endif file.close(); if (!result) { qDebug() << "Error creating file " << local_filename; From 70ec3ba21510f3caf6ddc44115e8be25554e4a6c Mon Sep 17 00:00:00 2001 From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com> Date: Thu, 7 Jan 2021 09:36:32 +0100 Subject: [PATCH 05/11] Update modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache Co-authored-by: Martin Delille --- .../main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache index bb02ca5de619..4bfc28ed8e8d 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache @@ -57,7 +57,7 @@ QJsonValue {{prefix}}HttpFileElement::asJsonValue() const { if (!result) { qDebug() << "Error opening file " << local_filename; } -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 return QJsonDocument::fromJson(bArray.data()).object(); #else return QJsonDocument::fromBinaryData(bArray.data()).object(); From cca25735599cf96b36ce70c0d5d1812be30ed4c6 Mon Sep 17 00:00:00 2001 From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com> Date: Thu, 7 Jan 2021 09:36:51 +0100 Subject: [PATCH 06/11] Update modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache Co-authored-by: Martin Delille --- .../main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache index 4bfc28ed8e8d..4163b8be316a 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpFileElement.cpp.mustache @@ -86,7 +86,7 @@ bool {{prefix}}HttpFileElement::fromJsonValue(const QJsonValue &jval) { file.remove(); } result = file.open(QIODevice::WriteOnly); -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 file.write(QJsonDocument(jval.toObject()).toJson()); #else file.write(QJsonDocument(jval.toObject()).toBinaryData()); From e795d8ad6bc2e46f9b8da906a0e278d0e62d122c Mon Sep 17 00:00:00 2001 From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com> Date: Thu, 7 Jan 2021 09:37:03 +0100 Subject: [PATCH 07/11] Update modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache Co-authored-by: Martin Delille --- .../src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache index e6ef2e70eeca..3d5bbeb0781b 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache @@ -7,7 +7,7 @@ #include #include #include -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 #define SKIP_EMPTY_PARTS Qt::SkipEmptyParts #else #define SKIP_EMPTY_PARTS QString::SkipEmptyParts From f46a64a75a9920f88431387888e64224b548644d Mon Sep 17 00:00:00 2001 From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com> Date: Thu, 7 Jan 2021 09:37:19 +0100 Subject: [PATCH 08/11] Update modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache Co-authored-by: Martin Delille --- .../src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache index 3d5bbeb0781b..86772a5535fc 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache @@ -52,7 +52,7 @@ void {{prefix}}HttpRequestInput::add_file(QString variable_name, QString local_f {{prefix}}HttpRequestWorker::{{prefix}}HttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager) : QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) { -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 randomGenerator = QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch()); #else qsrand(QDateTime::currentDateTime().toTime_t()); From cd3bc86c988ddf76dc681c9297a28fba68ae71a7 Mon Sep 17 00:00:00 2001 From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com> Date: Thu, 7 Jan 2021 09:37:54 +0100 Subject: [PATCH 09/11] Update modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache Co-authored-by: Martin Delille --- .../src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache index 86772a5535fc..4ce0cfb2d6d4 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache @@ -216,7 +216,7 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) { // variable layout is MULTIPART boundary = QString("__-----------------------%1%2") - #if QT_VERSION >= 0x060000 + #if QT_VERSION >= 0x051500 .arg(QDateTime::currentDateTime().toSecsSinceEpoch()) .arg(randomGenerator.generate()); #else From 3341dcc14aad7f1a0006343294bb690f47b03fc0 Mon Sep 17 00:00:00 2001 From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com> Date: Thu, 7 Jan 2021 09:38:04 +0100 Subject: [PATCH 10/11] Update modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache Co-authored-by: Martin Delille --- .../src/main/resources/cpp-qt5-client/HttpRequest.h.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache index 6446b3aeaada..e6f93e0376d3 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache @@ -14,7 +14,7 @@ #include #include #include -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 #include #endif From c2d5b5b3a52687267e666a8ae7b6a97ccba8fa95 Mon Sep 17 00:00:00 2001 From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com> Date: Thu, 7 Jan 2021 09:41:15 +0100 Subject: [PATCH 11/11] Apply suggestions from code review Changed version check to Qt 5.15 to remove the warning of the deprecated functions when compiling with Qt 5.15 Co-authored-by: Martin Delille --- .../main/resources/cpp-qt5-client/HttpRequest.h.mustache | 2 +- .../client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp | 4 ++-- samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp | 6 +++--- samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache index e6f93e0376d3..a853306225d6 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache @@ -89,7 +89,7 @@ private: bool isResponseCompressionEnabled; bool isRequestCompressionEnabled; int httpResponseCode; -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 QRandomGenerator randomGenerator; #endif diff --git a/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp b/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp index e81dde55d85d..3bf0e7998540 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp +++ b/samples/client/petstore/cpp-qt5/client/PFXHttpFileElement.cpp @@ -65,7 +65,7 @@ QJsonValue PFXHttpFileElement::asJsonValue() const { if (!result) { qDebug() << "Error opening file " << local_filename; } -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 return QJsonDocument::fromJson(bArray.data()).object(); #else return QJsonDocument::fromBinaryData(bArray.data()).object(); @@ -94,7 +94,7 @@ bool PFXHttpFileElement::fromJsonValue(const QJsonValue &jval) { file.remove(); } result = file.open(QIODevice::WriteOnly); -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 file.write(QJsonDocument(jval.toObject()).toJson()); #else file.write(QJsonDocument(jval.toObject()).toBinaryData()); diff --git a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp index b9f879bd09e9..e81f8b4e1ccc 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp +++ b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp @@ -17,7 +17,7 @@ #include #include #include -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 #define SKIP_EMPTY_PARTS Qt::SkipEmptyParts #else #define SKIP_EMPTY_PARTS QString::SkipEmptyParts @@ -59,7 +59,7 @@ void PFXHttpRequestInput::add_file(QString variable_name, QString local_filename PFXHttpRequestWorker::PFXHttpRequestWorker(QObject *parent, QNetworkAccessManager *_manager) : QObject(parent), manager(_manager), timeOutTimer(this), isResponseCompressionEnabled(false), isRequestCompressionEnabled(false), httpResponseCode(-1) { -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 randomGenerator = QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch()); #else qsrand(QDateTime::currentDateTime().toTime_t()); @@ -223,7 +223,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { // variable layout is MULTIPART boundary = QString("__-----------------------%1%2") - #if QT_VERSION >= 0x060000 + #if QT_VERSION >= 0x051500 .arg(QDateTime::currentDateTime().toSecsSinceEpoch()) .arg(randomGenerator.generate()); #else diff --git a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h index a9c00e75b89e..cea7d43168c4 100644 --- a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h +++ b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.h @@ -24,7 +24,7 @@ #include #include #include -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 #include #endif @@ -97,7 +97,7 @@ class PFXHttpRequestWorker : public QObject { bool isResponseCompressionEnabled; bool isRequestCompressionEnabled; int httpResponseCode; -#if QT_VERSION >= 0x060000 +#if QT_VERSION >= 0x051500 QRandomGenerator randomGenerator; #endif