loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Add Q_DECLARE_METATYPE to the generated models and remove ref in signals (#3091)

Browse Source
This commit is contained in:
sunn 2019-06-06 16:13:11 +02:00 committed by GitHub
parent 19f47d0caa
commit 6660b74247
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 95 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache vendored
View File

@ -38,9 +38,9 @@ signals:
{{/operation}}{{/operations}} {{/operation}}{{/operations}}
{{#operations}}{{#operation}}void {{nickname}}SignalFull({{prefix}}HttpRequestWorker* worker{{#returnType}}, {{{returnType}}} summary{{/returnType}}); {{#operations}}{{#operation}}void {{nickname}}SignalFull({{prefix}}HttpRequestWorker* worker{{#returnType}}, {{{returnType}}} summary{{/returnType}});
{{/operation}}{{/operations}} {{/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}} {{/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}} {{/operation}}{{/operations}}
}; };

3
modules/openapi-generator/src/main/resources/cpp-qt5-client/enum.mustache vendored
View File

@ -4,6 +4,7 @@
#include <QString> #include <QString>
#include <QJsonValue> #include <QJsonValue>
#include <QMetaType>
{{#cppNamespaceDeclarations}} {{#cppNamespaceDeclarations}}
namespace {{this}} { namespace {{this}} {
@ -54,4 +55,6 @@ private :
} }
{{/cppNamespaceDeclarations}} {{/cppNamespaceDeclarations}}
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Enum)
#endif // {{prefix}}_ENUM_H #endif // {{prefix}}_ENUM_H

2
modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache vendored
View File

@ -74,6 +74,8 @@ private:
} }
{{/cppNamespaceDeclarations}} {{/cppNamespaceDeclarations}}
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{classname}})
#endif // {{classname}}_H #endif // {{classname}}_H
{{/model}} {{/model}}
{{/models}} {{/models}}

3
modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache vendored
View File

@ -4,6 +4,7 @@
#include <QJsonObject> #include <QJsonObject>
#include <QJsonDocument> #include <QJsonDocument>
#include <QMetaType>
{{#cppNamespaceDeclarations}} {{#cppNamespaceDeclarations}}
namespace {{this}} { namespace {{this}} {
@ -56,4 +57,6 @@ private :
} }
{{/cppNamespaceDeclarations}} {{/cppNamespaceDeclarations}}
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Object)
#endif // {{prefix}}_OBJECT_H #endif // {{prefix}}_OBJECT_H

3
modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/enum.mustache vendored
View File

@ -4,6 +4,7 @@
#include <QString> #include <QString>
#include <QJsonValue> #include <QJsonValue>
#include <QMetaType>
{{#cppNamespaceDeclarations}} {{#cppNamespaceDeclarations}}
namespace {{this}} { namespace {{this}} {
@ -54,4 +55,6 @@ private :
} }
{{/cppNamespaceDeclarations}} {{/cppNamespaceDeclarations}}
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Enum)
#endif // {{prefix}}_ENUM_H #endif // {{prefix}}_ENUM_H

2
modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache vendored
View File

@ -74,6 +74,8 @@ private:
} }
{{/cppNamespaceDeclarations}} {{/cppNamespaceDeclarations}}
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{classname}})
#endif // {{classname}}_H #endif // {{classname}}_H
{{/model}} {{/model}}
{{/models}} {{/models}}

3
modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache vendored
View File

@ -4,6 +4,7 @@
#include <QJsonObject> #include <QJsonObject>
#include <QJsonDocument> #include <QJsonDocument>
#include <QMetaType>
{{#cppNamespaceDeclarations}} {{#cppNamespaceDeclarations}}
namespace {{this}} { namespace {{this}} {
@ -56,4 +57,6 @@ private :
} }
{{/cppNamespaceDeclarations}} {{/cppNamespaceDeclarations}}
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Object)
#endif // {{prefix}}_OBJECT_H #endif // {{prefix}}_OBJECT_H

2
samples/client/petstore/cpp-qt5/.openapi-generator/VERSION
View File

@ -1 +1 @@
4.0.1-SNAPSHOT 4.0.2-SNAPSHOT

2
samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
View File

@ -76,4 +76,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAIApiResponse)
#endif // OAIApiResponse_H #endif // OAIApiResponse_H

2
samples/client/petstore/cpp-qt5/client/OAICategory.h
View File

@ -68,4 +68,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAICategory)
#endif // OAICategory_H #endif // OAICategory_H

3
samples/client/petstore/cpp-qt5/client/OAIEnum.h
View File

@ -15,6 +15,7 @@
#include <QString> #include <QString>
#include <QJsonValue> #include <QJsonValue>
#include <QMetaType>
namespace OpenAPI { namespace OpenAPI {
@ -61,4 +62,6 @@ private :
} }
Q_DECLARE_METATYPE(OpenAPI::OAIEnum)
#endif // OAI_ENUM_H #endif // OAI_ENUM_H

3
samples/client/petstore/cpp-qt5/client/OAIObject.h
View File

@ -15,6 +15,7 @@
#include <QJsonObject> #include <QJsonObject>
#include <QJsonDocument> #include <QJsonDocument>
#include <QMetaType>
namespace OpenAPI { namespace OpenAPI {
@ -63,4 +64,6 @@ private :
} }
Q_DECLARE_METATYPE(OpenAPI::OAIObject)
#endif // OAI_OBJECT_H #endif // OAI_OBJECT_H

2
samples/client/petstore/cpp-qt5/client/OAIOrder.h
View File

@ -101,4 +101,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAIOrder)
#endif // OAIOrder_H #endif // OAIOrder_H

2
samples/client/petstore/cpp-qt5/client/OAIPet.h
View File

@ -103,4 +103,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAIPet)
#endif // OAIPet_H #endif // OAIPet_H

32
samples/client/petstore/cpp-qt5/client/OAIPetApi.h
View File

@ -77,23 +77,23 @@ signals:
void updatePetWithFormSignalFull(OAIHttpRequestWorker* worker); void updatePetWithFormSignalFull(OAIHttpRequestWorker* worker);
void uploadFileSignalFull(OAIHttpRequestWorker* worker, OAIApiResponse summary); void uploadFileSignalFull(OAIHttpRequestWorker* worker, OAIApiResponse summary);
void addPetSignalE(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 deletePetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void findPetsByStatusSignalE(QList<OAIPet> summary, 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 findPetsByTagsSignalE(QList<OAIPet> summary, QNetworkReply::NetworkError error_type, QString error_str);
void getPetByIdSignalE(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 updatePetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void updatePetWithFormSignalE(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 uploadFileSignalE(OAIApiResponse summary, QNetworkReply::NetworkError error_type, QString error_str);
void addPetSignalEFull(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 deletePetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void findPetsByStatusSignalEFull(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 findPetsByTagsSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void getPetByIdSignalEFull(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 updatePetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void updatePetWithFormSignalEFull(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 uploadFileSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
}; };

16
samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
View File

@ -60,15 +60,15 @@ signals:
void getOrderByIdSignalFull(OAIHttpRequestWorker* worker, OAIOrder summary); void getOrderByIdSignalFull(OAIHttpRequestWorker* worker, OAIOrder summary);
void placeOrderSignalFull(OAIHttpRequestWorker* worker, OAIOrder summary); void placeOrderSignalFull(OAIHttpRequestWorker* worker, OAIOrder summary);
void deleteOrderSignalE(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 getInventorySignalE(QMap<QString, qint32> summary, QNetworkReply::NetworkError error_type, QString error_str);
void getOrderByIdSignalE(OAIOrder 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 placeOrderSignalE(OAIOrder summary, QNetworkReply::NetworkError error_type, QString error_str);
void deleteOrderSignalEFull(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 getInventorySignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void getOrderByIdSignalEFull(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 placeOrderSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
}; };

2
samples/client/petstore/cpp-qt5/client/OAITag.h
View File

@ -68,4 +68,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAITag)
#endif // OAITag_H #endif // OAITag_H

2
samples/client/petstore/cpp-qt5/client/OAIUser.h
View File

@ -116,4 +116,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAIUser)
#endif // OAIUser_H #endif // OAIUser_H

32
samples/client/petstore/cpp-qt5/client/OAIUserApi.h
View File

@ -76,23 +76,23 @@ signals:
void logoutUserSignalFull(OAIHttpRequestWorker* worker); void logoutUserSignalFull(OAIHttpRequestWorker* worker);
void updateUserSignalFull(OAIHttpRequestWorker* worker); void updateUserSignalFull(OAIHttpRequestWorker* worker);
void createUserSignalE(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 createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void createUsersWithListInputSignalE(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 deleteUserSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void getUserByNameSignalE(OAIUser summary, 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 loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, QString error_str);
void logoutUserSignalE(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 updateUserSignalE(QNetworkReply::NetworkError error_type, QString error_str);
void createUserSignalEFull(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 createUsersWithArrayInputSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void createUsersWithListInputSignalEFull(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 deleteUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void getUserByNameSignalEFull(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 loginUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
void logoutUserSignalEFull(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 updateUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
}; };

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h
View File

@ -76,4 +76,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAIApiResponse)
#endif // OAIApiResponse_H #endif // OAIApiResponse_H

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h
View File

@ -68,4 +68,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAICategory)
#endif // OAICategory_H #endif // OAICategory_H

3
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIEnum.h
View File

@ -15,6 +15,7 @@
#include <QString> #include <QString>
#include <QJsonValue> #include <QJsonValue>
#include <QMetaType>
namespace OpenAPI { namespace OpenAPI {
@ -61,4 +62,6 @@ private :
} }
Q_DECLARE_METATYPE(OpenAPI::OAIEnum)
#endif // OAI_ENUM_H #endif // OAI_ENUM_H

3
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h
View File

@ -15,6 +15,7 @@
#include <QJsonObject> #include <QJsonObject>
#include <QJsonDocument> #include <QJsonDocument>
#include <QMetaType>
namespace OpenAPI { namespace OpenAPI {
@ -63,4 +64,6 @@ private :
} }
Q_DECLARE_METATYPE(OpenAPI::OAIObject)
#endif // OAI_OBJECT_H #endif // OAI_OBJECT_H

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h
View File

@ -101,4 +101,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAIOrder)
#endif // OAIOrder_H #endif // OAIOrder_H

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h
View File

@ -103,4 +103,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAIPet)
#endif // OAIPet_H #endif // OAIPet_H

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h
View File

@ -68,4 +68,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAITag)
#endif // OAITag_H #endif // OAITag_H

2
samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h
View File

@ -116,4 +116,6 @@ private:
} }
Q_DECLARE_METATYPE(OpenAPI::OAIUser)
#endif // OAIUser_H #endif // OAIUser_H