feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppModelManager: Simplify future template parameter

Browse Source 
Since we don't use the future interface for result
reporting, simplify it to be QFutureInterface<void>.

Change-Id: I4d3a2e7f87721c54996894d744e5c43cc6223d47
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2024-06-24 13:30:11 +02:00
parent 828c50d33d
commit 1e0fc74739
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppmodelmanager.cpp
View File

@@ -553,7 +553,7 @@ using FindUnusedActionsEnabledSwitcherPtr = std::shared_ptr<FindUnusedActionsEna
static void checkNextFunctionForUnused( static void checkNextFunctionForUnused(
const QPointer<SearchResult> &search, const QPointer<SearchResult> &search,
const std::shared_ptr<QFutureInterface<bool>> &findRefsFuture, const std::shared_ptr<QFutureInterface<void>> &findRefsFuture,
const FindUnusedActionsEnabledSwitcherPtr &actionsSwitcher) const FindUnusedActionsEnabledSwitcherPtr &actionsSwitcher)
{ {
if (!search || findRefsFuture->isCanceled()) if (!search || findRefsFuture->isCanceled())
@@ -650,14 +650,14 @@ void CppModelManager::findUnusedFunctions(const FilePath &folder)
Utils::transform<QVariantList>(links, [](const Link &l) { return QVariant::fromValue(l); Utils::transform<QVariantList>(links, [](const Link &l) { return QVariant::fromValue(l);
})); }));
search->setUserData(remainingAndActiveLinks); search->setUserData(remainingAndActiveLinks);
const auto findRefsFuture = std::make_shared<QFutureInterface<bool>>(); const auto findRefsFuture = std::make_shared<QFutureInterface<void>>();
FutureProgress *const progress = ProgressManager::addTask(findRefsFuture->future(), FutureProgress *const progress = ProgressManager::addTask(findRefsFuture->future(),
Tr::tr("Finding Unused Functions"), Tr::tr("Finding Unused Functions"),
"CppEditor.FindUnusedFunctions"); "CppEditor.FindUnusedFunctions");
connect(progress, connect(progress,
&FutureProgress::canceled, &FutureProgress::canceled,
search, search,
[search, future = std::weak_ptr<QFutureInterface<bool>>(findRefsFuture)] { [search, future = std::weak_ptr<QFutureInterface<void>>(findRefsFuture)] {
search->finishSearch(true); search->finishSearch(true);
if (const auto f = future.lock()) { if (const auto f = future.lock()) {
f->cancel(); f->cancel();