Skip to content

Commit

Permalink
Add Q_DECLARE_METATYPE to the generated models and remove ref in signals
Browse files Browse the repository at this point in the history
  • Loading branch information
etherealjoy committed Jun 4, 2019
1 parent dcf3f42 commit 8a9eca7
Show file tree
Hide file tree
Showing 27 changed files with 95 additions and 43 deletions.
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
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
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}}
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
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
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}}
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit 8a9eca7

Please # to comment.