From ce80a6dad5ef40449ea2584c2d5a41584095fa36 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Sun, 19 Nov 2023 14:50:55 +0100 Subject: [PATCH] TaskTree: Rename TreeStorage<> -> Storage<> This addresses the 20th point in the master task below. Task-number: QTCREATORBUG-28741 Change-Id: I696beda87430fbe637abba8054012fb77516e220 Reviewed-by: hjk --- src/libs/solutions/tasking/barrier.h | 2 +- src/libs/solutions/tasking/tasktree.h | 10 +++---- src/libs/utils/filestreamer.cpp | 2 +- src/plugins/android/androidsdkdownloader.cpp | 2 +- src/plugins/autotest/testrunner.cpp | 2 +- .../clangcodemodel/clangdlocatorfilters.cpp | 4 +-- src/plugins/clangtools/clangtool.cpp | 2 +- src/plugins/clangtools/clangtoolrunner.cpp | 2 +- .../cmakelocatorfilter.cpp | 2 +- src/plugins/coreplugin/actionsfilter.cpp | 2 +- .../coreplugin/locator/commandlocator.cpp | 2 +- .../coreplugin/locator/executefilter.cpp | 2 +- .../locator/externaltoolsfilter.cpp | 2 +- .../coreplugin/locator/filesystemfilter.cpp | 2 +- .../coreplugin/locator/ilocatorfilter.cpp | 6 ++-- .../coreplugin/locator/ilocatorfilter.h | 2 +- .../coreplugin/locator/javascriptfilter.cpp | 2 +- .../locator/locatorfiltersfilter.cpp | 2 +- .../locator/opendocumentsfilter.cpp | 2 +- .../locator/spotlightlocatorfilter.cpp | 2 +- .../coreplugin/locator/urllocatorfilter.cpp | 2 +- src/plugins/cppeditor/cpplocatorfilter.cpp | 4 +-- src/plugins/cppeditor/cppprojectupdater.cpp | 2 +- src/plugins/diffeditor/diffeditorplugin.cpp | 2 +- src/plugins/git/branchview.cpp | 2 +- src/plugins/git/gitclient.cpp | 10 +++---- src/plugins/help/helpindexfilter.cpp | 2 +- src/plugins/ios/iosdeploystep.cpp | 2 +- src/plugins/languageclient/locatorfilter.cpp | 8 +++--- src/plugins/macros/macrolocatorfilter.cpp | 2 +- src/plugins/mercurial/mercurialclient.cpp | 2 +- .../projectexplorer/projectexplorer.cpp | 2 +- .../qmljstools/qmljsfunctionfilter.cpp | 2 +- src/plugins/remotelinux/genericdeploystep.cpp | 10 +++---- .../remotelinux/genericdirectuploadstep.cpp | 14 +++++----- src/plugins/remotelinux/linuxdevicetester.cpp | 6 ++-- src/plugins/subversion/subversionclient.cpp | 2 +- src/plugins/texteditor/bookmarkfilter.cpp | 2 +- src/plugins/texteditor/linenumberfilter.cpp | 2 +- src/plugins/valgrind/valgrindprocess.cpp | 2 +- .../vcsbase/vcsbasediffeditorcontroller.cpp | 2 +- .../vcsbase/vcsbasediffeditorcontroller.h | 2 +- .../concurrentcall/tst_concurrentcall.cpp | 8 +++--- tests/auto/solutions/tasking/tst_tasking.cpp | 28 +++++++++---------- tests/manual/tasking/dataexchange/recipe.cpp | 4 +-- tests/manual/tasking/dataexchange/recipe.h | 4 +-- tests/manual/tasking/dataexchange/viewer.h | 2 +- .../tasking/imagescaling/imagescaling.cpp | 2 +- 48 files changed, 93 insertions(+), 93 deletions(-) diff --git a/src/libs/solutions/tasking/barrier.h b/src/libs/solutions/tasking/barrier.h index 13b6dfa48fd..a9ed9949f06 100644 --- a/src/libs/solutions/tasking/barrier.h +++ b/src/libs/solutions/tasking/barrier.h @@ -59,7 +59,7 @@ private: }; template -using MultiBarrier = TreeStorage>; +using MultiBarrier = Storage>; // Can't write: "MultiBarrier barrier;". Only "MultiBarrier<> barrier;" would work. // Can't have one alias with default type in C++17, getting the following error: diff --git a/src/libs/solutions/tasking/tasktree.h b/src/libs/solutions/tasking/tasktree.h index 9f3deaefa4e..022a466294f 100644 --- a/src/libs/solutions/tasking/tasktree.h +++ b/src/libs/solutions/tasking/tasktree.h @@ -121,7 +121,7 @@ private: QSharedPointer m_storageData; - template friend class TreeStorage; + template friend class Storage; friend class ExecutionContextActivator; friend class StorageData; friend class TaskRuntimeContainer; @@ -130,10 +130,10 @@ private: }; template -class TreeStorage final : public StorageBase +class Storage final : public StorageBase { public: - TreeStorage() : StorageBase(TreeStorage::ctor(), TreeStorage::dtor()) {} + Storage() : StorageBase(Storage::ctor(), Storage::dtor()) {} StorageStruct &operator*() const noexcept { return *activeStorage(); } StorageStruct *operator->() const noexcept { return activeStorage(); } StorageStruct *activeStorage() const { @@ -491,7 +491,7 @@ public: int progressValue() const; // all finished / skipped / stopped tasks, groups itself excluded template - void onStorageSetup(const TreeStorage &storage, Handler &&handler) { + void onStorageSetup(const Storage &storage, Handler &&handler) { static_assert(std::is_invocable_v, StorageStruct &>, "Storage setup handler needs to take (Storage &) as an argument. " "The passed handler doesn't fulfill this requirement."); @@ -499,7 +499,7 @@ public: wrapHandler(std::forward(handler)), {}); } template - void onStorageDone(const TreeStorage &storage, Handler &&handler) { + void onStorageDone(const Storage &storage, Handler &&handler) { static_assert(std::is_invocable_v, const StorageStruct &>, "Storage done handler needs to take (const Storage &) as an argument. " "The passed handler doesn't fulfill this requirement."); diff --git a/src/libs/utils/filestreamer.cpp b/src/libs/utils/filestreamer.cpp index d062d97757e..e80c8e5bd0c 100644 --- a/src/libs/utils/filestreamer.cpp +++ b/src/libs/utils/filestreamer.cpp @@ -323,7 +323,7 @@ static Group interDeviceTransferTask(const FilePath &source, const FilePath &des { struct TransferStorage { QPointer writer; }; SingleBarrier writerReadyBarrier; - TreeStorage storage; + Storage storage; const auto onReaderSetup = [storage, source](FileStreamReader &reader) { reader.setFilePath(source); diff --git a/src/plugins/android/androidsdkdownloader.cpp b/src/plugins/android/androidsdkdownloader.cpp index a8d6ae0daaf..eb52f78b431 100644 --- a/src/plugins/android/androidsdkdownloader.cpp +++ b/src/plugins/android/androidsdkdownloader.cpp @@ -104,7 +104,7 @@ void AndroidSdkDownloader::downloadAndExtractSdk() using namespace Tasking; - TreeStorage> storage; + Storage> storage; const auto onQuerySetup = [this](NetworkQuery &query) { query.setRequest(QNetworkRequest(m_androidConfig.sdkToolsUrl())); diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 542d860ae7b..2c49614acce 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -351,7 +351,7 @@ void TestRunner::runTestsHelper() for (ITestConfiguration *config : m_selectedTests) { QTC_ASSERT(config, continue); - const TreeStorage storage; + const Storage storage; const auto onSetup = [this, config] { if (!config->project()) diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp index 069a987f6b4..469dfeec95f 100644 --- a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp +++ b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp @@ -175,8 +175,8 @@ static LocatorMatcherTask currentDocumentMatcher() { using namespace Tasking; - TreeStorage storage; - TreeStorage resultStorage; + Storage storage; + Storage resultStorage; const auto onQuerySetup = [=](CurrentDocumentSymbolsRequest &request) { Q_UNUSED(request) diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index 5199d7a0cd6..7d9d13b4c65 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -659,7 +659,7 @@ Group ClangTool::runRecipe(const RunSettings &runSettings, QElapsedTimer m_timer; std::function m_elapsedHandler = {}; }; - const TreeStorage storage; + const Storage storage; std::shared_ptr tempDir(new TemporaryDirectory("clangtools-XXXXXX")); tempDir->setAutoRemove(qtcEnvironmentVariable("QTC_CLANG_DONT_DELETE_OUTPUT_FILES") != "1"); diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp index eb07631f3de..1f1124dd400 100644 --- a/src/plugins/clangtools/clangtoolrunner.cpp +++ b/src/plugins/clangtools/clangtoolrunner.cpp @@ -119,7 +119,7 @@ GroupItem clangToolTask(const AnalyzeInputData &input, FilePath executable; FilePath outputFilePath; }; - const TreeStorage storage; + const Storage storage; const auto mainToolArguments = [=](const ClangToolStorage &data) { QStringList result; diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp index 8d63ee0fa91..8d9e07e5efb 100644 --- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp @@ -27,7 +27,7 @@ static LocatorMatcherTasks cmakeMatchers(const BuildAcceptor &acceptor) { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage, acceptor] { const QString input = storage->input(); diff --git a/src/plugins/coreplugin/actionsfilter.cpp b/src/plugins/coreplugin/actionsfilter.cpp index cc4939830ec..93efa1dd2cc 100644 --- a/src/plugins/coreplugin/actionsfilter.cpp +++ b/src/plugins/coreplugin/actionsfilter.cpp @@ -178,7 +178,7 @@ LocatorMatcherTasks ActionsFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [this, storage](Async &async) { m_entries.clear(); diff --git a/src/plugins/coreplugin/locator/commandlocator.cpp b/src/plugins/coreplugin/locator/commandlocator.cpp index 6fd21a524ba..2d997dd020a 100644 --- a/src/plugins/coreplugin/locator/commandlocator.cpp +++ b/src/plugins/coreplugin/locator/commandlocator.cpp @@ -27,7 +27,7 @@ LocatorMatcherTasks CommandLocator::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage, commands = m_commands] { const QString input = storage->input(); diff --git a/src/plugins/coreplugin/locator/executefilter.cpp b/src/plugins/coreplugin/locator/executefilter.cpp index 2a405c369ea..cd012629a33 100644 --- a/src/plugins/coreplugin/locator/executefilter.cpp +++ b/src/plugins/coreplugin/locator/executefilter.cpp @@ -42,7 +42,7 @@ LocatorMatcherTasks ExecuteFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [=] { const QString input = storage->input(); diff --git a/src/plugins/coreplugin/locator/externaltoolsfilter.cpp b/src/plugins/coreplugin/locator/externaltoolsfilter.cpp index 36fc78cba9b..86811e55b0b 100644 --- a/src/plugins/coreplugin/locator/externaltoolsfilter.cpp +++ b/src/plugins/coreplugin/locator/externaltoolsfilter.cpp @@ -29,7 +29,7 @@ LocatorMatcherTasks ExternalToolsFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage] { const QString input = storage->input(); diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp index 07bb25c1086..00890829b45 100644 --- a/src/plugins/coreplugin/locator/filesystemfilter.cpp +++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp @@ -308,7 +308,7 @@ LocatorMatcherTasks FileSystemFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage, includeHidden = m_includeHidden, shortcut = shortcutString()] (Async &async) { diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp index 764c0774613..307abb94594 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp @@ -429,7 +429,7 @@ void LocatorMatcher::start() { ResultsCollector *m_collector = nullptr; }; - TreeStorage collectorStorage; + Storage collectorStorage; const int filterCount = d->m_tasks.size(); const auto onCollectorSetup = [this, filterCount, collectorStorage](ResultsCollector &collector) { @@ -447,7 +447,7 @@ void LocatorMatcher::start() QList parallelTasks {parallelLimit(d->m_parallelLimit)}; - const auto onSetup = [this, collectorStorage](const TreeStorage &storage, + const auto onSetup = [this, collectorStorage](const Storage &storage, int index) { return [this, collectorStorage, storage, index] { ResultsCollector *collector = collectorStorage->m_collector; @@ -1482,7 +1482,7 @@ static void filter(QPromise &promise, const LocatorStor */ LocatorMatcherTask LocatorFileCache::matcher() const { - TreeStorage storage; + Storage storage; std::weak_ptr weak = d; const auto onSetup = [storage, weak](Async &async) { diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h index 57da6a2d85f..09c2c289100 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.h +++ b/src/plugins/coreplugin/locator/ilocatorfilter.h @@ -142,7 +142,7 @@ public: Tasking::GroupItem task = Tasking::Group{}; // When constructing the task, don't place the storage inside the task above. - Tasking::TreeStorage storage; + Tasking::Storage storage; }; using LocatorMatcherTasks = QList; diff --git a/src/plugins/coreplugin/locator/javascriptfilter.cpp b/src/plugins/coreplugin/locator/javascriptfilter.cpp index f1b8af35b9c..a991e201692 100644 --- a/src/plugins/coreplugin/locator/javascriptfilter.cpp +++ b/src/plugins/coreplugin/locator/javascriptfilter.cpp @@ -365,7 +365,7 @@ JavaScriptFilter::~JavaScriptFilter() = default; LocatorMatcherTasks JavaScriptFilter::matchers() { - TreeStorage storage; + Storage storage; if (!m_javaScriptEngine) m_javaScriptEngine.reset(new JavaScriptEngine); QPointer engine = m_javaScriptEngine.get(); diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp index 782cb3f5576..fa44d967e67 100644 --- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp +++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp @@ -28,7 +28,7 @@ LocatorMatcherTasks LocatorFiltersFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage, icon = m_icon] { if (!storage->input().isEmpty()) diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp index a13f51484bf..719de23098b 100644 --- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp +++ b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp @@ -72,7 +72,7 @@ static void matchEditors(QPromise &promise, const LocatorStorage &storage, LocatorMatcherTasks OpenDocumentsFilter::matchers() { - TreeStorage storage; + Storage storage; const auto onSetup = [storage](Async &async) { const QList editorsData = Utils::transform(DocumentModel::entries(), diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp index c9f7e43d7da..7ecd298a8c9 100644 --- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp @@ -180,7 +180,7 @@ LocatorMatcherTasks SpotlightLocatorFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage, command = m_command, diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.cpp b/src/plugins/coreplugin/locator/urllocatorfilter.cpp index c9025b2237a..1c67d9e0328 100644 --- a/src/plugins/coreplugin/locator/urllocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/urllocatorfilter.cpp @@ -165,7 +165,7 @@ LocatorMatcherTasks UrlLocatorFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage, urls = remoteUrls()] { const QString input = storage->input(); diff --git a/src/plugins/cppeditor/cpplocatorfilter.cpp b/src/plugins/cppeditor/cpplocatorfilter.cpp index 5e429ece522..c6d1be6663c 100644 --- a/src/plugins/cppeditor/cpplocatorfilter.cpp +++ b/src/plugins/cppeditor/cpplocatorfilter.cpp @@ -106,7 +106,7 @@ LocatorMatcherTask locatorMatcher(IndexItem::ItemType type, const EntryFromIndex { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [=](Async &async) { async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer()); @@ -304,7 +304,7 @@ LocatorMatcherTask currentDocumentMatcher() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [=](Async &async) { async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer()); diff --git a/src/plugins/cppeditor/cppprojectupdater.cpp b/src/plugins/cppeditor/cppprojectupdater.cpp index 547dcd50c54..3e208a8bf63 100644 --- a/src/plugins/cppeditor/cppprojectupdater.cpp +++ b/src/plugins/cppeditor/cppprojectupdater.cpp @@ -51,7 +51,7 @@ void CppProjectUpdater::update(const ProjectUpdateInfo &projectUpdateInfo, struct UpdateStorage { ProjectInfo::ConstPtr projectInfo = nullptr; }; - const TreeStorage storage; + const Storage storage; const auto onInfoGeneratorSetup = [=](Async &async) { async.setConcurrentCallData(infoGenerator); async.setFutureSynchronizer(&m_futureSynchronizer); diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 04ab3c7d87e..da2e4daaf21 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -108,7 +108,7 @@ DiffFilesController::DiffFilesController(IDocument *document) setDisplayName(Tr::tr("Diff")); using namespace Tasking; - const TreeStorage>> storage; + const Storage>> storage; const auto onTreeSetup = [this, storage](TaskTree &taskTree) { QList> *outputList = storage.activeStorage(); diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp index edb055a1fa1..4b846d38e54 100644 --- a/src/plugins/git/branchview.cpp +++ b/src/plugins/git/branchview.cpp @@ -545,7 +545,7 @@ TaskTree *BranchView::onFastForwardMerge(const std::function &callback) QString topRevision; }; - const TreeStorage storage; + const Storage storage; const auto onMergeBaseSetup = [repository = m_repository, branch](Process &process) { gitClient().setupCommand(process, repository, {"merge-base", "HEAD", branch}); diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 0b490d74eb1..508b1d4b81f 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -236,7 +236,7 @@ GitDiffEditorController::GitDiffEditorController(IDocument *document, const QStringList &extraArgs) : GitBaseDiffEditorController(document) { - const TreeStorage diffInputStorage; + const Storage diffInputStorage; const auto onDiffSetup = [=](Process &process) { process.setCodec(VcsBaseEditor::getCodec(workingDirectory(), {})); @@ -299,8 +299,8 @@ FileListDiffController::FileListDiffController(IDocument *document, const QStrin QString m_unstagedOutput; }; - const TreeStorage storage; - const TreeStorage diffInputStorage; + const Storage storage; + const Storage diffInputStorage; const auto onStagedSetup = [this, stagedFiles](Process &process) { if (stagedFiles.isEmpty()) @@ -371,8 +371,8 @@ ShowController::ShowController(IDocument *document, const QString &id) QStringList m_follows; }; - const TreeStorage storage; - const TreeStorage diffInputStorage; + const Storage storage; + const Storage diffInputStorage; const auto updateDescription = [this](const ReloadStorage &storage) { QString desc = storage.m_header; diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index 4c8910b1d86..60fc93b7652 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -83,7 +83,7 @@ static void matches(QPromise &promise, const LocatorStorage &storag LocatorMatcherTasks HelpIndexFilter::matchers() { - TreeStorage storage; + Storage storage; const auto onSetup = [this, storage](Async &async) { if (m_needsUpdate) { diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 02f75d27671..86493b7e975 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -107,7 +107,7 @@ public: private: void cleanup(); - Tasking::GroupItem runRecipe() final; + GroupItem runRecipe() final; void updateDisplayNames(); diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp index bd4b3907506..ccebcd76799 100644 --- a/src/plugins/languageclient/locatorfilter.cpp +++ b/src/plugins/languageclient/locatorfilter.cpp @@ -48,8 +48,8 @@ LocatorMatcherTask locatorMatcher(Client *client, int maxResultCount, { using namespace Tasking; - TreeStorage storage; - TreeStorage> resultStorage; + Storage storage; + Storage> resultStorage; const auto onQuerySetup = [storage, client, maxResultCount](ClientWorkspaceSymbolRequest &request) { request.setClient(client); @@ -119,8 +119,8 @@ LocatorMatcherTask currentDocumentMatcher() { using namespace Tasking; - TreeStorage storage; - TreeStorage resultStorage; + Storage storage; + Storage resultStorage; const auto onQuerySetup = [](CurrentDocumentSymbolsRequest &request) { Q_UNUSED(request) diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp index f43758bd034..4cc819d8b73 100644 --- a/src/plugins/macros/macrolocatorfilter.cpp +++ b/src/plugins/macros/macrolocatorfilter.cpp @@ -30,7 +30,7 @@ LocatorMatcherTasks MacroLocatorFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage, icon = m_icon] { const QString input = storage->input(); diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 00eb11ca201..e80ab8eabc6 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -53,7 +53,7 @@ MercurialDiffEditorController::MercurialDiffEditorController(IDocument *document using namespace Tasking; - const TreeStorage diffInputStorage; + const Storage diffInputStorage; const auto onDiffSetup = [=](Process &process) { setupCommand(process, {addConfigurationArguments(args)}); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index e88d4225414..b34d20ea367 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -4179,7 +4179,7 @@ static LocatorMatcherTasks runConfigurationMatchers(const RunAcceptor &acceptor) { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage, acceptor] { const QString input = storage->input(); diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp index 34a60040f3c..0453d11b9c1 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp +++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp @@ -78,7 +78,7 @@ LocatorMatcherTasks QmlJSFunctionsFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage, entries = m_data->entries()](Async &async) { async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer()); diff --git a/src/plugins/remotelinux/genericdeploystep.cpp b/src/plugins/remotelinux/genericdeploystep.cpp index 5c81bdfd249..77aef3d522c 100644 --- a/src/plugins/remotelinux/genericdeploystep.cpp +++ b/src/plugins/remotelinux/genericdeploystep.cpp @@ -64,15 +64,15 @@ public: private: GroupItem deployRecipe() final; - GroupItem mkdirTask(const TreeStorage &storage); - GroupItem transferTask(const TreeStorage &storage); + GroupItem mkdirTask(const Storage &storage); + GroupItem transferTask(const Storage &storage); StringAspect flags{this}; BoolAspect ignoreMissingFiles{this}; SelectionAspect method{this}; }; -GroupItem GenericDeployStep::mkdirTask(const TreeStorage &storage) +GroupItem GenericDeployStep::mkdirTask(const Storage &storage) { using ResultType = expected_str; @@ -133,7 +133,7 @@ static FileTransferMethod supportedTransferMethodFor(const FileToTransfer &fileT return FileTransferMethod::GenericCopy; } -GroupItem GenericDeployStep::transferTask(const TreeStorage &storage) +GroupItem GenericDeployStep::transferTask(const Storage &storage) { const auto onSetup = [this, storage](FileTransfer &transfer) { FileTransferMethod preferredTransferMethod = FileTransferMethod::Rsync; @@ -180,7 +180,7 @@ GroupItem GenericDeployStep::transferTask(const TreeStorage &st GroupItem GenericDeployStep::deployRecipe() { - const TreeStorage storage; + const Storage storage; const auto onSetup = [this, storage] { const QList deployableFiles = target()->deploymentData().allFiles(); diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp index 4e751a1aea3..97a8dcd1bb7 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.cpp +++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp @@ -64,11 +64,11 @@ public: = std::function; GroupItem statTask(UploadStorage *storage, const DeployableFile &file, StatEndHandler statEndHandler); - GroupItem statTree(const TreeStorage &storage, FilesToStat filesToStat, + GroupItem statTree(const Storage &storage, FilesToStat filesToStat, StatEndHandler statEndHandler); - GroupItem uploadTask(const TreeStorage &storage); + GroupItem uploadTask(const Storage &storage); GroupItem chmodTask(const DeployableFile &file); - GroupItem chmodTree(const TreeStorage &storage); + GroupItem chmodTree(const Storage &storage); BoolAspect incremental{this}; BoolAspect ignoreMissingFiles{this}; @@ -148,7 +148,7 @@ GroupItem GenericDirectUploadStep::statTask(UploadStorage *storage, return ProcessTask(onSetup, onDone); } -GroupItem GenericDirectUploadStep::statTree(const TreeStorage &storage, +GroupItem GenericDirectUploadStep::statTree(const Storage &storage, FilesToStat filesToStat, StatEndHandler statEndHandler) { const auto onSetup = [this, storage, filesToStat, statEndHandler](TaskTree &tree) { @@ -164,7 +164,7 @@ GroupItem GenericDirectUploadStep::statTree(const TreeStorage &st return TaskTreeTask(onSetup); } -GroupItem GenericDirectUploadStep::uploadTask(const TreeStorage &storage) +GroupItem GenericDirectUploadStep::uploadTask(const Storage &storage) { const auto onSetup = [this, storage](FileTransfer &transfer) { if (storage->filesToUpload.isEmpty()) { @@ -223,7 +223,7 @@ GroupItem GenericDirectUploadStep::chmodTask(const DeployableFile &file) return ProcessTask(onSetup, onError, CallDoneIf::Error); } -GroupItem GenericDirectUploadStep::chmodTree(const TreeStorage &storage) +GroupItem GenericDirectUploadStep::chmodTree(const Storage &storage) { const auto onSetup = [this, storage](TaskTree &tree) { QList filesToChmod; @@ -243,7 +243,7 @@ GroupItem GenericDirectUploadStep::chmodTree(const TreeStorage &s GroupItem GenericDirectUploadStep::deployRecipe() { - const TreeStorage storage; + const Storage storage; const auto setupHandler = [this, storage] { const QList deployableFiles = target()->deploymentData().allFiles(); diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp index 2e4598d9de8..11d9e7a3f5c 100644 --- a/src/plugins/remotelinux/linuxdevicetester.cpp +++ b/src/plugins/remotelinux/linuxdevicetester.cpp @@ -38,7 +38,7 @@ public: GroupItem unameTask() const; GroupItem gathererTask() const; GroupItem transferTask(FileTransferMethod method, - const TreeStorage &storage) const; + const Storage &storage) const; GroupItem transferTasks() const; GroupItem commandTask(const QString &commandName) const; GroupItem commandTasks() const; @@ -168,7 +168,7 @@ GroupItem GenericLinuxDeviceTesterPrivate::gathererTask() const } GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod method, - const TreeStorage &storage) const + const Storage &storage) const { const auto onSetup = [this, method](FileTransfer &transfer) { emit q->progressMessage(Tr::tr("Checking whether \"%1\" works...") @@ -226,7 +226,7 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTask(FileTransferMethod metho GroupItem GenericLinuxDeviceTesterPrivate::transferTasks() const { - TreeStorage storage; + Storage storage; return Group { continueOnSuccess, storage, diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp index c9d5df2d94a..beca47372de 100644 --- a/src/plugins/subversion/subversionclient.cpp +++ b/src/plugins/subversion/subversionclient.cpp @@ -163,7 +163,7 @@ SubversionDiffEditorController::SubversionDiffEditorController(IDocument *docume using namespace Tasking; - const TreeStorage diffInputStorage; + const Storage diffInputStorage; const auto onDescriptionSetup = [this](Process &process) { if (m_changeNumber == 0) diff --git a/src/plugins/texteditor/bookmarkfilter.cpp b/src/plugins/texteditor/bookmarkfilter.cpp index 2756521cd89..c56ddff617d 100644 --- a/src/plugins/texteditor/bookmarkfilter.cpp +++ b/src/plugins/texteditor/bookmarkfilter.cpp @@ -29,7 +29,7 @@ LocatorMatcherTasks BookmarkFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [=] { storage->reportOutput(match(storage->input())); }; return {{Sync(onSetup), storage}}; diff --git a/src/plugins/texteditor/linenumberfilter.cpp b/src/plugins/texteditor/linenumberfilter.cpp index b718e5b4331..0ac0a83ee68 100644 --- a/src/plugins/texteditor/linenumberfilter.cpp +++ b/src/plugins/texteditor/linenumberfilter.cpp @@ -27,7 +27,7 @@ LocatorMatcherTasks LineNumberFilter::matchers() { using namespace Tasking; - TreeStorage storage; + Storage storage; const auto onSetup = [storage] { const QStringList lineAndColumn = storage->input().split(':'); diff --git a/src/plugins/valgrind/valgrindprocess.cpp b/src/plugins/valgrind/valgrindprocess.cpp index aee18e170f9..c750e2963f2 100644 --- a/src/plugins/valgrind/valgrindprocess.cpp +++ b/src/plugins/valgrind/valgrindprocess.cpp @@ -127,7 +127,7 @@ Group ValgrindProcessPrivate::runRecipe() const std::unique_ptr m_xmlSocket; }; - TreeStorage storage; + Storage storage; SingleBarrier xmlBarrier; const auto onSetup = [this, storage, xmlBarrier] { diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp index 62f2a001d1d..cbd33f48fcf 100644 --- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp +++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp @@ -38,7 +38,7 @@ VcsBaseDiffEditorController::~VcsBaseDiffEditorController() delete d; } -GroupItem VcsBaseDiffEditorController::postProcessTask(const TreeStorage &inputStorage) +GroupItem VcsBaseDiffEditorController::postProcessTask(const Storage &inputStorage) { const auto onSetup = [inputStorage](Async> &async) { async.setFutureSynchronizer(ExtensionSystem::PluginManager::futureSynchronizer()); diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h index 2cd2ece26c8..f5a648d5b17 100644 --- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h +++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h @@ -26,7 +26,7 @@ public: void setVcsBinary(const Utils::FilePath &path); protected: - Tasking::GroupItem postProcessTask(const Tasking::TreeStorage &inputStorage); + Tasking::GroupItem postProcessTask(const Tasking::Storage &inputStorage); void setupCommand(Utils::Process &process, const QStringList &args) const; diff --git a/tests/auto/solutions/concurrentcall/tst_concurrentcall.cpp b/tests/auto/solutions/concurrentcall/tst_concurrentcall.cpp index 6f98ab4a073..69d7f83c16c 100644 --- a/tests/auto/solutions/concurrentcall/tst_concurrentcall.cpp +++ b/tests/auto/solutions/concurrentcall/tst_concurrentcall.cpp @@ -42,7 +42,7 @@ private: struct TestData { - TreeStorage storage; + Storage storage; Group root; }; @@ -136,7 +136,7 @@ template ::Type> TestData createTestData(const QList &expectedResults, Function &&function, Args &&...args) { - TreeStorage storage; + Storage storage; const auto onSetup = [=](ConcurrentCall &task) { task.setConcurrentCallData(function, args...); @@ -197,8 +197,8 @@ void tst_ConcurrentCall::taskTree_data() << createTestData(reportNResult, &MyObject::member, &m_myObject, 2); { - TreeStorage storage; - TreeStorage internalStorage; + Storage storage; + Storage internalStorage; const auto onSetup = [internalStorage](ConcurrentCall &task) { task.setConcurrentCallData(multiplyBy2, *internalStorage); diff --git a/tests/auto/solutions/tasking/tst_tasking.cpp b/tests/auto/solutions/tasking/tst_tasking.cpp index fc4e0d26a3a..0d7f8bac3a2 100644 --- a/tests/auto/solutions/tasking/tst_tasking.cpp +++ b/tests/auto/solutions/tasking/tst_tasking.cpp @@ -78,7 +78,7 @@ std::atomic_int CustomStorage::s_count = 0; struct TestData { - TreeStorage storage; + Storage storage; Group root; Log expectedLog; int taskCount = 0; @@ -258,7 +258,7 @@ void tst_Tasking::runtimeCheck() QTest::ignoreMessage(QtDebugMsg, QRegularExpression("^SOFT ASSERT: ")); QTest::ignoreMessage(QtWarningMsg, "Can't add the same storage into one Group twice, skipping..."); - const TreeStorage storage; + const Storage storage; Group { storage, @@ -270,7 +270,7 @@ void tst_Tasking::runtimeCheck() QTest::ignoreMessage(QtDebugMsg, QRegularExpression("^SOFT ASSERT: ")); QTest::ignoreMessage(QtWarningMsg, "Can't add the same storage into one Group twice, skipping..."); - const TreeStorage storage1; + const Storage storage1; const auto storage2 = storage1; Group { @@ -352,7 +352,7 @@ public: using TickAndDoneTask = CustomTask; template -GroupItem createBarrierAdvance(const TreeStorage &storage, +GroupItem createBarrierAdvance(const Storage &storage, const SharedBarrierType &barrier, int taskId) { return TickAndDoneTask([storage, barrier, taskId](TickAndDone &tickAndDone) { @@ -398,11 +398,11 @@ static TestData storageShadowingData() { // This test check if storage shadowing works OK. - const TreeStorage storage; + const Storage storage; // This helper storage collect the pointers to storages created by shadowedStorage. - const TreeStorage> helperStorage; // One instance in this test. + const Storage> helperStorage; // One instance in this test. // This storage is repeated in nested groups, the innermost storage will shadow outer ones. - const TreeStorage shadowedStorage; // Three instances in this test. + const Storage shadowedStorage; // Three instances in this test. const auto groupSetupWithStorage = [storage, helperStorage, shadowedStorage](int taskId) { return onGroupSetup([storage, helperStorage, shadowedStorage, taskId] { @@ -473,7 +473,7 @@ static TestData storageShadowingData() static TestData parallelData() { - TreeStorage storage; + Storage storage; const auto setupTask = [storage](int taskId, milliseconds timeout) { return [storage, taskId, timeout](TaskObject &taskObject) { @@ -539,7 +539,7 @@ void tst_Tasking::testTree_data() { QTest::addColumn("testData"); - TreeStorage storage; + Storage storage; const auto setupTask = [storage](int taskId, milliseconds timeout) { return [storage, taskId, timeout](TaskObject &taskObject) { @@ -2746,7 +2746,7 @@ struct StorageIO int value = 0; }; -static Group inputOutputRecipe(const TreeStorage &storage) +static Group inputOutputRecipe(const Storage &storage) { return Group { storage, @@ -2773,7 +2773,7 @@ void tst_Tasking::storageIO() int actualOutput = 0; - const TreeStorage storage; + const Storage storage; TaskTree taskTree(inputOutputRecipe(storage)); const auto setInput = [input](StorageIO &storage) { storage.value = input; }; @@ -2789,8 +2789,8 @@ void tst_Tasking::storageIO() void tst_Tasking::storageOperators() { - StorageBase storage1 = TreeStorage(); - StorageBase storage2 = TreeStorage(); + StorageBase storage1 = Storage(); + StorageBase storage2 = Storage(); StorageBase storage3 = storage1; QVERIFY(storage1 == storage3); @@ -2814,7 +2814,7 @@ void tst_Tasking::storageDestructor() }; QCOMPARE(CustomStorage::instanceCount(), 0); { - TreeStorage storage; + Storage storage; const auto setupSleepingTask = [](TaskObject &taskObject) { taskObject = 1000ms; }; diff --git a/tests/manual/tasking/dataexchange/recipe.cpp b/tests/manual/tasking/dataexchange/recipe.cpp index 389377c388d..f89b31e27cc 100644 --- a/tests/manual/tasking/dataexchange/recipe.cpp +++ b/tests/manual/tasking/dataexchange/recipe.cpp @@ -31,9 +31,9 @@ public: static int sizeForIndex(int index) { return (index + 1) * s_sizeInterval; } -Group recipe(const Tasking::TreeStorage &externalStorage) +Group recipe(const Storage &externalStorage) { - TreeStorage internalStorage; + Storage internalStorage; const auto onDownloadSetup = [externalStorage](NetworkQuery &query) { query.setNetworkAccessManager(externalStorage->inputNam); diff --git a/tests/manual/tasking/dataexchange/recipe.h b/tests/manual/tasking/dataexchange/recipe.h index 7b17e1349a3..327a7e88166 100644 --- a/tests/manual/tasking/dataexchange/recipe.h +++ b/tests/manual/tasking/dataexchange/recipe.h @@ -13,7 +13,7 @@ namespace Tasking { class Group; template -class TreeStorage; +class Storage; } static const int s_sizeInterval = 10; @@ -31,6 +31,6 @@ public: std::optional outputError; }; -Tasking::Group recipe(const Tasking::TreeStorage &externalStorage); +Tasking::Group recipe(const Tasking::Storage &externalStorage); #endif // RECIPE_H diff --git a/tests/manual/tasking/dataexchange/viewer.h b/tests/manual/tasking/dataexchange/viewer.h index 81575596f5f..46fe6943ffd 100644 --- a/tests/manual/tasking/dataexchange/viewer.h +++ b/tests/manual/tasking/dataexchange/viewer.h @@ -25,7 +25,7 @@ private: QStatusBar *m_statusBar = nullptr; QNetworkAccessManager m_nam; - const Tasking::TreeStorage m_storage; + const Tasking::Storage m_storage; const Tasking::Group m_recipe; std::unique_ptr m_taskTree; }; diff --git a/tests/manual/tasking/imagescaling/imagescaling.cpp b/tests/manual/tasking/imagescaling/imagescaling.cpp index 36b6a71ad83..0da91089862 100644 --- a/tests/manual/tasking/imagescaling/imagescaling.cpp +++ b/tests/manual/tasking/imagescaling/imagescaling.cpp @@ -73,7 +73,7 @@ void Images::process() int i = 0; for (const QUrl &url : urls) { - TreeStorage storage; + Storage storage; const auto onDownloadSetup = [this, url](NetworkQuery &query) { query.setNetworkAccessManager(&qnam);