From 95340d5264f13a3c14fad612c3d5d7956c14c1d5 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Sun, 3 Dec 2023 11:14:22 +0100 Subject: [PATCH] [cpp-qt-client] pass QString by const reference instead of by value (#16793) * [cpp-qt-client] pass QString by const reference instead of by value * Add another signal instead of changing its signature * Bump qt version * Fix CODEOWNERS * Try to fix workflow * use v3 * Remove openssl from windows build --------- Co-authored-by: William Cheng --- .github/CODEOWNERS | 6 +- .github/workflows/samples-cpp-qt-client.yaml | 8 +- .../resources/cpp-qt-client/api-body.mustache | 26 ++ .../cpp-qt-client/api-header.mustache | 9 +- .../petstore/cpp-qt/PetStore/PetApiTests.cpp | 22 +- .../cpp-qt/PetStore/StoreApiTests.cpp | 6 +- .../petstore/cpp-qt/PetStore/UserApiTests.cpp | 16 +- .../petstore/cpp-qt/client/PFXPetApi.cpp | 234 ++++++++++++++++++ .../client/petstore/cpp-qt/client/PFXPetApi.h | 37 ++- .../cpp-qt/client/PFXPrimitivesApi.cpp | 52 ++++ .../petstore/cpp-qt/client/PFXPrimitivesApi.h | 9 +- .../petstore/cpp-qt/client/PFXStoreApi.cpp | 104 ++++++++ .../petstore/cpp-qt/client/PFXStoreApi.h | 17 +- .../petstore/cpp-qt/client/PFXUserApi.cpp | 208 ++++++++++++++++ .../petstore/cpp-qt/client/PFXUserApi.h | 33 ++- 15 files changed, 749 insertions(+), 38 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 416f9199ba..2274576ada 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -29,7 +29,5 @@ modules/openapi-generator-gradle-plugin/**/* @jimschubert modules/openapi-generator-maven-plugin/**/* @jimschubert # Martin Delille -/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtClientCodegen.java @martindelille -/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java @martindelille -/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/resources/cpp-qt-client @martindelille -/Users/martin/dev/clone/openapi-generator/samples/client/petstore/cpp-qt @martindelille +modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @martindelille +samples/client/petstore/cpp-qt/**/* @martindelille diff --git a/.github/workflows/samples-cpp-qt-client.yaml b/.github/workflows/samples-cpp-qt-client.yaml index de602c41e6..b65195b8bf 100644 --- a/.github/workflows/samples-cpp-qt-client.yaml +++ b/.github/workflows/samples-cpp-qt-client.yaml @@ -18,18 +18,16 @@ jobs: matrix: qt-version: - '5.15.2' - - '6.4.2' + - '6.5.3' os: - ubuntu-latest - macOS-latest - windows-latest - include: - - os: windows-latest - tools: 'tools_openssl_x64' runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: jurplel/install-qt-action@v4 + - name: Install Qt + uses: jurplel/install-qt-action@v3 with: version: ${{ matrix.qt-version }} tools: ${{ matrix.tools }} diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache index 83db65526d..56146b4821 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/api-body.mustache @@ -909,8 +909,34 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) { emit _passwordFlow.authenticationNeeded(); {{/isPassword}}{{/isOAuth}}{{/authMethods}} } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit {{nickname}}SignalE({{#returnType}}output, {{/returnType}}error_type, error_str); emit {{nickname}}SignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit {{nickname}}SignalError({{#returnType}}output, {{/returnType}}error_type, error_str); + emit {{nickname}}SignalErrorFull(worker, error_type, error_str); } } diff --git a/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache index 6d1376d52c..ff6ee39125 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt-client/api-header.mustache @@ -91,16 +91,19 @@ signals: {{#operations}}{{#operation}} void {{nickname}}SignalFull({{prefix}}HttpRequestWorker *worker{{#returnType}}, {{{.}}} summary{{/returnType}});{{/operation}}{{/operations}} {{#operations}}{{#operation}} - void {{nickname}}SignalE({{#returnType}}{{{.}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, QString error_str);{{/operation}}{{/operations}} + Q_DECL_DEPRECATED_X("Use {{nickname}}SignalError() instead") + void {{nickname}}SignalE({{#returnType}}{{{.}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, QString error_str); + void {{nickname}}SignalError({{#returnType}}{{{.}}} summary, {{/returnType}}QNetworkReply::NetworkError error_type, const QString &error_str);{{/operation}}{{/operations}} {{#operations}}{{#operation}} - void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);{{/operation}}{{/operations}} + Q_DECL_DEPRECATED_X("Use {{nickname}}SignalErrorFull() instead") + void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void {{nickname}}SignalErrorFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str);{{/operation}}{{/operations}} void abortRequestsSignal(); void allPendingRequestsCompleted(); public slots: void tokenAvailable(); - }; {{#cppNamespaceDeclarations}} diff --git a/samples/client/petstore/cpp-qt/PetStore/PetApiTests.cpp b/samples/client/petstore/cpp-qt/PetStore/PetApiTests.cpp index f27d76e8ed..223debe595 100644 --- a/samples/client/petstore/cpp-qt/PetStore/PetApiTests.cpp +++ b/samples/client/petstore/cpp-qt/PetStore/PetApiTests.cpp @@ -24,7 +24,7 @@ void PetApiTests::findPetsByStatusTest() { } QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXPetApi::findPetsByStatusSignalE, [&](QList, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::findPetsByStatusSignalError, [&](QList, QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -47,7 +47,7 @@ void PetApiTests::createAndGetPetTest() { petCreated = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXPetApi::addPetSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::addPetSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -69,7 +69,7 @@ void PetApiTests::createAndGetPetTest() { // QVERIFY(pet.getStatus().compare("freaky") == 0); petFetched = true; }); - connect(&api, &PFXPetApi::getPetByIdSignalE, [&](PFXPet, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::getPetByIdSignalError, [&](PFXPet, QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -92,7 +92,7 @@ void PetApiTests::updatePetTest() { petAdded = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXPetApi::addPetSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::addPetSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -110,7 +110,7 @@ void PetApiTests::updatePetTest() { petToCheck = pet; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXPetApi::getPetByIdSignalE, this, [&](PFXPet, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::getPetByIdSignalError, this, [&](PFXPet, QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -126,7 +126,7 @@ void PetApiTests::updatePetTest() { petUpdated = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXPetApi::updatePetSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::updatePetSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -146,7 +146,7 @@ void PetApiTests::updatePetTest() { QVERIFY(pet.getStatus().compare(petToCheck.getStatus()) == 0); QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXPetApi::getPetByIdSignalE, [&](PFXPet, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::getPetByIdSignalError, [&](PFXPet, QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -170,7 +170,7 @@ void PetApiTests::updatePetWithFormTest() { petAdded = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXPetApi::addPetSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::addPetSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -187,7 +187,7 @@ void PetApiTests::updatePetWithFormTest() { petToCheck = pet; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXPetApi::getPetByIdSignalE, [&](PFXPet, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::getPetByIdSignalError, [&](PFXPet, QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -203,7 +203,7 @@ void PetApiTests::updatePetWithFormTest() { petUpdated = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXPetApi::updatePetWithFormSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::updatePetWithFormSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -222,7 +222,7 @@ void PetApiTests::updatePetWithFormTest() { // QVERIFY(pet.getName().compare(QString("gorilla")) == 0); QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXPetApi::getPetByIdSignalE, [&](PFXPet, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXPetApi::getPetByIdSignalError, [&](PFXPet, QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); diff --git a/samples/client/petstore/cpp-qt/PetStore/StoreApiTests.cpp b/samples/client/petstore/cpp-qt/PetStore/StoreApiTests.cpp index 5bb1fbd82b..982121fc9d 100644 --- a/samples/client/petstore/cpp-qt/PetStore/StoreApiTests.cpp +++ b/samples/client/petstore/cpp-qt/PetStore/StoreApiTests.cpp @@ -18,7 +18,7 @@ void StoreApiTests::placeOrderTest() { qDebug() << order.getShipDate(); QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXStoreApi::placeOrderSignalE, [&](PFXOrder, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXStoreApi::placeOrderSignalError, [&](PFXOrder, QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -49,7 +49,7 @@ void StoreApiTests::getOrderByIdTest() { qDebug() << order.getShipDate(); QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXStoreApi::getOrderByIdSignalE, [&](PFXOrder, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXStoreApi::getOrderByIdSignalError, [&](PFXOrder, QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -73,7 +73,7 @@ void StoreApiTests::getInventoryTest() { } QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXStoreApi::getInventorySignalE, [&](QMap, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXStoreApi::getInventorySignalError, [&](QMap, QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); diff --git a/samples/client/petstore/cpp-qt/PetStore/UserApiTests.cpp b/samples/client/petstore/cpp-qt/PetStore/UserApiTests.cpp index f55df89de4..4665a1a4d2 100644 --- a/samples/client/petstore/cpp-qt/PetStore/UserApiTests.cpp +++ b/samples/client/petstore/cpp-qt/PetStore/UserApiTests.cpp @@ -26,7 +26,7 @@ void UserApiTests::createUserTest() { userCreated = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXUserApi::createUserSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXUserApi::createUserSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -46,7 +46,7 @@ void UserApiTests::createUsersWithArrayInputTest() { usersCreated = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXUserApi::createUsersWithArrayInputSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXUserApi::createUsersWithArrayInputSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -70,7 +70,7 @@ void UserApiTests::createUsersWithListInputTest() { usersCreated = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXUserApi::createUsersWithListInputSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXUserApi::createUsersWithListInputSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -98,7 +98,7 @@ void UserApiTests::deleteUserTest() { userDeleted = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXUserApi::deleteUserSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXUserApi::deleteUserSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { userDeleted = true; qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); @@ -121,7 +121,7 @@ void UserApiTests::getUserByNameTest() { // QVERIFY(summary.getUsername() == "johndoe"); QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXUserApi::getUserByNameSignalE, [&](PFXUser, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXUserApi::getUserByNameSignalError, [&](PFXUser, QNetworkReply::NetworkError, const QString &error_str) { userFetched = true; qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); @@ -143,7 +143,7 @@ void UserApiTests::loginUserTest() { qDebug() << summary; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXUserApi::loginUserSignalE, [&](QString, QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXUserApi::loginUserSignalError, [&](QString, QNetworkReply::NetworkError, const QString &error_str) { userLogged = true; qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); @@ -164,7 +164,7 @@ void UserApiTests::logoutUserTest() { userLoggedOut = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXUserApi::logoutUserSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXUserApi::logoutUserSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); @@ -184,7 +184,7 @@ void UserApiTests::updateUserTest() { userUpdated = true; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); - connect(&api, &PFXUserApi::updateUserSignalE, [&](QNetworkReply::NetworkError, QString error_str) { + connect(&api, &PFXUserApi::updateUserSignalError, [&](QNetworkReply::NetworkError, const QString &error_str) { qDebug() << "Error happened while issuing request : " << error_str; QTimer::singleShot(0, &loop, &QEventLoop::quit); }); diff --git a/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp b/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp index e1822961fa..22d16f8db9 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXPetApi.cpp @@ -316,8 +316,34 @@ void PFXPetApi::addPetCallback(PFXHttpRequestWorker *worker) { } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit addPetSignalE(error_type, error_str); emit addPetSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit addPetSignalError(error_type, error_str); + emit addPetSignalErrorFull(worker, error_type, error_str); } } @@ -374,8 +400,34 @@ void PFXPetApi::allPetsCallback(PFXHttpRequestWorker *worker) { emit allPetsSignal(output); emit allPetsSignalFull(worker, output); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit allPetsSignalE(output, error_type, error_str); emit allPetsSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit allPetsSignalError(output, error_type, error_str); + emit allPetsSignalErrorFull(worker, error_type, error_str); } } @@ -482,8 +534,34 @@ void PFXPetApi::deletePetCallback(PFXHttpRequestWorker *worker) { } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit deletePetSignalE(error_type, error_str); emit deletePetSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit deletePetSignalError(error_type, error_str); + emit deletePetSignalErrorFull(worker, error_type, error_str); } } @@ -666,8 +744,34 @@ void PFXPetApi::findPetsByStatusCallback(PFXHttpRequestWorker *worker) { } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit findPetsByStatusSignalE(output, error_type, error_str); emit findPetsByStatusSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit findPetsByStatusSignalError(output, error_type, error_str); + emit findPetsByStatusSignalErrorFull(worker, error_type, error_str); } } @@ -850,8 +954,34 @@ void PFXPetApi::findPetsByTagsCallback(PFXHttpRequestWorker *worker) { } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit findPetsByTagsSignalE(output, error_type, error_str); emit findPetsByTagsSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit findPetsByTagsSignalError(output, error_type, error_str); + emit findPetsByTagsSignalErrorFull(worker, error_type, error_str); } } @@ -917,8 +1047,34 @@ void PFXPetApi::getPetByIdCallback(PFXHttpRequestWorker *worker) { emit getPetByIdSignal(output); emit getPetByIdSignalFull(worker, output); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit getPetByIdSignalE(output, error_type, error_str); emit getPetByIdSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit getPetByIdSignalError(output, error_type, error_str); + emit getPetByIdSignalErrorFull(worker, error_type, error_str); } } @@ -1010,8 +1166,34 @@ void PFXPetApi::updatePetCallback(PFXHttpRequestWorker *worker) { } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit updatePetSignalE(error_type, error_str); emit updatePetSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit updatePetSignalError(error_type, error_str); + emit updatePetSignalErrorFull(worker, error_type, error_str); } } @@ -1120,8 +1302,34 @@ void PFXPetApi::updatePetWithFormCallback(PFXHttpRequestWorker *worker) { } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit updatePetWithFormSignalE(error_type, error_str); emit updatePetWithFormSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit updatePetWithFormSignalError(error_type, error_str); + emit updatePetWithFormSignalErrorFull(worker, error_type, error_str); } } @@ -1231,8 +1439,34 @@ void PFXPetApi::uploadFileCallback(PFXHttpRequestWorker *worker) { } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit uploadFileSignalE(output, error_type, error_str); emit uploadFileSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit uploadFileSignalError(output, error_type, error_str); + emit uploadFileSignalErrorFull(worker, error_type, error_str); } } diff --git a/samples/client/petstore/cpp-qt/client/PFXPetApi.h b/samples/client/petstore/cpp-qt/client/PFXPetApi.h index 004050016f..cb3f9113c6 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPetApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXPetApi.h @@ -162,32 +162,67 @@ signals: void updatePetWithFormSignalFull(PFXHttpRequestWorker *worker); void uploadFileSignalFull(PFXHttpRequestWorker *worker, PFXApiResponse summary); + Q_DECL_DEPRECATED_X("Use addPetSignalError() instead") void addPetSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void addPetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use allPetsSignalError() instead") void allPetsSignalE(QSet summary, QNetworkReply::NetworkError error_type, QString error_str); + void allPetsSignalError(QSet summary, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use deletePetSignalError() instead") void deletePetSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void deletePetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use findPetsByStatusSignalError() instead") void findPetsByStatusSignalE(QList summary, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByStatusSignalError(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use findPetsByTagsSignalError() instead") void findPetsByTagsSignalE(QList summary, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByTagsSignalError(QList summary, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use getPetByIdSignalError() instead") void getPetByIdSignalE(PFXPet summary, QNetworkReply::NetworkError error_type, QString error_str); + void getPetByIdSignalError(PFXPet summary, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use updatePetSignalError() instead") void updatePetSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void updatePetSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use updatePetWithFormSignalError() instead") void updatePetWithFormSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void updatePetWithFormSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use uploadFileSignalError() instead") void uploadFileSignalE(PFXApiResponse summary, QNetworkReply::NetworkError error_type, QString error_str); + void uploadFileSignalError(PFXApiResponse summary, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use addPetSignalErrorFull() instead") void addPetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void addPetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use allPetsSignalErrorFull() instead") void allPetsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void allPetsSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use deletePetSignalErrorFull() instead") void deletePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void deletePetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use findPetsByStatusSignalErrorFull() instead") void findPetsByStatusSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByStatusSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use findPetsByTagsSignalErrorFull() instead") void findPetsByTagsSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void findPetsByTagsSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use getPetByIdSignalErrorFull() instead") void getPetByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getPetByIdSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use updatePetSignalErrorFull() instead") void updatePetSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void updatePetSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use updatePetWithFormSignalErrorFull() instead") void updatePetWithFormSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void updatePetWithFormSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use uploadFileSignalErrorFull() instead") void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void uploadFileSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); void allPendingRequestsCompleted(); public slots: void tokenAvailable(); - }; } // namespace test_namespace diff --git a/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.cpp b/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.cpp index 792128b66f..b76fb7b3cf 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.cpp @@ -261,8 +261,34 @@ void PFXPrimitivesApi::primitivesIntegerPostCallback(PFXHttpRequestWorker *worke emit primitivesIntegerPostSignal(); emit primitivesIntegerPostSignalFull(worker); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit primitivesIntegerPostSignalE(error_type, error_str); emit primitivesIntegerPostSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit primitivesIntegerPostSignalError(error_type, error_str); + emit primitivesIntegerPostSignalErrorFull(worker, error_type, error_str); } } @@ -313,8 +339,34 @@ void PFXPrimitivesApi::primitivesNumberPutCallback(PFXHttpRequestWorker *worker) emit primitivesNumberPutSignal(); emit primitivesNumberPutSignalFull(worker); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit primitivesNumberPutSignalE(error_type, error_str); emit primitivesNumberPutSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit primitivesNumberPutSignalError(error_type, error_str); + emit primitivesNumberPutSignalErrorFull(worker, error_type, error_str); } } diff --git a/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h b/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h index 3c7d4d2bd6..b0d96ab767 100644 --- a/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h @@ -99,18 +99,25 @@ signals: void primitivesIntegerPostSignalFull(PFXHttpRequestWorker *worker); void primitivesNumberPutSignalFull(PFXHttpRequestWorker *worker); + Q_DECL_DEPRECATED_X("Use primitivesIntegerPostSignalError() instead") void primitivesIntegerPostSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void primitivesIntegerPostSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use primitivesNumberPutSignalError() instead") void primitivesNumberPutSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void primitivesNumberPutSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use primitivesIntegerPostSignalErrorFull() instead") void primitivesIntegerPostSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void primitivesIntegerPostSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use primitivesNumberPutSignalErrorFull() instead") void primitivesNumberPutSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void primitivesNumberPutSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); void allPendingRequestsCompleted(); public slots: void tokenAvailable(); - }; } // namespace test_namespace diff --git a/samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp b/samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp index 77a98da9c7..39428806ad 100644 --- a/samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp @@ -275,8 +275,34 @@ void PFXStoreApi::deleteOrderCallback(PFXHttpRequestWorker *worker) { emit deleteOrderSignal(); emit deleteOrderSignalFull(worker); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit deleteOrderSignalE(error_type, error_str); emit deleteOrderSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit deleteOrderSignalError(error_type, error_str); + emit deleteOrderSignalErrorFull(worker, error_type, error_str); } } @@ -337,8 +363,34 @@ void PFXStoreApi::getInventoryCallback(PFXHttpRequestWorker *worker) { emit getInventorySignal(output); emit getInventorySignalFull(worker, output); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit getInventorySignalE(output, error_type, error_str); emit getInventorySignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit getInventorySignalError(output, error_type, error_str); + emit getInventorySignalErrorFull(worker, error_type, error_str); } } @@ -400,8 +452,34 @@ void PFXStoreApi::getOrderByIdCallback(PFXHttpRequestWorker *worker) { emit getOrderByIdSignal(output); emit getOrderByIdSignalFull(worker, output); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit getOrderByIdSignalE(output, error_type, error_str); emit getOrderByIdSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit getOrderByIdSignalError(output, error_type, error_str); + emit getOrderByIdSignalErrorFull(worker, error_type, error_str); } } @@ -454,8 +532,34 @@ void PFXStoreApi::placeOrderCallback(PFXHttpRequestWorker *worker) { emit placeOrderSignal(output); emit placeOrderSignalFull(worker, output); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit placeOrderSignalE(output, error_type, error_str); emit placeOrderSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit placeOrderSignalError(output, error_type, error_str); + emit placeOrderSignalErrorFull(worker, error_type, error_str); } } diff --git a/samples/client/petstore/cpp-qt/client/PFXStoreApi.h b/samples/client/petstore/cpp-qt/client/PFXStoreApi.h index 43bf25f4ea..3512e8eb74 100644 --- a/samples/client/petstore/cpp-qt/client/PFXStoreApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXStoreApi.h @@ -115,22 +115,37 @@ signals: void getOrderByIdSignalFull(PFXHttpRequestWorker *worker, PFXOrder summary); void placeOrderSignalFull(PFXHttpRequestWorker *worker, PFXOrder summary); + Q_DECL_DEPRECATED_X("Use deleteOrderSignalError() instead") void deleteOrderSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void deleteOrderSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use getInventorySignalError() instead") void getInventorySignalE(QMap summary, QNetworkReply::NetworkError error_type, QString error_str); + void getInventorySignalError(QMap summary, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use getOrderByIdSignalError() instead") void getOrderByIdSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, QString error_str); + void getOrderByIdSignalError(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use placeOrderSignalError() instead") void placeOrderSignalE(PFXOrder summary, QNetworkReply::NetworkError error_type, QString error_str); + void placeOrderSignalError(PFXOrder summary, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use deleteOrderSignalErrorFull() instead") void deleteOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void deleteOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use getInventorySignalErrorFull() instead") void getInventorySignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getInventorySignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use getOrderByIdSignalErrorFull() instead") void getOrderByIdSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getOrderByIdSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use placeOrderSignalErrorFull() instead") void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void placeOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); void allPendingRequestsCompleted(); public slots: void tokenAvailable(); - }; } // namespace test_namespace diff --git a/samples/client/petstore/cpp-qt/client/PFXUserApi.cpp b/samples/client/petstore/cpp-qt/client/PFXUserApi.cpp index 197825fd03..36dc71b0ef 100644 --- a/samples/client/petstore/cpp-qt/client/PFXUserApi.cpp +++ b/samples/client/petstore/cpp-qt/client/PFXUserApi.cpp @@ -274,8 +274,34 @@ void PFXUserApi::createUserCallback(PFXHttpRequestWorker *worker) { emit createUserSignal(); emit createUserSignalFull(worker); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit createUserSignalE(error_type, error_str); emit createUserSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit createUserSignalError(error_type, error_str); + emit createUserSignalErrorFull(worker, error_type, error_str); } } @@ -326,8 +352,34 @@ void PFXUserApi::createUsersWithArrayInputCallback(PFXHttpRequestWorker *worker) emit createUsersWithArrayInputSignal(); emit createUsersWithArrayInputSignalFull(worker); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit createUsersWithArrayInputSignalE(error_type, error_str); emit createUsersWithArrayInputSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit createUsersWithArrayInputSignalError(error_type, error_str); + emit createUsersWithArrayInputSignalErrorFull(worker, error_type, error_str); } } @@ -378,8 +430,34 @@ void PFXUserApi::createUsersWithListInputCallback(PFXHttpRequestWorker *worker) emit createUsersWithListInputSignal(); emit createUsersWithListInputSignalFull(worker); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit createUsersWithListInputSignalE(error_type, error_str); emit createUsersWithListInputSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit createUsersWithListInputSignalError(error_type, error_str); + emit createUsersWithListInputSignalErrorFull(worker, error_type, error_str); } } @@ -440,8 +518,34 @@ void PFXUserApi::deleteUserCallback(PFXHttpRequestWorker *worker) { emit deleteUserSignal(); emit deleteUserSignalFull(worker); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit deleteUserSignalE(error_type, error_str); emit deleteUserSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit deleteUserSignalError(error_type, error_str); + emit deleteUserSignalErrorFull(worker, error_type, error_str); } } @@ -503,8 +607,34 @@ void PFXUserApi::getUserByNameCallback(PFXHttpRequestWorker *worker) { emit getUserByNameSignal(output); emit getUserByNameSignalFull(worker, output); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit getUserByNameSignalE(output, error_type, error_str); emit getUserByNameSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit getUserByNameSignalError(output, error_type, error_str); + emit getUserByNameSignalErrorFull(worker, error_type, error_str); } } @@ -584,8 +714,34 @@ void PFXUserApi::loginUserCallback(PFXHttpRequestWorker *worker) { emit loginUserSignal(output); emit loginUserSignalFull(worker, output); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit loginUserSignalE(output, error_type, error_str); emit loginUserSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit loginUserSignalError(output, error_type, error_str); + emit loginUserSignalErrorFull(worker, error_type, error_str); } } @@ -632,8 +788,34 @@ void PFXUserApi::logoutUserCallback(PFXHttpRequestWorker *worker) { emit logoutUserSignal(); emit logoutUserSignalFull(worker); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit logoutUserSignalE(error_type, error_str); emit logoutUserSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit logoutUserSignalError(error_type, error_str); + emit logoutUserSignalErrorFull(worker, error_type, error_str); } } @@ -699,8 +881,34 @@ void PFXUserApi::updateUserCallback(PFXHttpRequestWorker *worker) { emit updateUserSignal(); emit updateUserSignalFull(worker); } else { + +#if defined(_MSC_VER) +// For MSVC +#pragma warning(push) +#pragma warning(disable : 4996) +#elif defined(__clang__) +// For Clang +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +// For GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + emit updateUserSignalE(error_type, error_str); emit updateUserSignalEFull(worker, error_type, error_str); + +#if defined(_MSC_VER) +#pragma warning(pop) +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) +#pragma GCC diagnostic pop +#endif + + emit updateUserSignalError(error_type, error_str); + emit updateUserSignalErrorFull(worker, error_type, error_str); } } diff --git a/samples/client/petstore/cpp-qt/client/PFXUserApi.h b/samples/client/petstore/cpp-qt/client/PFXUserApi.h index 52e790b2e7..573980d991 100644 --- a/samples/client/petstore/cpp-qt/client/PFXUserApi.h +++ b/samples/client/petstore/cpp-qt/client/PFXUserApi.h @@ -148,30 +148,61 @@ signals: void logoutUserSignalFull(PFXHttpRequestWorker *worker); void updateUserSignalFull(PFXHttpRequestWorker *worker); + Q_DECL_DEPRECATED_X("Use createUserSignalError() instead") void createUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void createUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use createUsersWithArrayInputSignalError() instead") void createUsersWithArrayInputSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithArrayInputSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use createUsersWithListInputSignalError() instead") void createUsersWithListInputSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithListInputSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use deleteUserSignalError() instead") void deleteUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void deleteUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use getUserByNameSignalError() instead") void getUserByNameSignalE(PFXUser summary, QNetworkReply::NetworkError error_type, QString error_str); + void getUserByNameSignalError(PFXUser summary, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use loginUserSignalError() instead") void loginUserSignalE(QString summary, QNetworkReply::NetworkError error_type, QString error_str); + void loginUserSignalError(QString summary, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use logoutUserSignalError() instead") void logoutUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void logoutUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use updateUserSignalError() instead") void updateUserSignalE(QNetworkReply::NetworkError error_type, QString error_str); + void updateUserSignalError(QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use createUserSignalErrorFull() instead") void createUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void createUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use createUsersWithArrayInputSignalErrorFull() instead") void createUsersWithArrayInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithArrayInputSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use createUsersWithListInputSignalErrorFull() instead") void createUsersWithListInputSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void createUsersWithListInputSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use deleteUserSignalErrorFull() instead") void deleteUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void deleteUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use getUserByNameSignalErrorFull() instead") void getUserByNameSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void getUserByNameSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use loginUserSignalErrorFull() instead") void loginUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void loginUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use logoutUserSignalErrorFull() instead") void logoutUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void logoutUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); + Q_DECL_DEPRECATED_X("Use updateUserSignalErrorFull() instead") void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str); + void updateUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str); void abortRequestsSignal(); void allPendingRequestsCompleted(); public slots: void tokenAvailable(); - }; } // namespace test_namespace