Skip to content

[C++] [Qt5] Add enum support for client and server #2339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 4 commits into from
Mar 30, 2019
Merged

[C++] [Qt5] Add enum support for client and server #2339

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a521dd
Add enum support to Qt5 client and server
etherealjoy Mar 9, 2019
f758252
Correct model name prefix
etherealjoy Mar 9, 2019
a5cc2e0
Remove tabs
etherealjoy Mar 9, 2019
aebd02c
Correct wrong filename when prefix used
etherealjoy Mar 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove tabs
  • Loading branch information
@etherealjoy
etherealjoy committed Mar 9, 2019
commit a5cc2e0f161954e0413a56fd3016db5a524db3ce
18 changes: 9 additions & 9 deletions ...api-generator/src/main/java/org/openapitools/codegen/languages/CppQt5AbstractCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,17 +283,17 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
Map<String, CodegenModel> codegenModels = new HashMap<String, CodegenModel> ();
for(Object moObj : allModels) {
CodegenModel mo = ((Map<String, CodegenModel>) moObj).get("model");
if(mo.isEnum) {
codegenModels.put(mo.classname, mo);
}
CodegenModel mo = ((Map<String, CodegenModel>) moObj).get("model");
if(mo.isEnum) {
codegenModels.put(mo.classname, mo);
}
}
for (CodegenOperation operation : operations) {
if(operation.returnType != null) {
if(codegenModels.containsKey(operation.returnType)){
operation.vendorExtensions.put("returnsEnum", true);
}
}
if(operation.returnType != null) {
if(codegenModels.containsKey(operation.returnType)){
operation.vendorExtensions.put("returnsEnum", true);
}
}
// Check all return parameter baseType if there is a necessity to include, include it if not
// already done
if (operation.returnBaseType != null && needToImport(operation.returnBaseType)) {
Expand Down