Skip to content

Commit 493912c

Browse files
wing328wing328
committed
fix tabs, update samples
1 parent 6bac162 commit 493912c

13 files changed

+34
-5
lines changed

‎modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.cpp.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ void {{prefix}}HttpRequestWorker::execute({{prefix}}HttpRequestInput *input) {
376376
}
377377
if (reply != nullptr) {
378378
reply->setParent(this);
379-
connect(reply, &QNetworkReply::downloadProgress, this, &{{prefix}}HttpRequestWorker::downloadProgress);
379+
connect(reply, &QNetworkReply::downloadProgress, this, &{{prefix}}HttpRequestWorker::downloadProgress);
380380
connect(reply, &QNetworkReply::finished, this, [this, reply] {
381381
on_reply_finished(reply);
382382
});

‎modules/openapi-generator/src/main/resources/cpp-qt-client/HttpRequest.h.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public:
7474

7575
Q_SIGNALS:
7676
void on_execution_finished({{prefix}}HttpRequestWorker *worker);
77-
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
77+
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
7878

7979
private:
8080
enum {{prefix}}CompressionType{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Q_SIGNALS:
9999
void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
100100
void {{nickname}}SignalErrorFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str);{{/operation}}{{/operations}}
101101

102-
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
102+
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
103103
void abortRequestsSignal();
104104
void allPendingRequestsCompleted();
105105

‎samples/client/petstore/cpp-qt/client/PFXHttpRequest.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -383,12 +383,13 @@ void PFXHttpRequestWorker::execute(PFXHttpRequestInput *input) {
383383
}
384384
if (reply != nullptr) {
385385
reply->setParent(this);
386-
connect(reply, &QNetworkReply::finished, [this, reply] {
386+
connect(reply, &QNetworkReply::downloadProgress, this, &PFXHttpRequestWorker::downloadProgress);
387+
connect(reply, &QNetworkReply::finished, this, [this, reply] {
387388
on_reply_finished(reply);
388389
});
389390
}
390391
if (timeOutTimer.interval() > 0) {
391-
QObject::connect(&timeOutTimer, &QTimer::timeout, [this, reply] {
392+
QObject::connect(&timeOutTimer, &QTimer::timeout, this, [this, reply] {
392393
on_reply_timeout(reply);
393394
});
394395
timeOutTimer.start();

‎samples/client/petstore/cpp-qt/client/PFXHttpRequest.h

+1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ class PFXHttpRequestWorker : public QObject {
8282

8383
Q_SIGNALS:
8484
void on_execution_finished(PFXHttpRequestWorker *worker);
85+
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
8586

8687
private:
8788
enum PFXCompressionType{

‎samples/client/petstore/cpp-qt/client/PFXPetApi.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ void PFXPetApi::addPet(const PFXPet &pfx_pet) {
252252
}
253253
#endif
254254

255+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPetApi::downloadProgress);
255256
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::addPetCallback);
256257
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
257258
connect(worker, &QObject::destroyed, this, [this]() {
@@ -366,6 +367,7 @@ void PFXPetApi::allPets() {
366367
}
367368
#endif
368369

370+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPetApi::downloadProgress);
369371
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::allPetsCallback);
370372
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
371373
connect(worker, &QObject::destroyed, this, [this]() {
@@ -470,6 +472,7 @@ void PFXPetApi::deletePet(const qint64 &pet_id, const ::test_namespace::Optional
470472
}
471473
#endif
472474

475+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPetApi::downloadProgress);
473476
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::deletePetCallback);
474477
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
475478
connect(worker, &QObject::destroyed, this, [this]() {
@@ -670,6 +673,7 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
670673
}
671674
#endif
672675

676+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPetApi::downloadProgress);
673677
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByStatusCallback);
674678
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
675679
connect(worker, &QObject::destroyed, this, [this]() {
@@ -880,6 +884,7 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
880884
}
881885
#endif
882886

887+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPetApi::downloadProgress);
883888
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByTagsCallback);
884889
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
885890
connect(worker, &QObject::destroyed, this, [this]() {
@@ -1022,6 +1027,7 @@ void PFXPetApi::getPetById(const qint64 &pet_id) {
10221027
}
10231028
#endif
10241029

1030+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPetApi::downloadProgress);
10251031
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::getPetByIdCallback);
10261032
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
10271033
connect(worker, &QObject::destroyed, this, [this]() {
@@ -1102,6 +1108,7 @@ void PFXPetApi::updatePet(const PFXPet &pfx_pet) {
11021108
}
11031109
#endif
11041110

1111+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPetApi::downloadProgress);
11051112
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetCallback);
11061113
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
11071114
connect(worker, &QObject::destroyed, this, [this]() {
@@ -1238,6 +1245,7 @@ void PFXPetApi::updatePetWithForm(const qint64 &pet_id, const ::test_namespace::
12381245
}
12391246
#endif
12401247

1248+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPetApi::downloadProgress);
12411249
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetWithFormCallback);
12421250
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
12431251
connect(worker, &QObject::destroyed, this, [this]() {
@@ -1374,6 +1382,7 @@ void PFXPetApi::uploadFile(const qint64 &pet_id, const ::test_namespace::Optiona
13741382
}
13751383
#endif
13761384

1385+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPetApi::downloadProgress);
13771386
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::uploadFileCallback);
13781387
connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
13791388
connect(worker, &QObject::destroyed, this, [this]() {

‎samples/client/petstore/cpp-qt/client/PFXPetApi.h

+1
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ class PFXPetApi : public QObject {
218218
void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
219219
void uploadFileSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str);
220220

221+
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
221222
void abortRequestsSignal();
222223
void allPendingRequestsCompleted();
223224

‎samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ void PFXPrimitivesApi::primitivesIntegerPost(const ::test_namespace::OptionalPar
237237
}
238238
#endif
239239

240+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPrimitivesApi::downloadProgress);
240241
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPrimitivesApi::primitivesIntegerPostCallback);
241242
connect(this, &PFXPrimitivesApi::abortRequestsSignal, worker, &QObject::deleteLater);
242243
connect(worker, &QObject::destroyed, this, [this]() {
@@ -315,6 +316,7 @@ void PFXPrimitivesApi::primitivesNumberPut(const ::test_namespace::OptionalParam
315316
}
316317
#endif
317318

319+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXPrimitivesApi::downloadProgress);
318320
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPrimitivesApi::primitivesNumberPutCallback);
319321
connect(this, &PFXPrimitivesApi::abortRequestsSignal, worker, &QObject::deleteLater);
320322
connect(worker, &QObject::destroyed, this, [this]() {

‎samples/client/petstore/cpp-qt/client/PFXPrimitivesApi.h

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ class PFXPrimitivesApi : public QObject {
113113
void primitivesNumberPutSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
114114
void primitivesNumberPutSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str);
115115

116+
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
116117
void abortRequestsSignal();
117118
void allPendingRequestsCompleted();
118119

‎samples/client/petstore/cpp-qt/client/PFXStoreApi.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ void PFXStoreApi::deleteOrder(const QString &order_id) {
251251
}
252252
#endif
253253

254+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXStoreApi::downloadProgress);
254255
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::deleteOrderCallback);
255256
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
256257
connect(worker, &QObject::destroyed, this, [this]() {
@@ -329,6 +330,7 @@ void PFXStoreApi::getInventory() {
329330
}
330331
#endif
331332

333+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXStoreApi::downloadProgress);
332334
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::getInventoryCallback);
333335
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
334336
connect(worker, &QObject::destroyed, this, [this]() {
@@ -427,6 +429,7 @@ void PFXStoreApi::getOrderById(const qint64 &order_id) {
427429
}
428430
#endif
429431

432+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXStoreApi::downloadProgress);
430433
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::getOrderByIdCallback);
431434
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
432435
connect(worker, &QObject::destroyed, this, [this]() {
@@ -507,6 +510,7 @@ void PFXStoreApi::placeOrder(const PFXOrder &pfx_order) {
507510
}
508511
#endif
509512

513+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXStoreApi::downloadProgress);
510514
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::placeOrderCallback);
511515
connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
512516
connect(worker, &QObject::destroyed, this, [this]() {

‎samples/client/petstore/cpp-qt/client/PFXStoreApi.h

+1
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ class PFXStoreApi : public QObject {
141141
void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
142142
void placeOrderSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str);
143143

144+
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
144145
void abortRequestsSignal();
145146
void allPendingRequestsCompleted();
146147

‎samples/client/petstore/cpp-qt/client/PFXUserApi.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ void PFXUserApi::createUser(const PFXUser &pfx_user) {
250250
}
251251
#endif
252252

253+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXUserApi::downloadProgress);
253254
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUserCallback);
254255
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
255256
connect(worker, &QObject::destroyed, this, [this]() {
@@ -328,6 +329,7 @@ void PFXUserApi::createUsersWithArrayInput(const QList<PFXUser> &pfx_user) {
328329
}
329330
#endif
330331

332+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXUserApi::downloadProgress);
331333
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUsersWithArrayInputCallback);
332334
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
333335
connect(worker, &QObject::destroyed, this, [this]() {
@@ -406,6 +408,7 @@ void PFXUserApi::createUsersWithListInput(const QList<PFXUser> &pfx_user) {
406408
}
407409
#endif
408410

411+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXUserApi::downloadProgress);
409412
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUsersWithListInputCallback);
410413
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
411414
connect(worker, &QObject::destroyed, this, [this]() {
@@ -494,6 +497,7 @@ void PFXUserApi::deleteUser(const QString &username) {
494497
}
495498
#endif
496499

500+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXUserApi::downloadProgress);
497501
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::deleteUserCallback);
498502
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
499503
connect(worker, &QObject::destroyed, this, [this]() {
@@ -582,6 +586,7 @@ void PFXUserApi::getUserByName(const QString &username) {
582586
}
583587
#endif
584588

589+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXUserApi::downloadProgress);
585590
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::getUserByNameCallback);
586591
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
587592
connect(worker, &QObject::destroyed, this, [this]() {
@@ -688,6 +693,7 @@ void PFXUserApi::loginUser(const QString &username, const QString &password) {
688693
}
689694
#endif
690695

696+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXUserApi::downloadProgress);
691697
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::loginUserCallback);
692698
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
693699
connect(worker, &QObject::destroyed, this, [this]() {
@@ -764,6 +770,7 @@ void PFXUserApi::logoutUser() {
764770
}
765771
#endif
766772

773+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXUserApi::downloadProgress);
767774
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::logoutUserCallback);
768775
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
769776
connect(worker, &QObject::destroyed, this, [this]() {
@@ -857,6 +864,7 @@ void PFXUserApi::updateUser(const QString &username, const PFXUser &pfx_user) {
857864
}
858865
#endif
859866

867+
connect(worker, &PFXHttpRequestWorker::downloadProgress, this, &PFXUserApi::downloadProgress);
860868
connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::updateUserCallback);
861869
connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
862870
connect(worker, &QObject::destroyed, this, [this]() {

‎samples/client/petstore/cpp-qt/client/PFXUserApi.h

+1
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ class PFXUserApi : public QObject {
198198
void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
199199
void updateUserSignalErrorFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, const QString &error_str);
200200

201+
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
201202
void abortRequestsSignal();
202203
void allPendingRequestsCompleted();
203204

0 commit comments

Comments
 (0)