Renamed switchCurrentEntity()

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)

src/libs/cplusplus/LookupContext.h

@@ -121,22 +121,22 @@ public:
     ClassOrNamespace *findClassOrNamespace(const QList<const Name *> &path);
 
     /// \internal
-    void process(Symbol *s, ClassOrNamespace *classOrNamespace);
+    Control *control() const;
 
     /// \internal
-    ClassOrNamespace *allocClassOrNamespace(ClassOrNamespace *parent);
+    void lookupInScope(const Name *name, Scope *scope, QList<Symbol *> *result,
+                       const TemplateNameId *templateId);
 
     /// \internal
-    Control *control() const;
+    void process(Symbol *s, ClassOrNamespace *classOrNamespace);
 
     /// \internal
-    void lookupInScope(const Name *name, Scope *scope, QList<Symbol *> *result,
-                       const TemplateNameId *templateId);
+    ClassOrNamespace *allocClassOrNamespace(ClassOrNamespace *parent);
 
 protected:
     using SymbolVisitor::visit;
 
-    ClassOrNamespace *switchCurrentEntity(ClassOrNamespace *classOrNamespace);
+    ClassOrNamespace *switchCurrentClassOrNamespace(ClassOrNamespace *classOrNamespace);
     ClassOrNamespace *enterEntity(Symbol *symbol);
     ClassOrNamespace *enterGlobalEntity(Symbol *symbol);