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

Utils: Merge Abstract{Qtc,}MacroExpander classes

Browse Source 
Change-Id: Id78fb47a9b8059684b8b4fc77d9aaaaf23b11bae
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-06-24 16:17:58 +02:00
parent 5d7effd0f3
commit 8005de886b
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,8 @@ QTCREATOR_UTILS_EXPORT QString commonPath(const QStringList &files);
// If path is not sub of home path, or when running on Windows, returns the input
QTCREATOR_UTILS_EXPORT QString withTildeHomePath(const QString &path);
class QTCREATOR_UTILS_EXPORT AbstractMacroExpander {
class QTCREATOR_UTILS_EXPORT AbstractMacroExpander
{
public:
virtual ~AbstractMacroExpander() {}
// Not const, as it may change the state of the expander.
@@ -64,11 +65,6 @@ public:
//! \param pos Position to start scan on input, found position on output
//! \param ret Replacement string on output
//! \return Length of string part to replace, zero if no (further) matches found
virtual int findMacro(const QString &str, int *pos, QString *ret) = 0;
};
class QTCREATOR_UTILS_EXPORT AbstractQtcMacroExpander : public AbstractMacroExpander {
public:
virtual int findMacro(const QString &str, int *pos, QString *ret);
//! Provide a replacement string for an expando
//! \param name The name of the expando