diff options
| author | hjk <hjk121@nokiamail.com> | 2014-10-13 10:24:29 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-10-13 11:51:03 +0200 |
| commit | df3d22ef1c68f39c7ca0688955f8a44350ebc657 (patch) | |
| tree | 82a6850e0a76639b2205d0c961a1e9834b10ce41 /src/libs/utils/stringutils.h | |
| parent | b3f3c96bcaeb092aefc237465bb1c805bc1b5fe7 (diff) | |
| download | qt-creator-df3d22ef1c68f39c7ca0688955f8a44350ebc657.tar.gz | |
Utils: Move MacroExpander to file pair of its own
Change-Id: I777accd58dafca39a0d3e50541af325277c49c6b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/libs/utils/stringutils.h')
| -rw-r--r-- | src/libs/utils/stringutils.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h index 958d56976c..97d47d64e4 100644 --- a/src/libs/utils/stringutils.h +++ b/src/libs/utils/stringutils.h @@ -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); |