Utils: Merge Abstract{Qtc,}MacroExpander classes

Change-Id: Id78fb47a9b8059684b8b4fc77d9aaaaf23b11bae
Reviewed-by: Eike Ziller <[email protected]>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h
index 4622d7e543e..c4643634922 100644
--- a/src/libs/utils/stringutils.h
+++ b/src/libs/utils/stringutils.h
@@ -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