forked from qt-creator/qt-creator
CppProjectUpdater: Remove unread attribute
Change-Id: I51123e5b5609de431cfa6d1558aed0b9739ff9c8 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
@@ -70,7 +70,7 @@ using namespace ProjectExplorer;
|
|||||||
AutotoolsProject::AutotoolsProject(const Utils::FileName &fileName) :
|
AutotoolsProject::AutotoolsProject(const Utils::FileName &fileName) :
|
||||||
Project(Constants::MAKEFILE_MIMETYPE, fileName),
|
Project(Constants::MAKEFILE_MIMETYPE, fileName),
|
||||||
m_fileWatcher(new Utils::FileSystemWatcher(this)),
|
m_fileWatcher(new Utils::FileSystemWatcher(this)),
|
||||||
m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this))
|
m_cppCodeModelUpdater(new CppTools::CppProjectUpdater)
|
||||||
{
|
{
|
||||||
setId(Constants::AUTOTOOLS_PROJECT_ID);
|
setId(Constants::AUTOTOOLS_PROJECT_ID);
|
||||||
setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
|
setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
|
||||||
|
@@ -78,7 +78,7 @@ static CMakeBuildConfiguration *activeBc(const CMakeProject *p)
|
|||||||
\class CMakeProject
|
\class CMakeProject
|
||||||
*/
|
*/
|
||||||
CMakeProject::CMakeProject(const FileName &fileName) : Project(Constants::CMAKEMIMETYPE, fileName),
|
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);
|
setId(CMakeProjectManager::Constants::CMAKEPROJECT_ID);
|
||||||
setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
|
setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
|
||||||
|
@@ -408,7 +408,7 @@ void CompilationDatabaseProject::buildTreeAndProjectParts(const Utils::FileName
|
|||||||
|
|
||||||
CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FileName &projectFile)
|
CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FileName &projectFile)
|
||||||
: Project(Constants::COMPILATIONDATABASEMIMETYPE, projectFile)
|
: Project(Constants::COMPILATIONDATABASEMIMETYPE, projectFile)
|
||||||
, m_cppCodeModelUpdater(std::make_unique<CppTools::CppProjectUpdater>(this))
|
, m_cppCodeModelUpdater(std::make_unique<CppTools::CppProjectUpdater>())
|
||||||
{
|
{
|
||||||
setId(Constants::COMPILATIONDATABASEPROJECT_ID);
|
setId(Constants::COMPILATIONDATABASEPROJECT_ID);
|
||||||
setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
|
setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
|
||||||
|
@@ -35,8 +35,7 @@
|
|||||||
|
|
||||||
namespace CppTools {
|
namespace CppTools {
|
||||||
|
|
||||||
CppProjectUpdater::CppProjectUpdater(ProjectExplorer::Project *project)
|
CppProjectUpdater::CppProjectUpdater()
|
||||||
: m_project(project)
|
|
||||||
{
|
{
|
||||||
connect(&m_generateFutureWatcher, &QFutureWatcher<void>::finished,
|
connect(&m_generateFutureWatcher, &QFutureWatcher<void>::finished,
|
||||||
this, &CppProjectUpdater::onProjectInfoGenerated);
|
this, &CppProjectUpdater::onProjectInfoGenerated);
|
||||||
|
@@ -28,8 +28,6 @@
|
|||||||
#include "cpptools_global.h"
|
#include "cpptools_global.h"
|
||||||
#include "projectinfo.h"
|
#include "projectinfo.h"
|
||||||
|
|
||||||
#include <projectexplorer/project.h>
|
|
||||||
|
|
||||||
#include <QFutureInterface>
|
#include <QFutureInterface>
|
||||||
#include <QFutureWatcher>
|
#include <QFutureWatcher>
|
||||||
|
|
||||||
@@ -43,7 +41,7 @@ class CPPTOOLS_EXPORT CppProjectUpdater : public QObject
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CppProjectUpdater(ProjectExplorer::Project *project);
|
CppProjectUpdater();
|
||||||
~CppProjectUpdater() override;
|
~CppProjectUpdater() override;
|
||||||
|
|
||||||
void update(const ProjectUpdateInfo &projectUpdateInfo);
|
void update(const ProjectUpdateInfo &projectUpdateInfo);
|
||||||
@@ -56,7 +54,6 @@ private:
|
|||||||
void onProjectInfoGenerated();
|
void onProjectInfoGenerated();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ProjectExplorer::Project * const m_project;
|
|
||||||
ProjectUpdateInfo m_projectUpdateInfo;
|
ProjectUpdateInfo m_projectUpdateInfo;
|
||||||
|
|
||||||
QFutureInterface<void> m_futureInterface;
|
QFutureInterface<void> m_futureInterface;
|
||||||
|
@@ -166,7 +166,7 @@ private:
|
|||||||
|
|
||||||
GenericProject::GenericProject(const Utils::FileName &fileName) :
|
GenericProject::GenericProject(const Utils::FileName &fileName) :
|
||||||
Project(Constants::GENERICMIMETYPE, fileName, [this]() { refresh(Everything); }),
|
Project(Constants::GENERICMIMETYPE, fileName, [this]() { refresh(Everything); }),
|
||||||
m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this)),
|
m_cppCodeModelUpdater(new CppTools::CppProjectUpdater),
|
||||||
m_deployFileWatcher(new FileSystemWatcher(this))
|
m_deployFileWatcher(new FileSystemWatcher(this))
|
||||||
{
|
{
|
||||||
setId(Constants::GENERICPROJECT_ID);
|
setId(Constants::GENERICPROJECT_ID);
|
||||||
|
@@ -122,7 +122,7 @@ private:
|
|||||||
|
|
||||||
QbsProject::QbsProject(const FileName &fileName) :
|
QbsProject::QbsProject(const FileName &fileName) :
|
||||||
Project(Constants::MIME_TYPE, fileName, [this] { delayParsing(); }),
|
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.
|
m_parsingDelay.setInterval(1000); // delay parsing by 1s.
|
||||||
|
|
||||||
|
@@ -164,7 +164,7 @@ static QList<QmakeProject *> s_projects;
|
|||||||
QmakeProject::QmakeProject(const FileName &fileName) :
|
QmakeProject::QmakeProject(const FileName &fileName) :
|
||||||
Project(QmakeProjectManager::Constants::PROFILE_MIMETYPE, fileName),
|
Project(QmakeProjectManager::Constants::PROFILE_MIMETYPE, fileName),
|
||||||
m_qmakeVfs(new QMakeVfs),
|
m_qmakeVfs(new QMakeVfs),
|
||||||
m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this))
|
m_cppCodeModelUpdater(new CppTools::CppProjectUpdater)
|
||||||
{
|
{
|
||||||
s_projects.append(this);
|
s_projects.append(this);
|
||||||
setId(Constants::QMAKEPROJECT_ID);
|
setId(Constants::QMAKEPROJECT_ID);
|
||||||
|
Reference in New Issue
Block a user