Skip to content

Commit 8a9eca7

Browse files
etherealjoyetherealjoy
committed
Add Q_DECLARE_METATYPE to the generated models and remove ref in signals
1 parent dcf3f42 commit 8a9eca7

File tree

27 files changed

+95
-43
lines changed

27 files changed

+95
-43
lines changed

‎modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ signals:
3838
{{/operation}}{{/operations}}
3939
{{#operations}}{{#operation}}void {{nickname}}SignalFull({{prefix}}HttpRequestWorker* worker{{#returnType}}, {{{returnType}}} summary{{/returnType}});
4040
{{/operation}}{{/operations}}
41-
{{#operations}}{{#operation}}void {{nickname}}SignalE({{#returnType}}{{{returnType}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str);
41+
{{#operations}}{{#operation}}void {{nickname}}SignalE({{#returnType}}{{{returnType}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, QString error_str);
4242
{{/operation}}{{/operations}}
43-
{{#operations}}{{#operation}}void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
43+
{{#operations}}{{#operation}}void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
4444
{{/operation}}{{/operations}}
4545
};
4646

‎modules/openapi-generator/src/main/resources/cpp-qt5-client/enum.mustache

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include <QString>
66
#include <QJsonValue>
7+
#include <QMetaType>
78

89
{{#cppNamespaceDeclarations}}
910
namespace {{this}} {
@@ -54,4 +55,6 @@ private :
5455
}
5556
{{/cppNamespaceDeclarations}}
5657

58+
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Enum)
59+
5760
#endif // {{prefix}}_ENUM_H

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

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ private:
7474
}
7575
{{/cppNamespaceDeclarations}}
7676

77+
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{classname}})
78+
7779
#endif // {{classname}}_H
7880
{{/model}}
7981
{{/models}}

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

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include <QJsonObject>
66
#include <QJsonDocument>
7+
#include <QMetaType>
78

89
{{#cppNamespaceDeclarations}}
910
namespace {{this}} {
@@ -56,4 +57,6 @@ private :
5657
}
5758
{{/cppNamespaceDeclarations}}
5859

60+
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Object)
61+
5962
#endif // {{prefix}}_OBJECT_H

‎modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/enum.mustache

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include <QString>
66
#include <QJsonValue>
7+
#include <QMetaType>
78

89
{{#cppNamespaceDeclarations}}
910
namespace {{this}} {
@@ -54,4 +55,6 @@ private :
5455
}
5556
{{/cppNamespaceDeclarations}}
5657

58+
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Enum)
59+
5760
#endif // {{prefix}}_ENUM_H

‎modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-header.mustache

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ private:
7474
}
7575
{{/cppNamespaceDeclarations}}
7676

77+
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{classname}})
78+
7779
#endif // {{classname}}_H
7880
{{/model}}
7981
{{/models}}

‎modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/object.mustache

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include <QJsonObject>
66
#include <QJsonDocument>
7+
#include <QMetaType>
78

89
{{#cppNamespaceDeclarations}}
910
namespace {{this}} {
@@ -56,4 +57,6 @@ private :
5657
}
5758
{{/cppNamespaceDeclarations}}
5859

60+
Q_DECLARE_METATYPE({{#cppNamespaceDeclarations}}{{this}}::{{/cppNamespaceDeclarations}}{{prefix}}Object)
61+
5962
#endif // {{prefix}}_OBJECT_H

‎samples/client/petstore/cpp-qt5/.openapi-generator/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.1-SNAPSHOT
1+
4.0.2-SNAPSHOT

‎samples/client/petstore/cpp-qt5/client/OAIApiResponse.h

+2
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,6 @@ class OAIApiResponse: public OAIObject {
7676

7777
}
7878

79+
Q_DECLARE_METATYPE(OpenAPI::OAIApiResponse)
80+
7981
#endif // OAIApiResponse_H

‎samples/client/petstore/cpp-qt5/client/OAICategory.h

+2
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,6 @@ class OAICategory: public OAIObject {
6868

6969
}
7070

71+
Q_DECLARE_METATYPE(OpenAPI::OAICategory)
72+
7173
#endif // OAICategory_H

‎samples/client/petstore/cpp-qt5/client/OAIEnum.h

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include <QString>
1717
#include <QJsonValue>
18+
#include <QMetaType>
1819

1920
namespace OpenAPI {
2021

@@ -61,4 +62,6 @@ private :
6162

6263
}
6364

65+
Q_DECLARE_METATYPE(OpenAPI::OAIEnum)
66+
6467
#endif // OAI_ENUM_H

‎samples/client/petstore/cpp-qt5/client/OAIObject.h

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include <QJsonObject>
1717
#include <QJsonDocument>
18+
#include <QMetaType>
1819

1920
namespace OpenAPI {
2021

@@ -63,4 +64,6 @@ private :
6364

6465
}
6566

67+
Q_DECLARE_METATYPE(OpenAPI::OAIObject)
68+
6669
#endif // OAI_OBJECT_H

‎samples/client/petstore/cpp-qt5/client/OAIOrder.h

+2
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,6 @@ class OAIOrder: public OAIObject {
101101

102102
}
103103

104+
Q_DECLARE_METATYPE(OpenAPI::OAIOrder)
105+
104106
#endif // OAIOrder_H

‎samples/client/petstore/cpp-qt5/client/OAIPet.h

+2
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,6 @@ class OAIPet: public OAIObject {
103103

104104
}
105105

106+
Q_DECLARE_METATYPE(OpenAPI::OAIPet)
107+
106108
#endif // OAIPet_H

‎samples/client/petstore/cpp-qt5/client/OAIPetApi.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,23 @@ class OAIPetApi: public QObject {
7777
void updatePetWithFormSignalFull(OAIHttpRequestWorker* worker);
7878
void uploadFileSignalFull(OAIHttpRequestWorker* worker, OAIApiResponse summary);
7979

80-
void addPetSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
81-
void deletePetSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
82-
void findPetsByStatusSignalE(QList<OAIPet> summary, QNetworkReply::NetworkError error_type, QString& error_str);
83-
void findPetsByTagsSignalE(QList<OAIPet> summary, QNetworkReply::NetworkError error_type, QString& error_str);
84-
void getPetByIdSignalE(OAIPet summary, QNetworkReply::NetworkError error_type, QString& error_str);
85-
void updatePetSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
86-
void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
87-
void uploadFileSignalE(OAIApiResponse summary, QNetworkReply::NetworkError error_type, QString& error_str);
80+
void addPetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
81+
void deletePetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
82+
void findPetsByStatusSignalE(QList<OAIPet> summary, QNetworkReply::NetworkError error_type, QString error_str);
83+
void findPetsByTagsSignalE(QList<OAIPet> summary, QNetworkReply::NetworkError error_type, QString error_str);
84+
void getPetByIdSignalE(OAIPet summary, QNetworkReply::NetworkError error_type, QString error_str);
85+
void updatePetSignalE(QNetworkReply::NetworkError error_type, QString error_str);
86+
void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, QString error_str);
87+
void uploadFileSignalE(OAIApiResponse summary, QNetworkReply::NetworkError error_type, QString error_str);
8888

89-
void addPetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
90-
void deletePetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
91-
void findPetsByStatusSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
92-
void findPetsByTagsSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
93-
void getPetByIdSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
94-
void updatePetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
95-
void updatePetWithFormSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
96-
void uploadFileSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
89+
void addPetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
90+
void deletePetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
91+
void findPetsByStatusSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
92+
void findPetsByTagsSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
93+
void getPetByIdSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
94+
void updatePetSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
95+
void updatePetWithFormSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
96+
void uploadFileSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
9797

9898
};
9999

‎samples/client/petstore/cpp-qt5/client/OAIStoreApi.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ class OAIStoreApi: public QObject {
6060
void getOrderByIdSignalFull(OAIHttpRequestWorker* worker, OAIOrder summary);
6161
void placeOrderSignalFull(OAIHttpRequestWorker* worker, OAIOrder summary);
6262

63-
void deleteOrderSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
64-
void getInventorySignalE(QMap<QString, qint32> summary, QNetworkReply::NetworkError error_type, QString& error_str);
65-
void getOrderByIdSignalE(OAIOrder summary, QNetworkReply::NetworkError error_type, QString& error_str);
66-
void placeOrderSignalE(OAIOrder summary, QNetworkReply::NetworkError error_type, QString& error_str);
63+
void deleteOrderSignalE(QNetworkReply::NetworkError error_type, QString error_str);
64+
void getInventorySignalE(QMap<QString, qint32> summary, QNetworkReply::NetworkError error_type, QString error_str);
65+
void getOrderByIdSignalE(OAIOrder summary, QNetworkReply::NetworkError error_type, QString error_str);
66+
void placeOrderSignalE(OAIOrder summary, QNetworkReply::NetworkError error_type, QString error_str);
6767

68-
void deleteOrderSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
69-
void getInventorySignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
70-
void getOrderByIdSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
71-
void placeOrderSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
68+
void deleteOrderSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
69+
void getInventorySignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
70+
void getOrderByIdSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
71+
void placeOrderSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
7272

7373
};
7474

‎samples/client/petstore/cpp-qt5/client/OAITag.h

+2
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,6 @@ class OAITag: public OAIObject {
6868

6969
}
7070

71+
Q_DECLARE_METATYPE(OpenAPI::OAITag)
72+
7173
#endif // OAITag_H

‎samples/client/petstore/cpp-qt5/client/OAIUser.h

+2
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,6 @@ class OAIUser: public OAIObject {
116116

117117
}
118118

119+
Q_DECLARE_METATYPE(OpenAPI::OAIUser)
120+
119121
#endif // OAIUser_H

‎samples/client/petstore/cpp-qt5/client/OAIUserApi.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -76,23 +76,23 @@ class OAIUserApi: public QObject {
7676
void logoutUserSignalFull(OAIHttpRequestWorker* worker);
7777
void updateUserSignalFull(OAIHttpRequestWorker* worker);
7878

79-
void createUserSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
80-
void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
81-
void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
82-
void deleteUserSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
83-
void getUserByNameSignalE(OAIUser summary, QNetworkReply::NetworkError error_type, QString& error_str);
84-
void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, QString& error_str);
85-
void logoutUserSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
86-
void updateUserSignalE(QNetworkReply::NetworkError error_type, QString& error_str);
79+
void createUserSignalE(QNetworkReply::NetworkError error_type, QString error_str);
80+
void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, QString error_str);
81+
void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, QString error_str);
82+
void deleteUserSignalE(QNetworkReply::NetworkError error_type, QString error_str);
83+
void getUserByNameSignalE(OAIUser summary, QNetworkReply::NetworkError error_type, QString error_str);
84+
void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, QString error_str);
85+
void logoutUserSignalE(QNetworkReply::NetworkError error_type, QString error_str);
86+
void updateUserSignalE(QNetworkReply::NetworkError error_type, QString error_str);
8787

88-
void createUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
89-
void createUsersWithArrayInputSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
90-
void createUsersWithListInputSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
91-
void deleteUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
92-
void getUserByNameSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
93-
void loginUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
94-
void logoutUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
95-
void updateUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString& error_str);
88+
void createUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
89+
void createUsersWithArrayInputSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
90+
void createUsersWithListInputSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
91+
void deleteUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
92+
void getUserByNameSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
93+
void loginUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
94+
void logoutUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
95+
void updateUserSignalEFull(OAIHttpRequestWorker* worker, QNetworkReply::NetworkError error_type, QString error_str);
9696

9797
};
9898

‎samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h

+2
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,6 @@ class OAIApiResponse: public OAIObject {
7676

7777
}
7878

79+
Q_DECLARE_METATYPE(OpenAPI::OAIApiResponse)
80+
7981
#endif // OAIApiResponse_H

‎samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h

+2
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,6 @@ class OAICategory: public OAIObject {
6868

6969
}
7070

71+
Q_DECLARE_METATYPE(OpenAPI::OAICategory)
72+
7173
#endif // OAICategory_H

‎samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIEnum.h

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include <QString>
1717
#include <QJsonValue>
18+
#include <QMetaType>
1819

1920
namespace OpenAPI {
2021

@@ -61,4 +62,6 @@ private :
6162

6263
}
6364

65+
Q_DECLARE_METATYPE(OpenAPI::OAIEnum)
66+
6467
#endif // OAI_ENUM_H

‎samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include <QJsonObject>
1717
#include <QJsonDocument>
18+
#include <QMetaType>
1819

1920
namespace OpenAPI {
2021

@@ -63,4 +64,6 @@ private :
6364

6465
}
6566

67+
Q_DECLARE_METATYPE(OpenAPI::OAIObject)
68+
6669
#endif // OAI_OBJECT_H

‎samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h

+2
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,6 @@ class OAIOrder: public OAIObject {
101101

102102
}
103103

104+
Q_DECLARE_METATYPE(OpenAPI::OAIOrder)
105+
104106
#endif // OAIOrder_H

‎samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h

+2
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,6 @@ class OAIPet: public OAIObject {
103103

104104
}
105105

106+
Q_DECLARE_METATYPE(OpenAPI::OAIPet)
107+
106108
#endif // OAIPet_H

‎samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h

+2
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,6 @@ class OAITag: public OAIObject {
6868

6969
}
7070

71+
Q_DECLARE_METATYPE(OpenAPI::OAITag)
72+
7173
#endif // OAITag_H

‎samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h

+2
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,6 @@ class OAIUser: public OAIObject {
116116

117117
}
118118

119+
Q_DECLARE_METATYPE(OpenAPI::OAIUser)
120+
119121
#endif // OAIUser_H

0 commit comments

Comments
 (0)