From 427455ec4d33b1e75cd8189cfa4b74eb840a53e2 Mon Sep 17 00:00:00 2001 From: Miklos Marton Date: Mon, 2 Mar 2026 00:23:18 +0100 Subject: [PATCH 1/3] [cpp-qt-client]Optimize generated code - Use const references at function parameters - Do not perform useless initialization of QStrings - Use qDeleteAll --- .../cpp-qt-client/HttpRequest.cpp.mustache | 37 +++++++++---------- .../cpp-qt-client/HttpRequest.h.mustache | 8 ++-- .../resources/cpp-qt-client/README.mustache | 2 +- .../resources/cpp-qt-client/api-body.mustache | 2 +- .../cpp-qt-client/api-header.mustache | 4 +- .../resources/cpp-qt-client/enum.mustache | 4 +- .../cpp-qt-client/model-body.mustache | 4 +- .../cpp-qt-client/model-header.mustache | 4 +- .../cpp-qt-client/oauth.cpp.mustache | 14 +++---- .../resources/cpp-qt-client/oauth.h.mustache | 14 +++---- .../resources/cpp-qt-client/object.mustache | 4 +- .../cpp-qt-addDownloadProgress/README.md | 4 +- .../client/PFXApiResponse.cpp | 4 +- .../client/PFXApiResponse.h | 4 +- .../client/PFXCategory.cpp | 4 +- .../client/PFXCategory.h | 4 +- .../client/PFXEnum.h | 4 +- .../client/PFXEnumStatus.cpp | 4 +- .../client/PFXEnumStatus.h | 4 +- .../client/PFXFakeApi.h | 4 +- .../client/PFXHttpRequest.cpp | 37 +++++++++---------- .../client/PFXHttpRequest.h | 8 ++-- .../client/PFXOauth.cpp | 12 +++--- .../client/PFXOauth.h | 14 +++---- .../client/PFXObject.h | 4 +- .../client/PFXOrder.cpp | 4 +- .../client/PFXOrder.h | 4 +- .../client/PFXPet.cpp | 4 +- .../client/PFXPet.h | 4 +- .../client/PFXPetApi.cpp | 6 +-- .../client/PFXPetApi.h | 36 +++++++++--------- .../client/PFXPrimitivesApi.h | 8 ++-- .../client/PFXStoreApi.h | 16 ++++---- .../client/PFXTag.cpp | 4 +- .../client/PFXTag.h | 4 +- .../client/PFXTestAnyType.cpp | 4 +- .../client/PFXTestAnyType.h | 4 +- .../client/PFXUser.cpp | 4 +- .../client/PFXUser.h | 4 +- .../client/PFXUserApi.h | 32 ++++++++-------- samples/client/petstore/cpp-qt/README.md | 4 +- .../petstore/cpp-qt/client/PFXApiResponse.cpp | 4 +- .../petstore/cpp-qt/client/PFXApiResponse.h | 4 +- .../petstore/cpp-qt/client/PFXCategory.cpp | 4 +- .../petstore/cpp-qt/client/PFXCategory.h | 4 +- .../client/petstore/cpp-qt/client/PFXEnum.h | 4 +- .../petstore/cpp-qt/client/PFXEnumStatus.cpp | 4 +- .../petstore/cpp-qt/client/PFXEnumStatus.h | 4 +- .../petstore/cpp-qt/client/PFXFakeApi.h | 4 +- .../petstore/cpp-qt/client/PFXHttpRequest.cpp | 37 +++++++++---------- .../petstore/cpp-qt/client/PFXHttpRequest.h | 8 ++-- .../petstore/cpp-qt/client/PFXOauth.cpp | 12 +++--- .../client/petstore/cpp-qt/client/PFXOauth.h | 14 +++---- .../client/petstore/cpp-qt/client/PFXObject.h | 4 +- .../petstore/cpp-qt/client/PFXOrder.cpp | 4 +- .../client/petstore/cpp-qt/client/PFXOrder.h | 4 +- .../client/petstore/cpp-qt/client/PFXPet.cpp | 4 +- .../client/petstore/cpp-qt/client/PFXPet.h | 4 +- .../petstore/cpp-qt/client/PFXPetApi.cpp | 6 +-- .../client/petstore/cpp-qt/client/PFXPetApi.h | 36 +++++++++--------- .../petstore/cpp-qt/client/PFXPrimitivesApi.h | 8 ++-- .../petstore/cpp-qt/client/PFXStoreApi.h | 16 ++++---- .../client/petstore/cpp-qt/client/PFXTag.cpp | 4 +- .../client/petstore/cpp-qt/client/PFXTag.h | 4 +- .../petstore/cpp-qt/client/PFXTestAnyType.cpp | 4 +- .../petstore/cpp-qt/client/PFXTestAnyType.h | 4 +- .../client/petstore/cpp-qt/client/PFXUser.cpp | 4 +- .../client/petstore/cpp-qt/client/PFXUser.h | 4 +- .../petstore/cpp-qt/client/PFXUserApi.h | 32 ++++++++-------- 69 files changed, 296 insertions(+), 299 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.cpp.mustache index 083477d37e9b..090672ed68ca 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.cpp.mustache @@ -7,6 +7,9 @@ #include #include #include +#include + +#include {{#contentCompression}} #include {{/contentCompression}} @@ -20,7 +23,7 @@ namespace {{this}} { initialize(); } -{{prefix}}HttpRequestInput::{{prefix}}HttpRequestInput(QString v_url_str, QString v_http_method) { +{{prefix}}HttpRequestInput::{{prefix}}HttpRequestInput(const QString &v_url_str, const QString &v_http_method) { initialize(); url_str = v_url_str; http_method = v_http_method; @@ -32,11 +35,11 @@ void {{prefix}}HttpRequestInput::initialize() { http_method = "GET"; } -void {{prefix}}HttpRequestInput::add_var(QString key, QString value) { +void {{prefix}}HttpRequestInput::add_var(const QString &key, const QString &value) { vars[key] = value; } -void {{prefix}}HttpRequestInput::add_file(QString variable_name, QString local_filename, QString request_filename, QString mime_type) { +void {{prefix}}HttpRequestInput::add_file(const QString &variable_name, const QString &local_filename, const QString &request_filename, const QString &mime_type) { {{prefix}}HttpFileElement file; file.variable_name = variable_name; file.local_filename = local_filename; @@ -58,11 +61,7 @@ void {{prefix}}HttpRequestInput::add_file(QString variable_name, QString local_f {{prefix}}HttpRequestWorker::~{{prefix}}HttpRequestWorker() { QObject::disconnect(&timeOutTimer, &QTimer::timeout, nullptr, nullptr); timeOutTimer.stop(); - for (const auto &item : multiPartFields) { - if (item != nullptr) { - delete item; - } - } + qDeleteAll(multiPartFields); } QMap {{prefix}}HttpRequestWorker::getResponseHeaders() const { @@ -116,10 +115,10 @@ int {{prefix}}HttpRequestWorker::getHttpResponseCode() const{ return httpResponseCode; } -QString {{prefix}}HttpRequestWorker::http_attribute_encode(QString attribute_name, QString input) { +QString {{prefix}}HttpRequestWorker::http_attribute_encode(const QString &attribute_name, const QString &input) { // result structure follows RFC 5987 bool need_utf_encoding = false; - QString result = ""; + QString result; QByteArray input_c = input.toLocal8Bit(); char c; for (int i = 0; i < input_c.length(); i++) { @@ -143,7 +142,7 @@ QString {{prefix}}HttpRequestWorker::http_attribute_encode(QString attribute_nam return QString("%1=\"%2\"").arg(attribute_name, result); } - QString result_utf8 = ""; + QString result_utf8; for (int i = 0; i < input_c.length(); i++) { c = input_c.at(i); if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) { @@ -178,7 +177,7 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) { // prepare request content - QString boundary = ""; + QString boundary; if (input->var_layout == ADDRESS || input->var_layout == URL_ENCODED) { // variable layout is ADDRESS or URL_ENCODED @@ -186,7 +185,7 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) { if (input->vars.count() > 0) { bool first = true; isFormData = true; - for (QString key : input->vars.keys()) { + for (const QString &key : input->vars.keys()) { if (!first) { request_content.append("&"); } @@ -208,11 +207,11 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) { boundary = QString("__-----------------------%1%2") .arg(QDateTime::currentSecsSinceEpoch()) .arg(randomGenerator.generate()); - QString boundary_delimiter = "--"; - QString new_line = "\r\n"; + const QString boundary_delimiter = "--"; + const QString new_line = "\r\n"; // add variables - for (QString key : input->vars.keys()) { + for (const QString &key : input->vars.keys()) { // add boundary request_content.append(boundary_delimiter.toUtf8()); request_content.append(boundary.toUtf8()); @@ -314,7 +313,7 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) { request.setSslConfiguration(*{{prefix}}HttpRequestWorker::sslDefaultConfiguration); } request.setRawHeader("User-Agent", "{{httpUserAgent}}{{^httpUserAgent}}OpenAPI-Generator/{{apiVersion}}/cpp-qt{{/httpUserAgent}}"); - for (QString key : input->headers.keys()) { request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str()); } + for (const QString &key : input->headers.keys()) { request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str()); } if (request_content.size() > 0 && !isFormData && (input->var_layout != MULTIPART)) { if (!input->headers.contains("Content-Type")) { @@ -404,7 +403,7 @@ void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) { QString contentTypeHdr; QString contentEncodingHdr; - for(auto hdr: getResponseHeaders().keys()){ + for(const auto &hdr: getResponseHeaders().keys()){ if(hdr.compare(QString("Content-Disposition"), Qt::CaseInsensitive) == 0){ contentDispositionHdr = getResponseHeaders().value(hdr); } @@ -422,7 +421,7 @@ void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) { !contentTypeHdr.isEmpty() ? contentTypeHdr.split(QString(";"), Qt::SkipEmptyParts).first() : QString(); if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) { QString filename = QUuid::createUuid().toString(); - for (const auto &file : contentDisposition) { + for (const auto &file : std::as_const(contentDisposition)) { if (file.contains(QString("filename"))) { filename = file.split(QString("="), Qt::SkipEmptyParts).at(1); break; diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.h.mustache index 4566a9c0b0a3..ecc9ea8e501a 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.h.mustache @@ -41,10 +41,10 @@ public: QByteArray request_body; {{prefix}}HttpRequestInput(); - {{prefix}}HttpRequestInput(QString v_url_str, QString v_http_method); + {{prefix}}HttpRequestInput(const QString &v_url_str, const QString &v_http_method); void initialize(); - void add_var(QString key, QString value); - void add_file(QString variable_name, QString local_filename, QString request_filename, QString mime_type); + void add_var(const QString &key, const QString &value); + void add_file(const QString &variable_name, const QString &local_filename, const QString &request_filename, const QString &mime_type); }; class {{prefix}}HttpRequestWorker : public QObject { @@ -59,7 +59,7 @@ public: QString error_str; QMap getResponseHeaders() const; - QString http_attribute_encode(QString attribute_name, QString input); + QString http_attribute_encode(const QString &attribute_name, const QString &input); void execute({{prefix}}HttpRequestInput *input); static QSslConfiguration *sslDefaultConfiguration; void setTimeOut(int timeOutMs); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/README.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/README.mustache index 7ce175c627b8..42a12d0ffd89 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/README.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/README.mustache @@ -83,7 +83,7 @@ void Example::exampleFunction1(){ connect(&apiInstance, &{{{classname}}}::{{nickname}}Signal, [&]() { loop.quit(); }); - connect(&apiInstance, &{{{classname}}}::{{nickname}}SignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&apiInstance, &{{{classname}}}::{{nickname}}SignalE, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; loop.quit(); }); 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 38172b270edb..2d8187cedb3e 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 @@ -831,7 +831,7 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) { {{#returnType}} {{#isArray}} {{{returnType}}} output; - QString json(worker->response); + QString json(worker->response) ; QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache index 888589643701..2943e6f896cc 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache @@ -95,11 +95,11 @@ Q_SIGNALS: void {{nickname}}SignalFull({{prefix}}HttpRequestWorker *worker{{#returnType}}, {{{.}}} summary{{/returnType}});{{/operation}}{{/operations}} {{#operations}}{{#operation}} Q_DECL_DEPRECATED_X("Use {{nickname}}SignalError() instead") - void {{nickname}}SignalE({{#returnType}}{{{.}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, QString error_str); + void {{nickname}}SignalE({{#returnType}}{{{.}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, const QString &error_str); void {{nickname}}SignalError({{#returnType}}{{{.}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, const QString &error_str);{{/operation}}{{/operations}} {{#operations}}{{#operation}} Q_DECL_DEPRECATED_X("Use {{nickname}}SignalErrorFull() instead") - void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void {{nickname}}SignalErrorFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str);{{/operation}}{{/operations}} void abortRequestsSignal(); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/enum.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/enum.mustache index 0851c1393d8f..21bb678bbcc3 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/enum.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/enum.mustache @@ -15,7 +15,7 @@ class {{prefix}}Enum { public: {{prefix}}Enum() {} - {{prefix}}Enum(QString jsonString) { + {{prefix}}Enum(const QString &jsonString) { fromJson(jsonString); } @@ -35,7 +35,7 @@ public: return obj; } - virtual void fromJson(QString jsonString) { + virtual void fromJson(const QString &jsonString) { jstr = jsonString; } diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/model-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/model-body.mustache index 28e3f674e41a..6055967efcc3 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/model-body.mustache @@ -12,7 +12,7 @@ namespace {{this}} { {{/cppNamespaceDeclarations}} -{{classname}}::{{classname}}(QString json) { +{{classname}}::{{classname}}(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -33,7 +33,7 @@ void {{classname}}::initializeModel() { m_value = e{{classname}}::INVALID_VALUE_OPENAPI_GENERATED;{{/isEnum}} } -void {{classname}}::fromJson(QString jsonString) { +void {{classname}}::fromJson(const QString &jsonString) { {{^isEnum}}QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/model-header.mustache index 8b4a1a6d4d22..e5f8d67d4aff 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/model-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/model-header.mustache @@ -27,13 +27,13 @@ namespace {{this}} { class {{classname}} : public {{prefix}}{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Enum{{/isEnum}} { public: {{classname}}(); - {{classname}}(QString json); + {{classname}}(const QString &json); ~{{classname}}() override; QString asJson() const override; QJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnum}} asJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnum}}() const override; void fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnum}}(QJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnum}} json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; {{^isEnum}}{{#vars}} {{#deprecated}}Q_DECL_DEPRECATED {{/deprecated}}{{{dataType}}} {{getter}}() const; {{#deprecated}}Q_DECL_DEPRECATED {{/deprecated}}void {{setter}}(const {{{dataType}}} &{{name}}); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/oauth.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/oauth.cpp.mustache index b9927d11d677..174f82a303c5 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/oauth.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/oauth.cpp.mustache @@ -22,7 +22,7 @@ void OauthBase::onFinish(QNetworkReply *rep) addToken(oauthToken(token, expiresIn, scope, type)); } -oauthToken OauthBase::getToken(QString scope) +oauthToken OauthBase::getToken(const QString &scope) { auto tokenIt = m_oauthTokenMap.find(scope); return tokenIt != m_oauthTokenMap.end() ? tokenIt.value() : oauthToken(); @@ -35,7 +35,7 @@ void OauthBase::addToken(oauthToken token) } -void OauthBase::removeToken(QString scope) +void OauthBase::removeToken(const QString &scope) { m_oauthTokenMap.remove(scope); } @@ -59,7 +59,7 @@ void OauthCode::unlink() disconnect(&m_server, nullptr, nullptr, nullptr); } -void OauthCode::setVariables(QString authUrl, QString tokenUrl, QString scope, QString state, QString redirectUri, QString clientId, QString clientSecret, QString accessType){ +void OauthCode::setVariables(const QString &authUrl, const QString &tokenUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &clientSecret, const QString &accessType){ m_authUrl = QUrl(authUrl); m_tokenUrl = QUrl(tokenUrl); @@ -126,7 +126,7 @@ void OauthImplicit::unlink() m_linked = false; } -void OauthImplicit::setVariables(QString authUrl, QString scope, QString state, QString redirectUri, QString clientId, QString accessType){ +void OauthImplicit::setVariables(const QString &authUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &accessType){ m_authUrl = QUrl(authUrl); m_scope = scope; @@ -168,7 +168,7 @@ void OauthCredentials::unlink() disconnect(this, nullptr, nullptr, nullptr); } -void OauthCredentials::setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret){ +void OauthCredentials::setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret){ m_tokenUrl = QUrl(tokenUrl); m_scope = scope; @@ -211,7 +211,7 @@ void OauthPassword::unlink() disconnect(this, nullptr, nullptr, nullptr); } -void OauthPassword::setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret, QString username, QString password){ +void OauthPassword::setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret, const QString &username, const QString &password){ m_tokenUrl = QUrl(tokenUrl); m_scope = scope; @@ -346,4 +346,4 @@ void ReplyServer::read() {{#cppNamespaceDeclarations}} } // namespace {{this}} -{{/cppNamespaceDeclarations}} \ No newline at end of file +{{/cppNamespaceDeclarations}} diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/oauth.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/oauth.h.mustache index dd5ca9474361..6e74e17e16af 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/oauth.h.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/oauth.h.mustache @@ -53,7 +53,7 @@ class ReplyServer : public QTcpServer Q_OBJECT public: explicit ReplyServer(QObject *parent = nullptr); - void setReply(QByteArray reply){m_reply = reply;}; + void setReply(const QByteArray &reply) {m_reply = reply;}; void run(); private: QByteArray m_reply; @@ -74,9 +74,9 @@ class OauthBase : public QObject Q_OBJECT public: OauthBase(QObject* parent = nullptr) : QObject(parent) {}; - oauthToken getToken(QString scope); + oauthToken getToken(const QString &scope); void addToken(oauthToken token); - void removeToken(QString scope); + void removeToken(const QString &scope); bool linked(){return m_linked;}; virtual void link()=0; virtual void unlink()=0; @@ -105,7 +105,7 @@ public: OauthCode(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString authUrl, QString tokenUrl, QString scope, QString state, QString redirectUri, QString clientId, QString clientSecret, QString accessType = ""); + void setVariables(const QString &authUrl, const QString &tokenUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &clientSecret, const QString &accessType = QString()); private: ReplyServer m_server; @@ -124,7 +124,7 @@ public: OauthImplicit(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString authUrl, QString scope, QString state, QString redirectUri, QString clientId, QString accessType = ""); + void setVariables(const QString &authUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &accessType = QString()); private: ReplyServer m_server; @@ -142,7 +142,7 @@ public: OauthCredentials(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret); + void setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret); public Q_SLOTS: void authenticationNeededCallback() override; @@ -157,7 +157,7 @@ public: OauthPassword(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret, QString username, QString password); + void setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret, const QString &username, const QString &password); private: QString m_username, m_password; diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/object.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/object.mustache index 6a6b3758a867..7b6236801153 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/object.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/object.mustache @@ -14,7 +14,7 @@ class {{prefix}}Object { public: {{prefix}}Object() {} - {{prefix}}Object(QString jsonString) { + {{prefix}}Object(const QString &jsonString) { fromJson(jsonString); } @@ -29,7 +29,7 @@ public: return doc.toJson(QJsonDocument::Compact); } - virtual void fromJson(QString jsonString) { + virtual void fromJson(const QString &jsonString) { QJsonDocument doc = QJsonDocument::fromJson(jsonString.toUtf8()); jObj = doc.object(); } diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/README.md b/samples/client/petstore/cpp-qt-addDownloadProgress/README.md index d1813e65b52d..50df38674c1f 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/README.md +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/README.md @@ -63,7 +63,7 @@ void Example::exampleFunction1(){ connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignal, [&]() { loop.quit(); }); - connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignalE, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; loop.quit(); }); @@ -74,7 +74,7 @@ void Example::exampleFunction1(){ connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignal, [&]() { loop.quit(); }); - connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignalE, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; loop.quit(); }); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXApiResponse.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXApiResponse.cpp index 8fbef0fb8c5c..ef7bb19bdb17 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXApiResponse.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXApiResponse.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXApiResponse::PFXApiResponse(QString json) { +PFXApiResponse::PFXApiResponse(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -43,7 +43,7 @@ void PFXApiResponse::initializeModel() { m_message_isValid = false; } -void PFXApiResponse::fromJson(QString jsonString) { +void PFXApiResponse::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXApiResponse.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXApiResponse.h index dc7682206561..fdf691fa6e59 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXApiResponse.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXApiResponse.h @@ -30,13 +30,13 @@ namespace test_namespace { class PFXApiResponse : public PFXObject { public: PFXApiResponse(); - PFXApiResponse(QString json); + PFXApiResponse(const QString &json); ~PFXApiResponse() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint32 getCode() const; void setCode(const qint32 &code); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXCategory.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXCategory.cpp index 1651c44c1c35..46944b4aa07b 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXCategory.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXCategory.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXCategory::PFXCategory(QString json) { +PFXCategory::PFXCategory(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -40,7 +40,7 @@ void PFXCategory::initializeModel() { m_name_isValid = false; } -void PFXCategory::fromJson(QString jsonString) { +void PFXCategory::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXCategory.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXCategory.h index d86eee9a2626..9449837db442 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXCategory.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXCategory.h @@ -30,13 +30,13 @@ namespace test_namespace { class PFXCategory : public PFXObject { public: PFXCategory(); - PFXCategory(QString json); + PFXCategory(const QString &json); ~PFXCategory() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint64 getId() const; void setId(const qint64 &id); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnum.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnum.h index 045cc6095c82..fa2a98482e7d 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnum.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnum.h @@ -23,7 +23,7 @@ class PFXEnum { public: PFXEnum() {} - PFXEnum(QString jsonString) { + PFXEnum(const QString &jsonString) { fromJson(jsonString); } @@ -43,7 +43,7 @@ class PFXEnum { return obj; } - virtual void fromJson(QString jsonString) { + virtual void fromJson(const QString &jsonString) { jstr = jsonString; } diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnumStatus.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnumStatus.cpp index da7f6d388a38..7c6f338e48c9 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnumStatus.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnumStatus.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXEnumStatus::PFXEnumStatus(QString json) { +PFXEnumStatus::PFXEnumStatus(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -38,7 +38,7 @@ void PFXEnumStatus::initializeModel() { m_value = ePFXEnumStatus::INVALID_VALUE_OPENAPI_GENERATED; } -void PFXEnumStatus::fromJson(QString jsonString) { +void PFXEnumStatus::fromJson(const QString &jsonString) { if ( jsonString.compare("placed", Qt::CaseInsensitive) == 0) { m_value = ePFXEnumStatus::PLACED; diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnumStatus.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnumStatus.h index 10d787b9e4d9..fa19717e1340 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnumStatus.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXEnumStatus.h @@ -29,13 +29,13 @@ namespace test_namespace { class PFXEnumStatus : public PFXEnum { public: PFXEnumStatus(); - PFXEnumStatus(QString json); + PFXEnumStatus(const QString &json); ~PFXEnumStatus() override; QString asJson() const override; QJsonValue asJsonValue() const override; void fromJsonValue(QJsonValue json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; enum class ePFXEnumStatus { INVALID_VALUE_OPENAPI_GENERATED = 0, diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXFakeApi.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXFakeApi.h index cba16795183b..c9909d4df353 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXFakeApi.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXFakeApi.h @@ -97,11 +97,11 @@ class PFXFakeApi : public QObject { void getEnumInlineOrRefSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use getEnumInlineOrRefSignalError() instead") - void getEnumInlineOrRefSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void getEnumInlineOrRefSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void getEnumInlineOrRefSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getEnumInlineOrRefSignalErrorFull() instead") - void getEnumInlineOrRefSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getEnumInlineOrRefSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void getEnumInlineOrRefSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXHttpRequest.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXHttpRequest.cpp index de3615747bd6..00b953e89b2f 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXHttpRequest.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXHttpRequest.cpp @@ -17,6 +17,9 @@ #include #include #include +#include + +#include #include "PFXHttpRequest.h" @@ -27,7 +30,7 @@ PFXHttpRequestInput::PFXHttpRequestInput() { initialize(); } -PFXHttpRequestInput::PFXHttpRequestInput(QString v_url_str, QString v_http_method) { +PFXHttpRequestInput::PFXHttpRequestInput(const QString &v_url_str, const QString &v_http_method) { initialize(); url_str = v_url_str; http_method = v_http_method; @@ -39,11 +42,11 @@ void PFXHttpRequestInput::initialize() { http_method = "GET"; } -void PFXHttpRequestInput::add_var(QString key, QString value) { +void PFXHttpRequestInput::add_var(const QString &key, const QString &value) { vars[key] = value; } -void PFXHttpRequestInput::add_file(QString variable_name, QString local_filename, QString request_filename, QString mime_type) { +void PFXHttpRequestInput::add_file(const QString &variable_name, const QString &local_filename, const QString &request_filename, const QString &mime_type) { PFXHttpFileElement file; file.variable_name = variable_name; file.local_filename = local_filename; @@ -65,11 +68,7 @@ PFXHttpRequestWorker::PFXHttpRequestWorker(QObject *parent, QNetworkAccessManage PFXHttpRequestWorker::~PFXHttpRequestWorker() { QObject::disconnect(&timeOutTimer, &QTimer::timeout, nullptr, nullptr); timeOutTimer.stop(); - for (const auto &item : multiPartFields) { - if (item != nullptr) { - delete item; - } - } + qDeleteAll(multiPartFields); } QMap PFXHttpRequestWorker::getResponseHeaders() const { @@ -123,10 +122,10 @@ int PFXHttpRequestWorker::getHttpResponseCode() const{ return httpResponseCode; } -QString PFXHttpRequestWorker::http_attribute_encode(QString attribute_name, QString input) { +QString PFXHttpRequestWorker::http_attribute_encode(const QString &attribute_name, const QString &input) { // result structure follows RFC 5987 bool need_utf_encoding = false; - QString result = ""; + QString result; QByteArray input_c = input.toLocal8Bit(); char c; for (int i = 0; i < input_c.length(); i++) { @@ -150,7 +149,7 @@ QString PFXHttpRequestWorker::http_attribute_encode(QString attribute_name, QStr return QString("%1=\"%2\"").arg(attribute_name, result); } - QString result_utf8 = ""; + QString result_utf8; for (int i = 0; i < input_c.length(); i++) { c = input_c.at(i); if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) { @@ -185,7 +184,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { // prepare request content - QString boundary = ""; + QString boundary; if (input->var_layout == ADDRESS || input->var_layout == URL_ENCODED) { // variable layout is ADDRESS or URL_ENCODED @@ -193,7 +192,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { if (input->vars.count() > 0) { bool first = true; isFormData = true; - for (QString key : input->vars.keys()) { + for (const QString &key : input->vars.keys()) { if (!first) { request_content.append("&"); } @@ -215,11 +214,11 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { boundary = QString("__-----------------------%1%2") .arg(QDateTime::currentSecsSinceEpoch()) .arg(randomGenerator.generate()); - QString boundary_delimiter = "--"; - QString new_line = "\r\n"; + const QString boundary_delimiter = "--"; + const QString new_line = "\r\n"; // add variables - for (QString key : input->vars.keys()) { + for (const QString &key : input->vars.keys()) { // add boundary request_content.append(boundary_delimiter.toUtf8()); request_content.append(boundary.toUtf8()); @@ -321,7 +320,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { request.setSslConfiguration(*PFXHttpRequestWorker::sslDefaultConfiguration); } request.setRawHeader("User-Agent", "OpenAPI-Generator/1.0.0/cpp-qt"); - for (QString key : input->headers.keys()) { request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str()); } + for (const QString &key : input->headers.keys()) { request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str()); } if (request_content.size() > 0 && !isFormData && (input->var_layout != MULTIPART)) { if (!input->headers.contains("Content-Type")) { @@ -411,7 +410,7 @@ void PFXHttpRequestWorker::process_response(QNetworkReply *reply) { QString contentTypeHdr; QString contentEncodingHdr; - for(auto hdr: getResponseHeaders().keys()){ + for(const auto &hdr: getResponseHeaders().keys()){ if(hdr.compare(QString("Content-Disposition"), Qt::CaseInsensitive) == 0){ contentDispositionHdr = getResponseHeaders().value(hdr); } @@ -429,7 +428,7 @@ void PFXHttpRequestWorker::process_response(QNetworkReply *reply) { !contentTypeHdr.isEmpty() ? contentTypeHdr.split(QString(";"), Qt::SkipEmptyParts).first() : QString(); if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) { QString filename = QUuid::createUuid().toString(); - for (const auto &file : contentDisposition) { + for (const auto &file : std::as_const(contentDisposition)) { if (file.contains(QString("filename"))) { filename = file.split(QString("="), Qt::SkipEmptyParts).at(1); break; diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXHttpRequest.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXHttpRequest.h index 3ebd6e1724a1..138f9e13a38c 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXHttpRequest.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXHttpRequest.h @@ -49,10 +49,10 @@ class PFXHttpRequestInput { QByteArray request_body; PFXHttpRequestInput(); - PFXHttpRequestInput(QString v_url_str, QString v_http_method); + PFXHttpRequestInput(const QString &v_url_str, const QString &v_http_method); void initialize(); - void add_var(QString key, QString value); - void add_file(QString variable_name, QString local_filename, QString request_filename, QString mime_type); + void add_var(const QString &key, const QString &value); + void add_file(const QString &variable_name, const QString &local_filename, const QString &request_filename, const QString &mime_type); }; class PFXHttpRequestWorker : public QObject { @@ -67,7 +67,7 @@ class PFXHttpRequestWorker : public QObject { QString error_str; QMap getResponseHeaders() const; - QString http_attribute_encode(QString attribute_name, QString input); + QString http_attribute_encode(const QString &attribute_name, const QString &input); void execute(PFXHttpRequestInput *input); static QSslConfiguration *sslDefaultConfiguration; void setTimeOut(int timeOutMs); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOauth.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOauth.cpp index c22d3a849997..3024053e10d7 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOauth.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOauth.cpp @@ -20,7 +20,7 @@ void OauthBase::onFinish(QNetworkReply *rep) addToken(oauthToken(token, expiresIn, scope, type)); } -oauthToken OauthBase::getToken(QString scope) +oauthToken OauthBase::getToken(const QString &scope) { auto tokenIt = m_oauthTokenMap.find(scope); return tokenIt != m_oauthTokenMap.end() ? tokenIt.value() : oauthToken(); @@ -33,7 +33,7 @@ void OauthBase::addToken(oauthToken token) } -void OauthBase::removeToken(QString scope) +void OauthBase::removeToken(const QString &scope) { m_oauthTokenMap.remove(scope); } @@ -57,7 +57,7 @@ void OauthCode::unlink() disconnect(&m_server, nullptr, nullptr, nullptr); } -void OauthCode::setVariables(QString authUrl, QString tokenUrl, QString scope, QString state, QString redirectUri, QString clientId, QString clientSecret, QString accessType){ +void OauthCode::setVariables(const QString &authUrl, const QString &tokenUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &clientSecret, const QString &accessType){ m_authUrl = QUrl(authUrl); m_tokenUrl = QUrl(tokenUrl); @@ -124,7 +124,7 @@ void OauthImplicit::unlink() m_linked = false; } -void OauthImplicit::setVariables(QString authUrl, QString scope, QString state, QString redirectUri, QString clientId, QString accessType){ +void OauthImplicit::setVariables(const QString &authUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &accessType){ m_authUrl = QUrl(authUrl); m_scope = scope; @@ -166,7 +166,7 @@ void OauthCredentials::unlink() disconnect(this, nullptr, nullptr, nullptr); } -void OauthCredentials::setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret){ +void OauthCredentials::setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret){ m_tokenUrl = QUrl(tokenUrl); m_scope = scope; @@ -209,7 +209,7 @@ void OauthPassword::unlink() disconnect(this, nullptr, nullptr, nullptr); } -void OauthPassword::setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret, QString username, QString password){ +void OauthPassword::setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret, const QString &username, const QString &password){ m_tokenUrl = QUrl(tokenUrl); m_scope = scope; diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOauth.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOauth.h index 9038d05940c2..471862af1a7d 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOauth.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOauth.h @@ -61,7 +61,7 @@ class ReplyServer : public QTcpServer Q_OBJECT public: explicit ReplyServer(QObject *parent = nullptr); - void setReply(QByteArray reply){m_reply = reply;}; + void setReply(const QByteArray &reply) {m_reply = reply;}; void run(); private: QByteArray m_reply; @@ -82,9 +82,9 @@ class OauthBase : public QObject Q_OBJECT public: OauthBase(QObject* parent = nullptr) : QObject(parent) {}; - oauthToken getToken(QString scope); + oauthToken getToken(const QString &scope); void addToken(oauthToken token); - void removeToken(QString scope); + void removeToken(const QString &scope); bool linked(){return m_linked;}; virtual void link()=0; virtual void unlink()=0; @@ -113,7 +113,7 @@ class OauthCode : public OauthBase OauthCode(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString authUrl, QString tokenUrl, QString scope, QString state, QString redirectUri, QString clientId, QString clientSecret, QString accessType = ""); + void setVariables(const QString &authUrl, const QString &tokenUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &clientSecret, const QString &accessType = QString()); private: ReplyServer m_server; @@ -132,7 +132,7 @@ class OauthImplicit : public OauthBase OauthImplicit(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString authUrl, QString scope, QString state, QString redirectUri, QString clientId, QString accessType = ""); + void setVariables(const QString &authUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &accessType = QString()); private: ReplyServer m_server; @@ -150,7 +150,7 @@ class OauthCredentials : public OauthBase OauthCredentials(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret); + void setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret); public Q_SLOTS: void authenticationNeededCallback() override; @@ -165,7 +165,7 @@ class OauthPassword : public OauthBase OauthPassword(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret, QString username, QString password); + void setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret, const QString &username, const QString &password); private: QString m_username, m_password; diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXObject.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXObject.h index 7b2e81b53440..9bdd1e8c5439 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXObject.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXObject.h @@ -22,7 +22,7 @@ class PFXObject { public: PFXObject() {} - PFXObject(QString jsonString) { + PFXObject(const QString &jsonString) { fromJson(jsonString); } @@ -37,7 +37,7 @@ class PFXObject { return doc.toJson(QJsonDocument::Compact); } - virtual void fromJson(QString jsonString) { + virtual void fromJson(const QString &jsonString) { QJsonDocument doc = QJsonDocument::fromJson(jsonString.toUtf8()); jObj = doc.object(); } diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOrder.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOrder.cpp index 15f7e8c36011..bb299fd96336 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOrder.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOrder.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXOrder::PFXOrder(QString json) { +PFXOrder::PFXOrder(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -52,7 +52,7 @@ void PFXOrder::initializeModel() { m_complete_isValid = false; } -void PFXOrder::fromJson(QString jsonString) { +void PFXOrder::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOrder.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOrder.h index 3d58afa70e30..eb1ff9c9d223 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOrder.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXOrder.h @@ -31,13 +31,13 @@ namespace test_namespace { class PFXOrder : public PFXObject { public: PFXOrder(); - PFXOrder(QString json); + PFXOrder(const QString &json); ~PFXOrder() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint64 getId() const; void setId(const qint64 &id); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPet.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPet.cpp index 6f99209ba90a..dc9d4d036940 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPet.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPet.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXPet::PFXPet(QString json) { +PFXPet::PFXPet(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -52,7 +52,7 @@ void PFXPet::initializeModel() { m_status_isValid = false; } -void PFXPet::fromJson(QString jsonString) { +void PFXPet::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPet.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPet.h index 86395d417ac2..3cf5dd9a4e6b 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPet.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPet.h @@ -35,13 +35,13 @@ class PFXTag; class PFXPet : public PFXObject { public: PFXPet(); - PFXPet(QString json); + PFXPet(const QString &json); ~PFXPet() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint64 getId() const; void setId(const qint64 &id); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp index b414998f9c24..ea174aa7cb2b 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp @@ -385,7 +385,7 @@ void PFXPetApi::allPetsCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QSet output; - QString json(worker->response); + QString json(worker->response) ; QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); @@ -707,7 +707,7 @@ void PFXPetApi::findPetsByStatusCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QList output; - QString json(worker->response); + QString json(worker->response) ; QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); @@ -912,7 +912,7 @@ void PFXPetApi::findPetsByTagsCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QList output; - QString json(worker->response); + QString json(worker->response) ; QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.h index 265237f4e555..4d474878d786 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.h @@ -174,59 +174,59 @@ class PFXPetApi : public QObject { void uploadFileSignalFull(PFXHttpRequestWorker *worker, PFXApiResponse summary); Q_DECL_DEPRECATED_X("Use addPetSignalError() instead") - void addPetSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void addPetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void addPetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use allPetsSignalError() instead") - void allPetsSignalE(QSet summary, QNetworkReply::NetworkError error_type, QString error_str); + void allPetsSignalE(QSet summary, QNetworkReply::NetworkError error_type, const QString &error_str); void allPetsSignalError(QSet summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deletePetSignalError() instead") - void deletePetSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void deletePetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void deletePetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByStatusSignalError() instead") - void findPetsByStatusSignalE(QList summary, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByStatusSignalE(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); void findPetsByStatusSignalError(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByTagsSignalError() instead") - void findPetsByTagsSignalE(QList summary, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByTagsSignalE(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); void findPetsByTagsSignalError(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getPetByIdSignalError() instead") - void getPetByIdSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, QString error_str); + void getPetByIdSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, const QString &error_str); void getPetByIdSignalError(PFXPet summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetSignalError() instead") - void updatePetSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void updatePetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void updatePetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetWithFormSignalError() instead") - void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void updatePetWithFormSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use uploadFileSignalError() instead") - void uploadFileSignalE(PFXApiResponse summary, QNetworkReply::NetworkError error_type, QString error_str); + void uploadFileSignalE(PFXApiResponse summary, QNetworkReply::NetworkError error_type, const QString &error_str); void uploadFileSignalError(PFXApiResponse summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use addPetSignalErrorFull() instead") - void addPetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void addPetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void addPetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use allPetsSignalErrorFull() instead") - void allPetsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void allPetsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void allPetsSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deletePetSignalErrorFull() instead") - void deletePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void deletePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void deletePetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByStatusSignalErrorFull() instead") - void findPetsByStatusSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByStatusSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void findPetsByStatusSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByTagsSignalErrorFull() instead") - void findPetsByTagsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByTagsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void findPetsByTagsSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getPetByIdSignalErrorFull() instead") - void getPetByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getPetByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void getPetByIdSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetSignalErrorFull() instead") - void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void updatePetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetWithFormSignalErrorFull() instead") - void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void updatePetWithFormSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use uploadFileSignalErrorFull() instead") - void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void uploadFileSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.h index b13e83173984..966f4944ee12 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.h @@ -104,17 +104,17 @@ class PFXPrimitivesApi : public QObject { void primitivesNumberPutSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use primitivesIntegerPostSignalError() instead") - void primitivesIntegerPostSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void primitivesIntegerPostSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void primitivesIntegerPostSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesNumberPutSignalError() instead") - void primitivesNumberPutSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void primitivesNumberPutSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void primitivesNumberPutSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesIntegerPostSignalErrorFull() instead") - void primitivesIntegerPostSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void primitivesIntegerPostSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void primitivesIntegerPostSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesNumberPutSignalErrorFull() instead") - void primitivesNumberPutSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void primitivesNumberPutSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void primitivesNumberPutSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.h index c46b31250a15..1fd6d91c454f 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.h @@ -122,29 +122,29 @@ class PFXStoreApi : public QObject { void placeOrderSignalFull(PFXHttpRequestWorker *worker, PFXOrder summary); Q_DECL_DEPRECATED_X("Use deleteOrderSignalError() instead") - void deleteOrderSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void deleteOrderSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void deleteOrderSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getInventorySignalError() instead") - void getInventorySignalE(QMap summary, QNetworkReply::NetworkError error_type, QString error_str); + void getInventorySignalE(QMap summary, QNetworkReply::NetworkError error_type, const QString &error_str); void getInventorySignalError(QMap summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getOrderByIdSignalError() instead") - void getOrderByIdSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, QString error_str); + void getOrderByIdSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); void getOrderByIdSignalError(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use placeOrderSignalError() instead") - void placeOrderSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, QString error_str); + void placeOrderSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); void placeOrderSignalError(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteOrderSignalErrorFull() instead") - void deleteOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void deleteOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void deleteOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getInventorySignalErrorFull() instead") - void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void getInventorySignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getOrderByIdSignalErrorFull() instead") - void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void getOrderByIdSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use placeOrderSignalErrorFull() instead") - void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void placeOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTag.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTag.cpp index ea32dc814765..255653d5f7a0 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTag.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTag.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXTag::PFXTag(QString json) { +PFXTag::PFXTag(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -40,7 +40,7 @@ void PFXTag::initializeModel() { m_name_isValid = false; } -void PFXTag::fromJson(QString jsonString) { +void PFXTag::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTag.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTag.h index 808aab4519e0..5cb5196bfad7 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTag.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTag.h @@ -30,13 +30,13 @@ namespace test_namespace { class PFXTag : public PFXObject { public: PFXTag(); - PFXTag(QString json); + PFXTag(const QString &json); ~PFXTag() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint64 getId() const; void setId(const qint64 &id); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTestAnyType.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTestAnyType.cpp index f0baa2c149e5..d5ef6d36da48 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTestAnyType.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTestAnyType.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXTestAnyType::PFXTestAnyType(QString json) { +PFXTestAnyType::PFXTestAnyType(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -40,7 +40,7 @@ void PFXTestAnyType::initializeModel() { m_message_isValid = false; } -void PFXTestAnyType::fromJson(QString jsonString) { +void PFXTestAnyType::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTestAnyType.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTestAnyType.h index b8a76d1fc964..49228ad295e2 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTestAnyType.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXTestAnyType.h @@ -31,13 +31,13 @@ namespace test_namespace { class PFXTestAnyType : public PFXObject { public: PFXTestAnyType(); - PFXTestAnyType(QString json); + PFXTestAnyType(const QString &json); ~PFXTestAnyType() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; QJsonValue getCode() const; void setCode(const QJsonValue &code); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUser.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUser.cpp index e466a42424cc..c329701733b4 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUser.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUser.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXUser::PFXUser(QString json) { +PFXUser::PFXUser(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -58,7 +58,7 @@ void PFXUser::initializeModel() { m_user_status_isValid = false; } -void PFXUser::fromJson(QString jsonString) { +void PFXUser::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUser.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUser.h index 5a3def81b532..509dd5420cd5 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUser.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUser.h @@ -30,13 +30,13 @@ namespace test_namespace { class PFXUser : public PFXObject { public: PFXUser(); - PFXUser(QString json); + PFXUser(const QString &json); ~PFXUser() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint64 getId() const; void setId(const qint64 &id); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.h index cce2728f3114..036033220fe9 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.h @@ -159,53 +159,53 @@ class PFXUserApi : public QObject { void updateUserSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use createUserSignalError() instead") - void createUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void createUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void createUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithArrayInputSignalError() instead") - void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void createUsersWithArrayInputSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithListInputSignalError() instead") - void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void createUsersWithListInputSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteUserSignalError() instead") - void deleteUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void deleteUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void deleteUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getUserByNameSignalError() instead") - void getUserByNameSignalE(PFXUser summary, QNetworkReply::NetworkError error_type, QString error_str); + void getUserByNameSignalE(PFXUser summary, QNetworkReply::NetworkError error_type, const QString &error_str); void getUserByNameSignalError(PFXUser summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use loginUserSignalError() instead") - void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, QString error_str); + void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, const QString &error_str); void loginUserSignalError(QString summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use logoutUserSignalError() instead") - void logoutUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void logoutUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void logoutUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updateUserSignalError() instead") - void updateUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void updateUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void updateUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUserSignalErrorFull() instead") - void createUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void createUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void createUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithArrayInputSignalErrorFull() instead") - void createUsersWithArrayInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithArrayInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void createUsersWithArrayInputSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithListInputSignalErrorFull() instead") - void createUsersWithListInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithListInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void createUsersWithListInputSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteUserSignalErrorFull() instead") - void deleteUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void deleteUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void deleteUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getUserByNameSignalErrorFull() instead") - void getUserByNameSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getUserByNameSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void getUserByNameSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use loginUserSignalErrorFull() instead") - void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void loginUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use logoutUserSignalErrorFull() instead") - void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void logoutUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updateUserSignalErrorFull() instead") - void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void updateUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt/README.md b/samples/client/petstore/cpp-qt/README.md index d1813e65b52d..50df38674c1f 100644 --- a/samples/client/petstore/cpp-qt/README.md +++ b/samples/client/petstore/cpp-qt/README.md @@ -63,7 +63,7 @@ void Example::exampleFunction1(){ connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignal, [&]() { loop.quit(); }); - connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignalE, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; loop.quit(); }); @@ -74,7 +74,7 @@ void Example::exampleFunction1(){ connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignal, [&]() { loop.quit(); }); - connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&apiInstance, &PFXFakeApi::getEnumInlineOrRefSignalE, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; loop.quit(); }); diff --git a/samples/client/petstore/cpp-qt/client/PFXApiResponse.cpp b/samples/client/petstore/cpp-qt/client/PFXApiResponse.cpp index 8fbef0fb8c5c..ef7bb19bdb17 100644 --- a/samples/client/petstore/cpp-qt/client/PFXApiResponse.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXApiResponse.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXApiResponse::PFXApiResponse(QString json) { +PFXApiResponse::PFXApiResponse(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -43,7 +43,7 @@ void PFXApiResponse::initializeModel() { m_message_isValid = false; } -void PFXApiResponse::fromJson(QString jsonString) { +void PFXApiResponse::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt/client/PFXApiResponse.h b/samples/client/petstore/cpp-qt/client/PFXApiResponse.h index dc7682206561..fdf691fa6e59 100644 --- a/samples/client/petstore/cpp-qt/client/PFXApiResponse.h +++ b/samples/client/petstore/cpp-qt/client/PFXApiResponse.h @@ -30,13 +30,13 @@ namespace test_namespace { class PFXApiResponse : public PFXObject { public: PFXApiResponse(); - PFXApiResponse(QString json); + PFXApiResponse(const QString &json); ~PFXApiResponse() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint32 getCode() const; void setCode(const qint32 &code); diff --git a/samples/client/petstore/cpp-qt/client/PFXCategory.cpp b/samples/client/petstore/cpp-qt/client/PFXCategory.cpp index 1651c44c1c35..46944b4aa07b 100644 --- a/samples/client/petstore/cpp-qt/client/PFXCategory.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXCategory.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXCategory::PFXCategory(QString json) { +PFXCategory::PFXCategory(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -40,7 +40,7 @@ void PFXCategory::initializeModel() { m_name_isValid = false; } -void PFXCategory::fromJson(QString jsonString) { +void PFXCategory::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt/client/PFXCategory.h b/samples/client/petstore/cpp-qt/client/PFXCategory.h index d86eee9a2626..9449837db442 100644 --- a/samples/client/petstore/cpp-qt/client/PFXCategory.h +++ b/samples/client/petstore/cpp-qt/client/PFXCategory.h @@ -30,13 +30,13 @@ namespace test_namespace { class PFXCategory : public PFXObject { public: PFXCategory(); - PFXCategory(QString json); + PFXCategory(const QString &json); ~PFXCategory() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint64 getId() const; void setId(const qint64 &id); diff --git a/samples/client/petstore/cpp-qt/client/PFXEnum.h b/samples/client/petstore/cpp-qt/client/PFXEnum.h index 045cc6095c82..fa2a98482e7d 100644 --- a/samples/client/petstore/cpp-qt/client/PFXEnum.h +++ b/samples/client/petstore/cpp-qt/client/PFXEnum.h @@ -23,7 +23,7 @@ class PFXEnum { public: PFXEnum() {} - PFXEnum(QString jsonString) { + PFXEnum(const QString &jsonString) { fromJson(jsonString); } @@ -43,7 +43,7 @@ class PFXEnum { return obj; } - virtual void fromJson(QString jsonString) { + virtual void fromJson(const QString &jsonString) { jstr = jsonString; } diff --git a/samples/client/petstore/cpp-qt/client/PFXEnumStatus.cpp b/samples/client/petstore/cpp-qt/client/PFXEnumStatus.cpp index da7f6d388a38..7c6f338e48c9 100644 --- a/samples/client/petstore/cpp-qt/client/PFXEnumStatus.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXEnumStatus.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXEnumStatus::PFXEnumStatus(QString json) { +PFXEnumStatus::PFXEnumStatus(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -38,7 +38,7 @@ void PFXEnumStatus::initializeModel() { m_value = ePFXEnumStatus::INVALID_VALUE_OPENAPI_GENERATED; } -void PFXEnumStatus::fromJson(QString jsonString) { +void PFXEnumStatus::fromJson(const QString &jsonString) { if ( jsonString.compare("placed", Qt::CaseInsensitive) == 0) { m_value = ePFXEnumStatus::PLACED; diff --git a/samples/client/petstore/cpp-qt/client/PFXEnumStatus.h b/samples/client/petstore/cpp-qt/client/PFXEnumStatus.h index 10d787b9e4d9..fa19717e1340 100644 --- a/samples/client/petstore/cpp-qt/client/PFXEnumStatus.h +++ b/samples/client/petstore/cpp-qt/client/PFXEnumStatus.h @@ -29,13 +29,13 @@ namespace test_namespace { class PFXEnumStatus : public PFXEnum { public: PFXEnumStatus(); - PFXEnumStatus(QString json); + PFXEnumStatus(const QString &json); ~PFXEnumStatus() override; QString asJson() const override; QJsonValue asJsonValue() const override; void fromJsonValue(QJsonValue json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; enum class ePFXEnumStatus { INVALID_VALUE_OPENAPI_GENERATED = 0, diff --git a/samples/client/petstore/cpp-qt/client/PFXFakeApi.h b/samples/client/petstore/cpp-qt/client/PFXFakeApi.h index f81543a99463..b83d9c15ccc7 100644 --- a/samples/client/petstore/cpp-qt/client/PFXFakeApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXFakeApi.h @@ -96,11 +96,11 @@ class PFXFakeApi : public QObject { void getEnumInlineOrRefSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use getEnumInlineOrRefSignalError() instead") - void getEnumInlineOrRefSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void getEnumInlineOrRefSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void getEnumInlineOrRefSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getEnumInlineOrRefSignalErrorFull() instead") - void getEnumInlineOrRefSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getEnumInlineOrRefSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void getEnumInlineOrRefSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt/client/PFXHttpRequest.cpp b/samples/client/petstore/cpp-qt/client/PFXHttpRequest.cpp index de3615747bd6..00b953e89b2f 100644 --- a/samples/client/petstore/cpp-qt/client/PFXHttpRequest.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXHttpRequest.cpp @@ -17,6 +17,9 @@ #include #include #include +#include + +#include #include "PFXHttpRequest.h" @@ -27,7 +30,7 @@ PFXHttpRequestInput::PFXHttpRequestInput() { initialize(); } -PFXHttpRequestInput::PFXHttpRequestInput(QString v_url_str, QString v_http_method) { +PFXHttpRequestInput::PFXHttpRequestInput(const QString &v_url_str, const QString &v_http_method) { initialize(); url_str = v_url_str; http_method = v_http_method; @@ -39,11 +42,11 @@ void PFXHttpRequestInput::initialize() { http_method = "GET"; } -void PFXHttpRequestInput::add_var(QString key, QString value) { +void PFXHttpRequestInput::add_var(const QString &key, const QString &value) { vars[key] = value; } -void PFXHttpRequestInput::add_file(QString variable_name, QString local_filename, QString request_filename, QString mime_type) { +void PFXHttpRequestInput::add_file(const QString &variable_name, const QString &local_filename, const QString &request_filename, const QString &mime_type) { PFXHttpFileElement file; file.variable_name = variable_name; file.local_filename = local_filename; @@ -65,11 +68,7 @@ PFXHttpRequestWorker::PFXHttpRequestWorker(QObject *parent, QNetworkAccessManage PFXHttpRequestWorker::~PFXHttpRequestWorker() { QObject::disconnect(&timeOutTimer, &QTimer::timeout, nullptr, nullptr); timeOutTimer.stop(); - for (const auto &item : multiPartFields) { - if (item != nullptr) { - delete item; - } - } + qDeleteAll(multiPartFields); } QMap PFXHttpRequestWorker::getResponseHeaders() const { @@ -123,10 +122,10 @@ int PFXHttpRequestWorker::getHttpResponseCode() const{ return httpResponseCode; } -QString PFXHttpRequestWorker::http_attribute_encode(QString attribute_name, QString input) { +QString PFXHttpRequestWorker::http_attribute_encode(const QString &attribute_name, const QString &input) { // result structure follows RFC 5987 bool need_utf_encoding = false; - QString result = ""; + QString result; QByteArray input_c = input.toLocal8Bit(); char c; for (int i = 0; i < input_c.length(); i++) { @@ -150,7 +149,7 @@ QString PFXHttpRequestWorker::http_attribute_encode(QString attribute_name, QStr return QString("%1=\"%2\"").arg(attribute_name, result); } - QString result_utf8 = ""; + QString result_utf8; for (int i = 0; i < input_c.length(); i++) { c = input_c.at(i); if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) { @@ -185,7 +184,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { // prepare request content - QString boundary = ""; + QString boundary; if (input->var_layout == ADDRESS || input->var_layout == URL_ENCODED) { // variable layout is ADDRESS or URL_ENCODED @@ -193,7 +192,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { if (input->vars.count() > 0) { bool first = true; isFormData = true; - for (QString key : input->vars.keys()) { + for (const QString &key : input->vars.keys()) { if (!first) { request_content.append("&"); } @@ -215,11 +214,11 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { boundary = QString("__-----------------------%1%2") .arg(QDateTime::currentSecsSinceEpoch()) .arg(randomGenerator.generate()); - QString boundary_delimiter = "--"; - QString new_line = "\r\n"; + const QString boundary_delimiter = "--"; + const QString new_line = "\r\n"; // add variables - for (QString key : input->vars.keys()) { + for (const QString &key : input->vars.keys()) { // add boundary request_content.append(boundary_delimiter.toUtf8()); request_content.append(boundary.toUtf8()); @@ -321,7 +320,7 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) { request.setSslConfiguration(*PFXHttpRequestWorker::sslDefaultConfiguration); } request.setRawHeader("User-Agent", "OpenAPI-Generator/1.0.0/cpp-qt"); - for (QString key : input->headers.keys()) { request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str()); } + for (const QString &key : input->headers.keys()) { request.setRawHeader(key.toStdString().c_str(), input->headers.value(key).toStdString().c_str()); } if (request_content.size() > 0 && !isFormData && (input->var_layout != MULTIPART)) { if (!input->headers.contains("Content-Type")) { @@ -411,7 +410,7 @@ void PFXHttpRequestWorker::process_response(QNetworkReply *reply) { QString contentTypeHdr; QString contentEncodingHdr; - for(auto hdr: getResponseHeaders().keys()){ + for(const auto &hdr: getResponseHeaders().keys()){ if(hdr.compare(QString("Content-Disposition"), Qt::CaseInsensitive) == 0){ contentDispositionHdr = getResponseHeaders().value(hdr); } @@ -429,7 +428,7 @@ void PFXHttpRequestWorker::process_response(QNetworkReply *reply) { !contentTypeHdr.isEmpty() ? contentTypeHdr.split(QString(";"), Qt::SkipEmptyParts).first() : QString(); if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) { QString filename = QUuid::createUuid().toString(); - for (const auto &file : contentDisposition) { + for (const auto &file : std::as_const(contentDisposition)) { if (file.contains(QString("filename"))) { filename = file.split(QString("="), Qt::SkipEmptyParts).at(1); break; diff --git a/samples/client/petstore/cpp-qt/client/PFXHttpRequest.h b/samples/client/petstore/cpp-qt/client/PFXHttpRequest.h index 3ebd6e1724a1..138f9e13a38c 100644 --- a/samples/client/petstore/cpp-qt/client/PFXHttpRequest.h +++ b/samples/client/petstore/cpp-qt/client/PFXHttpRequest.h @@ -49,10 +49,10 @@ class PFXHttpRequestInput { QByteArray request_body; PFXHttpRequestInput(); - PFXHttpRequestInput(QString v_url_str, QString v_http_method); + PFXHttpRequestInput(const QString &v_url_str, const QString &v_http_method); void initialize(); - void add_var(QString key, QString value); - void add_file(QString variable_name, QString local_filename, QString request_filename, QString mime_type); + void add_var(const QString &key, const QString &value); + void add_file(const QString &variable_name, const QString &local_filename, const QString &request_filename, const QString &mime_type); }; class PFXHttpRequestWorker : public QObject { @@ -67,7 +67,7 @@ class PFXHttpRequestWorker : public QObject { QString error_str; QMap getResponseHeaders() const; - QString http_attribute_encode(QString attribute_name, QString input); + QString http_attribute_encode(const QString &attribute_name, const QString &input); void execute(PFXHttpRequestInput *input); static QSslConfiguration *sslDefaultConfiguration; void setTimeOut(int timeOutMs); diff --git a/samples/client/petstore/cpp-qt/client/PFXOauth.cpp b/samples/client/petstore/cpp-qt/client/PFXOauth.cpp index c22d3a849997..3024053e10d7 100644 --- a/samples/client/petstore/cpp-qt/client/PFXOauth.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXOauth.cpp @@ -20,7 +20,7 @@ void OauthBase::onFinish(QNetworkReply *rep) addToken(oauthToken(token, expiresIn, scope, type)); } -oauthToken OauthBase::getToken(QString scope) +oauthToken OauthBase::getToken(const QString &scope) { auto tokenIt = m_oauthTokenMap.find(scope); return tokenIt != m_oauthTokenMap.end() ? tokenIt.value() : oauthToken(); @@ -33,7 +33,7 @@ void OauthBase::addToken(oauthToken token) } -void OauthBase::removeToken(QString scope) +void OauthBase::removeToken(const QString &scope) { m_oauthTokenMap.remove(scope); } @@ -57,7 +57,7 @@ void OauthCode::unlink() disconnect(&m_server, nullptr, nullptr, nullptr); } -void OauthCode::setVariables(QString authUrl, QString tokenUrl, QString scope, QString state, QString redirectUri, QString clientId, QString clientSecret, QString accessType){ +void OauthCode::setVariables(const QString &authUrl, const QString &tokenUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &clientSecret, const QString &accessType){ m_authUrl = QUrl(authUrl); m_tokenUrl = QUrl(tokenUrl); @@ -124,7 +124,7 @@ void OauthImplicit::unlink() m_linked = false; } -void OauthImplicit::setVariables(QString authUrl, QString scope, QString state, QString redirectUri, QString clientId, QString accessType){ +void OauthImplicit::setVariables(const QString &authUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &accessType){ m_authUrl = QUrl(authUrl); m_scope = scope; @@ -166,7 +166,7 @@ void OauthCredentials::unlink() disconnect(this, nullptr, nullptr, nullptr); } -void OauthCredentials::setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret){ +void OauthCredentials::setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret){ m_tokenUrl = QUrl(tokenUrl); m_scope = scope; @@ -209,7 +209,7 @@ void OauthPassword::unlink() disconnect(this, nullptr, nullptr, nullptr); } -void OauthPassword::setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret, QString username, QString password){ +void OauthPassword::setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret, const QString &username, const QString &password){ m_tokenUrl = QUrl(tokenUrl); m_scope = scope; diff --git a/samples/client/petstore/cpp-qt/client/PFXOauth.h b/samples/client/petstore/cpp-qt/client/PFXOauth.h index 9038d05940c2..471862af1a7d 100644 --- a/samples/client/petstore/cpp-qt/client/PFXOauth.h +++ b/samples/client/petstore/cpp-qt/client/PFXOauth.h @@ -61,7 +61,7 @@ class ReplyServer : public QTcpServer Q_OBJECT public: explicit ReplyServer(QObject *parent = nullptr); - void setReply(QByteArray reply){m_reply = reply;}; + void setReply(const QByteArray &reply) {m_reply = reply;}; void run(); private: QByteArray m_reply; @@ -82,9 +82,9 @@ class OauthBase : public QObject Q_OBJECT public: OauthBase(QObject* parent = nullptr) : QObject(parent) {}; - oauthToken getToken(QString scope); + oauthToken getToken(const QString &scope); void addToken(oauthToken token); - void removeToken(QString scope); + void removeToken(const QString &scope); bool linked(){return m_linked;}; virtual void link()=0; virtual void unlink()=0; @@ -113,7 +113,7 @@ class OauthCode : public OauthBase OauthCode(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString authUrl, QString tokenUrl, QString scope, QString state, QString redirectUri, QString clientId, QString clientSecret, QString accessType = ""); + void setVariables(const QString &authUrl, const QString &tokenUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &clientSecret, const QString &accessType = QString()); private: ReplyServer m_server; @@ -132,7 +132,7 @@ class OauthImplicit : public OauthBase OauthImplicit(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString authUrl, QString scope, QString state, QString redirectUri, QString clientId, QString accessType = ""); + void setVariables(const QString &authUrl, const QString &scope, const QString &state, const QString &redirectUri, const QString &clientId, const QString &accessType = QString()); private: ReplyServer m_server; @@ -150,7 +150,7 @@ class OauthCredentials : public OauthBase OauthCredentials(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret); + void setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret); public Q_SLOTS: void authenticationNeededCallback() override; @@ -165,7 +165,7 @@ class OauthPassword : public OauthBase OauthPassword(QObject *parent = nullptr); void link() override; void unlink() override; - void setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret, QString username, QString password); + void setVariables(const QString &tokenUrl, const QString &scope, const QString &clientId, const QString &clientSecret, const QString &username, const QString &password); private: QString m_username, m_password; diff --git a/samples/client/petstore/cpp-qt/client/PFXObject.h b/samples/client/petstore/cpp-qt/client/PFXObject.h index 7b2e81b53440..9bdd1e8c5439 100644 --- a/samples/client/petstore/cpp-qt/client/PFXObject.h +++ b/samples/client/petstore/cpp-qt/client/PFXObject.h @@ -22,7 +22,7 @@ class PFXObject { public: PFXObject() {} - PFXObject(QString jsonString) { + PFXObject(const QString &jsonString) { fromJson(jsonString); } @@ -37,7 +37,7 @@ class PFXObject { return doc.toJson(QJsonDocument::Compact); } - virtual void fromJson(QString jsonString) { + virtual void fromJson(const QString &jsonString) { QJsonDocument doc = QJsonDocument::fromJson(jsonString.toUtf8()); jObj = doc.object(); } diff --git a/samples/client/petstore/cpp-qt/client/PFXOrder.cpp b/samples/client/petstore/cpp-qt/client/PFXOrder.cpp index 15f7e8c36011..bb299fd96336 100644 --- a/samples/client/petstore/cpp-qt/client/PFXOrder.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXOrder.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXOrder::PFXOrder(QString json) { +PFXOrder::PFXOrder(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -52,7 +52,7 @@ void PFXOrder::initializeModel() { m_complete_isValid = false; } -void PFXOrder::fromJson(QString jsonString) { +void PFXOrder::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt/client/PFXOrder.h b/samples/client/petstore/cpp-qt/client/PFXOrder.h index 3d58afa70e30..eb1ff9c9d223 100644 --- a/samples/client/petstore/cpp-qt/client/PFXOrder.h +++ b/samples/client/petstore/cpp-qt/client/PFXOrder.h @@ -31,13 +31,13 @@ namespace test_namespace { class PFXOrder : public PFXObject { public: PFXOrder(); - PFXOrder(QString json); + PFXOrder(const QString &json); ~PFXOrder() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint64 getId() const; void setId(const qint64 &id); diff --git a/samples/client/petstore/cpp-qt/client/PFXPet.cpp b/samples/client/petstore/cpp-qt/client/PFXPet.cpp index 6f99209ba90a..dc9d4d036940 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPet.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXPet.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXPet::PFXPet(QString json) { +PFXPet::PFXPet(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -52,7 +52,7 @@ void PFXPet::initializeModel() { m_status_isValid = false; } -void PFXPet::fromJson(QString jsonString) { +void PFXPet::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt/client/PFXPet.h b/samples/client/petstore/cpp-qt/client/PFXPet.h index 86395d417ac2..3cf5dd9a4e6b 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPet.h +++ b/samples/client/petstore/cpp-qt/client/PFXPet.h @@ -35,13 +35,13 @@ class PFXTag; class PFXPet : public PFXObject { public: PFXPet(); - PFXPet(QString json); + PFXPet(const QString &json); ~PFXPet() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint64 getId() const; void setId(const qint64 &id); diff --git a/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp b/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp index cb07b0b4718b..88c81bb25732 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp @@ -385,7 +385,7 @@ void PFXPetApi::allPetsCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QSet output; - QString json(worker->response); + QString json(worker->response) ; QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); @@ -707,7 +707,7 @@ void PFXPetApi::findPetsByStatusCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QList output; - QString json(worker->response); + QString json(worker->response) ; QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); @@ -912,7 +912,7 @@ void PFXPetApi::findPetsByTagsCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QList output; - QString json(worker->response); + QString json(worker->response) ; QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); diff --git a/samples/client/petstore/cpp-qt/client/PFXPetApi.h b/samples/client/petstore/cpp-qt/client/PFXPetApi.h index be4917756d21..c6c2d5948c55 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPetApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXPetApi.h @@ -165,59 +165,59 @@ class PFXPetApi : public QObject { void uploadFileSignalFull(PFXHttpRequestWorker *worker, PFXApiResponse summary); Q_DECL_DEPRECATED_X("Use addPetSignalError() instead") - void addPetSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void addPetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void addPetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use allPetsSignalError() instead") - void allPetsSignalE(QSet summary, QNetworkReply::NetworkError error_type, QString error_str); + void allPetsSignalE(QSet summary, QNetworkReply::NetworkError error_type, const QString &error_str); void allPetsSignalError(QSet summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deletePetSignalError() instead") - void deletePetSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void deletePetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void deletePetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByStatusSignalError() instead") - void findPetsByStatusSignalE(QList summary, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByStatusSignalE(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); void findPetsByStatusSignalError(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByTagsSignalError() instead") - void findPetsByTagsSignalE(QList summary, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByTagsSignalE(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); void findPetsByTagsSignalError(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getPetByIdSignalError() instead") - void getPetByIdSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, QString error_str); + void getPetByIdSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, const QString &error_str); void getPetByIdSignalError(PFXPet summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetSignalError() instead") - void updatePetSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void updatePetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void updatePetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetWithFormSignalError() instead") - void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void updatePetWithFormSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use uploadFileSignalError() instead") - void uploadFileSignalE(PFXApiResponse summary, QNetworkReply::NetworkError error_type, QString error_str); + void uploadFileSignalE(PFXApiResponse summary, QNetworkReply::NetworkError error_type, const QString &error_str); void uploadFileSignalError(PFXApiResponse summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use addPetSignalErrorFull() instead") - void addPetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void addPetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void addPetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use allPetsSignalErrorFull() instead") - void allPetsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void allPetsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void allPetsSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deletePetSignalErrorFull() instead") - void deletePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void deletePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void deletePetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByStatusSignalErrorFull() instead") - void findPetsByStatusSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByStatusSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void findPetsByStatusSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByTagsSignalErrorFull() instead") - void findPetsByTagsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByTagsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void findPetsByTagsSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getPetByIdSignalErrorFull() instead") - void getPetByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getPetByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void getPetByIdSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetSignalErrorFull() instead") - void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void updatePetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetWithFormSignalErrorFull() instead") - void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void updatePetWithFormSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use uploadFileSignalErrorFull() instead") - void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void uploadFileSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h b/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h index a5bdfeeabb1e..e8b920b5ed15 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h @@ -102,17 +102,17 @@ class PFXPrimitivesApi : public QObject { void primitivesNumberPutSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use primitivesIntegerPostSignalError() instead") - void primitivesIntegerPostSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void primitivesIntegerPostSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void primitivesIntegerPostSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesNumberPutSignalError() instead") - void primitivesNumberPutSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void primitivesNumberPutSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void primitivesNumberPutSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesIntegerPostSignalErrorFull() instead") - void primitivesIntegerPostSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void primitivesIntegerPostSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void primitivesIntegerPostSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesNumberPutSignalErrorFull() instead") - void primitivesNumberPutSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void primitivesNumberPutSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void primitivesNumberPutSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt/client/PFXStoreApi.h b/samples/client/petstore/cpp-qt/client/PFXStoreApi.h index d16fbe9502d5..ec930b97bb99 100644 --- a/samples/client/petstore/cpp-qt/client/PFXStoreApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXStoreApi.h @@ -118,29 +118,29 @@ class PFXStoreApi : public QObject { void placeOrderSignalFull(PFXHttpRequestWorker *worker, PFXOrder summary); Q_DECL_DEPRECATED_X("Use deleteOrderSignalError() instead") - void deleteOrderSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void deleteOrderSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void deleteOrderSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getInventorySignalError() instead") - void getInventorySignalE(QMap summary, QNetworkReply::NetworkError error_type, QString error_str); + void getInventorySignalE(QMap summary, QNetworkReply::NetworkError error_type, const QString &error_str); void getInventorySignalError(QMap summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getOrderByIdSignalError() instead") - void getOrderByIdSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, QString error_str); + void getOrderByIdSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); void getOrderByIdSignalError(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use placeOrderSignalError() instead") - void placeOrderSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, QString error_str); + void placeOrderSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); void placeOrderSignalError(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteOrderSignalErrorFull() instead") - void deleteOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void deleteOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void deleteOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getInventorySignalErrorFull() instead") - void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void getInventorySignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getOrderByIdSignalErrorFull() instead") - void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void getOrderByIdSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use placeOrderSignalErrorFull() instead") - void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void placeOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt/client/PFXTag.cpp b/samples/client/petstore/cpp-qt/client/PFXTag.cpp index ea32dc814765..255653d5f7a0 100644 --- a/samples/client/petstore/cpp-qt/client/PFXTag.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXTag.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXTag::PFXTag(QString json) { +PFXTag::PFXTag(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -40,7 +40,7 @@ void PFXTag::initializeModel() { m_name_isValid = false; } -void PFXTag::fromJson(QString jsonString) { +void PFXTag::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt/client/PFXTag.h b/samples/client/petstore/cpp-qt/client/PFXTag.h index 808aab4519e0..5cb5196bfad7 100644 --- a/samples/client/petstore/cpp-qt/client/PFXTag.h +++ b/samples/client/petstore/cpp-qt/client/PFXTag.h @@ -30,13 +30,13 @@ namespace test_namespace { class PFXTag : public PFXObject { public: PFXTag(); - PFXTag(QString json); + PFXTag(const QString &json); ~PFXTag() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint64 getId() const; void setId(const qint64 &id); diff --git a/samples/client/petstore/cpp-qt/client/PFXTestAnyType.cpp b/samples/client/petstore/cpp-qt/client/PFXTestAnyType.cpp index f0baa2c149e5..d5ef6d36da48 100644 --- a/samples/client/petstore/cpp-qt/client/PFXTestAnyType.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXTestAnyType.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXTestAnyType::PFXTestAnyType(QString json) { +PFXTestAnyType::PFXTestAnyType(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -40,7 +40,7 @@ void PFXTestAnyType::initializeModel() { m_message_isValid = false; } -void PFXTestAnyType::fromJson(QString jsonString) { +void PFXTestAnyType::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt/client/PFXTestAnyType.h b/samples/client/petstore/cpp-qt/client/PFXTestAnyType.h index b8a76d1fc964..49228ad295e2 100644 --- a/samples/client/petstore/cpp-qt/client/PFXTestAnyType.h +++ b/samples/client/petstore/cpp-qt/client/PFXTestAnyType.h @@ -31,13 +31,13 @@ namespace test_namespace { class PFXTestAnyType : public PFXObject { public: PFXTestAnyType(); - PFXTestAnyType(QString json); + PFXTestAnyType(const QString &json); ~PFXTestAnyType() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; QJsonValue getCode() const; void setCode(const QJsonValue &code); diff --git a/samples/client/petstore/cpp-qt/client/PFXUser.cpp b/samples/client/petstore/cpp-qt/client/PFXUser.cpp index e466a42424cc..c329701733b4 100644 --- a/samples/client/petstore/cpp-qt/client/PFXUser.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXUser.cpp @@ -20,7 +20,7 @@ namespace test_namespace { -PFXUser::PFXUser(QString json) { +PFXUser::PFXUser(const QString &json) { this->initializeModel(); this->fromJson(json); } @@ -58,7 +58,7 @@ void PFXUser::initializeModel() { m_user_status_isValid = false; } -void PFXUser::fromJson(QString jsonString) { +void PFXUser::fromJson(const QString &jsonString) { QByteArray array(jsonString.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonObject jsonObject = doc.object(); diff --git a/samples/client/petstore/cpp-qt/client/PFXUser.h b/samples/client/petstore/cpp-qt/client/PFXUser.h index 5a3def81b532..509dd5420cd5 100644 --- a/samples/client/petstore/cpp-qt/client/PFXUser.h +++ b/samples/client/petstore/cpp-qt/client/PFXUser.h @@ -30,13 +30,13 @@ namespace test_namespace { class PFXUser : public PFXObject { public: PFXUser(); - PFXUser(QString json); + PFXUser(const QString &json); ~PFXUser() override; QString asJson() const override; QJsonObject asJsonObject() const override; void fromJsonObject(QJsonObject json) override; - void fromJson(QString jsonString) override; + void fromJson(const QString &jsonString) override; qint64 getId() const; void setId(const qint64 &id); diff --git a/samples/client/petstore/cpp-qt/client/PFXUserApi.h b/samples/client/petstore/cpp-qt/client/PFXUserApi.h index 15bc9510433f..ebc25f534a6a 100644 --- a/samples/client/petstore/cpp-qt/client/PFXUserApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXUserApi.h @@ -151,53 +151,53 @@ class PFXUserApi : public QObject { void updateUserSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use createUserSignalError() instead") - void createUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void createUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void createUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithArrayInputSignalError() instead") - void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void createUsersWithArrayInputSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithListInputSignalError() instead") - void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void createUsersWithListInputSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteUserSignalError() instead") - void deleteUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void deleteUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void deleteUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getUserByNameSignalError() instead") - void getUserByNameSignalE(PFXUser summary, QNetworkReply::NetworkError error_type, QString error_str); + void getUserByNameSignalE(PFXUser summary, QNetworkReply::NetworkError error_type, const QString &error_str); void getUserByNameSignalError(PFXUser summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use loginUserSignalError() instead") - void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, QString error_str); + void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, const QString &error_str); void loginUserSignalError(QString summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use logoutUserSignalError() instead") - void logoutUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void logoutUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void logoutUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updateUserSignalError() instead") - void updateUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void updateUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); void updateUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUserSignalErrorFull() instead") - void createUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void createUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void createUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithArrayInputSignalErrorFull() instead") - void createUsersWithArrayInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithArrayInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void createUsersWithArrayInputSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithListInputSignalErrorFull() instead") - void createUsersWithListInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithListInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void createUsersWithListInputSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteUserSignalErrorFull() instead") - void deleteUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void deleteUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void deleteUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getUserByNameSignalErrorFull() instead") - void getUserByNameSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getUserByNameSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void getUserByNameSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use loginUserSignalErrorFull() instead") - void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void loginUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use logoutUserSignalErrorFull() instead") - void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void logoutUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updateUserSignalErrorFull() instead") - void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void updateUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); From 54f608fb2ed8bb284012113a99863bb9196c9fb8 Mon Sep 17 00:00:00 2001 From: Miklos Marton Date: Wed, 4 Mar 2026 14:35:15 +0100 Subject: [PATCH 2/3] - Do not change signal arguments to const in public API as it breaks API - Fix whitespace typo --- .../src/main/resources/cpp-qt-client/api-body.mustache | 2 +- .../src/main/resources/cpp-qt-client/api-header.mustache | 4 ++-- 2 files changed, 3 insertions(+), 3 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 2d8187cedb3e..38172b270edb 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 @@ -831,7 +831,7 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) { {{#returnType}} {{#isArray}} {{{returnType}}} output; - QString json(worker->response) ; + QString json(worker->response); QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache index 2943e6f896cc..888589643701 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache @@ -95,11 +95,11 @@ Q_SIGNALS: void {{nickname}}SignalFull({{prefix}}HttpRequestWorker *worker{{#returnType}}, {{{.}}} summary{{/returnType}});{{/operation}}{{/operations}} {{#operations}}{{#operation}} Q_DECL_DEPRECATED_X("Use {{nickname}}SignalError() instead") - void {{nickname}}SignalE({{#returnType}}{{{.}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, const QString &error_str); + void {{nickname}}SignalE({{#returnType}}{{{.}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, QString error_str); void {{nickname}}SignalError({{#returnType}}{{{.}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, const QString &error_str);{{/operation}}{{/operations}} {{#operations}}{{#operation}} Q_DECL_DEPRECATED_X("Use {{nickname}}SignalErrorFull() instead") - void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void {{nickname}}SignalErrorFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str);{{/operation}}{{/operations}} void abortRequestsSignal(); From 98c42beceab7d6ba549db2af2916382e9498f33c Mon Sep 17 00:00:00 2001 From: Miklos Marton Date: Wed, 4 Mar 2026 14:41:08 +0100 Subject: [PATCH 3/3] Regenerate tests --- .../client/PFXFakeApi.h | 4 +-- .../client/PFXPetApi.cpp | 6 ++-- .../client/PFXPetApi.h | 36 +++++++++---------- .../client/PFXPrimitivesApi.h | 8 ++--- .../client/PFXStoreApi.h | 16 ++++----- .../client/PFXUserApi.h | 32 ++++++++--------- .../petstore/cpp-qt/client/PFXFakeApi.h | 4 +-- .../petstore/cpp-qt/client/PFXPetApi.cpp | 6 ++-- .../client/petstore/cpp-qt/client/PFXPetApi.h | 36 +++++++++---------- .../petstore/cpp-qt/client/PFXPrimitivesApi.h | 8 ++--- .../petstore/cpp-qt/client/PFXStoreApi.h | 16 ++++----- .../petstore/cpp-qt/client/PFXUserApi.h | 32 ++++++++--------- .../README.md | 2 +- .../org/openapitools/server/models/Cat.kt | 14 ++++---- .../org/openapitools/server/models/Dog.kt | 21 +++++------ .../org/openapitools/server/models/Pet.kt | 13 +++---- 16 files changed, 122 insertions(+), 132 deletions(-) diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXFakeApi.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXFakeApi.h index c9909d4df353..cba16795183b 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXFakeApi.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXFakeApi.h @@ -97,11 +97,11 @@ class PFXFakeApi : public QObject { void getEnumInlineOrRefSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use getEnumInlineOrRefSignalError() instead") - void getEnumInlineOrRefSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void getEnumInlineOrRefSignalE(QNetworkReply::NetworkError error_type, QString error_str); void getEnumInlineOrRefSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getEnumInlineOrRefSignalErrorFull() instead") - void getEnumInlineOrRefSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void getEnumInlineOrRefSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void getEnumInlineOrRefSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp index ea174aa7cb2b..b414998f9c24 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.cpp @@ -385,7 +385,7 @@ void PFXPetApi::allPetsCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QSet output; - QString json(worker->response) ; + QString json(worker->response); QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); @@ -707,7 +707,7 @@ void PFXPetApi::findPetsByStatusCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QList output; - QString json(worker->response) ; + QString json(worker->response); QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); @@ -912,7 +912,7 @@ void PFXPetApi::findPetsByTagsCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QList output; - QString json(worker->response) ; + QString json(worker->response); QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.h index 4d474878d786..265237f4e555 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPetApi.h @@ -174,59 +174,59 @@ class PFXPetApi : public QObject { void uploadFileSignalFull(PFXHttpRequestWorker *worker, PFXApiResponse summary); Q_DECL_DEPRECATED_X("Use addPetSignalError() instead") - void addPetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void addPetSignalE(QNetworkReply::NetworkError error_type, QString error_str); void addPetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use allPetsSignalError() instead") - void allPetsSignalE(QSet summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void allPetsSignalE(QSet summary, QNetworkReply::NetworkError error_type, QString error_str); void allPetsSignalError(QSet summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deletePetSignalError() instead") - void deletePetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void deletePetSignalE(QNetworkReply::NetworkError error_type, QString error_str); void deletePetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByStatusSignalError() instead") - void findPetsByStatusSignalE(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void findPetsByStatusSignalE(QList summary, QNetworkReply::NetworkError error_type, QString error_str); void findPetsByStatusSignalError(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByTagsSignalError() instead") - void findPetsByTagsSignalE(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void findPetsByTagsSignalE(QList summary, QNetworkReply::NetworkError error_type, QString error_str); void findPetsByTagsSignalError(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getPetByIdSignalError() instead") - void getPetByIdSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void getPetByIdSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, QString error_str); void getPetByIdSignalError(PFXPet summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetSignalError() instead") - void updatePetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void updatePetSignalE(QNetworkReply::NetworkError error_type, QString error_str); void updatePetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetWithFormSignalError() instead") - void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, QString error_str); void updatePetWithFormSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use uploadFileSignalError() instead") - void uploadFileSignalE(PFXApiResponse summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void uploadFileSignalE(PFXApiResponse summary, QNetworkReply::NetworkError error_type, QString error_str); void uploadFileSignalError(PFXApiResponse summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use addPetSignalErrorFull() instead") - void addPetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void addPetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void addPetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use allPetsSignalErrorFull() instead") - void allPetsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void allPetsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void allPetsSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deletePetSignalErrorFull() instead") - void deletePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void deletePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void deletePetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByStatusSignalErrorFull() instead") - void findPetsByStatusSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void findPetsByStatusSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void findPetsByStatusSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByTagsSignalErrorFull() instead") - void findPetsByTagsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void findPetsByTagsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void findPetsByTagsSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getPetByIdSignalErrorFull() instead") - void getPetByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void getPetByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void getPetByIdSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetSignalErrorFull() instead") - void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void updatePetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetWithFormSignalErrorFull() instead") - void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void updatePetWithFormSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use uploadFileSignalErrorFull() instead") - void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void uploadFileSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.h index 966f4944ee12..b13e83173984 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXPrimitivesApi.h @@ -104,17 +104,17 @@ class PFXPrimitivesApi : public QObject { void primitivesNumberPutSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use primitivesIntegerPostSignalError() instead") - void primitivesIntegerPostSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void primitivesIntegerPostSignalE(QNetworkReply::NetworkError error_type, QString error_str); void primitivesIntegerPostSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesNumberPutSignalError() instead") - void primitivesNumberPutSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void primitivesNumberPutSignalE(QNetworkReply::NetworkError error_type, QString error_str); void primitivesNumberPutSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesIntegerPostSignalErrorFull() instead") - void primitivesIntegerPostSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void primitivesIntegerPostSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void primitivesIntegerPostSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesNumberPutSignalErrorFull() instead") - void primitivesNumberPutSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void primitivesNumberPutSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void primitivesNumberPutSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.h index 1fd6d91c454f..c46b31250a15 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXStoreApi.h @@ -122,29 +122,29 @@ class PFXStoreApi : public QObject { void placeOrderSignalFull(PFXHttpRequestWorker *worker, PFXOrder summary); Q_DECL_DEPRECATED_X("Use deleteOrderSignalError() instead") - void deleteOrderSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void deleteOrderSignalE(QNetworkReply::NetworkError error_type, QString error_str); void deleteOrderSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getInventorySignalError() instead") - void getInventorySignalE(QMap summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void getInventorySignalE(QMap summary, QNetworkReply::NetworkError error_type, QString error_str); void getInventorySignalError(QMap summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getOrderByIdSignalError() instead") - void getOrderByIdSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void getOrderByIdSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, QString error_str); void getOrderByIdSignalError(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use placeOrderSignalError() instead") - void placeOrderSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void placeOrderSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, QString error_str); void placeOrderSignalError(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteOrderSignalErrorFull() instead") - void deleteOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void deleteOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void deleteOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getInventorySignalErrorFull() instead") - void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void getInventorySignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getOrderByIdSignalErrorFull() instead") - void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void getOrderByIdSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use placeOrderSignalErrorFull() instead") - void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void placeOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.h b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.h index 036033220fe9..cce2728f3114 100644 --- a/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.h +++ b/samples/client/petstore/cpp-qt-addDownloadProgress/client/PFXUserApi.h @@ -159,53 +159,53 @@ class PFXUserApi : public QObject { void updateUserSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use createUserSignalError() instead") - void createUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void createUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); void createUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithArrayInputSignalError() instead") - void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, QString error_str); void createUsersWithArrayInputSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithListInputSignalError() instead") - void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, QString error_str); void createUsersWithListInputSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteUserSignalError() instead") - void deleteUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void deleteUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); void deleteUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getUserByNameSignalError() instead") - void getUserByNameSignalE(PFXUser summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void getUserByNameSignalE(PFXUser summary, QNetworkReply::NetworkError error_type, QString error_str); void getUserByNameSignalError(PFXUser summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use loginUserSignalError() instead") - void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, QString error_str); void loginUserSignalError(QString summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use logoutUserSignalError() instead") - void logoutUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void logoutUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); void logoutUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updateUserSignalError() instead") - void updateUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void updateUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); void updateUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUserSignalErrorFull() instead") - void createUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void createUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void createUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithArrayInputSignalErrorFull() instead") - void createUsersWithArrayInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void createUsersWithArrayInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void createUsersWithArrayInputSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithListInputSignalErrorFull() instead") - void createUsersWithListInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void createUsersWithListInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void createUsersWithListInputSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteUserSignalErrorFull() instead") - void deleteUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void deleteUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void deleteUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getUserByNameSignalErrorFull() instead") - void getUserByNameSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void getUserByNameSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void getUserByNameSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use loginUserSignalErrorFull() instead") - void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void loginUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use logoutUserSignalErrorFull() instead") - void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void logoutUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updateUserSignalErrorFull() instead") - void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void updateUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt/client/PFXFakeApi.h b/samples/client/petstore/cpp-qt/client/PFXFakeApi.h index b83d9c15ccc7..f81543a99463 100644 --- a/samples/client/petstore/cpp-qt/client/PFXFakeApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXFakeApi.h @@ -96,11 +96,11 @@ class PFXFakeApi : public QObject { void getEnumInlineOrRefSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use getEnumInlineOrRefSignalError() instead") - void getEnumInlineOrRefSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void getEnumInlineOrRefSignalE(QNetworkReply::NetworkError error_type, QString error_str); void getEnumInlineOrRefSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getEnumInlineOrRefSignalErrorFull() instead") - void getEnumInlineOrRefSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void getEnumInlineOrRefSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void getEnumInlineOrRefSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp b/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp index 88c81bb25732..cb07b0b4718b 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp @@ -385,7 +385,7 @@ void PFXPetApi::allPetsCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QSet output; - QString json(worker->response) ; + QString json(worker->response); QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); @@ -707,7 +707,7 @@ void PFXPetApi::findPetsByStatusCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QList output; - QString json(worker->response) ; + QString json(worker->response); QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); @@ -912,7 +912,7 @@ void PFXPetApi::findPetsByTagsCallback(PFXHttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str, QString(worker->response)); } QList output; - QString json(worker->response) ; + QString json(worker->response); QByteArray array(json.toStdString().c_str()); QJsonDocument doc = QJsonDocument::fromJson(array); QJsonArray jsonArray = doc.array(); diff --git a/samples/client/petstore/cpp-qt/client/PFXPetApi.h b/samples/client/petstore/cpp-qt/client/PFXPetApi.h index c6c2d5948c55..be4917756d21 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPetApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXPetApi.h @@ -165,59 +165,59 @@ class PFXPetApi : public QObject { void uploadFileSignalFull(PFXHttpRequestWorker *worker, PFXApiResponse summary); Q_DECL_DEPRECATED_X("Use addPetSignalError() instead") - void addPetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void addPetSignalE(QNetworkReply::NetworkError error_type, QString error_str); void addPetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use allPetsSignalError() instead") - void allPetsSignalE(QSet summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void allPetsSignalE(QSet summary, QNetworkReply::NetworkError error_type, QString error_str); void allPetsSignalError(QSet summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deletePetSignalError() instead") - void deletePetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void deletePetSignalE(QNetworkReply::NetworkError error_type, QString error_str); void deletePetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByStatusSignalError() instead") - void findPetsByStatusSignalE(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void findPetsByStatusSignalE(QList summary, QNetworkReply::NetworkError error_type, QString error_str); void findPetsByStatusSignalError(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByTagsSignalError() instead") - void findPetsByTagsSignalE(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void findPetsByTagsSignalE(QList summary, QNetworkReply::NetworkError error_type, QString error_str); void findPetsByTagsSignalError(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getPetByIdSignalError() instead") - void getPetByIdSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void getPetByIdSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, QString error_str); void getPetByIdSignalError(PFXPet summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetSignalError() instead") - void updatePetSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void updatePetSignalE(QNetworkReply::NetworkError error_type, QString error_str); void updatePetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetWithFormSignalError() instead") - void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, QString error_str); void updatePetWithFormSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use uploadFileSignalError() instead") - void uploadFileSignalE(PFXApiResponse summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void uploadFileSignalE(PFXApiResponse summary, QNetworkReply::NetworkError error_type, QString error_str); void uploadFileSignalError(PFXApiResponse summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use addPetSignalErrorFull() instead") - void addPetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void addPetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void addPetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use allPetsSignalErrorFull() instead") - void allPetsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void allPetsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void allPetsSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deletePetSignalErrorFull() instead") - void deletePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void deletePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void deletePetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByStatusSignalErrorFull() instead") - void findPetsByStatusSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void findPetsByStatusSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void findPetsByStatusSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use findPetsByTagsSignalErrorFull() instead") - void findPetsByTagsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void findPetsByTagsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void findPetsByTagsSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getPetByIdSignalErrorFull() instead") - void getPetByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void getPetByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void getPetByIdSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetSignalErrorFull() instead") - void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void updatePetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updatePetWithFormSignalErrorFull() instead") - void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void updatePetWithFormSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use uploadFileSignalErrorFull() instead") - void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void uploadFileSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h b/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h index e8b920b5ed15..a5bdfeeabb1e 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h @@ -102,17 +102,17 @@ class PFXPrimitivesApi : public QObject { void primitivesNumberPutSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use primitivesIntegerPostSignalError() instead") - void primitivesIntegerPostSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void primitivesIntegerPostSignalE(QNetworkReply::NetworkError error_type, QString error_str); void primitivesIntegerPostSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesNumberPutSignalError() instead") - void primitivesNumberPutSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void primitivesNumberPutSignalE(QNetworkReply::NetworkError error_type, QString error_str); void primitivesNumberPutSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesIntegerPostSignalErrorFull() instead") - void primitivesIntegerPostSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void primitivesIntegerPostSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void primitivesIntegerPostSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use primitivesNumberPutSignalErrorFull() instead") - void primitivesNumberPutSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void primitivesNumberPutSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void primitivesNumberPutSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt/client/PFXStoreApi.h b/samples/client/petstore/cpp-qt/client/PFXStoreApi.h index ec930b97bb99..d16fbe9502d5 100644 --- a/samples/client/petstore/cpp-qt/client/PFXStoreApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXStoreApi.h @@ -118,29 +118,29 @@ class PFXStoreApi : public QObject { void placeOrderSignalFull(PFXHttpRequestWorker *worker, PFXOrder summary); Q_DECL_DEPRECATED_X("Use deleteOrderSignalError() instead") - void deleteOrderSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void deleteOrderSignalE(QNetworkReply::NetworkError error_type, QString error_str); void deleteOrderSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getInventorySignalError() instead") - void getInventorySignalE(QMap summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void getInventorySignalE(QMap summary, QNetworkReply::NetworkError error_type, QString error_str); void getInventorySignalError(QMap summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getOrderByIdSignalError() instead") - void getOrderByIdSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void getOrderByIdSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, QString error_str); void getOrderByIdSignalError(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use placeOrderSignalError() instead") - void placeOrderSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void placeOrderSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, QString error_str); void placeOrderSignalError(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteOrderSignalErrorFull() instead") - void deleteOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void deleteOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void deleteOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getInventorySignalErrorFull() instead") - void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void getInventorySignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getOrderByIdSignalErrorFull() instead") - void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void getOrderByIdSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use placeOrderSignalErrorFull() instead") - void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void placeOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/client/petstore/cpp-qt/client/PFXUserApi.h b/samples/client/petstore/cpp-qt/client/PFXUserApi.h index ebc25f534a6a..15bc9510433f 100644 --- a/samples/client/petstore/cpp-qt/client/PFXUserApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXUserApi.h @@ -151,53 +151,53 @@ class PFXUserApi : public QObject { void updateUserSignalFull(PFXHttpRequestWorker *worker); Q_DECL_DEPRECATED_X("Use createUserSignalError() instead") - void createUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void createUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); void createUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithArrayInputSignalError() instead") - void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, QString error_str); void createUsersWithArrayInputSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithListInputSignalError() instead") - void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, QString error_str); void createUsersWithListInputSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteUserSignalError() instead") - void deleteUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void deleteUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); void deleteUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getUserByNameSignalError() instead") - void getUserByNameSignalE(PFXUser summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void getUserByNameSignalE(PFXUser summary, QNetworkReply::NetworkError error_type, QString error_str); void getUserByNameSignalError(PFXUser summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use loginUserSignalError() instead") - void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, const QString &error_str); + void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, QString error_str); void loginUserSignalError(QString summary, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use logoutUserSignalError() instead") - void logoutUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void logoutUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); void logoutUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updateUserSignalError() instead") - void updateUserSignalE(QNetworkReply::NetworkError error_type, const QString &error_str); + void updateUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); void updateUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUserSignalErrorFull() instead") - void createUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void createUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void createUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithArrayInputSignalErrorFull() instead") - void createUsersWithArrayInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void createUsersWithArrayInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void createUsersWithArrayInputSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use createUsersWithListInputSignalErrorFull() instead") - void createUsersWithListInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void createUsersWithListInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void createUsersWithListInputSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use deleteUserSignalErrorFull() instead") - void deleteUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void deleteUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void deleteUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use getUserByNameSignalErrorFull() instead") - void getUserByNameSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void getUserByNameSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void getUserByNameSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use loginUserSignalErrorFull() instead") - void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void loginUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use logoutUserSignalErrorFull() instead") - void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void logoutUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); Q_DECL_DEPRECATED_X("Use updateUserSignalErrorFull() instead") - void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); void updateUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); diff --git a/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/README.md b/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/README.md index 55bf4dec040e..b6b998a88141 100644 --- a/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/README.md +++ b/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/README.md @@ -1,4 +1,4 @@ -# org.openapitools.server - Kotlin Server library for Polymorphism example with allOf and discriminator +# org.openapitools.server - Kotlin Server library for Basic polymorphism example with discriminator No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) diff --git a/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Cat.kt b/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Cat.kt index e9e835517bae..99ab4e0f3f50 100644 --- a/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Cat.kt +++ b/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Cat.kt @@ -1,5 +1,5 @@ /** - * Polymorphism example with allOf and discriminator + * Basic polymorphism example with discriminator * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * * The version of the OpenAPI document: 1.0 @@ -11,11 +11,11 @@ */ package org.openapitools.server.models -import org.openapitools.server.models.Pet /** - * A representation of a cat + * A pet cat * @param huntingSkill The measured skill for hunting + * @param petType */ data class Cat( /* The measured skill for hunting */ @@ -23,12 +23,10 @@ data class Cat( @field:com.fasterxml.jackson.annotation.JsonProperty("huntingSkill") val huntingSkill: Cat.HuntingSkill, - @field:com.fasterxml.jackson.annotation.JsonProperty("name") - override val name: kotlin.String, - @field:com.fasterxml.jackson.annotation.JsonProperty("petType") - override val petType: kotlin.String -) : Pet(name = name, petType = petType) + override val petType: kotlin.String = "cat", + +) : Pet(petType = petType) { /** * The measured skill for hunting diff --git a/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Dog.kt b/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Dog.kt index 4066cb7a51f8..9f3cbe860d93 100644 --- a/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Dog.kt +++ b/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Dog.kt @@ -1,5 +1,5 @@ /** - * Polymorphism example with allOf and discriminator + * Basic polymorphism example with discriminator * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * * The version of the OpenAPI document: 1.0 @@ -11,24 +11,19 @@ */ package org.openapitools.server.models -import org.openapitools.server.models.Pet /** - * A representation of a dog + * A pet dog + * @param petType * @param packSize the size of the pack the dog is from */ data class Dog( + + @field:com.fasterxml.jackson.annotation.JsonProperty("petType") + override val petType: kotlin.String = "dog", /* the size of the pack the dog is from */ @field:com.fasterxml.jackson.annotation.JsonProperty("packSize") - val packSize: kotlin.Int = 0, - - @field:com.fasterxml.jackson.annotation.JsonProperty("name") - override val name: kotlin.String, - - @field:com.fasterxml.jackson.annotation.JsonProperty("petType") - override val petType: kotlin.String -) : Pet(name = name, petType = petType) -{ -} + val packSize: kotlin.Int = 0 +) : Pet(petType = petType) diff --git a/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Pet.kt b/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Pet.kt index 5812ac1944eb..1311dc6d56ff 100644 --- a/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Pet.kt +++ b/samples/server/others/kotlin-server/polymorphism-allof-and-discriminator/src/main/kotlin/org/openapitools/server/models/Pet.kt @@ -1,5 +1,5 @@ /** - * Polymorphism example with allOf and discriminator + * Basic polymorphism example with discriminator * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * * The version of the OpenAPI document: 1.0 @@ -11,23 +11,20 @@ */ package org.openapitools.server.models +import org.openapitools.server.models.Cat +import org.openapitools.server.models.Dog /** * - * @param name * @param petType */ @com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, property = "petType", visible = true) @com.fasterxml.jackson.annotation.JsonSubTypes( - com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Cat::class, name = "Cat"), - com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Dog::class, name = "Dog") + com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Cat::class, name = "cat"), + com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = Dog::class, name = "dog") ) sealed class Pet( - @field:com.fasterxml.jackson.annotation.JsonProperty("name") - open val name: kotlin.String -, - @field:com.fasterxml.jackson.annotation.JsonProperty("petType") open val petType: kotlin.String