[cpp-qt-client] Optimize generated code

modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.cpp.mustache

@@ -7,6 +7,9 @@
 #include <QUrl>
 #include <QUuid>
 #include <QtGlobal>
+#include <QtAlgorithms>
+
+#include <utility>
 {{#contentCompression}}
 #include <zlib.h>{{/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<QString, QString> {{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,15 +177,15 @@ 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
 
         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;

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<QString, QString> 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);

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();
       });

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;
     }
 

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();

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}});

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}}
+{{/cppNamespaceDeclarations}}

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;

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();
     }

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();
       });

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();

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);