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

Removed ResolveExpression::resolveMember().

Browse Source
This commit is contained in:
Roberto Raggi
2010-05-12 15:27:13 +02:00
parent a3e76dd2cf
commit b66375819d
2 changed files with 7 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/libs/cplusplus/ResolveExpression.cpp
View File

@@ -747,61 +747,6 @@ FullySpecifiedType ResolveExpression::instantiate(const Name *className, Symbol
return GenTemplateInstance::instantiate(className, candidate, _context.control());
}
QList<LookupItem> ResolveExpression::resolveMember(const Name *memberName, Class *klass,
const Name *className) const
{
QList<LookupItem> results;
if (! klass)
return results;
if (! className)
className = klass->name();
if (! className)
return results;
const QList<Symbol *> candidates = _context.lookup(memberName, klass->members());
foreach (Symbol *candidate, candidates) {
FullySpecifiedType ty = candidate->type();
const Name *unqualifiedNameId = className;
if (const QualifiedNameId *q = className->asQualifiedNameId())
unqualifiedNameId = q->unqualifiedNameId();
if (const TemplateNameId *templId = unqualifiedNameId->asTemplateNameId())
ty = GenTemplateInstance::instantiate(templId, candidate, _context.control());
LookupItem item;
item.setType(ty);
item.setDeclaration(candidate);
results.append(item);
}
return removeDuplicates(results);
}
QList<LookupItem> ResolveExpression::resolveMember(const Name *memberName, ObjCClass *klass) const
{
QList<LookupItem> results;
if (!memberName || !klass)
return results;
const QList<Symbol *> candidates = _context.lookup(memberName, klass->members());
foreach (Symbol *candidate, candidates) {
FullySpecifiedType ty = candidate->type();
LookupItem item;
item.setType(ty);
item.setDeclaration(candidate);
results.append(item);
}
return removeDuplicates(results);
}
bool ResolveExpression::visit(PostIncrDecrAST *)
{
return false;
@@ -809,6 +754,11 @@ bool ResolveExpression::visit(PostIncrDecrAST *)
bool ResolveExpression::visit(ObjCMessageExpressionAST *ast)
{
#warning implement ResolveExpression::visit
qWarning() << Q_FUNC_INFO << __LINE__;
return false;
#if 0
const QList<LookupItem> receiverResults = resolve(ast->receiver_expression);
if (!receiverResults.isEmpty()) {
@@ -838,5 +788,6 @@ bool ResolveExpression::visit(ObjCMessageExpressionAST *ast)
}
return false;
#endif
}

7
src/libs/cplusplus/ResolveExpression.h
View File

@@ -55,16 +55,11 @@ public:
int accessOp,
bool *replacedDotOperator = 0) const;
protected:
ClassOrNamespace *findClass(const FullySpecifiedType &ty, Scope *scope) const;
protected:
QList<LookupItem> resolve(ExpressionAST *ast);
Q_DECL_DEPRECATED QList<LookupItem> resolveMember(const Name *memberName, Class *klass,
const Name *className = 0) const;
Q_DECL_DEPRECATED QList<LookupItem> resolveMember(const Name *memberName, ObjCClass *klass) const;
QList<LookupItem> switchResults(const QList<LookupItem> &symbols);
FullySpecifiedType instantiate(const Name *className, Symbol *candidate) const;