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

etherealjoy · web-flow · commit 6660b74247e8 · 2019-06-06T16:13:11.000+02:00
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache
@@ -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}}
 };
 
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/enum.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/enum.mustache
@@ -4,6 +4,7 @@
 
 #include <QString>
 #include <QJsonValue>
+#include <QMetaType>
 
 {{#cppNamespaceDeclarations}}
 namespace {{this}} {
@@ -54,4 +55,6 @@ private :
 }
 {{/cppNamespaceDeclarations}}
 
+Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Enum)
+
 #endif // {{prefix}}_ENUM_H
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
@@ -74,6 +74,8 @@ private:
 }
 {{/cppNamespaceDeclarations}}
 
+Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{classname}})
+
 #endif // {{classname}}_H
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache
@@ -4,6 +4,7 @@
 
 #include <QJsonObject>
 #include <QJsonDocument>
+#include <QMetaType>
 
 {{#cppNamespaceDeclarations}}
 namespace {{this}} {
@@ -56,4 +57,6 @@ private :
 }
 {{/cppNamespaceDeclarations}}
 
+Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Object)
+
 #endif // {{prefix}}_OBJECT_H
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/enum.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/enum.mustache
@@ -4,6 +4,7 @@
 
 #include <QString>
 #include <QJsonValue>
+#include <QMetaType>
 
 {{#cppNamespaceDeclarations}}
 namespace {{this}} {
@@ -54,4 +55,6 @@ private :
 }
 {{/cppNamespaceDeclarations}}
 
+Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Enum)
+
 #endif // {{prefix}}_ENUM_H
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache
@@ -74,6 +74,8 @@ private:
 }
 {{/cppNamespaceDeclarations}}
 
+Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{classname}})
+
 #endif // {{classname}}_H
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache
@@ -4,6 +4,7 @@
 
 #include <QJsonObject>
 #include <QJsonDocument>
+#include <QMetaType>
 
 {{#cppNamespaceDeclarations}}
 namespace {{this}} {
@@ -56,4 +57,6 @@ private :
 }
 {{/cppNamespaceDeclarations}}
 
+Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Object)
+
 #endif // {{prefix}}_OBJECT_H
diff --git a/samples/client/petstore/cpp-qt5/.openapi-generator/VERSION b/samples/client/petstore/cpp-qt5/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.1-SNAPSHOT
+4.0.2-SNAPSHOT
diff --git a/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h b/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
@@ -76,4 +76,6 @@ class OAIApiResponse: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIApiResponse)
+
 #endif // OAIApiResponse_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAICategory.h b/samples/client/petstore/cpp-qt5/client/OAICategory.h
@@ -68,4 +68,6 @@ class OAICategory: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAICategory)
+
 #endif // OAICategory_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIEnum.h b/samples/client/petstore/cpp-qt5/client/OAIEnum.h
@@ -15,6 +15,7 @@
 
 #include <QString>
 #include <QJsonValue>
+#include <QMetaType>
 
 namespace OpenAPI {
 
@@ -61,4 +62,6 @@ private :
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIEnum)
+
 #endif // OAI_ENUM_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIObject.h b/samples/client/petstore/cpp-qt5/client/OAIObject.h
@@ -15,6 +15,7 @@
 
 #include <QJsonObject>
 #include <QJsonDocument>
+#include <QMetaType>
 
 namespace OpenAPI {
 
@@ -63,4 +64,6 @@ private :
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIObject)
+
 #endif // OAI_OBJECT_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIOrder.h b/samples/client/petstore/cpp-qt5/client/OAIOrder.h
@@ -101,4 +101,6 @@ class OAIOrder: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIOrder)
+
 #endif // OAIOrder_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIPet.h b/samples/client/petstore/cpp-qt5/client/OAIPet.h
@@ -103,4 +103,6 @@ class OAIPet: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIPet)
+
 #endif // OAIPet_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIPetApi.h b/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
@@ -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);
     
 };
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
@@ -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);
     
 };
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAITag.h b/samples/client/petstore/cpp-qt5/client/OAITag.h
@@ -68,4 +68,6 @@ class OAITag: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAITag)
+
 #endif // OAITag_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIUser.h b/samples/client/petstore/cpp-qt5/client/OAIUser.h
@@ -116,4 +116,6 @@ class OAIUser: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIUser)
+
 #endif // OAIUser_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIUserApi.h b/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
@@ -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);
     
 };
 
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h
@@ -76,4 +76,6 @@ class OAIApiResponse: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIApiResponse)
+
 #endif // OAIApiResponse_H
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h
@@ -68,4 +68,6 @@ class OAICategory: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAICategory)
+
 #endif // OAICategory_H
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIEnum.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIEnum.h
@@ -15,6 +15,7 @@
 
 #include <QString>
 #include <QJsonValue>
+#include <QMetaType>
 
 namespace OpenAPI {
 
@@ -61,4 +62,6 @@ private :
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIEnum)
+
 #endif // OAI_ENUM_H
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h
@@ -15,6 +15,7 @@
 
 #include <QJsonObject>
 #include <QJsonDocument>
+#include <QMetaType>
 
 namespace OpenAPI {
 
@@ -63,4 +64,6 @@ private :
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIObject)
+
 #endif // OAI_OBJECT_H
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h
@@ -101,4 +101,6 @@ class OAIOrder: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIOrder)
+
 #endif // OAIOrder_H
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h
@@ -103,4 +103,6 @@ class OAIPet: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIPet)
+
 #endif // OAIPet_H
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h
@@ -68,4 +68,6 @@ class OAITag: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAITag)
+
 #endif // OAITag_H
diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h
@@ -116,4 +116,6 @@ class OAIUser: public OAIObject {
 
 }
 
+Q_DECLARE_METATYPE(OpenAPI::OAIUser)
+
 #endif // OAIUser_H

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,8 @@ private:`
`74`	`74`	`}`
`75`	`75`	`{{/cppNamespaceDeclarations}}`
`76`	`76`
	`77`	`+Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{classname}})`
	`78`	`+`
`77`	`79`	`#endif // {{classname}}_H`
`78`	`80`	`{{/model}}`
`79`	`81`	`{{/models}}`
Original file line number	Diff line number	Diff line change
`@@ -76,4 +76,6 @@ class OAIApiResponse: public OAIObject {`
`76`	`76`
`77`	`77`	`}`
`78`	`78`
	`79`	`+Q_DECLARE_METATYPE(OpenAPI::OAIApiResponse)`
	`80`	`+`
`79`	`81`	`#endif // OAIApiResponse_H`
Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,6 @@ class OAICategory: public OAIObject {`
`68`	`68`
`69`	`69`	`}`
`70`	`70`
	`71`	`+Q_DECLARE_METATYPE(OpenAPI::OAICategory)`
	`72`	`+`
`71`	`73`	`#endif // OAICategory_H`