summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/ResolveExpression.cpp
diff options
context:
space:
mode:
authorPrzemyslaw Gorszkowski <pgorszkowski@gmail.com>2015-02-11 07:55:06 +0100
committerOrgad Shaneh <orgads@gmail.com>2015-02-25 15:04:28 +0000
commit168d9201d562da458fc0ed4580967f706df8e6df (patch)
tree26c122d1eaeabf00d227ae4fa80b1a25afb45c13 /src/libs/cplusplus/ResolveExpression.cpp
parent1a239bd3e978b41fd03b0757314f8a6e88efa0b7 (diff)
downloadqt-creator-168d9201d562da458fc0ed4580967f706df8e6df.tar.gz
C++: rename enclosingTemplateInstantiation to enclosingBinding
Change-Id: I6989cd0e62e9587824737b756a37607dfdcf5ebf Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/libs/cplusplus/ResolveExpression.cpp')
-rw-r--r--src/libs/cplusplus/ResolveExpression.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 21482a5f1b..932a248d34 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -1015,20 +1015,20 @@ bool ResolveExpression::visit(MemberAccessAST *ast)
}
ClassOrNamespace *ResolveExpression::findClass(const FullySpecifiedType &originalTy, Scope *scope,
- ClassOrNamespace* enclosingTemplateInstantiation) const
+ ClassOrNamespace *enclosingBinding) const
{
FullySpecifiedType ty = originalTy.simplified();
ClassOrNamespace *binding = 0;
if (Class *klass = ty->asClassType()) {
if (scope->isBlock())
- binding = _context.lookupType(klass->name(), scope, enclosingTemplateInstantiation);
+ binding = _context.lookupType(klass->name(), scope, enclosingBinding);
if (!binding)
- binding = _context.lookupType(klass, enclosingTemplateInstantiation);
+ binding = _context.lookupType(klass, enclosingBinding);
}
else if (NamedType *namedTy = ty->asNamedType())
- binding = _context.lookupType(namedTy->name(), scope, enclosingTemplateInstantiation);
+ binding = _context.lookupType(namedTy->name(), scope, enclosingBinding);
else if (Function *funTy = ty->asFunctionType())
return findClass(funTy->returnType(), scope);
@@ -1146,13 +1146,13 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
return binding;
}
- ClassOrNamespace *enclosingTemplateInstantiation = 0;
+ ClassOrNamespace *enclosingBinding = 0;
if (ClassOrNamespace *binding = r.binding()) {
if (binding->instantiationOrigin())
- enclosingTemplateInstantiation = binding;
+ enclosingBinding = binding;
}
- if (ClassOrNamespace *binding = findClass(ty, scope, enclosingTemplateInstantiation))
+ if (ClassOrNamespace *binding = findClass(ty, scope, enclosingBinding))
return binding;
}
}