diff --git a/app/test/testmerginapi.cpp b/app/test/testmerginapi.cpp index bc32dc807..bf8a3966a 100644 --- a/app/test/testmerginapi.cpp +++ b/app/test/testmerginapi.cpp @@ -2982,7 +2982,7 @@ void TestMerginApi::testDownloadWithNetworkError() QVERIFY( retrySpy.count() > 0 ); QCOMPARE( finishSpy.count(), 1 ); - // Verify that 5 (MAX_RETRY_COUNT) retry attempts were made + // Verify that transaction.MAX_RETRY_COUNT retry attempts were made int maxRetries = TransactionStatus::MAX_RETRY_COUNT; QCOMPARE( retrySpy.count(), maxRetries ); diff --git a/core/merginapi.cpp b/core/merginapi.cpp index 398407d6f..7eaa4bb24 100644 --- a/core/merginapi.cpp +++ b/core/merginapi.cpp @@ -427,7 +427,8 @@ void MerginApi::downloadItemReplyFinished( DownloadQueueItem item ) transaction.retryCount++; transaction.downloadQueue.append( item ); - CoreUtils::log( "pull " + projectFullName, QStringLiteral( "Retrying download (attempt %1 of 5)" ).arg( transaction.retryCount ) ); + CoreUtils::log( "pull " + projectFullName, QStringLiteral( "Retrying download (attempt %1 of %2)" ).arg( transaction.retryCount ) + .arg( transaction.MAX_RETRY_COUNT ) ); downloadNextItem( projectFullName ); @@ -3228,8 +3229,8 @@ ProjectDiff MerginApi::compareProjectFiles( /* for ( MerginFile file : oldServerFilesMap ) { - // R-D/L-D - // TODO: need to do anything? + // R-D/L-D + // TODO: need to do anything? } */ diff --git a/core/merginapi.h b/core/merginapi.h index 6089a7fd3..17cbac183 100644 --- a/core/merginapi.h +++ b/core/merginapi.h @@ -584,7 +584,6 @@ class MerginApi: public QObject /** * Sets the network manager to be used for Mergin API requests - * \param QNetworkAccessManager */ void setNetworkManager( QNetworkAccessManager *manager );