remove trailing spaces in qt5 c++ templates (#7525)

modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache

@@ -160,10 +160,12 @@ void
     }
     {{/isListContainer}}
 
-    {{^isListContainer}}{{^isMapContainer}}
+    {{^isListContainer}}
+    {{^isMapContainer}}
     {{#returnTypeIsPrimitive}}
     {{{returnType}}} output;  // TODO add primitive output support
-    {{/returnTypeIsPrimitive}}{{/isMapContainer}}
+    {{/returnTypeIsPrimitive}}
+    {{/isMapContainer}}
     {{#isMapContainer}}
     {{{returnType}}} output = {{{defaultResponse}}};
     QString json(worker->response);

modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache

@@ -83,6 +83,7 @@ void
                 {{#items.isMapContainer}}auto {{name}}_item = new QMap<QString, {{items.items.baseType}}{{^items.items.isLong}}{{^items.items.isInteger}}{{^items.items.isDouble}}{{^items.items.isFloat}}{{^items.items.isBoolean}}*{{/items.items.isBoolean}}{{/items.items.isFloat}}{{/items.items.isDouble}}{{/items.items.isInteger}}{{/items.items.isLong}}>();{{/items.isMapContainer}}
     		    auto jsonval = QJsonValue::fromVariant(varmap.value(val));
     		    ::{{cppNamespace}}::setValue((QMap<QString, void *>*)&{{name}}_item, jsonval, "{{items.baseType}}", "{{items.items.baseType}}");
+
                 {{name}}->insert({{name}}->end(), val, {{name}}_item);
             }
         }
@@ -104,47 +105,92 @@ QJsonObject*
 {{classname}}::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
     {{#vars}}
-    {{^isContainer}}{{#complexType}}{{^isString}}{{^isDate}}{{^isDateTime}}{{^isByteArray}} 
+    {{^isContainer}}
+    {{#complexType}}
+    {{^isString}}
+    {{^isDate}}
+    {{^isDateTime}}
+    {{^isByteArray}} 
     if(({{name}} != nullptr) && ({{name}}->isSet())){
         toJsonValue(QString("{{baseName}}"), {{name}}, obj, QString("{{complexType}}"));
-    }{{/isByteArray}}{{/isDateTime}}{{/isDate}}{{/isString}}{{#isString}}
+    }
+    {{/isByteArray}}
+    {{/isDateTime}}
+    {{/isDate}}
+    {{/isString}}
+    {{#isString}}
     if({{name}} != nullptr && *{{name}} != QString("")){
         toJsonValue(QString("{{baseName}}"), {{name}}, obj, QString("{{complexType}}"));
-    }{{/isString}}{{/complexType}}{{#isPrimitiveType}}{{^isDateTime}}{{^isDate}}{{^isByteArray}}
+    }
+    {{/isString}}
+    {{/complexType}}
+    {{#isPrimitiveType}}
+    {{^isDateTime}}
+    {{^isDate}}
+    {{^isByteArray}}
     if(m_{{name}}_isSet){
         obj->insert("{{baseName}}", QJsonValue({{name}}));
-    }{{/isByteArray}}{{/isDate}}{{/isDateTime}}{{/isPrimitiveType}}{{#isDate}}    
+    }
+    {{/isByteArray}}
+    {{/isDate}}
+    {{/isDateTime}}
+    {{/isPrimitiveType}}
+    {{#isDate}}    
     if({{name}} != nullptr) { 
         toJsonValue(QString("{{baseName}}"), {{name}}, obj, QString("{{complexType}}"));
-    }{{/isDate}}{{#isByteArray}}    
+    }
+    {{/isDate}}
+    {{#isByteArray}}    
     if({{name}} != nullptr) { 
         obj->insert("{{name}}", QJsonValue(*{{name}}));
-    }{{/isByteArray}}{{#isDateTime}}   
+    }
+    {{/isByteArray}}
+    {{#isDateTime}}   
     if({{name}} != nullptr) { 
         toJsonValue(QString("{{baseName}}"), {{name}}, obj, QString("{{complexType}}"));
-    }{{/isDateTime}}{{/isContainer}}{{#isContainer}}{{#isListContainer}}
+    }
+    {{/isDateTime}}
+    {{/isContainer}}
+    {{#isContainer}}
+    {{#isListContainer}}
     if({{name}}->size() > 0){
-        {{^items.isContainer}}toJsonArray((QList<void*>*){{name}}, obj, "{{baseName}}", "{{complexType}}");{{/items.isContainer}}{{#items.isContainer}}
+        {{^items.isContainer}}
+        toJsonArray((QList<void*>*){{name}}, obj, "{{baseName}}", "{{complexType}}");
+        {{/items.isContainer}}
+        {{#items.isContainer}}
         QJsonArray jarray;
         for(auto items : *{{name}}){
             QJsonObject jobj;
-            {{#items.isListContainer}}toJsonArray((QList<void*>*)items, &jobj, "{{baseName}}", "{{items.items.baseType}}");{{/items.isListContainer}}
+            {{#items.isListContainer}}
-            {{#items.isMapContainer}}toJsonMap((QMap<QString, void*>*)items, &jobj, "{{baseName}}", "{{items.items.baseType}}");{{/items.isMapContainer}}
+            toJsonArray((QList<void*>*)items, &jobj, "{{baseName}}", "{{items.items.baseType}}");
+            {{/items.isListContainer}}
+            {{#items.isMapContainer}}
+            toJsonMap((QMap<QString, void*>*)items, &jobj, "{{baseName}}", "{{items.items.baseType}}");
+            {{/items.isMapContainer}}
             jarray.append(jobj.value("{{baseName}}"));
         }
-        obj->insert("{{baseName}}", jarray);{{/items.isContainer}}
+        obj->insert("{{baseName}}", jarray);
-    }{{/isListContainer}}{{#isMapContainer}}
+        {{/items.isContainer}}
+    }
+    {{/isListContainer}}
+    {{#isMapContainer}}
     if({{name}}->size() > 0){
         {{^items.isContainer}}toJsonMap((QMap<QString, void*>*) {{name}}, obj, "{{baseName}}", "{{complexType}}");{{/items.isContainer}}{{#items.isContainer}}
         QJsonObject mapobj;
         for(auto itemkey : {{name}}->keys()){
             QJsonObject jobj;
-            {{#items.isListContainer}}toJsonArray((QList<void*>*){{name}}->value(itemkey), &jobj, itemkey, "{{items.items.baseType}}");{{/items.isListContainer}}
+            {{#items.isListContainer}}
-            {{#items.isMapContainer}}toJsonMap((QMap<QString, void*>*){{name}}->value(itemkey), &jobj, itemkey, "{{items.items.baseType}}");{{/items.isMapContainer}}
+            toJsonArray((QList<void*>*){{name}}->value(itemkey), &jobj, itemkey, "{{items.items.baseType}}");
+            {{/items.isListContainer}}
+            {{#items.isMapContainer}}
+            toJsonMap((QMap<QString, void*>*){{name}}->value(itemkey), &jobj, itemkey, "{{items.items.baseType}}");
+            {{/items.isMapContainer}}
             mapobj.insert(itemkey, jobj);
         }
         obj->insert("{{baseName}}", mapobj);{{/items.isContainer}}
-    }{{/isMapContainer}}{{/isContainer}}
+    }
+    {{/isMapContainer}}
+    {{/isContainer}}
     {{/vars}}
 
     return obj;

samples/client/petstore/qt5cpp/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.4.0-SNAPSHOT

samples/client/petstore/qt5cpp/client/SWGApiResponse.cpp

@@ -88,15 +88,12 @@ SWGApiResponse::asJson ()
 QJsonObject*
 SWGApiResponse::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    
     if(m_code_isSet){
         obj->insert("code", QJsonValue(code));
     }
-    
     if(type != nullptr && *type != QString("")){
         toJsonValue(QString("type"), type, obj, QString("QString"));
     }
-    
     if(message != nullptr && *message != QString("")){
         toJsonValue(QString("message"), message, obj, QString("QString"));
     }

samples/client/petstore/qt5cpp/client/SWGCategory.cpp

@@ -81,11 +81,9 @@ SWGCategory::asJson ()
 QJsonObject*
 SWGCategory::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    
     if(m_id_isSet){
         obj->insert("id", QJsonValue(id));
     }
-    
     if(name != nullptr && *name != QString("")){
         toJsonValue(QString("name"), name, obj, QString("QString"));
     }

samples/client/petstore/qt5cpp/client/SWGOrder.cpp

@@ -103,27 +103,21 @@ SWGOrder::asJson ()
 QJsonObject*
 SWGOrder::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    
     if(m_id_isSet){
         obj->insert("id", QJsonValue(id));
     }
-    
     if(m_pet_id_isSet){
         obj->insert("petId", QJsonValue(pet_id));
     }
-    
     if(m_quantity_isSet){
         obj->insert("quantity", QJsonValue(quantity));
     }
-       
     if(ship_date != nullptr) { 
         toJsonValue(QString("shipDate"), ship_date, obj, QString("QDateTime"));
     }
-    
     if(status != nullptr && *status != QString("")){
         toJsonValue(QString("status"), status, obj, QString("QString"));
     }
-    
     if(m_complete_isSet){
         obj->insert("complete", QJsonValue(complete));
     }

samples/client/petstore/qt5cpp/client/SWGPet.cpp

@@ -117,27 +117,21 @@ SWGPet::asJson ()
 QJsonObject*
 SWGPet::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    
     if(m_id_isSet){
         obj->insert("id", QJsonValue(id));
     }
-     
     if((category != nullptr) && (category->isSet())){
         toJsonValue(QString("category"), category, obj, QString("SWGCategory"));
     }
-    
     if(name != nullptr && *name != QString("")){
         toJsonValue(QString("name"), name, obj, QString("QString"));
     }
-    
     if(photo_urls->size() > 0){
         toJsonArray((QList<void*>*)photo_urls, obj, "photoUrls", "QString");
     }
-    
     if(tags->size() > 0){
         toJsonArray((QList<void*>*)tags, obj, "tags", "SWGTag");
     }
-    
     if(status != nullptr && *status != QString("")){
         toJsonValue(QString("status"), status, obj, QString("QString"));
     }

samples/client/petstore/qt5cpp/client/SWGPetApi.cpp

@@ -229,7 +229,7 @@ SWGPetApi::findPetsByStatusCallback(SWGHttpRequestWorker * worker) {
         output->append(o);
     }
 
-        worker->deleteLater();
+    worker->deleteLater();
 
     if (worker->error_type == QNetworkReply::NoError) {
         emit findPetsByStatusSignal(output);
@@ -334,7 +334,7 @@ SWGPetApi::findPetsByTagsCallback(SWGHttpRequestWorker * worker) {
         output->append(o);
     }
 
-        worker->deleteLater();
+    worker->deleteLater();
 
     if (worker->error_type == QNetworkReply::NoError) {
         emit findPetsByTagsSignal(output);
@@ -386,8 +386,6 @@ SWGPetApi::getPetByIdCallback(SWGHttpRequestWorker * worker) {
     }
 
 
-    
-
     QString json(worker->response);
     SWGPet* output = static_cast<SWGPet*>(create(json, QString("SWGPet")));
     worker->deleteLater();
@@ -557,8 +555,6 @@ SWGPetApi::uploadFileCallback(SWGHttpRequestWorker * worker) {
     }
 
 
-    
-
     QString json(worker->response);
     SWGApiResponse* output = static_cast<SWGApiResponse*>(create(json, QString("SWGApiResponse")));
     worker->deleteLater();

samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp

@@ -119,7 +119,6 @@ SWGStoreApi::getInventoryCallback(SWGHttpRequestWorker * worker) {
     }
 
 
-    
     QMap<QString, qint32>* output = new QMap<QString, qint32>();
     QString json(worker->response);
     QByteArray array (json.toStdString().c_str());
@@ -183,8 +182,6 @@ SWGStoreApi::getOrderByIdCallback(SWGHttpRequestWorker * worker) {
     }
 
 
-    
-
     QString json(worker->response);
     SWGOrder* output = static_cast<SWGOrder*>(create(json, QString("SWGOrder")));
     worker->deleteLater();
@@ -240,8 +237,6 @@ SWGStoreApi::placeOrderCallback(SWGHttpRequestWorker * worker) {
     }
 
 
-    
-
     QString json(worker->response);
     SWGOrder* output = static_cast<SWGOrder*>(create(json, QString("SWGOrder")));
     worker->deleteLater();

samples/client/petstore/qt5cpp/client/SWGTag.cpp

@@ -81,11 +81,9 @@ SWGTag::asJson ()
 QJsonObject*
 SWGTag::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    
     if(m_id_isSet){
         obj->insert("id", QJsonValue(id));
     }
-    
     if(name != nullptr && *name != QString("")){
         toJsonValue(QString("name"), name, obj, QString("QString"));
     }

samples/client/petstore/qt5cpp/client/SWGUser.cpp

@@ -121,35 +121,27 @@ SWGUser::asJson ()
 QJsonObject*
 SWGUser::asJsonObject() {
     QJsonObject* obj = new QJsonObject();
-    
     if(m_id_isSet){
         obj->insert("id", QJsonValue(id));
     }
-    
     if(username != nullptr && *username != QString("")){
         toJsonValue(QString("username"), username, obj, QString("QString"));
     }
-    
     if(first_name != nullptr && *first_name != QString("")){
         toJsonValue(QString("firstName"), first_name, obj, QString("QString"));
     }
-    
     if(last_name != nullptr && *last_name != QString("")){
         toJsonValue(QString("lastName"), last_name, obj, QString("QString"));
     }
-    
     if(email != nullptr && *email != QString("")){
         toJsonValue(QString("email"), email, obj, QString("QString"));
     }
-    
     if(password != nullptr && *password != QString("")){
         toJsonValue(QString("password"), password, obj, QString("QString"));
     }
-    
     if(phone != nullptr && *phone != QString("")){
         toJsonValue(QString("phone"), phone, obj, QString("QString"));
     }
-    
     if(m_user_status_isSet){
         obj->insert("userStatus", QJsonValue(user_status));
     }

samples/client/petstore/qt5cpp/client/SWGUserApi.cpp

@@ -285,8 +285,6 @@ SWGUserApi::getUserByNameCallback(SWGHttpRequestWorker * worker) {
     }
 
 
-    
-
     QString json(worker->response);
     SWGUser* output = static_cast<SWGUser*>(create(json, QString("SWGUser")));
     worker->deleteLater();
@@ -355,8 +353,6 @@ SWGUserApi::loginUserCallback(SWGHttpRequestWorker * worker) {
     }
 
 
-    
-
     QString json(worker->response);
     QString* output = static_cast<QString*>(create(json, QString("QString")));
     worker->deleteLater();