From 3bdb7d1de5d82b8522c884aa3200fc6cb1a01472 Mon Sep 17 00:00:00 2001 From: Bernhard Beschow Date: Tue, 11 Dec 2018 15:37:59 +0100 Subject: [PATCH] CppProjectUpdater: Remove unread attribute Change-Id: I51123e5b5609de431cfa6d1558aed0b9739ff9c8 Reviewed-by: Orgad Shaneh Reviewed-by: Nikolai Kosjar --- src/plugins/autotoolsprojectmanager/autotoolsproject.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 2 +- .../compilationdatabaseproject.cpp | 2 +- src/plugins/cpptools/cppprojectupdater.cpp | 3 +-- src/plugins/cpptools/cppprojectupdater.h | 5 +---- src/plugins/genericprojectmanager/genericproject.cpp | 2 +- src/plugins/qbsprojectmanager/qbsproject.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 2 +- 8 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp index 4ea59f07a86..ca67aed4e23 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp @@ -70,7 +70,7 @@ using namespace ProjectExplorer; AutotoolsProject::AutotoolsProject(const Utils::FileName &fileName) : Project(Constants::MAKEFILE_MIMETYPE, fileName), m_fileWatcher(new Utils::FileSystemWatcher(this)), - m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this)) + m_cppCodeModelUpdater(new CppTools::CppProjectUpdater) { setId(Constants::AUTOTOOLS_PROJECT_ID); setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID)); diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index cd984ad4abd..85070ac85b0 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -78,7 +78,7 @@ static CMakeBuildConfiguration *activeBc(const CMakeProject *p) \class CMakeProject */ CMakeProject::CMakeProject(const FileName &fileName) : Project(Constants::CMAKEMIMETYPE, fileName), - m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this)) + m_cppCodeModelUpdater(new CppTools::CppProjectUpdater) { setId(CMakeProjectManager::Constants::CMAKEPROJECT_ID); setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID)); diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 4bc065a5647..cc01b1fd476 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -408,7 +408,7 @@ void CompilationDatabaseProject::buildTreeAndProjectParts(const Utils::FileName CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FileName &projectFile) : Project(Constants::COMPILATIONDATABASEMIMETYPE, projectFile) - , m_cppCodeModelUpdater(std::make_unique(this)) + , m_cppCodeModelUpdater(std::make_unique()) { setId(Constants::COMPILATIONDATABASEPROJECT_ID); setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID)); diff --git a/src/plugins/cpptools/cppprojectupdater.cpp b/src/plugins/cpptools/cppprojectupdater.cpp index 0db4480a655..23842f15f36 100644 --- a/src/plugins/cpptools/cppprojectupdater.cpp +++ b/src/plugins/cpptools/cppprojectupdater.cpp @@ -35,8 +35,7 @@ namespace CppTools { -CppProjectUpdater::CppProjectUpdater(ProjectExplorer::Project *project) - : m_project(project) +CppProjectUpdater::CppProjectUpdater() { connect(&m_generateFutureWatcher, &QFutureWatcher::finished, this, &CppProjectUpdater::onProjectInfoGenerated); diff --git a/src/plugins/cpptools/cppprojectupdater.h b/src/plugins/cpptools/cppprojectupdater.h index 94dc068b77b..65eb1522a16 100644 --- a/src/plugins/cpptools/cppprojectupdater.h +++ b/src/plugins/cpptools/cppprojectupdater.h @@ -28,8 +28,6 @@ #include "cpptools_global.h" #include "projectinfo.h" -#include - #include #include @@ -43,7 +41,7 @@ class CPPTOOLS_EXPORT CppProjectUpdater : public QObject Q_OBJECT public: - CppProjectUpdater(ProjectExplorer::Project *project); + CppProjectUpdater(); ~CppProjectUpdater() override; void update(const ProjectUpdateInfo &projectUpdateInfo); @@ -56,7 +54,6 @@ private: void onProjectInfoGenerated(); private: - ProjectExplorer::Project * const m_project; ProjectUpdateInfo m_projectUpdateInfo; QFutureInterface m_futureInterface; diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 6464bd2053f..63473a7f1c8 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -166,7 +166,7 @@ private: GenericProject::GenericProject(const Utils::FileName &fileName) : Project(Constants::GENERICMIMETYPE, fileName, [this]() { refresh(Everything); }), - m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this)), + m_cppCodeModelUpdater(new CppTools::CppProjectUpdater), m_deployFileWatcher(new FileSystemWatcher(this)) { setId(Constants::GENERICPROJECT_ID); diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 4e3fda68b33..7eb54dccd79 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -122,7 +122,7 @@ private: QbsProject::QbsProject(const FileName &fileName) : Project(Constants::MIME_TYPE, fileName, [this] { delayParsing(); }), - m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this)) + m_cppCodeModelUpdater(new CppTools::CppProjectUpdater) { m_parsingDelay.setInterval(1000); // delay parsing by 1s. diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 959cf56dbce..84247c355ea 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -164,7 +164,7 @@ static QList s_projects; QmakeProject::QmakeProject(const FileName &fileName) : Project(QmakeProjectManager::Constants::PROFILE_MIMETYPE, fileName), m_qmakeVfs(new QMakeVfs), - m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this)) + m_cppCodeModelUpdater(new CppTools::CppProjectUpdater) { s_projects.append(this); setId(Constants::QMAKEPROJECT_ID);