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

Provide a facility to hide macros in the chooser

Browse Source 
... and use it for the Current* fallbacks in the Kit expander.

Change-Id: I1d346aa56647f6d3030bd4384eb89e2a27db6418
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2014-11-05 10:30:51 +01:00
parent a12344ce61
commit bb81a61814
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/utils/macroexpander.cpp
View File

@@ -101,6 +101,7 @@ public:
QHash<QByteArray, MacroExpander::StringFunction> m_map;
QHash<QByteArray, MacroExpander::PrefixFunction> m_prefixMap;
QSet<QByteArray> m_invisbleInChooser;
QVector<MacroExpander::ResolverFunction> m_extraResolvers;
QMap<QByteArray, QString> m_descriptions;
QString m_displayName;
@@ -301,8 +302,10 @@ void MacroExpander::registerPrefix(const QByteArray &prefix, const QString &desc
* \sa registerFileVariables(), registerIntVariable(), registerPrefix()
*/
void MacroExpander::registerVariable(const QByteArray &variable,
const QString &description, const StringFunction &value)
const QString &description, const StringFunction &value, bool visibleInChooser)
{
if (!visibleInChooser)
d->m_invisbleInChooser.insert(variable);
d->m_descriptions.insert(variable, description);
d->m_map.insert(variable, value);
}
@@ -362,9 +365,15 @@ void MacroExpander::registerExtraResolver(const MacroExpander::ResolverFunction
* \sa registerVariable()
* \sa registerFileVariables()
*/
QList<QByteArray> MacroExpander::variables() const
QList<QByteArray> MacroExpander::visibleVariables() const
{
return d->m_descriptions.keys();
QList<QByteArray> res;
for (auto it = d->m_descriptions.begin(), end = d->m_descriptions.end(); it != end; ++it) {
if (!d->m_invisbleInChooser.contains(it.key()))
res.append(it.key());
}
return res;
}
/*!