From 33f54d10c6a11d6a7d0228e67dce9e4e1f165411 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Fri, 15 Mar 2013 15:38:28 +0100
Subject: [PATCH] s/ProjectExpander/ProjectMacroExpander/g
The new name is a better description of what the class is all about,
it matches the filename and it does not conflict show up when trying
to expand "PE" to ProjectExplorer.
Change-Id: Ie6a10b9a83dc8bc529e35e3381f733dbe25847a3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/cmakeprojectmanager/cmakeproject.cpp | 2 +-
src/plugins/projectexplorer/projectexplorer.cpp | 2 +-
src/plugins/projectexplorer/projectmacroexpander.cpp | 6 +++---
src/plugins/projectexplorer/projectmacroexpander.h | 4 ++--
src/plugins/qt4projectmanager/qt4project.cpp | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index aa430eb691c..fa1d2ce7aae 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -209,7 +209,7 @@ QString CMakeProject::shadowBuildDirectory(const QString &projectFilePath, const
return info.absolutePath();
const QString projectName = QFileInfo(info.absolutePath()).fileName();
- ProjectExplorer::ProjectExpander expander(projectFilePath, projectName, k, bcName);
+ ProjectExplorer::ProjectMacroExpander expander(projectFilePath, projectName, k, bcName);
QDir projectDir = QDir(projectDirectory(projectFilePath));
QString buildPath = Utils::expandMacros(Core::DocumentManager::buildDirectory(), &expander);
return QDir::cleanPath(projectDir.absoluteFilePath(buildPath));
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 52571ceac8f..29e6e01b6e5 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1178,7 +1178,7 @@ void ProjectExplorerPlugin::updateVariable(const QByteArray &variable)
}
}
}
- ProjectExpander expander(projectFilePath, projectName, kit, buildConfigurationName);
+ ProjectMacroExpander expander(projectFilePath, projectName, kit, buildConfigurationName);
QString result;
if (expander.resolveProjectMacro(QString::fromUtf8(variable), &result))
Core::VariableManager::insert(variable, result);
diff --git a/src/plugins/projectexplorer/projectmacroexpander.cpp b/src/plugins/projectexplorer/projectmacroexpander.cpp
index 32730d3a95b..13256fcbffc 100644
--- a/src/plugins/projectexplorer/projectmacroexpander.cpp
+++ b/src/plugins/projectexplorer/projectmacroexpander.cpp
@@ -35,12 +35,12 @@
using namespace ProjectExplorer;
-ProjectExpander::ProjectExpander(const QString &projectFilePath, const QString &projectName,
+ProjectMacroExpander::ProjectMacroExpander(const QString &projectFilePath, const QString &projectName,
const Kit *k, const QString &bcName)
: m_projectFile(projectFilePath), m_projectName(projectName), m_kit(k), m_bcName(bcName)
{ }
-bool ProjectExpander::resolveProjectMacro(const QString &name, QString *ret)
+bool ProjectMacroExpander::resolveProjectMacro(const QString &name, QString *ret)
{
QString result;
bool found = false;
@@ -75,7 +75,7 @@ bool ProjectExpander::resolveProjectMacro(const QString &name, QString *ret)
return found;
}
-bool ProjectExpander::resolveMacro(const QString &name, QString *ret)
+bool ProjectMacroExpander::resolveMacro(const QString &name, QString *ret)
{
bool found = resolveProjectMacro(name, ret);
if (!found) {
diff --git a/src/plugins/projectexplorer/projectmacroexpander.h b/src/plugins/projectexplorer/projectmacroexpander.h
index 46181c228d7..8786a082773 100644
--- a/src/plugins/projectexplorer/projectmacroexpander.h
+++ b/src/plugins/projectexplorer/projectmacroexpander.h
@@ -37,10 +37,10 @@
namespace ProjectExplorer {
class Kit;
-class PROJECTEXPLORER_EXPORT ProjectExpander : public Utils::AbstractQtcMacroExpander
+class PROJECTEXPLORER_EXPORT ProjectMacroExpander : public Utils::AbstractQtcMacroExpander
{
public:
- ProjectExpander(const QString &projectFilePath, const QString &projectName, const Kit *k, const QString &bcName);
+ ProjectMacroExpander(const QString &projectFilePath, const QString &projectName, const Kit *k, const QString &bcName);
bool resolveProjectMacro(const QString &name, QString *ret);
bool resolveMacro(const QString &name, QString *ret);
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 293404eccae..1618d46cb0f 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -1390,7 +1390,7 @@ QString Qt4Project::shadowBuildDirectory(const QString &proFilePath, const Kit *
return info.absolutePath();
const QString projectName = QFileInfo(proFilePath).completeBaseName();
- ProjectExplorer::ProjectExpander expander(proFilePath, projectName, k, suffix);
+ ProjectExplorer::ProjectMacroExpander expander(proFilePath, projectName, k, suffix);
QDir projectDir = QDir(projectDirectory(proFilePath));
QString buildPath = Utils::expandMacros(Core::DocumentManager::buildDirectory(), &expander);
return QDir::cleanPath(projectDir.absoluteFilePath(buildPath));
--
GitLab