feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Renamed classOrNamespace() and lookup/findClassOrNamespace().

Browse Source
This commit is contained in:
Roberto Raggi
2010-05-14 13:44:54 +02:00
parent fca0d359ba
commit a600614866
4 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/cppcodecompletion.cpp
View File

@@ -947,7 +947,7 @@ bool CppCodeCompletion::completeConstructorOrFunction(const QList<LookupItem> &r
Scope *scope = result.scope();
if (NamedType *namedTy = ty->asNamedType()) {
if (ClassOrNamespace *b = context.classOrNamespace(namedTy->name(), scope)) {
if (ClassOrNamespace *b = context.lookupType(namedTy->name(), scope)) {
foreach (Symbol *overload, b->lookup(functionCallOp)) {
FullySpecifiedType overloadTy = overload->type().simplified();
@@ -1114,19 +1114,19 @@ bool CppCodeCompletion::completeScope(const QList<LookupItem> &results,
Scope *scope = result.scope();
if (NamedType *namedTy = ty->asNamedType()) {
if (ClassOrNamespace *b = context.classOrNamespace(namedTy->name(), scope)) {
if (ClassOrNamespace *b = context.lookupType(namedTy->name(), scope)) {
completeClass(b, context);
break;
}
} else if (Class *classTy = ty->asClassType()) {
if (ClassOrNamespace *b = context.classOrNamespace(classTy)) {
if (ClassOrNamespace *b = context.lookupType(classTy)) {
completeClass(b, context);
break;
}
} else if (Namespace *nsTy = ty->asNamespaceType()) {
if (ClassOrNamespace *b = context.classOrNamespace(nsTy)) {
if (ClassOrNamespace *b = context.lookupType(nsTy)) {
completeNamespace(b, context);
break;
}
@@ -1379,7 +1379,7 @@ bool CppCodeCompletion::completeQtMethod(const QList<LookupItem> &results,
if (! namedTy) // not a class name.
continue;
ClassOrNamespace *b = newContext.classOrNamespace(namedTy->name(), p.scope());
ClassOrNamespace *b = newContext.lookupType(namedTy->name(), p.scope());
if (! b)
continue;