Skip to content

[C++][Qt5] Add Q_DECLARE_METATYPE to the generated models and remove ref in signals #3091

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

[C++][Qt5] Add Q_DECLARE_METATYPE to the generated models and remove ref in signals #3091

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
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ signals:
{{/operation}}{{/operations}}
{{#operations}}{{#operation}}void {{nickname}}SignalFull({{prefix}}HttpRequestWorker* worker{{#returnType}}, {{{returnType}}} summary{{/returnType}});
{{/operation}}{{/operations}}
{{#operations}}{{#operation}}void {{nickname}}SignalE({{#returnType}}{{{returnType}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str);
{{#operations}}{{#operation}}void {{nickname}}SignalE({{#returnType}}{{{returnType}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, QString error_str);
{{/operation}}{{/operations}}
{{#operations}}{{#operation}}void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
{{#operations}}{{#operation}}void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
{{/operation}}{{/operations}}
};

Expand Down
3 changes: 3 additions & 0 deletions modules/openapi-generator/src/main/resources/cpp-qt5-client/enum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <QString>
#include <QJsonValue>
#include <QMetaType>

{{#cppNamespaceDeclarations}}
namespace {{this}} {
Expand Down Expand Up @@ -54,4 +55,6 @@ private :
}
{{/cppNamespaceDeclarations}}

Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Enum)

#endif // {{prefix}}_ENUM_H
2 changes: 2 additions & 0 deletions 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 @@ -74,6 +74,8 @@ private:
}
{{/cppNamespaceDeclarations}}

Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{classname}})

#endif // {{classname}}_H
{{/model}}
{{/models}}
3 changes: 3 additions & 0 deletions 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 @@ -4,6 +4,7 @@

#include <QJsonObject>
#include <QJsonDocument>
#include <QMetaType>

{{#cppNamespaceDeclarations}}
namespace {{this}} {
Expand Down Expand Up @@ -56,4 +57,6 @@ private :
}
{{/cppNamespaceDeclarations}}

Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Object)

#endif // {{prefix}}_OBJECT_H
3 changes: 3 additions & 0 deletions modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/enum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <QString>
#include <QJsonValue>
#include <QMetaType>

{{#cppNamespaceDeclarations}}
namespace {{this}} {
Expand Down Expand Up @@ -54,4 +55,6 @@ private :
}
{{/cppNamespaceDeclarations}}

Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Enum)

#endif // {{prefix}}_ENUM_H
2 changes: 2 additions & 0 deletions ...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 @@ -74,6 +74,8 @@ private:
}
{{/cppNamespaceDeclarations}}

Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{classname}})

#endif // {{classname}}_H
{{/model}}
{{/models}}
3 changes: 3 additions & 0 deletions 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 @@ -4,6 +4,7 @@

#include <QJsonObject>
#include <QJsonDocument>
#include <QMetaType>

{{#cppNamespaceDeclarations}}
namespace {{this}} {
Expand Down Expand Up @@ -56,4 +57,6 @@ private :
}
{{/cppNamespaceDeclarations}}

Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Object)

#endif // {{prefix}}_OBJECT_H
2 changes: 1 addition & 1 deletion samples/client/petstore/cpp-qt5/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.1-SNAPSHOT
4.0.2-SNAPSHOT
2 changes: 2 additions & 0 deletions 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 @@ -76,4 +76,6 @@ class OAIApiResponse: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAIApiResponse)

#endif // OAIApiResponse_H
2 changes: 2 additions & 0 deletions 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 @@ -68,4 +68,6 @@ class OAICategory: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAICategory)

#endif // OAICategory_H
3 changes: 3 additions & 0 deletions samples/client/petstore/cpp-qt5/client/OAIEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include <QString>
#include <QJsonValue>
#include <QMetaType>

namespace OpenAPI {

Expand Down Expand Up @@ -61,4 +62,6 @@ private :

}

Q_DECLARE_METATYPE(OpenAPI::OAIEnum)

#endif // OAI_ENUM_H
3 changes: 3 additions & 0 deletions 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 @@ -15,6 +15,7 @@

#include <QJsonObject>
#include <QJsonDocument>
#include <QMetaType>

namespace OpenAPI {

Expand Down Expand Up @@ -63,4 +64,6 @@ private :

}

Q_DECLARE_METATYPE(OpenAPI::OAIObject)

#endif // OAI_OBJECT_H
2 changes: 2 additions & 0 deletions 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 @@ -101,4 +101,6 @@ class OAIOrder: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAIOrder)

#endif // OAIOrder_H
2 changes: 2 additions & 0 deletions 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 @@ -103,4 +103,6 @@ class OAIPet: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAIPet)

#endif // OAIPet_H
32 changes: 16 additions & 16 deletions samples/client/petstore/cpp-qt5/client/OAIPetApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,23 @@ class OAIPetApi: public QObject {
void updatePetWithFormSignalFull(OAIHttpRequestWorker* worker);
void uploadFileSignalFull(OAIHttpRequestWorker* worker, OAIApiResponse summary);

void addPetSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void deletePetSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void findPetsByStatusSignalE(QList<OAIPet> summary, QNetworkReply::NetworkError error_type, QString& error_str);
void findPetsByTagsSignalE(QList<OAIPet> summary, QNetworkReply::NetworkError error_type, QString& error_str);
void getPetByIdSignalE(OAIPet summary, QNetworkReply::NetworkError error_type, QString& error_str);
void updatePetSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void uploadFileSignalE(OAIApiResponse summary, QNetworkReply::NetworkError error_type, QString& error_str);
void addPetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void deletePetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void findPetsByStatusSignalE(QList<OAIPet> summary, QNetworkReply::NetworkError error_type, QString error_str);
void findPetsByTagsSignalE(QList<OAIPet> summary, QNetworkReply::NetworkError error_type, QString error_str);
void getPetByIdSignalE(OAIPet summary, QNetworkReply::NetworkError error_type, QString error_str);
void updatePetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void uploadFileSignalE(OAIApiResponse summary, QNetworkReply::NetworkError error_type, QString error_str);

void addPetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void deletePetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void findPetsByStatusSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void findPetsByTagsSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void getPetByIdSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void updatePetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void updatePetWithFormSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void uploadFileSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void addPetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void deletePetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void findPetsByStatusSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void findPetsByTagsSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void getPetByIdSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void updatePetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void updatePetWithFormSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void uploadFileSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);

};

Expand Down
16 changes: 8 additions & 8 deletions samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ class OAIStoreApi: public QObject {
void getOrderByIdSignalFull(OAIHttpRequestWorker* worker, OAIOrder summary);
void placeOrderSignalFull(OAIHttpRequestWorker* worker, OAIOrder summary);

void deleteOrderSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void getInventorySignalE(QMap<QString, qint32> summary, QNetworkReply::NetworkError error_type, QString& error_str);
void getOrderByIdSignalE(OAIOrder summary, QNetworkReply::NetworkError error_type, QString& error_str);
void placeOrderSignalE(OAIOrder summary, QNetworkReply::NetworkError error_type, QString& error_str);
void deleteOrderSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void getInventorySignalE(QMap<QString, qint32> summary, QNetworkReply::NetworkError error_type, QString error_str);
void getOrderByIdSignalE(OAIOrder summary, QNetworkReply::NetworkError error_type, QString error_str);
void placeOrderSignalE(OAIOrder summary, QNetworkReply::NetworkError error_type, QString error_str);

void deleteOrderSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void getInventorySignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void getOrderByIdSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void placeOrderSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void deleteOrderSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void getInventorySignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void getOrderByIdSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void placeOrderSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);

};

Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -68,4 +68,6 @@ class OAITag: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAITag)

#endif // OAITag_H
2 changes: 2 additions & 0 deletions 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 @@ -116,4 +116,6 @@ class OAIUser: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAIUser)

#endif // OAIUser_H
32 changes: 16 additions & 16 deletions samples/client/petstore/cpp-qt5/client/OAIUserApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,23 @@ class OAIUserApi: public QObject {
void logoutUserSignalFull(OAIHttpRequestWorker* worker);
void updateUserSignalFull(OAIHttpRequestWorker* worker);

void createUserSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void deleteUserSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void getUserByNameSignalE(OAIUser summary, QNetworkReply::NetworkError error_type, QString& error_str);
void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, QString& error_str);
void logoutUserSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void updateUserSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
void createUserSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void deleteUserSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void getUserByNameSignalE(OAIUser summary, QNetworkReply::NetworkError error_type, QString error_str);
void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, QString error_str);
void logoutUserSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void updateUserSignalE(QNetworkReply::NetworkError error_type, QString error_str);

void createUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void createUsersWithArrayInputSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void createUsersWithListInputSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void deleteUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void getUserByNameSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void loginUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void logoutUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void updateUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
void createUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void createUsersWithArrayInputSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void createUsersWithListInputSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void deleteUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void getUserByNameSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void loginUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void logoutUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void updateUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);

};

Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -76,4 +76,6 @@ class OAIApiResponse: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAIApiResponse)

#endif // OAIApiResponse_H
2 changes: 2 additions & 0 deletions 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 @@ -68,4 +68,6 @@ class OAICategory: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAICategory)

#endif // OAICategory_H
3 changes: 3 additions & 0 deletions samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include <QString>
#include <QJsonValue>
#include <QMetaType>

namespace OpenAPI {

Expand Down Expand Up @@ -61,4 +62,6 @@ private :

}

Q_DECLARE_METATYPE(OpenAPI::OAIEnum)

#endif // OAI_ENUM_H
3 changes: 3 additions & 0 deletions 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 @@ -15,6 +15,7 @@

#include <QJsonObject>
#include <QJsonDocument>
#include <QMetaType>

namespace OpenAPI {

Expand Down Expand Up @@ -63,4 +64,6 @@ private :

}

Q_DECLARE_METATYPE(OpenAPI::OAIObject)

#endif // OAI_OBJECT_H
2 changes: 2 additions & 0 deletions 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 @@ -101,4 +101,6 @@ class OAIOrder: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAIOrder)

#endif // OAIOrder_H
2 changes: 2 additions & 0 deletions 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 @@ -103,4 +103,6 @@ class OAIPet: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAIPet)

#endif // OAIPet_H
2 changes: 2 additions & 0 deletions 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 @@ -68,4 +68,6 @@ class OAITag: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAITag)

#endif // OAITag_H
2 changes: 2 additions & 0 deletions 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 @@ -116,4 +116,6 @@ class OAIUser: public OAIObject {

}

Q_DECLARE_METATYPE(OpenAPI::OAIUser)

#endif // OAIUser_H