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

MacroExpander: Fall back to global expander

Browse Source 
... and use that all over the place.

Change-Id: Ie6e0ed0f0d9eaba9b4466761e6b455f33a905086
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2014-10-15 14:45:31 +02:00
parent 89602419c4
commit ef563d8085
30 changed files with 154 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp
View File

@@ -61,7 +61,7 @@ void JsonWizard::addGenerator(JsonWizardGenerator *gen)
m_generators.append(gen);
}
Utils::AbstractMacroExpander *JsonWizard::expander() const
Utils::MacroExpander *JsonWizard::expander() const
{
return m_expander;
}
@@ -114,7 +114,7 @@ QVariant JsonWizard::value(const QString &n) const
QVariant v = property(n.toUtf8());
if (v.isValid()) {
if (v.type() == QVariant::String)
return Utils::expandMacros(v.toString(), m_expander);
return m_expander->expand(v.toString());
else
return v;
}
@@ -128,10 +128,10 @@ void JsonWizard::setValue(const QString &key, const QVariant &value)
setProperty(key.toUtf8(), value);
}
bool JsonWizard::boolFromVariant(const QVariant &v, Utils::AbstractMacroExpander *expander)
bool JsonWizard::boolFromVariant(const QVariant &v, Utils::MacroExpander *expander)
{
if (v.type() == QVariant::String)
return !Utils::expandMacros(v.toString(), expander).isEmpty();
return !expander->expand(v.toString()).isEmpty();
return v.toBool();
}