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

Project: Add setDocument method

Browse Source 
Add setDocument method, implement document method, use this in all
projects.

Change-Id: I5018bf7c2739665c13eee340184ce7c41fd319bb
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-01-08 11:09:37 +01:00
parent dc3ca42eea
commit b386dd0e99
24 changed files with 62 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,17 +65,17 @@ QmlProject::QmlProject(Internal::Manager *manager, const Utils::FileName &fileNa
m_activeTarget(0)
{
setId("QmlProjectManager.QmlProject");
setDocument(new Internal::QmlProjectFile(this, fileName));
DocumentManager::addDocument(document(), true);
setProjectContext(Context(QmlProjectManager::Constants::PROJECTCONTEXT));
setProjectLanguages(Context(ProjectExplorer::Constants::LANG_QMLJS));
QFileInfo fileInfo = m_fileName.toFileInfo();
m_projectName = fileInfo.completeBaseName();
m_file = new Internal::QmlProjectFile(this, fileName);
m_rootNode = new Internal::QmlProjectNode(this);
DocumentManager::addDocument(m_file, true);
m_manager->registerProject(this);
}
@@ -83,8 +83,6 @@ QmlProject::~QmlProject()
{
m_manager->unregisterProject(this);
DocumentManager::removeDocument(m_file);
delete m_projectItem.data();
delete m_rootNode;
}
@@ -292,11 +290,6 @@ QString QmlProject::displayName() const
return m_projectName;
}
IDocument *QmlProject::document() const
{
return m_file;
}
IProjectManager *QmlProject::projectManager() const
{
return m_manager;

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

@@ -62,7 +62,6 @@ public:
Utils::FileName filesFileName() const;
QString displayName() const override;
Core::IDocument *document() const override;
ProjectExplorer::IProjectManager *projectManager() const override;
bool supportsKit(ProjectExplorer::Kit *k, QString *errorMessage) const override;
@@ -112,7 +111,6 @@ private:
Internal::Manager *m_manager;
Utils::FileName m_fileName;
Internal::QmlProjectFile *m_file;
QString m_projectName;
QmlImport m_defaultImport;
ProjectExplorer::Target *m_activeTarget;

5
src/plugins/qmlprojectmanager/qmlprojectfile.cpp
View File

@@ -36,9 +36,8 @@
namespace QmlProjectManager {
namespace Internal {
QmlProjectFile::QmlProjectFile(QmlProject *parent, const Utils::FileName &fileName)
: Core::IDocument(parent),
m_project(parent)
QmlProjectFile::QmlProjectFile(QmlProject *parent, const Utils::FileName &fileName) :
m_project(parent)
{
QTC_CHECK(m_project);
QTC_CHECK(!fileName.isEmpty());