From d144ea58e02468c40afd1316a08baf5b04b799a2 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 8 Jan 2016 12:49:00 +0100 Subject: Project: Add setRootProjectNode method Add setRootProjectNode method and a default implementation of rootProjectNode to Project. Use that in all derived classes. Change-Id: Id28cde04457a20a8963d43020785ef9d77fea57c Reviewed-by: Niels Weber Reviewed-by: Tobias Hunger --- src/plugins/pythoneditor/pythoneditorplugin.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/plugins/pythoneditor/pythoneditorplugin.cpp') diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index 226d7e558b..ec6854bb6d 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -251,7 +251,6 @@ public: QString displayName() const override { return m_projectName; } PythonProjectManager *projectManager() const override; - ProjectNode *rootProjectNode() const override; QStringList files(FilesMode) const override { return m_files; } QStringList files() const { return m_files; } @@ -274,8 +273,6 @@ private: QStringList m_rawFileList; QStringList m_files; QHash m_rawListEntries; - - ProjectNode *m_rootNode; }; class PythonProjectFile : public Core::IDocument @@ -620,6 +617,7 @@ PythonProject::PythonProject(PythonProjectManager *manager, const QString &fileN setProjectManager(manager); setDocument(new PythonProjectFile(this, fileName)); DocumentManager::addDocument(document()); + setRootProjectNode(new PythonProjectNode(this)); setProjectContext(Context(PythonProjectContext)); setProjectLanguages(Context(ProjectExplorer::Constants::LANG_CXX)); @@ -627,7 +625,6 @@ PythonProject::PythonProject(PythonProjectManager *manager, const QString &fileN QFileInfo fileInfo = projectFilePath().toFileInfo(); m_projectName = fileInfo.completeBaseName(); - m_rootNode = new PythonProjectNode(this); projectManager()->registerProject(this); } @@ -635,8 +632,6 @@ PythonProject::PythonProject(PythonProjectManager *manager, const QString &fileN PythonProject::~PythonProject() { projectManager()->unregisterProject(this); - - delete m_rootNode; } PythonProjectManager *PythonProject::projectManager() const @@ -775,7 +770,7 @@ private: void PythonProject::refresh() { - m_rootNode->removeFileNodes(m_rootNode->fileNodes()); + rootProjectNode()->removeFileNodes(rootProjectNode()->fileNodes()); parseProject(); QDir baseDir(projectDirectory().toString()); @@ -786,7 +781,7 @@ void PythonProject::refresh() fileNodes.append(new PythonFileNode(FileName::fromString(file), displayName)); } - m_rootNode->addFileNodes(fileNodes); + rootProjectNode()->addFileNodes(fileNodes); } /** @@ -844,11 +839,6 @@ QStringList PythonProject::processEntries(const QStringList &paths, return absolutePaths; } -ProjectNode *PythonProject::rootProjectNode() const -{ - return m_rootNode; -} - Project::RestoreResult PythonProject::fromMap(const QVariantMap &map, QString *errorMessage) { Project::RestoreResult res = Project::fromMap(map, errorMessage); -- cgit v1.2.1