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

OpenAPITools · Feb 1, 2018 · 36f69a0 · 36f69a0
1 parent 2d0bafb
commit 36f69a0
Show file tree

Hide file tree

Showing 20 changed files with 139 additions and 131 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/api-body.mustache
@@ -33,9 +33,9 @@ void
 
     {{#queryParams}}
     {{^collectionFormat}}
-    if (fullPath.indexOf("?") > 0) 
+    if (fullPath.indexOf("?") > 0)
       fullPath.append("&");
-    else 
+    else
       fullPath.append("?");
     fullPath.append(QUrl::toPercentEncoding("{{baseName}}"))
         .append("=")
@@ -49,15 +49,15 @@ void
         foreach({{{baseType}}} t, *{{paramName}}) {
           if (fullPath.indexOf("?") > 0)
             fullPath.append("&");
-          else 
+          else
             fullPath.append("?");
           fullPath.append("{{{baseName}}}=").append(stringValue(t));
         }
       }
       else if (QString("{{collectionFormat}}").indexOf("ssv") == 0) {
         if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
-        else 
+        else
           fullPath.append("?");
         fullPath.append("{{baseName}}=");
         qint32 count = 0;
@@ -71,7 +71,7 @@ void
       else if (QString("{{collectionFormat}}").indexOf("tsv") == 0) {
         if (fullPath.indexOf("?") > 0)
           fullPath.append("&");
-        else 
+        else
           fullPath.append("?");
         fullPath.append("{{baseName}}=");
         qint32 count = 0;
@@ -160,11 +160,13 @@ void
     }
     {{/isListContainer}}
 
-    {{^isListContainer}}{{^isMapContainer}}
+    {{^isListContainer}}
+    {{^isMapContainer}}
     {{#returnTypeIsPrimitive}}
     {{{returnType}}} output;  // TODO add primitive output support
-    {{/returnTypeIsPrimitive}}{{/isMapContainer}}
-    {{#isMapContainer}} 
+    {{/returnTypeIsPrimitive}}
+    {{/isMapContainer}}
+    {{#isMapContainer}}
     {{{returnType}}} output = {{{defaultResponse}}};
     QString json(worker->response);
     QByteArray array (json.toStdString().c_str());

diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache
@@ -41,7 +41,7 @@ void
     if({{name}} != nullptr) { {{#isContainer}}
         auto arr = {{name}};
         for(auto o: *arr) { {{#items.isContainer}}
-            for(auto o1: *o) {                
+            for(auto o1: *o) {
                 delete o1;
             }{{/items.isContainer}}
             delete o;
@@ -71,7 +71,7 @@ void
             {{#items.isListContainer}}auto {{name}}_item = new QList<{{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.isListContainer}}
             {{#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 = jval.toObject();
-            ::{{cppNamespace}}::setValue({{name}}_item, jsonval, "{{items.baseType}}", "{{items.items.baseType}}"); 
+            ::{{cppNamespace}}::setValue({{name}}_item, jsonval, "{{items.baseType}}", "{{items.items.baseType}}");
             {{name}}->push_back({{name}}_item);
         }
     }{{/isListContainer}}{{#isMapContainer}}
@@ -80,10 +80,11 @@ void
         if(varmap.count() > 0){
             for(auto val : varmap.keys()){
                 {{#items.isListContainer}}auto {{name}}_item = new QList<{{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.isListContainer}}
-                {{#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}}    		    
+                {{#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);             
+    		    ::{{cppNamespace}}::setValue((QMap<QString, void *>*)&{{name}}_item, jsonval, "{{items.baseType}}", "{{items.items.baseType}}");
+
+                {{name}}->insert({{name}}->end(), val, {{name}}_item);
             }
         }
     }{{/isMapContainer}}{{/items.isContainer}}{{/isContainer}}
@@ -94,7 +95,7 @@ QString
 {{classname}}::asJson ()
 {
     QJsonObject* obj = this->asJsonObject();
-    
+
     QJsonDocument doc(*obj);
     QByteArray bytes = doc.toJson();
     return QString(bytes);
@@ -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.isMapContainer}}toJsonMap((QMap<QString, void*>*)items, &jobj, "{{baseName}}", "{{items.items.baseType}}");{{/items.isMapContainer}}
+            {{#items.isListContainer}}
+            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}}
-    }{{/isListContainer}}{{#isMapContainer}}
+        obj->insert("{{baseName}}", jarray);
+        {{/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.isMapContainer}}toJsonMap((QMap<QString, void*>*){{name}}->value(itemkey), &jobj, itemkey, "{{items.items.baseType}}");{{/items.isMapContainer}}
+            {{#items.isListContainer}}
+            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;
@@ -163,7 +209,7 @@ void
 
 {{/vars}}
 
-bool 
+bool
 {{classname}}::isSet(){
     bool isObjectUpdated = false;
     do{

diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/model-header.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/model-header.mustache
@@ -1,7 +1,7 @@
 {{>licenseInfo}}
 {{#models}}{{#model}}/*
  * {{classname}}.h
- * 
+ *
  * {{description}}
  */
 
@@ -47,7 +47,7 @@ private:
     {{#vars}}
     {{{datatype}}} {{name}};
     bool m_{{name}}_isSet;
-    
+
     {{/vars}}
 };
 

diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/model.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/model.mustache
@@ -1,7 +1,7 @@
 {{>licenseInfo}}
 {{#models}}{{#model}}/*
  * {{classname}}.h
- * 
+ *
  * {{description}}
  */
 

diff --git a/samples/client/petstore/qt5cpp/.swagger-codegen/VERSION b/samples/client/petstore/qt5cpp/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.4.0-SNAPSHOT
diff --git a/samples/client/petstore/qt5cpp/client/SWGApiResponse.cpp b/samples/client/petstore/qt5cpp/client/SWGApiResponse.cpp
@@ -79,7 +79,7 @@ QString
 SWGApiResponse::asJson ()
 {
     QJsonObject* obj = this->asJsonObject();
-    
+
     QJsonDocument doc(*obj);
     QByteArray bytes = doc.toJson();
     return QString(bytes);
@@ -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"));
     }
@@ -135,7 +132,7 @@ SWGApiResponse::setMessage(QString* message) {
 }
 
 
-bool 
+bool
 SWGApiResponse::isSet(){
     bool isObjectUpdated = false;
     do{

diff --git a/samples/client/petstore/qt5cpp/client/SWGApiResponse.h b/samples/client/petstore/qt5cpp/client/SWGApiResponse.h
@@ -12,7 +12,7 @@
 
 /*
  * SWGApiResponse.h
- * 
+ *
  * Describes the result of uploading an image resource
  */
 
@@ -56,13 +56,13 @@ class SWGApiResponse: public SWGObject {
 private:
     qint32 code;
     bool m_code_isSet;
-    
+
     QString* type;
     bool m_type_isSet;
-    
+
     QString* message;
     bool m_message_isSet;
-    
+
 };
 
 }

diff --git a/samples/client/petstore/qt5cpp/client/SWGCategory.cpp b/samples/client/petstore/qt5cpp/client/SWGCategory.cpp
@@ -72,7 +72,7 @@ QString
 SWGCategory::asJson ()
 {
     QJsonObject* obj = this->asJsonObject();
-    
+
     QJsonDocument doc(*obj);
     QByteArray bytes = doc.toJson();
     return QString(bytes);
@@ -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"));
     }
@@ -114,7 +112,7 @@ SWGCategory::setName(QString* name) {
 }
 
 
-bool 
+bool
 SWGCategory::isSet(){
     bool isObjectUpdated = false;
     do{

diff --git a/samples/client/petstore/qt5cpp/client/SWGCategory.h b/samples/client/petstore/qt5cpp/client/SWGCategory.h
@@ -12,7 +12,7 @@
 
 /*
  * SWGCategory.h
- * 
+ *
  * A category for a pet
  */
 
@@ -53,10 +53,10 @@ class SWGCategory: public SWGObject {
 private:
     qint64 id;
     bool m_id_isSet;
-    
+
     QString* name;
     bool m_name_isSet;
-    
+
 };
 
 }