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

Project: Add setProjectManager method

Browse Source 
Implement default projectManager method in Project and use
these two everywhere.

Change-Id: I27e011e6fdc17b36aff1b8b931527307320e347c
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-01-08 11:31:06 +01:00
parent b386dd0e99
commit 21d204ad5c
17 changed files with 64 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,13 +58,12 @@ namespace Internal {
} // namespace Internal
QmlProject::QmlProject(Internal::Manager *manager, const Utils::FileName &fileName)
: m_manager(manager),
m_fileName(fileName),
m_defaultImport(UnknownImport),
m_activeTarget(0)
QmlProject::QmlProject(Internal::Manager *manager, const Utils::FileName &fileName) :
m_fileName(fileName),
m_defaultImport(UnknownImport)
{
setId("QmlProjectManager.QmlProject");
setProjectManager(manager);
setDocument(new Internal::QmlProjectFile(this, fileName));
DocumentManager::addDocument(document(), true);
@@ -76,12 +75,12 @@ QmlProject::QmlProject(Internal::Manager *manager, const Utils::FileName &fileNa
m_rootNode = new Internal::QmlProjectNode(this);
m_manager->registerProject(this);
projectManager()->registerProject(this);
}
QmlProject::~QmlProject()
{
m_manager->unregisterProject(this);
projectManager()->unregisterProject(this);
delete m_projectItem.data();
delete m_rootNode;
@@ -290,9 +289,9 @@ QString QmlProject::displayName() const
return m_projectName;
}
IProjectManager *QmlProject::projectManager() const
Internal::Manager *QmlProject::projectManager() const
{
return m_manager;
return static_cast<Internal::Manager *>(Project::projectManager());
}
bool QmlProject::supportsKit(Kit *k, QString *errorMessage) const

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

@@ -33,6 +33,8 @@
#include "qmlprojectmanager_global.h"
#include "qmlprojectmanager.h"
#include <projectexplorer/project.h>
#include <QPointer>
@@ -46,7 +48,6 @@ namespace QmlProjectManager {
class QmlProjectItem;
namespace Internal {
class Manager;
class QmlProjectFile;
class QmlProjectNode;
} // namespace Internal
@@ -62,7 +63,7 @@ public:
Utils::FileName filesFileName() const;
QString displayName() const override;
ProjectExplorer::IProjectManager *projectManager() const override;
Internal::Manager *projectManager() const override;
bool supportsKit(ProjectExplorer::Kit *k, QString *errorMessage) const override;
@@ -109,11 +110,10 @@ private:
QStringList convertToAbsoluteFiles(const QStringList &paths) const;
QmlJS::ModelManagerInterface *modelManager() const;
Internal::Manager *m_manager;
Utils::FileName m_fileName;
QString m_projectName;
QmlImport m_defaultImport;
ProjectExplorer::Target *m_activeTarget;
ProjectExplorer::Target *m_activeTarget = 0;
// plain format
QStringList m_files;