From 1966e2eaf750e5cf6439f4d3a780478f0cd2df25 Mon Sep 17 00:00:00 2001 From: etherealjoy Date: Thu, 18 Jan 2018 11:11:54 +0100 Subject: [PATCH 1/3] Small fixes to prevent crash when empty json body is provided. --- .../src/main/resources/qt5cpp/helpers-header.mustache | 2 ++ .../src/main/resources/qt5cpp/model-body.mustache | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-header.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-header.mustache index c3569d7e7be..b40c2ee8ba6 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-header.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/helpers-header.mustache @@ -3,6 +3,8 @@ #define {{prefix}}_HELPERS_H #include +#include +#include {{#cppNamespaceDeclarations}} namespace {{this}} { diff --git a/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache b/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache index f5e707f5605..011bf19fd69 100644 --- a/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache +++ b/modules/swagger-codegen/src/main/resources/qt5cpp/model-body.mustache @@ -105,7 +105,7 @@ QJsonObject* QJsonObject* obj = new QJsonObject(); {{#vars}} {{^isContainer}}{{#complexType}}{{^isString}}{{^isDate}}{{^isDateTime}}{{^isByteArray}} - if({{name}}->isSet()){ + if(({{name}} != nullptr) && ({{name}}->isSet())){ toJsonValue(QString("{{baseName}}"), {{name}}, obj, QString("{{complexType}}")); }{{/isByteArray}}{{/isDateTime}}{{/isDate}}{{/isString}}{{#isString}} if({{name}} != nullptr && *{{name}} != QString("")){ From 03edd361b6939d2aea4ceac54903d3fd547f9b66 Mon Sep 17 00:00:00 2001 From: etherealjoy Date: Thu, 15 Mar 2018 01:05:17 +0100 Subject: [PATCH 2/3] Add linux as a reserved keyword --- .../java/io/swagger/codegen/languages/AbstractCppCodegen.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCppCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCppCodegen.java index 8fa66fa6aa8..ae6e4e7fb7d 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCppCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCppCodegen.java @@ -59,6 +59,7 @@ public AbstractCppCodegen() { "inline", "int", "long", + "linux", "mutable", "namespace", "new", From 9acbeb19f0257719c2f49022003a3d4700a08087 Mon Sep 17 00:00:00 2001 From: etherealjoy Date: Thu, 15 Mar 2018 01:13:30 +0100 Subject: [PATCH 3/3] Small reorder of introduced keyword --- .../java/io/swagger/codegen/languages/AbstractCppCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCppCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCppCodegen.java index ae6e4e7fb7d..e4831843716 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCppCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCppCodegen.java @@ -58,8 +58,8 @@ public AbstractCppCodegen() { "if", "inline", "int", + "linux", "long", - "linux", "mutable", "namespace", "new",