Skip to content

[C++][QT5] plain object compilation fix #1826

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
etherealjoy merged 1 commit into from
Jan 6, 2019
Merged

[C++][QT5] plain object compilation fix #1826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public:
{{classname}}();
{{classname}}(QString json);
~{{classname}}() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand All @@ -43,6 +42,7 @@ public:
virtual bool isValid() const override;

private:
void init();
{{#vars}}
{{{dataType}}} {{name}};
bool m_{{name}}_isSet;
Expand Down
10 changes: 9 additions & 1 deletion modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ namespace {{this}} {

class {{prefix}}Object {
public:
{{prefix}}Object() {

}

{{prefix}}Object(QString jsonString) {
fromJson(jsonString);
}

virtual ~{{prefix}}Object(){

}
Expand Down Expand Up @@ -41,7 +49,7 @@ class {{prefix}}Object {
return true;
}
private :
QJsonObject jObj;
QJsonObject jObj;
};

{{#cppNamespaceDeclarations}}
Expand Down
2 changes: 1 addition & 1 deletion ...les/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public:
{{classname}}();
{{classname}}(QString json);
~{{classname}}() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand All @@ -43,6 +42,7 @@ public:
virtual bool isValid() const override;

private:
void init();
{{#vars}}
{{{dataType}}} {{name}};
bool m_{{name}}_isSet;
Expand Down
10 changes: 9 additions & 1 deletion modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ namespace {{this}} {

class {{prefix}}Object {
public:
{{prefix}}Object() {

}

{{prefix}}Object(QString jsonString) {
fromJson(jsonString);
}

virtual ~{{prefix}}Object(){

}
Expand Down Expand Up @@ -41,7 +49,7 @@ class {{prefix}}Object {
return true;
}
private :
QJsonObject jObj;
QJsonObject jObj;
};

{{#cppNamespaceDeclarations}}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class OAIApiResponse: public OAIObject {
OAIApiResponse();
OAIApiResponse(QString json);
~OAIApiResponse() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand All @@ -53,6 +52,7 @@ class OAIApiResponse: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint32 code;
bool m_code_isSet;
bool m_code_isValid;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/client/OAICategory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class OAICategory: public OAIObject {
OAICategory();
OAICategory(QString json);
~OAICategory() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand All @@ -50,6 +49,7 @@ class OAICategory: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint64 id;
bool m_id_isSet;
bool m_id_isValid;
Expand Down
10 changes: 9 additions & 1 deletion samples/client/petstore/cpp-qt5/client/OAIObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ namespace OpenAPI {

class OAIObject {
public:
OAIObject() {

}

OAIObject(QString jsonString) {
fromJson(jsonString);
}

virtual ~OAIObject(){

}
Expand Down Expand Up @@ -50,7 +58,7 @@ class OAIObject {
return true;
}
private :
QJsonObject jObj;
QJsonObject jObj;
};

}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/client/OAIOrder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class OAIOrder: public OAIObject {
OAIOrder();
OAIOrder(QString json);
~OAIOrder() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand Down Expand Up @@ -63,6 +62,7 @@ class OAIOrder: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint64 id;
bool m_id_isSet;
bool m_id_isValid;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/client/OAIPet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ class OAIPet: public OAIObject {
OAIPet();
OAIPet(QString json);
~OAIPet() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand Down Expand Up @@ -65,6 +64,7 @@ class OAIPet: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint64 id;
bool m_id_isSet;
bool m_id_isValid;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/client/OAITag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class OAITag: public OAIObject {
OAITag();
OAITag(QString json);
~OAITag() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand All @@ -50,6 +49,7 @@ class OAITag: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint64 id;
bool m_id_isSet;
bool m_id_isValid;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/client/OAIUser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class OAIUser: public OAIObject {
OAIUser();
OAIUser(QString json);
~OAIUser() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand Down Expand Up @@ -68,6 +67,7 @@ class OAIUser: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint64 id;
bool m_id_isSet;
bool m_id_isValid;
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class OAIApiResponse: public OAIObject {
OAIApiResponse();
OAIApiResponse(QString json);
~OAIApiResponse() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand All @@ -53,6 +52,7 @@ class OAIApiResponse: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint32 code;
bool m_code_isSet;
bool m_code_isValid;
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class OAICategory: public OAIObject {
OAICategory();
OAICategory(QString json);
~OAICategory() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand All @@ -50,6 +49,7 @@ class OAICategory: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint64 id;
bool m_id_isSet;
bool m_id_isValid;
Expand Down
10 changes: 9 additions & 1 deletion samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ namespace OpenAPI {

class OAIObject {
public:
OAIObject() {

}

OAIObject(QString jsonString) {
fromJson(jsonString);
}

virtual ~OAIObject(){

}
Expand Down Expand Up @@ -50,7 +58,7 @@ class OAIObject {
return true;
}
private :
QJsonObject jObj;
QJsonObject jObj;
};

}
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class OAIOrder: public OAIObject {
OAIOrder();
OAIOrder(QString json);
~OAIOrder() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand Down Expand Up @@ -63,6 +62,7 @@ class OAIOrder: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint64 id;
bool m_id_isSet;
bool m_id_isValid;
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ class OAIPet: public OAIObject {
OAIPet();
OAIPet(QString json);
~OAIPet() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand Down Expand Up @@ -65,6 +64,7 @@ class OAIPet: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint64 id;
bool m_id_isSet;
bool m_id_isValid;
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class OAITag: public OAIObject {
OAITag();
OAITag(QString json);
~OAITag() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand All @@ -50,6 +49,7 @@ class OAITag: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint64 id;
bool m_id_isSet;
bool m_id_isValid;
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class OAIUser: public OAIObject {
OAIUser();
OAIUser(QString json);
~OAIUser() override;
void init();

QString asJson () const override;
QJsonObject asJsonObject() const override;
Expand Down Expand Up @@ -68,6 +67,7 @@ class OAIUser: public OAIObject {
virtual bool isValid() const override;

private:
void init();
qint64 id;
bool m_id_isSet;
bool m_id_isValid;
Expand Down