Removed LookupUtils.

src/libs/cplusplus/LookupContext.cpp

@@ -44,10 +44,7 @@
 
 using namespace CPlusPlus;
 
-/////////////////////////////////////////////////////////////////////
-// LookupUtils
-/////////////////////////////////////////////////////////////////////
-bool LookupUtils::isNameCompatibleWithIdentifier(Name *name, Identifier *id)
+bool LookupContext::isNameCompatibleWithIdentifier(Name *name, Identifier *id)
 {
     if (! name) {
         return false;

src/libs/cplusplus/LookupContext.h

@@ -34,22 +34,12 @@
 #ifndef CPLUSPLUS_LOOKUPCONTEXT_H
 #define CPLUSPLUS_LOOKUPCONTEXT_H
 
-#include <SymbolVisitor.h>
 #include <cplusplus/CppDocument.h>
-
-#include <QList>
-#include <QSet>
-#include <QMap>
+#include <QPair>
 
 namespace CPlusPlus {
 
-class CPLUSPLUS_EXPORT LookupUtils
-{
-public:
-    static bool isNameCompatibleWithIdentifier(Name *name, Identifier *id);
-};
-
-class CPLUSPLUS_EXPORT LookupContext: LookupUtils
+class CPLUSPLUS_EXPORT LookupContext
 {
 public:
     LookupContext(Control *control = 0);
@@ -142,7 +132,7 @@ public:
 
 private:
     QList<Scope *> buildVisibleScopes();
-
+    static bool isNameCompatibleWithIdentifier(Name *name, Identifier *id);
 
 private:
     Control *_control;

src/libs/cplusplus/TypeOfExpression.cpp

@@ -38,6 +38,7 @@
 #include <cplusplus/LookupContext.h>
 #include <cplusplus/ResolveExpression.h>
 #include <cplusplus/pp.h>
+#include <QSet>
 
 using namespace CPlusPlus;