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

Utils: Move MacroExpander to file pair of its own

Browse Source 
Change-Id: I777accd58dafca39a0d3e50541af325277c49c6b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2014-10-13 10:24:29 +02:00
parent b3f3c96bca
commit df3d22ef1c
7 changed files with 105 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/utils/stringutils.h
View File

@@ -32,8 +32,6 @@
#include "utils_global.h"
#include <functional>
QT_BEGIN_NAMESPACE
class QStringList;
QT_END_NAMESPACE
@@ -77,19 +75,6 @@ private:
bool expandNestedMacros(const QString &str, int *pos, QString *ret);
};
class QTCREATOR_UTILS_EXPORT MacroExpander : public AbstractMacroExpander
{
public:
typedef std::function<bool(const QString &name, QString *ret)> Resolver;
explicit MacroExpander(const Resolver &resolver) : m_resolver(resolver) {}
bool resolveMacro(const QString &name, QString *ret) { return m_resolver(name, ret); }
private:
Resolver m_resolver;
};
QTCREATOR_UTILS_EXPORT void expandMacros(QString *str, AbstractMacroExpander *mx);
QTCREATOR_UTILS_EXPORT QString expandMacros(const QString &str, AbstractMacroExpander *mx);