From 52b062c43dfc39bd73e2a18f30cf7cf3de7fd991 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 9 Aug 2010 15:40:14 +0200
Subject: [PATCH] Look only at the viable functions.
---
src/plugins/cppeditor/cppchecksymbols.cpp | 29 +++++++++++++----------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/plugins/cppeditor/cppchecksymbols.cpp b/src/plugins/cppeditor/cppchecksymbols.cpp
index 923928063ee..c62d18f064d 100644
--- a/src/plugins/cppeditor/cppchecksymbols.cpp
+++ b/src/plugins/cppeditor/cppchecksymbols.cpp
@@ -780,10 +780,6 @@ void CheckSymbols::addType(const QList<LookupItem> &candidates, NameAST *ast)
if (tok.generated())
return;
- unsigned line, column;
- getTokenStartPosition(startToken, &line, &column);
- const unsigned length = tok.length();
-
foreach (const LookupItem &r, candidates) {
Symbol *c = r.declaration();
if (c->isUsingDeclaration()) // skip using declarations...
@@ -793,6 +789,11 @@ void CheckSymbols::addType(const QList<LookupItem> &candidates, NameAST *ast)
else if (c->isTypedef() || c->isNamespace() ||
c->isClass() || c->isEnum() ||
c->isForwardClassDeclaration() || c->isTypenameArgument()) {
+
+ unsigned line, column;
+ getTokenStartPosition(startToken, &line, &column);
+ const unsigned length = tok.length();
+
const Use use(line, column, length, Use::Type);
addUse(use);
//qDebug() << "added use" << oo(ast->name) << line << column << length;
@@ -811,10 +812,6 @@ void CheckSymbols::addClassMember(const QList<LookupItem> &candidates, NameAST *
if (tok.generated())
return;
- unsigned line, column;
- getTokenStartPosition(startToken, &line, &column);
- const unsigned length = tok.length();
-
foreach (const LookupItem &r, candidates) {
Symbol *c = r.declaration();
if (! c)
@@ -826,6 +823,10 @@ void CheckSymbols::addClassMember(const QList<LookupItem> &candidates, NameAST *
else if (c->isTypedef() || c->type()->isFunctionType())
return; // shadowed
+ unsigned line, column;
+ getTokenStartPosition(startToken, &line, &column);
+ const unsigned length = tok.length();
+
const Use use(line, column, length, Use::Field);
addUse(use);
break;
@@ -842,10 +843,6 @@ void CheckSymbols::addVirtualMethod(const QList<LookupItem> &candidates, NameAST
if (tok.generated())
return;
- unsigned line, column;
- getTokenStartPosition(startToken, &line, &column);
- const unsigned length = tok.length();
-
foreach (const LookupItem &r, candidates) {
Symbol *c = r.declaration();
if (! c)
@@ -858,6 +855,14 @@ void CheckSymbols::addVirtualMethod(const QList<LookupItem> &candidates, NameAST
continue;
else if (argumentCount < funTy->minimumArgumentCount())
continue;
+ else if (argumentCount > funTy->argumentCount()) {
+ if (! funTy->isVariadic())
+ continue;
+ }
+
+ unsigned line, column;
+ getTokenStartPosition(startToken, &line, &column);
+ const unsigned length = tok.length();
const Use use(line, column, length, Use::VirtualMethod);
addUse(use);
--
GitLab