From fb2a1fcb503e0a56ee3a87143107d6abfbf43a62 Mon Sep 17 00:00:00 2001 From: Tobias Hunger <tobias.hunger@theqtcompany.com> Date: Thu, 29 Oct 2015 17:12:36 +0100 Subject: [PATCH] Python: Simplify project node Change-Id: I21bf32612d10efce2ad8727637104f51013ae370 Reviewed-by: hjk <hjk@theqtcompany.com> --- .../pythoneditor/pythoneditorplugin.cpp | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index b14f6e2643a..fcdc44cb0dc 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -331,10 +331,7 @@ private: class PythonProjectNode : public ProjectNode { public: - PythonProjectNode(PythonProject *project, Core::IDocument *projectFile); - - Core::IDocument *projectFile() const; - QString projectFilePath() const; + PythonProjectNode(PythonProject *project); bool showInSimpleTree() const override; @@ -351,7 +348,6 @@ private: private: PythonProject *m_project; - Core::IDocument *m_projectFile; }; class PythonRunConfigurationWidget : public QWidget @@ -637,7 +633,7 @@ PythonProject::PythonProject(PythonProjectManager *manager, const QString &fileN DocumentManager::addDocument(m_document); - m_rootNode = new PythonProjectNode(this, m_document); + m_rootNode = new PythonProjectNode(this); m_manager->registerProject(this); } @@ -893,22 +889,11 @@ Project::RestoreResult PythonProject::fromMap(const QVariantMap &map, QString *e return res; } -PythonProjectNode::PythonProjectNode(PythonProject *project, Core::IDocument *projectFile) - : ProjectNode(projectFile->filePath()) +PythonProjectNode::PythonProjectNode(PythonProject *project) + : ProjectNode(project->projectFilePath()) , m_project(project) - , m_projectFile(projectFile) -{ - setDisplayName(projectFile->filePath().toFileInfo().completeBaseName()); -} - -Core::IDocument *PythonProjectNode::projectFile() const -{ - return m_projectFile; -} - -QString PythonProjectNode::projectFilePath() const { - return m_projectFile->filePath().toString(); + setDisplayName(project->projectFilePath().toFileInfo().completeBaseName()); } QHash<QString, QStringList> sortFilesIntoPaths(const QString &base, const QSet<QString> &files) -- GitLab