From 1eb2535c625c4f19f243d09636d7f84a08c183a8 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 19 Jun 2024 10:36:29 +0200 Subject: [PATCH] ProjectExplorer: fix warnings of projectnodeshelper.h Change-Id: I79ed8b4ac9fa3e8c25438678011e455bfedbaabc Reviewed-by: Jarek Kobus --- .../projectexplorer/projectnodeshelper.h | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/plugins/projectexplorer/projectnodeshelper.h b/src/plugins/projectexplorer/projectnodeshelper.h index 24edc853165..37b015ec321 100644 --- a/src/plugins/projectexplorer/projectnodeshelper.h +++ b/src/plugins/projectexplorer/projectnodeshelper.h @@ -29,8 +29,8 @@ struct DirectoryScanResult static DirectoryScanResult scanForFiles( const QFuture &future, const Utils::FilePath &directory, - const QDir::Filters &filter, - const std::function factory, + QDir::Filters filter, + const std::function &factory, const QList &versionControls) { DirectoryScanResult result; @@ -57,10 +57,10 @@ static DirectoryScanResult scanForFiles( template QList scanForFilesRecursively( QPromise &promise, - double progressRange, + int progressRange, const Utils::FilePath &directory, - const QDir::Filters &filter, - const std::function factory, + QDir::Filters filter, + const std::function &factory, const QList &versionControls) { const QFuture future(promise.future()); @@ -69,10 +69,9 @@ QList scanForFilesRecursively( const DirectoryScanResult result = scanForFiles(future, directory, filter, factory, versionControls); QList fileNodes = result.nodes; - const double progressIncrement = progressRange - / static_cast( - fileNodes.count() + result.subDirectories.count()); - promise.setProgressValue(fileNodes.count() * progressIncrement); + const int progressIncrement = int( + progressRange / static_cast(fileNodes.count() + result.subDirectories.count())); + promise.setProgressValue(int(fileNodes.count() * progressIncrement)); QList> subDirectories; auto addSubDirectories = [&](const Utils::FilePaths &subdirs, int progressIncrement) { for (const Utils::FilePath &subdir : subdirs) { @@ -98,12 +97,13 @@ QList scanForFilesRecursively( const int progressRange = iterator->second; const DirectoryScanResult result = task.result(); fileNodes.append(result.nodes); - const int subDirCount = result.subDirectories.count(); + const qsizetype subDirCount = result.subDirectories.count(); if (subDirCount == 0) { promise.setProgressValue(promise.future().progressValue() + progressRange); } else { - const int fileCount = result.nodes.count(); - const int increment = progressRange / static_cast(fileCount + subDirCount); + const qsizetype fileCount = result.nodes.count(); + const int increment = int( + progressRange / static_cast(fileCount + subDirCount)); promise.setProgressValue( promise.future().progressValue() + increment * fileCount); addSubDirectories(result.subDirectories, increment); @@ -126,12 +126,12 @@ template QList scanForFiles( QPromise &promise, const Utils::FilePath &directory, - const QDir::Filters &filter, - const std::function factory) + QDir::Filters filter, + const std::function &factory) { promise.setProgressRange(0, 1000000); return Internal::scanForFilesRecursively(promise, - 1000000.0, + 1000000, directory, filter, factory,