diff --git a/src/libs/utils/filestreamer.cpp b/src/libs/utils/filestreamer.cpp index c85fe9e4801..b11bb6d3215 100644 --- a/src/libs/utils/filestreamer.cpp +++ b/src/libs/utils/filestreamer.cpp @@ -266,7 +266,7 @@ private: process.setWriteData(m_writeData); connect(&process, &Process::started, this, [this] { emit started(); }); }; - const auto onDone = [this](const Process &, bool) { + const auto onDone = [this] { delete m_writeBuffer; m_writeBuffer = nullptr; }; @@ -278,7 +278,7 @@ private: async.setConcurrentCallData(localWrite, m_filePath, m_writeData, m_writeBuffer); emit started(); }; - const auto onDone = [this](const Async &, bool) { + const auto onDone = [this] { delete m_writeBuffer; m_writeBuffer = nullptr; }; @@ -327,17 +327,17 @@ static Group interDeviceTransferTask(const FilePath &source, const FilePath &des SingleBarrier writerReadyBarrier; TreeStorage storage; - const auto onReaderSetup = [=](FileStreamReader &reader) { + const auto onReaderSetup = [storage, source](FileStreamReader &reader) { reader.setFilePath(source); QTC_CHECK(storage->writer != nullptr); QObject::connect(&reader, &FileStreamReader::readyRead, storage->writer, &FileStreamWriter::write); }; - const auto onReaderDone = [=](const FileStreamReader &, bool) { + const auto onReaderDone = [storage] { if (storage->writer) // writer may be deleted before the reader on TaskTree::stop(). storage->writer->closeWriteChannel(); }; - const auto onWriterSetup = [=](FileStreamWriter &writer) { + const auto onWriterSetup = [writerReadyBarrier, storage, destination](FileStreamWriter &writer) { writer.setFilePath(destination); QObject::connect(&writer, &FileStreamWriter::started, writerReadyBarrier->barrier(), &Barrier::advance); diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 16ddf2717f4..270a77dba4a 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -410,7 +410,7 @@ void TestRunner::runTestsHelper() qCInfo(runnerLog) << "Working directory:" << process.workingDirectory(); qCDebug(runnerLog) << "Environment:" << process.environment().toStringList(); }; - const auto onProcessDone = [this, config, storage](const Process &process, bool) { + const auto onProcessDone = [this, config, storage](const Process &process) { TestStorage *testStorage = storage.activeStorage(); QTC_ASSERT(testStorage, return); if (process.result() == ProcessResult::StartFailed) { diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index d98d9e3a4a4..3f06d5144bf 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -686,7 +686,7 @@ Group ClangTool::runRecipe(const RunSettings &runSettings, const auto onSetup = [runControl](QPointer &buildRunControl) { buildRunControl = runControl; }; - const auto onError = [this](const QPointer &) { + const auto onError = [this] { const QString message(Tr::tr("Failed to build the project.")); m_infoBarWidget->setError(InfoBarWidget::Error, message, [this] { showOutputPane(); }); m_runControl->postMessage(message, ErrorMessageFormat); @@ -803,7 +803,7 @@ Group ClangTool::runRecipe(const RunSettings &runSettings, return SetupResult::Continue; }; - const auto onTreeDone = [this, target, runSettings](const TaskTree &) { + const auto onTreeDone = [this, target, runSettings] { if (m_filesFailed != 0) { m_runControl->postMessage(Tr::tr("Error: Failed to analyze %n files.", nullptr, m_filesFailed), ErrorMessageFormat); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 03a102a0d9c..6de133a6a36 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -365,7 +365,7 @@ GroupItem CMakeBuildStep::runRecipe() parseTarget = target(); return SetupResult::Continue; }; - const auto onParserError = [this](const QPointer &) { + const auto onParserError = [this] { emit addOutput(Tr::tr("Project did not parse successfully, cannot build."), OutputFormat::ErrorMessage); }; diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp index b8779c7f8f2..924bd6d8495 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp @@ -441,7 +441,7 @@ void LocatorMatcher::start() emit serialOutputDataReady(serialOutputData); }); }; - const auto onCollectorDone = [collectorStorage](const ResultsCollector &, bool) { + const auto onCollectorDone = [collectorStorage] { collectorStorage->m_collector = nullptr; }; diff --git a/src/plugins/coreplugin/plugininstallwizard.cpp b/src/plugins/coreplugin/plugininstallwizard.cpp index 510bf6ca8e7..9dc67ddfb29 100644 --- a/src/plugins/coreplugin/plugininstallwizard.cpp +++ b/src/plugins/coreplugin/plugininstallwizard.cpp @@ -230,7 +230,7 @@ public: m_output->append(output); }); }; - const auto onUnarchiverError = [this](const Unarchiver &) { + const auto onUnarchiverError = [this] { m_label->setType(InfoLabel::Error); m_label->setText(Tr::tr("There was an error while unarchiving.")); }; diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp index 0cb395b68a3..88722a4e259 100644 --- a/src/plugins/debugger/loadcoredialog.cpp +++ b/src/plugins/debugger/loadcoredialog.cpp @@ -250,13 +250,13 @@ void AttachCoreDialog::accepted() const Group root = { parallel, - AsyncTask{[=](auto &task) { - task.setConcurrentCallData(copyFileAsync, this->coreFile()); + AsyncTask{[this, copyFileAsync](auto &task) { + task.setConcurrentCallData(copyFileAsync, coreFile()); }, [=](const auto &task) { d->coreFileResult = task.result(); }, CallDoneIf::Success}, - AsyncTask{[=](auto &task) { - task.setConcurrentCallData(copyFileAsync, this->symbolFile()); + AsyncTask{[this, copyFileAsync](auto &task) { + task.setConcurrentCallData(copyFileAsync, symbolFile()); }, [=](const auto &task) { d->symbolFileResult = task.result(); }, CallDoneIf::Success} diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index b7b1355cf4e..5ac32a4ba6c 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -429,7 +429,7 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError) }; const auto onForEachRefDone = [this, workingDirectory, showError](const Process &process, - bool success) { + bool success) { if (!success) { if (showError == ShowError::No) return; diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index c64044259c8..b18e79502e9 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -164,7 +164,7 @@ GroupItem AbstractProcessStep::defaultProcessTask() const auto onSetup = [this](Process &process) { return setupProcess(process) ? SetupResult::Continue : SetupResult::StopWithError; }; - const auto onDone = [this](const Process &process, bool) { handleProcessDone(process); }; + const auto onDone = [this](const Process &process) { handleProcessDone(process); }; return ProcessTask(onSetup, onDone); } diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 53b7ab9048c..c95416ebd04 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -291,7 +291,7 @@ Tasking::GroupItem QMakeStep::runRecipe() return setupProcess(process) ? SetupResult::Continue : SetupResult::StopWithError; }; - const auto onProcessDone = [this](const Process &process, bool) { handleProcessDone(process); }; + const auto onProcessDone = [this](const Process &process) { handleProcessDone(process); }; const auto onDone = [this] { emit buildConfiguration()->buildDirectoryInitialized(); diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp index 0e23a586f31..9f3de9bc21b 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.cpp +++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp @@ -140,7 +140,7 @@ GroupItem GenericDirectUploadStep::statTask(UploadStorage *storage, process.setCommand({deviceConfiguration()->filePath("stat"), {"-t", Utils::ProcessArgs::quoteArgUnix(file.remoteFilePath())}}); }; - const auto onDone = [this, storage, file, statEndHandler](const Process &process, bool) { + const auto onDone = [this, storage, file, statEndHandler](const Process &process) { Process *proc = const_cast(&process); const QDateTime timestamp = timestampFromStat(file, proc); statEndHandler(storage, file, timestamp); diff --git a/tests/auto/solutions/tasking/tst_tasking.cpp b/tests/auto/solutions/tasking/tst_tasking.cpp index 6908817617e..a6dc8a3a264 100644 --- a/tests/auto/solutions/tasking/tst_tasking.cpp +++ b/tests/auto/solutions/tasking/tst_tasking.cpp @@ -78,8 +78,8 @@ void tst_Tasking::validConstructs() const Group task { parallel, TestTask([](TaskObject &) {}, [](const TaskObject &, bool) {}), - TestTask([](TaskObject &) {}, [](const TaskObject &, bool) {}), - TestTask([](TaskObject &) {}, [](const TaskObject &, bool) {}) + TestTask([](TaskObject &) {}, [](const TaskObject &) {}), + TestTask([](TaskObject &) {}, [] {}) }; const Group group1 { @@ -93,10 +93,10 @@ void tst_Tasking::validConstructs() TestTask([](TaskObject &) {}, [](const TaskObject &, bool) {}), Group { parallel, - TestTask([](TaskObject &) {}, [](const TaskObject &, bool) {}), + TestTask([](TaskObject &) {}, [](const TaskObject &) {}), Group { parallel, - TestTask([](TaskObject &) {}, [](const TaskObject &, bool) {}) + TestTask([](TaskObject &) {}, [] {}) } }, Group {