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

Project: Move ProjectDocument setup into Project class

Browse Source 
Change-Id: I5c0ec79ddf066e37660fb9a6b24f9d882355d511
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2017-03-29 11:25:01 +02:00
parent 6829e33dc2
commit b0c7bb0f7b
11 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/projectexplorer/project.cpp
View File

@@ -126,7 +126,9 @@ bool ProjectDocument::reload(QString *errorString, Core::IDocument::ReloadFlag f
class ProjectPrivate
{
public:
ProjectPrivate(Project *owner) : m_containerNode(owner) {}
ProjectPrivate(Project *owner, Core::IDocument *document) :
m_document(document), m_containerNode(owner)
{ }
~ProjectPrivate();
Core::Id m_id;
@@ -158,7 +160,9 @@ ProjectPrivate::~ProjectPrivate()
delete m_accessor;
}
Project::Project() : d(new ProjectPrivate(this))
Project::Project(const QString &mimeType, const Utils::FileName &fileName,
const ProjectDocument::ProjectCallback &callback) :
d(new ProjectPrivate(this, new ProjectDocument(mimeType, fileName, callback)))
{
d->m_macroExpander.setDisplayName(tr("Project"));
d->m_macroExpander.registerVariable("Project:Name", tr("Project Name"),
@@ -453,13 +457,6 @@ void Project::setId(Core::Id id)
d->m_id = id;
}
void Project::setDocument(Core::IDocument *doc)
{
QTC_ASSERT(doc, return);
QTC_ASSERT(!d->m_document, return);
d->m_document = doc;
}
void Project::setRootProjectNode(ProjectNode *root)
{
if (d->m_rootProjectNode == root)