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

qmake: rename QmakePriFile to QmakePriFileNodeDocument

Browse Source 
... to avoid ambigularities later

Change-Id: I81a062750b03f1b49a306b1694bc137b70b04606
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-09 16:37:54 +01:00
parent 574669d333
commit 458ec1a284
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -230,10 +230,10 @@ public:
QStringList errors; QStringList errors;
}; };
class QmakePriFile : public Core::IDocument class QmakePriFileNodeDocument : public Core::IDocument
{ {
public: public:
QmakePriFile(QmakePriFileNode *qmakePriFile) QmakePriFileNodeDocument(QmakePriFileNode *qmakePriFile)
: IDocument(nullptr), m_priFile(qmakePriFile) : IDocument(nullptr), m_priFile(qmakePriFile)
{ {
setId("Qmake.PriFile"); setId("Qmake.PriFile");
@@ -457,7 +457,7 @@ QmakePriFileNode::QmakePriFileNode(QmakeProject *project, QmakeProFileNode *qmak
m_projectDir(filePath.toFileInfo().absolutePath()) m_projectDir(filePath.toFileInfo().absolutePath())
{ {
Q_ASSERT(project); Q_ASSERT(project);
m_qmakePriFile = new QmakePriFile(this); m_qmakePriFile = new QmakePriFileNodeDocument(this);
Core::DocumentManager::addDocument(m_qmakePriFile); Core::DocumentManager::addDocument(m_qmakePriFile);
setDisplayName(filePath.toFileInfo().completeBaseName()); setDisplayName(filePath.toFileInfo().completeBaseName());

6
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -51,7 +51,7 @@ class QmakeProFileNode;
class QmakeProject; class QmakeProject;
namespace Internal { namespace Internal {
class QmakePriFile; class QmakePriFileNodeDocument;
struct InternalNode; struct InternalNode;
class EvalInput; class EvalInput;
@@ -157,7 +157,7 @@ private:
Utils::FileName m_projectFilePath; Utils::FileName m_projectFilePath;
QString m_projectDir; QString m_projectDir;
Internal::QmakePriFile *m_qmakePriFile; Internal::QmakePriFileNodeDocument *m_qmakePriFile;
// Memory is cheap... // Memory is cheap...
QMap<ProjectExplorer::FileType, QSet<Utils::FileName> > m_files; QMap<ProjectExplorer::FileType, QSet<Utils::FileName> > m_files;
@@ -167,7 +167,7 @@ private:
// managed by QmakeProFileNode // managed by QmakeProFileNode
friend class QmakeProjectManager::QmakeProFileNode; friend class QmakeProjectManager::QmakeProFileNode;
friend class Internal::QmakePriFile; // for scheduling updates on modified friend class Internal::QmakePriFileNodeDocument; // for scheduling updates on modified
// internal temporary subtree representation // internal temporary subtree representation
friend struct Internal::InternalNode; friend struct Internal::InternalNode;
}; };