feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProject: Simplify project node

Browse Source 
Change-Id: I370fdb2e6bda67fb4ee5c77d736971460a28a68c
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-10-29 17:18:23 +01:00
parent b4e6591188
commit 661f436e71
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -72,7 +72,7 @@ QmlProject::QmlProject(Internal::Manager *manager, const Utils::FileName &fileNa
m_projectName = fileInfo.completeBaseName(); m_projectName = fileInfo.completeBaseName();
m_file = new Internal::QmlProjectFile(this, fileName); m_file = new Internal::QmlProjectFile(this, fileName);
m_rootNode = new Internal::QmlProjectNode(this, m_file); m_rootNode = new Internal::QmlProjectNode(this);
DocumentManager::addDocument(m_file, true); DocumentManager::addDocument(m_file, true);

15
src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
View File

@@ -41,12 +41,11 @@
namespace QmlProjectManager { namespace QmlProjectManager {
namespace Internal { namespace Internal {
QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IDocument *projectFile) QmlProjectNode::QmlProjectNode(QmlProject *project)
: ProjectExplorer::ProjectNode(projectFile->filePath()), : ProjectExplorer::ProjectNode(project->projectFilePath()),
m_project(project), m_project(project)
m_projectFile(projectFile)
{ {
setDisplayName(projectFile->filePath().toFileInfo().completeBaseName()); setDisplayName(project->projectFilePath().toFileInfo().completeBaseName());
// make overlay // make overlay
const QSize desiredSize = QSize(16, 16); const QSize desiredSize = QSize(16, 16);
const QIcon projectBaseIcon(QLatin1String(":/qmlproject/images/qmlfolder.png")); const QIcon projectBaseIcon(QLatin1String(":/qmlproject/images/qmlfolder.png"));
@@ -59,12 +58,6 @@ QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IDocument *projectFile
QmlProjectNode::~QmlProjectNode() QmlProjectNode::~QmlProjectNode()
{ } { }
Core::IDocument *QmlProjectNode::projectFile() const
{ return m_projectFile; }
QString QmlProjectNode::projectFilePath() const
{ return m_projectFile->filePath().toString(); }
void QmlProjectNode::refresh() void QmlProjectNode::refresh()
{ {
using namespace ProjectExplorer; using namespace ProjectExplorer;

6
src/plugins/qmlprojectmanager/qmlprojectnodes.h
View File

@@ -47,12 +47,9 @@ namespace Internal {
class QmlProjectNode : public ProjectExplorer::ProjectNode class QmlProjectNode : public ProjectExplorer::ProjectNode
{ {
public: public:
QmlProjectNode(QmlProject *project, Core::IDocument *projectFile); QmlProjectNode(QmlProject *project);
~QmlProjectNode() override; ~QmlProjectNode() override;
Core::IDocument *projectFile() const;
QString projectFilePath() const;
virtual bool showInSimpleTree() const override; virtual bool showInSimpleTree() const override;
virtual QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override; virtual QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const override;
@@ -69,7 +66,6 @@ private:
private: private:
QmlProject *m_project; QmlProject *m_project;
Core::IDocument *m_projectFile;
QHash<QString, FolderNode *> m_folderByName; QHash<QString, FolderNode *> m_folderByName;
}; };