From cb350bfeb26afaa047f74232b7afc3f143684ef6 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 20 Apr 2015 17:42:34 +0300 Subject: C++: Rename ClassOrNamespace -> LookupScope Change-Id: Ide74482b133dd1fec40a725d9aa81bd749385f37 Reviewed-by: Nikolai Kosjar --- src/plugins/cppeditor/cppelementevaluator.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/cppeditor/cppelementevaluator.cpp') diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp index fa85a8eb05..119ab2d69b 100644 --- a/src/plugins/cppeditor/cppelementevaluator.cpp +++ b/src/plugins/cppeditor/cppelementevaluator.cpp @@ -327,10 +327,10 @@ bool CppClass::operator==(const CppClass &other) void CppClass::lookupBases(Symbol *declaration, const LookupContext &context) { - typedef QPair Data; + typedef QPair Data; - if (ClassOrNamespace *clazz = context.lookupType(declaration)) { - QSet visited; + if (LookupScope *clazz = context.lookupType(declaration)) { + QSet visited; QQueue q; q.enqueue(qMakePair(clazz, this)); @@ -338,8 +338,8 @@ void CppClass::lookupBases(Symbol *declaration, const LookupContext &context) Data current = q.dequeue(); clazz = current.first; visited.insert(clazz); - const QList &bases = clazz->usings(); - foreach (ClassOrNamespace *baseClass, bases) { + const QList &bases = clazz->usings(); + foreach (LookupScope *baseClass, bases) { const QList &symbols = baseClass->symbols(); foreach (Symbol *symbol, symbols) { if (symbol->isClass() && ( @@ -429,7 +429,7 @@ CppVariable::CppVariable(Symbol *declaration, const LookupContext &context, Scop } if (typeName) { - if (ClassOrNamespace *clazz = context.lookupType(typeName, scope)) { + if (LookupScope *clazz = context.lookupType(typeName, scope)) { if (!clazz->symbols().isEmpty()) { Overview overview; Symbol *symbol = clazz->symbols().at(0); -- cgit v1.2.1