From f9a05d9cedf5596e72f65f635fc0fd42dd01c358 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 12 May 2010 14:52:24 +0200
Subject: Reimplemented resolve base expression.

---
 src/libs/cplusplus/ResolveExpression.h | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/libs/cplusplus/ResolveExpression.h')

diff --git a/src/libs/cplusplus/ResolveExpression.h b/src/libs/cplusplus/ResolveExpression.h
index 95538ceba6..52bbd6eb99 100644
--- a/src/libs/cplusplus/ResolveExpression.h
+++ b/src/libs/cplusplus/ResolveExpression.h
@@ -47,14 +47,18 @@ public:
     QList<LookupItem> operator()(ExpressionAST *ast, Scope *scope);
     QList<LookupItem> resolve(ExpressionAST *ast, Scope *scope);
 
-    QList<LookupItem> resolveMemberExpression(const QList<LookupItem> &baseResults,
-                                              unsigned accessOp,
-                                              const Name *memberName,
-                                              bool *replacedDotOperator = 0) const;
-
-    QList<LookupItem> resolveBaseExpression(const QList<LookupItem> &baseResults,
-                                            int accessOp,
-                                            bool *replacedDotOperator = 0) const;
+    ClassOrNamespace *baseExpression(const QList<LookupItem> &baseResults,
+                                     int accessOp,
+                                     bool *replacedDotOperator = 0) const;
+
+    Q_DECL_DEPRECATED QList<LookupItem> resolveMemberExpression(const QList<LookupItem> &baseResults,
+                                                                unsigned accessOp,
+                                                                const Name *memberName,
+                                                                bool *replacedDotOperator = 0) const;
+
+    Q_DECL_DEPRECATED QList<LookupItem> resolveBaseExpression(const QList<LookupItem> &baseResults,
+                                                              int accessOp,
+                                                              bool *replacedDotOperator = 0) const;
 
 protected:
     QList<LookupItem> resolve(ExpressionAST *ast);
-- 
cgit v1.2.1