From 0185a49a78100c544f273ac6f6a31fee393e7aba Mon Sep 17 00:00:00 2001
From: Roberto Raggi <qtc-committer@nokia.com>
Date: Tue, 23 Dec 2008 15:27:55 +0100
Subject: [PATCH] Removed LookupUtils.
---
src/libs/cplusplus/LookupContext.cpp | 5 +----
src/libs/cplusplus/LookupContext.h | 16 +++-------------
src/libs/cplusplus/TypeOfExpression.cpp | 1 +
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index ed70e5b2168..2b787a9e11c 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/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;
diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h
index 58d5baf439d..8759a79210e 100644
--- a/src/libs/cplusplus/LookupContext.h
+++ b/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;
diff --git a/src/libs/cplusplus/TypeOfExpression.cpp b/src/libs/cplusplus/TypeOfExpression.cpp
index 8c4ccb05e2f..7f08d5874d8 100644
--- a/src/libs/cplusplus/TypeOfExpression.cpp
+++ b/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;
--
GitLab