Skip to content

Commit 067b172

Browse files
MartinDelilleMartinDelille
authored
[cpp-qt-client] Fix warning (#16083)
* [cpp-qt-client] Fix warning * Handle warnings for MSVC * Add warning flags only for non-MSVC compilers * Fix warnings for MSVC compiler too
1 parent f8e19b4 commit 067b172

21 files changed

+216
-198
lines changed

‎modules/openapi-generator/src/main/resources/cpp-qt-client/helpers-body.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ bool fromStringValue(const QString &inStr, QByteArray &value) {
225225
} else {
226226
value.clear();
227227
value.append(inStr.toUtf8());
228-
return value.size() > 0;
228+
return !value.isEmpty();
229229
}
230230
}
231231

‎modules/openapi-generator/src/main/resources/cpp-qt-client/model-body.mustache

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ void {{classname}}::fromJson(QString jsonString) {
4646

4747
void {{classname}}::fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnum}}(QJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnum}} json) {
4848
{{^isEnum}}{{#vars}}{{^isContainer}}
49-
m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue({{name}}, json[QString("{{baseName}}")]);
49+
m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue(m_{{name}}, json[QString("{{baseName}}")]);
5050
m_{{name}}_isSet = !json[QString("{{baseName}}")].isNull() && m_{{name}}_isValid;{{/isContainer}}{{#isContainer}}{{^items.isContainer}}
51-
m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue({{name}}, json[QString("{{baseName}}")]);
51+
m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue(m_{{name}}, json[QString("{{baseName}}")]);
5252
m_{{name}}_isSet = !json[QString("{{baseName}}")].isNull() && m_{{name}}_isValid;{{/items.isContainer}}{{#items.isContainer}}{{#isArray}}
5353
if(json["{{baseName}}"].isArray()){
5454
auto arr = json["{{baseName}}"].toArray();
@@ -58,7 +58,7 @@ void {{classname}}::fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnu
5858
{{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isArray}}QList<{{items.items.baseType}}>{{/items.isArray}}{{#items.isMap}}QMap<QString, {{items.items.baseType}}>{{/items.isMap}} item;
5959
m_{{name}}_isValid &= ::{{cppNamespace}}::fromJsonValue(item, jval);
6060
m_{{name}}_isSet = !jval.isNull() && m_{{name}}_isValid;
61-
{{name}}.push_back(item);
61+
m_{{name}}.push_back(item);
6262
}
6363
}
6464
}{{/isArray}}{{#isMap}}
@@ -71,7 +71,7 @@ void {{classname}}::fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnu
7171
auto jval = QJsonValue::fromVariant(varmap.value(val));
7272
m_{{name}}_isValid &= ::{{cppNamespace}}::fromJsonValue(item, jval);
7373
m_{{name}}_isSet &= !jval.isNull() && m_{{name}}_isValid;
74-
{{name}}.insert({{name}}.end(), val, item);
74+
m_{{name}}.insert(m_{{name}}.end(), val, item);
7575
}
7676
}
7777
}{{/isMap}}{{/items.isContainer}}{{/isContainer}}{{^-last}}
@@ -100,24 +100,24 @@ QString {{classname}}::asJson() const {
100100

101101
QJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnum}} {{classname}}::asJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnum}}() const {
102102
{{^isEnum}}QJsonObject obj;{{#vars}}{{^isContainer}}{{#complexType}}
103-
if ({{name}}.isSet()){{/complexType}}{{^complexType}}
103+
if (m_{{name}}.isSet()){{/complexType}}{{^complexType}}
104104
if (m_{{name}}_isSet){{/complexType}} {
105-
obj.insert(QString("{{baseName}}"), ::{{cppNamespace}}::toJsonValue({{name}}));
105+
obj.insert(QString("{{baseName}}"), ::{{cppNamespace}}::toJsonValue(m_{{name}}));
106106
}{{/isContainer}}{{#isContainer}}
107-
if ({{name}}.size() > 0) {
108-
{{^items.isContainer}}obj.insert(QString("{{baseName}}"), ::{{cppNamespace}}::toJsonValue({{name}}));{{/items.isContainer}}{{#items.isContainer}}
109-
obj.insert(QString("{{baseName}}"), toJsonValue({{name}}));{{/items.isContainer}}
107+
if (m_{{name}}.size() > 0) {
108+
{{^items.isContainer}}obj.insert(QString("{{baseName}}"), ::{{cppNamespace}}::toJsonValue(m_{{name}}));{{/items.isContainer}}{{#items.isContainer}}
109+
obj.insert(QString("{{baseName}}"), toJsonValue(m_{{name}}));{{/items.isContainer}}
110110
}{{/isContainer}}{{/vars}}
111111
return obj;{{/isEnum}}{{#isEnum}}
112112
{{#allowableValues}}{{#enumVars}}{{#-first}}{{^isString}}return QJsonValue(static_cast<int>(m_value));{{/isString}}{{#isString}}return QJsonValue(asJson());{{/isString}}{{/-first}}{{/enumVars}}{{/allowableValues}}{{/isEnum}}
113113
}
114114

115115
{{^isEnum}}{{#vars}}{{{dataType}}} {{classname}}::{{getter}}() const {
116-
return {{name}};
116+
return m_{{name}};
117117
}
118118
void {{classname}}::{{setter}}(const {{{dataType}}} &{{name}}) {
119-
this->{{name}} = {{name}};
120-
this->m_{{name}}_isSet = true;
119+
m_{{name}} = {{name}};
120+
m_{{name}}_isSet = true;
121121
}
122122

123123
bool {{classname}}::is_{{name}}_Set() const{
@@ -141,7 +141,7 @@ void {{classname}}::setValue(const {{classname}}::e{{classname}}& value){
141141
bool {{classname}}::isSet() const {
142142
{{^isEnum}}bool isObjectUpdated = false;
143143
do {
144-
{{#vars}} {{#isContainer}}if ({{name}}.size() > 0){{/isContainer}}{{^isContainer}}{{#complexType}}if ({{name}}.isSet()){{/complexType}}{{^complexType}}if (m_{{name}}_isSet){{/complexType}}{{/isContainer}} {
144+
{{#vars}} {{#isContainer}}if (m_{{name}}.size() > 0){{/isContainer}}{{^isContainer}}{{#complexType}}if (m_{{name}}.isSet()){{/complexType}}{{^complexType}}if (m_{{name}}_isSet){{/complexType}}{{/isContainer}} {
145145
isObjectUpdated = true;
146146
break;
147147
}{{^-last}}

‎modules/openapi-generator/src/main/resources/cpp-qt-client/model-header.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public:
6060
private:
6161
void initializeModel();
6262
{{^isEnum}}{{#vars}}
63-
{{{dataType}}} {{name}};
63+
{{{dataType}}} m_{{name}};
6464
bool m_{{name}}_isSet;
6565
bool m_{{name}}_isValid;
6666
{{/vars}}{{/isEnum}}{{#isEnum}}

‎modules/openapi-generator/src/main/resources/cpp-qt-client/object.mustache

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ inline bool operator==(const {{prefix}}Object& left, const {{prefix}}Object& rig
5454
return (left.asJsonObject() == right.asJsonObject());
5555
}
5656

57-
inline uint qHash(const {{prefix}}Object& obj, uint seed = 0) noexcept{
57+
inline
58+
#if QT_VERSION < 0x060000
59+
uint
60+
#else
61+
size_t
62+
#endif
63+
qHash(const {{prefix}}Object& obj, uint seed = 0) noexcept{
5864
return qHash(obj.asJsonObject(), seed);
5965
}
6066

‎samples/client/petstore/cpp-qt/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ set(CMAKE_AUTOMOC ON)
77

88
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network Gui Test)
99

10+
if(MSVC)
11+
add_compile_options(/W4 /WX)
12+
else()
13+
add_compile_options(-Wall -Wextra -Werror)
14+
endif()
15+
1016
add_subdirectory(client)
1117

1218
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test)

‎samples/client/petstore/cpp-qt/client/PFXApiResponse.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ void PFXApiResponse::fromJson(QString jsonString) {
5252

5353
void PFXApiResponse::fromJsonObject(QJsonObject json) {
5454

55-
m_code_isValid = ::test_namespace::fromJsonValue(code, json[QString("code")]);
55+
m_code_isValid = ::test_namespace::fromJsonValue(m_code, json[QString("code")]);
5656
m_code_isSet = !json[QString("code")].isNull() && m_code_isValid;
5757

58-
m_type_isValid = ::test_namespace::fromJsonValue(type, json[QString("type")]);
58+
m_type_isValid = ::test_namespace::fromJsonValue(m_type, json[QString("type")]);
5959
m_type_isSet = !json[QString("type")].isNull() && m_type_isValid;
6060

61-
m_message_isValid = ::test_namespace::fromJsonValue(message, json[QString("message")]);
61+
m_message_isValid = ::test_namespace::fromJsonValue(m_message, json[QString("message")]);
6262
m_message_isSet = !json[QString("message")].isNull() && m_message_isValid;
6363
}
6464

@@ -72,23 +72,23 @@ QString PFXApiResponse::asJson() const {
7272
QJsonObject PFXApiResponse::asJsonObject() const {
7373
QJsonObject obj;
7474
if (m_code_isSet) {
75-
obj.insert(QString("code"), ::test_namespace::toJsonValue(code));
75+
obj.insert(QString("code"), ::test_namespace::toJsonValue(m_code));
7676
}
7777
if (m_type_isSet) {
78-
obj.insert(QString("type"), ::test_namespace::toJsonValue(type));
78+
obj.insert(QString("type"), ::test_namespace::toJsonValue(m_type));
7979
}
8080
if (m_message_isSet) {
81-
obj.insert(QString("message"), ::test_namespace::toJsonValue(message));
81+
obj.insert(QString("message"), ::test_namespace::toJsonValue(m_message));
8282
}
8383
return obj;
8484
}
8585

8686
qint32 PFXApiResponse::getCode() const {
87-
return code;
87+
return m_code;
8888
}
8989
void PFXApiResponse::setCode(const qint32 &code) {
90-
this->code = code;
91-
this->m_code_isSet = true;
90+
m_code = code;
91+
m_code_isSet = true;
9292
}
9393

9494
bool PFXApiResponse::is_code_Set() const{
@@ -100,11 +100,11 @@ bool PFXApiResponse::is_code_Valid() const{
100100
}
101101

102102
QString PFXApiResponse::getType() const {
103-
return type;
103+
return m_type;
104104
}
105105
void PFXApiResponse::setType(const QString &type) {
106-
this->type = type;
107-
this->m_type_isSet = true;
106+
m_type = type;
107+
m_type_isSet = true;
108108
}
109109

110110
bool PFXApiResponse::is_type_Set() const{
@@ -116,11 +116,11 @@ bool PFXApiResponse::is_type_Valid() const{
116116
}
117117

118118
QString PFXApiResponse::getMessage() const {
119-
return message;
119+
return m_message;
120120
}
121121
void PFXApiResponse::setMessage(const QString &message) {
122-
this->message = message;
123-
this->m_message_isSet = true;
122+
m_message = message;
123+
m_message_isSet = true;
124124
}
125125

126126
bool PFXApiResponse::is_message_Set() const{

‎samples/client/petstore/cpp-qt/client/PFXApiResponse.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ class PFXApiResponse : public PFXObject {
5959
private:
6060
void initializeModel();
6161

62-
qint32 code;
62+
qint32 m_code;
6363
bool m_code_isSet;
6464
bool m_code_isValid;
6565

66-
QString type;
66+
QString m_type;
6767
bool m_type_isSet;
6868
bool m_type_isValid;
6969

70-
QString message;
70+
QString m_message;
7171
bool m_message_isSet;
7272
bool m_message_isValid;
7373
};

‎samples/client/petstore/cpp-qt/client/PFXCategory.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ void PFXCategory::fromJson(QString jsonString) {
4949

5050
void PFXCategory::fromJsonObject(QJsonObject json) {
5151

52-
m_id_isValid = ::test_namespace::fromJsonValue(id, json[QString("id")]);
52+
m_id_isValid = ::test_namespace::fromJsonValue(m_id, json[QString("id")]);
5353
m_id_isSet = !json[QString("id")].isNull() && m_id_isValid;
5454

55-
m_name_isValid = ::test_namespace::fromJsonValue(name, json[QString("name")]);
55+
m_name_isValid = ::test_namespace::fromJsonValue(m_name, json[QString("name")]);
5656
m_name_isSet = !json[QString("name")].isNull() && m_name_isValid;
5757
}
5858

@@ -66,20 +66,20 @@ QString PFXCategory::asJson() const {
6666
QJsonObject PFXCategory::asJsonObject() const {
6767
QJsonObject obj;
6868
if (m_id_isSet) {
69-
obj.insert(QString("id"), ::test_namespace::toJsonValue(id));
69+
obj.insert(QString("id"), ::test_namespace::toJsonValue(m_id));
7070
}
7171
if (m_name_isSet) {
72-
obj.insert(QString("name"), ::test_namespace::toJsonValue(name));
72+
obj.insert(QString("name"), ::test_namespace::toJsonValue(m_name));
7373
}
7474
return obj;
7575
}
7676

7777
qint64 PFXCategory::getId() const {
78-
return id;
78+
return m_id;
7979
}
8080
void PFXCategory::setId(const qint64 &id) {
81-
this->id = id;
82-
this->m_id_isSet = true;
81+
m_id = id;
82+
m_id_isSet = true;
8383
}
8484

8585
bool PFXCategory::is_id_Set() const{
@@ -91,11 +91,11 @@ bool PFXCategory::is_id_Valid() const{
9191
}
9292

9393
QString PFXCategory::getName() const {
94-
return name;
94+
return m_name;
9595
}
9696
void PFXCategory::setName(const QString &name) {
97-
this->name = name;
98-
this->m_name_isSet = true;
97+
m_name = name;
98+
m_name_isSet = true;
9999
}
100100

101101
bool PFXCategory::is_name_Set() const{

‎samples/client/petstore/cpp-qt/client/PFXCategory.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ class PFXCategory : public PFXObject {
5454
private:
5555
void initializeModel();
5656

57-
qint64 id;
57+
qint64 m_id;
5858
bool m_id_isSet;
5959
bool m_id_isValid;
6060

61-
QString name;
61+
QString m_name;
6262
bool m_name_isSet;
6363
bool m_name_isValid;
6464
};

‎samples/client/petstore/cpp-qt/client/PFXHelpers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ bool fromStringValue(const QString &inStr, QByteArray &value) {
233233
} else {
234234
value.clear();
235235
value.append(inStr.toUtf8());
236-
return value.size() > 0;
236+
return !value.isEmpty();
237237
}
238238
}
239239

0 commit comments

Comments
 (0)