From e5a174a3530934ebc60f0032bb4c40e6a8dc38da Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Wed, 5 Nov 2014 17:35:24 +0100
Subject: [PATCH] MacroExpander: Remove unused method and include

Change-Id: I6f0d9656efcea7bcaf6552ae20bd9cd0acbe46f6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
---
 src/libs/utils/macroexpander.cpp                | 10 +++-------
 src/libs/utils/macroexpander.h                  |  3 +--
 src/plugins/projectexplorer/projectexplorer.cpp |  1 +
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp
index 74fdab9f532..3bef7cc433a 100644
--- a/src/libs/utils/macroexpander.cpp
+++ b/src/libs/utils/macroexpander.cpp
@@ -29,10 +29,11 @@
 ****************************************************************************/
 
 #include "macroexpander.h"
-#include "qtcassert.h"
-#include "qtcprocess.h"
 
 #include "algorithm.h"
+#include "qtcassert.h"
+#include "qtcprocess.h"
+#include "stringutils.h"
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -417,11 +418,6 @@ MacroExpanders MacroExpander::subExpanders() const
     return expanders;
 }
 
-AbstractMacroExpander *MacroExpander::abstractExpander() const
-{
-    return d;
-}
-
 QString MacroExpander::displayName() const
 {
     return d->m_displayName;
diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h
index b2d87fc21e2..ae30527212a 100644
--- a/src/libs/utils/macroexpander.h
+++ b/src/libs/utils/macroexpander.h
@@ -31,7 +31,7 @@
 #ifndef UTILS_MACROEXPANDER_H
 #define UTILS_MACROEXPANDER_H
 
-#include "stringutils.h"
+#include "utils_global.h"
 
 #include <functional>
 
@@ -89,7 +89,6 @@ public:
     QString variableDescription(const QByteArray &variable) const;
 
     MacroExpanders subExpanders() const;
-    AbstractMacroExpander *abstractExpander() const;
 
     QString displayName() const;
     void setDisplayName(const QString &displayName);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index e66e3be0049..230b2404a90 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -126,6 +126,7 @@
 #include <utils/macroexpander.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QtPlugin>
 #include <QDebug>