Skip to content

Commit 5db2be0

Browse files
committed
Extend the reserved keywords for Qt projects with the following words:
- signals (builtin Qt macro) - slots (builtin Qt macro) - NULL - valid (generated classes has an isValid method) - set (generated classes has an isSet method) Fixes #17487
1 parent a5d3fb4 commit 5db2be0

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ public AbstractCppCodegen() {
112112
"noexcept",
113113
"not",
114114
"not_eq",
115+
"NULL",
115116
"nullptr",
116117
"operator",
117118
"or",

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java

+3
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ public CppQtAbstractCodegen() {
129129
systemIncludes.add("QDate");
130130
systemIncludes.add("QDateTime");
131131
systemIncludes.add("QByteArray");
132+
133+
reservedWords.add("signals");
134+
reservedWords.add("slots");
132135
}
133136

134137
@Override

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtClientCodegen.java

+3
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ public CppQtClientCodegen() {
120120
typeMapping.put("AnyType", "QJsonValue");
121121
importMapping.put(PREFIX + "HttpFileElement", "#include \"" + PREFIX + "HttpFileElement.h\"");
122122
importMapping.put("QJsonValue", "#include <QJsonValue>");
123+
124+
reservedWords.add("valid");
125+
reservedWords.add("set");
123126
}
124127

125128
@Override

0 commit comments

Comments
 (0)