From e376424b330f1b7e2f43f771285dc62ab2d66025 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 9 Feb 2017 14:57:39 +0100 Subject: [PATCH] qmake: Rename QmakeParserPriFile to QmakePriFileDocument Makes it clearer what that actually is. Change-Id: I2b50deba53ae5cef2bf1a30b9497c1867559e1e9 Reviewed-by: Tim Jenssen Reviewed-by: Oswald Buddenhagen --- src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp | 10 +++++----- src/plugins/qmakeprojectmanager/qmakeparsernodes.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index 13238e1672f..2b00a59e85a 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -232,10 +232,10 @@ public: QStringList errors; }; -class QmakeParserPriFile : public Core::IDocument +class QmakePriFileDocument : public Core::IDocument { public: - QmakeParserPriFile(QmakeParserPriFileNode *qmakePriFile) + QmakePriFileDocument(QmakeParserPriFileNode *qmakePriFile) : IDocument(nullptr), m_priFile(qmakePriFile) { setId("Qmake.PriFile"); @@ -460,8 +460,8 @@ QmakeParserPriFileNode::QmakeParserPriFileNode(QmakeProject *project, m_projectDir(filePath.toFileInfo().absolutePath()) { Q_ASSERT(project); - m_qmakePriFile = new QmakeParserPriFile(this); - Core::DocumentManager::addDocument(m_qmakePriFile); + m_priFileDocument = new QmakePriFileDocument(this); + Core::DocumentManager::addDocument(m_priFileDocument); setDisplayName(filePath.toFileInfo().completeBaseName()); setIcon(qmakeParserNodeStaticData()->projectIcon); @@ -470,7 +470,7 @@ QmakeParserPriFileNode::QmakeParserPriFileNode(QmakeProject *project, QmakeParserPriFileNode::~QmakeParserPriFileNode() { watchFolders(QSet()); - delete m_qmakePriFile; + delete m_priFileDocument; } void QmakeParserPriFileNode::scheduleUpdate() diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h index 6fdd21a0d84..de7095ff51a 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h @@ -99,7 +99,7 @@ enum class Variable { uint qHash(Variable key, uint seed = 0); namespace Internal { -class QmakeParserPriFile; +class QmakePriFileDocument; struct InternalParserNode; class QmakeEvalInput; @@ -205,7 +205,7 @@ private: Utils::FileName m_projectFilePath; QString m_projectDir; - Internal::QmakeParserPriFile *m_qmakePriFile; + Internal::QmakePriFileDocument *m_priFileDocument; // Memory is cheap... QMap> m_files; @@ -215,7 +215,7 @@ private: // managed by QmakeProFileNode 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 friend struct Internal::InternalParserNode; };