From dbe286c611c8fa0f63fb7266a7255afc9fd6a286 Mon Sep 17 00:00:00 2001 From: Ragnis Armus Date: Thu, 13 Oct 2016 10:50:31 +0300 Subject: [PATCH] Fix setting of model package --- .../io/swagger/codegen/languages/Qt5CPPGenerator.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java index f3179688c323..78d9c3e49de1 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java @@ -183,7 +183,12 @@ public class Qt5CPPGenerator extends DefaultCodegen implements CodegenConfig { } else if (systemIncludes.contains(name)) { return "#include <" + name + ">"; } - return "#include \"" + name + ".h\""; + + String folder = modelPackage().replace("::", File.separator); + if (!folder.isEmpty()) + folder += File.separator; + + return "#include \"" + folder + name + ".h\""; } /** @@ -203,7 +208,7 @@ public class Qt5CPPGenerator extends DefaultCodegen implements CodegenConfig { */ @Override public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace("::", File.separator); } /**