Introduced Symbol::copy(otherSymbol) and removed some deprecated code.

1 files changed, 1 insertions, 34 deletions

diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 198ff12cca..4edf109624 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -1115,7 +1115,7 @@ bool CppCodeCompletion::completeMember(const QList<LookupItem> &baseResults,
             classObjectCandidates.append(klass);
 
         else if (NamedType *namedTy = ty->asNamedType()) {
-            if (ClassOrNamespace *b = context.classOrNamespace(namedTy->name(), r.lastVisibleSymbol()->scope())) {
+            if (ClassOrNamespace *b = context.classOrNamespace(namedTy->name(), r.lastVisibleSymbol())) {
                 classOrNamespace = b;
                 break;
 
@@ -1342,22 +1342,6 @@ void CppCodeCompletion::completeNamespace(ClassOrNamespace *b, const LookupConte
     }
 }
 
-void CppCodeCompletion::completeNamespace(const QList<Symbol *> &candidates,
-                                          const DeprecatedLookupContext &deprecatedContext)
-{
-    if (candidates.isEmpty())
-        return;
-
-    else if (Namespace *ns = candidates.first()->asNamespace()) {
-        LookupContext context(deprecatedContext.expressionDocument(),
-                              deprecatedContext.thisDocument(),
-                              deprecatedContext.snapshot());
-
-        if (ClassOrNamespace *binding = context.classOrNamespace(ns))
-            completeNamespace(binding, context);
-    }
-}
-
 void CppCodeCompletion::completeClass(ClassOrNamespace *b, const LookupContext &, bool staticLookup)
 {
     QSet<ClassOrNamespace *> bindingsVisited;
@@ -1405,23 +1389,6 @@ void CppCodeCompletion::completeClass(ClassOrNamespace *b, const LookupContext &
     }
 }
 
-void CppCodeCompletion::completeClass(const QList<Symbol *> &candidates,
-                                      const DeprecatedLookupContext &deprecatedContext,
-                                      bool staticLookup)
-{
-    if (candidates.isEmpty())
-        return;
-
-    else if (Symbol *klass = candidates.first()) {
-        LookupContext context(deprecatedContext.expressionDocument(),
-                              deprecatedContext.thisDocument(),
-                              deprecatedContext.snapshot());
-
-        if (ClassOrNamespace *binding = context.classOrNamespace(klass))
-            completeClass(binding, context, staticLookup);
-    }
-}
-
 bool CppCodeCompletion::completeQtMethod(const QList<LookupItem> &results,
                                          const LookupContext &newContext,
                                          bool wantSignals)