From 6d6e18aa23ab4413c4ef227e60dfed0719737ba6 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 11 May 2010 10:03:30 +0200
Subject: [PATCH] Renamed switchCurrentEntity()

---
 src/libs/cplusplus/LookupContext.cpp | 10 +++++-----
 src/libs/cplusplus/LookupContext.h   | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 6bfa6a1b756..1dc8779b2ea 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -657,7 +657,7 @@ CreateBindings::~CreateBindings()
     delete _control;
 }
 
-ClassOrNamespace *CreateBindings::switchCurrentEntity(ClassOrNamespace *classOrNamespace)
+ClassOrNamespace *CreateBindings::switchCurrentClassOrNamespace(ClassOrNamespace *classOrNamespace)
 {
     ClassOrNamespace *previous = _currentClassOrNamespace;
     _currentClassOrNamespace = classOrNamespace;
@@ -693,9 +693,9 @@ ClassOrNamespace *CreateBindings::findClassOrNamespace(const QList<const Name *>
 
 void CreateBindings::process(Symbol *s, ClassOrNamespace *classOrNamespace)
 {
-    ClassOrNamespace *previous = switchCurrentEntity(classOrNamespace);
+    ClassOrNamespace *previous = switchCurrentClassOrNamespace(classOrNamespace);
     accept(s);
-    (void) switchCurrentEntity(previous);
+    (void) switchCurrentClassOrNamespace(previous);
 }
 
 void CreateBindings::process(Symbol *symbol)
@@ -743,7 +743,7 @@ ClassOrNamespace *CreateBindings::enterEntity(Symbol *symbol)
     ClassOrNamespace *entity = _currentClassOrNamespace->findOrCreate(symbol->name());
     entity->addSymbol(symbol);
 
-    return switchCurrentEntity(entity);
+    return switchCurrentClassOrNamespace(entity);
 }
 
 ClassOrNamespace *CreateBindings::enterGlobalEntity(Symbol *symbol)
@@ -751,7 +751,7 @@ ClassOrNamespace *CreateBindings::enterGlobalEntity(Symbol *symbol)
     ClassOrNamespace *entity = _globalNamespace->findOrCreate(symbol->name());
     entity->addSymbol(symbol);
 
-    return switchCurrentEntity(entity);
+    return switchCurrentClassOrNamespace(entity);
 }
 
 bool CreateBindings::visit(Namespace *ns)
diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h
index 6e23705a6c3..72c10798e3b 100644
--- a/src/libs/cplusplus/LookupContext.h
+++ b/src/libs/cplusplus/LookupContext.h
@@ -120,12 +120,6 @@ public:
     ClassOrNamespace *findClassOrNamespace(Symbol *s); // ### rename
     ClassOrNamespace *findClassOrNamespace(const QList<const Name *> &path);
 
-    /// \internal
-    void process(Symbol *s, ClassOrNamespace *classOrNamespace);
-
-    /// \internal
-    ClassOrNamespace *allocClassOrNamespace(ClassOrNamespace *parent);
-
     /// \internal
     Control *control() const;
 
@@ -133,10 +127,16 @@ public:
     void lookupInScope(const Name *name, Scope *scope, QList<Symbol *> *result,
                        const TemplateNameId *templateId);
 
+    /// \internal
+    void process(Symbol *s, ClassOrNamespace *classOrNamespace);
+
+    /// \internal
+    ClassOrNamespace *allocClassOrNamespace(ClassOrNamespace *parent);
+
 protected:
     using SymbolVisitor::visit;
 
-    ClassOrNamespace *switchCurrentEntity(ClassOrNamespace *classOrNamespace);
+    ClassOrNamespace *switchCurrentClassOrNamespace(ClassOrNamespace *classOrNamespace);
     ClassOrNamespace *enterEntity(Symbol *symbol);
     ClassOrNamespace *enterGlobalEntity(Symbol *symbol);