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

qmake: Rename QmakeParserPriFile to QmakePriFileDocument

Browse Source 
Makes it clearer what that actually is.

Change-Id: I2b50deba53ae5cef2bf1a30b9497c1867559e1e9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-09 14:57:39 +01:00
parent 528b5f2298
commit e376424b33
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -232,10 +232,10 @@ public:
QStringList errors; QStringList errors;
}; };
class QmakeParserPriFile : public Core::IDocument class QmakePriFileDocument : public Core::IDocument
{ {
public: public:
QmakeParserPriFile(QmakeParserPriFileNode *qmakePriFile) QmakePriFileDocument(QmakeParserPriFileNode *qmakePriFile)
: IDocument(nullptr), m_priFile(qmakePriFile) : IDocument(nullptr), m_priFile(qmakePriFile)
{ {
setId("Qmake.PriFile"); setId("Qmake.PriFile");
@@ -460,8 +460,8 @@ QmakeParserPriFileNode::QmakeParserPriFileNode(QmakeProject *project,
m_projectDir(filePath.toFileInfo().absolutePath()) m_projectDir(filePath.toFileInfo().absolutePath())
{ {
Q_ASSERT(project); Q_ASSERT(project);
m_qmakePriFile = new QmakeParserPriFile(this); m_priFileDocument = new QmakePriFileDocument(this);
Core::DocumentManager::addDocument(m_qmakePriFile); Core::DocumentManager::addDocument(m_priFileDocument);
setDisplayName(filePath.toFileInfo().completeBaseName()); setDisplayName(filePath.toFileInfo().completeBaseName());
setIcon(qmakeParserNodeStaticData()->projectIcon); setIcon(qmakeParserNodeStaticData()->projectIcon);
@@ -470,7 +470,7 @@ QmakeParserPriFileNode::QmakeParserPriFileNode(QmakeProject *project,
QmakeParserPriFileNode::~QmakeParserPriFileNode() QmakeParserPriFileNode::~QmakeParserPriFileNode()
{ {
watchFolders(QSet<QString>()); watchFolders(QSet<QString>());
delete m_qmakePriFile; delete m_priFileDocument;
} }
void QmakeParserPriFileNode::scheduleUpdate() void QmakeParserPriFileNode::scheduleUpdate()

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

@@ -99,7 +99,7 @@ enum class Variable {
uint qHash(Variable key, uint seed = 0); uint qHash(Variable key, uint seed = 0);
namespace Internal { namespace Internal {
class QmakeParserPriFile; class QmakePriFileDocument;
struct InternalParserNode; struct InternalParserNode;
class QmakeEvalInput; class QmakeEvalInput;
@@ -205,7 +205,7 @@ private:
Utils::FileName m_projectFilePath; Utils::FileName m_projectFilePath;
QString m_projectDir; QString m_projectDir;
Internal::QmakeParserPriFile *m_qmakePriFile; Internal::QmakePriFileDocument *m_priFileDocument;
// Memory is cheap... // Memory is cheap...
QMap<ProjectExplorer::FileType, QSet<Utils::FileName>> m_files; QMap<ProjectExplorer::FileType, QSet<Utils::FileName>> m_files;
@@ -215,7 +215,7 @@ private:
// managed by QmakeProFileNode // managed by QmakeProFileNode
friend class QmakeProjectManager::QmakeParserProFileNode; friend class QmakeProjectManager::QmakeParserProFileNode;
friend class Internal::QmakeParserPriFile; // for scheduling updates on modified friend class Internal::QmakePriFileDocument; // for scheduling updates on modified
// internal temporary subtree representation // internal temporary subtree representation
friend struct Internal::InternalParserNode; friend struct Internal::InternalParserNode;
}; };