From 5916be8756e03fbd1c7d1553500028a100bcf572 Mon Sep 17 00:00:00 2001 From: Bernhard Beschow Date: Tue, 11 Dec 2018 15:07:51 +0100 Subject: [PATCH] Remove unneeded invocations of CppProjectUpdater::cancel() The cancel methods were called just before setting up the parameters for the CppProjectUpdater::update() call, which calls cancel() as its very first action. Change-Id: I748cb4daa86bc8245cd906b2dff3c7b2d50795b2 Reviewed-by: Nikolai Kosjar --- src/plugins/autotoolsprojectmanager/autotoolsproject.cpp | 2 -- src/plugins/genericprojectmanager/genericproject.cpp | 2 -- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp index ca67aed4e23..952fdcf238d 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp @@ -268,8 +268,6 @@ void AutotoolsProject::updateCppCodeModel() ToolChain *cxxToolChain = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); - m_cppCodeModelUpdater->cancel(); - CppTools::RawProjectPart rpp; rpp.setDisplayName(displayName()); rpp.setProjectFileLocation(projectFilePath().toString()); diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 63473a7f1c8..341745a8f81 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -438,8 +438,6 @@ void GenericProject::refreshCppCodeModel() ToolChain *cxxToolChain = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); - m_cppCodeModelUpdater->cancel(); - CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt; if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(activeTarget()->kit())) { diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 84247c355ea..451d952fe84 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -272,8 +272,6 @@ void QmakeProject::updateCppCodeModel() ToolChain *cxxToolChain = ToolChainKitInformation::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); - m_cppCodeModelUpdater->cancel(); - QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k); ProjectPart::QtVersion qtVersionForPart = ProjectPart::NoQt; if (qtVersion) {