From 366b4c2ed74aae3e6495df9a487fedb4f0cfdfde Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 5 Aug 2010 14:14:16 +0200
Subject: [PATCH] Look at the virtual methods.
---
src/plugins/cppeditor/cppeditor.cpp | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 71e7bab691c..970a8d128ce 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -345,7 +345,22 @@ struct CanonicalSymbol
{
const QList<LookupItem> results = typeOfExpression(code, scope, TypeOfExpression::Preprocess);
- for (int i = 0; i < results.size(); ++i) { // ### TODO virtual methods and classes.
+ for (int i = results.size() - 1; i != -1; --i) {
+ const LookupItem &r = results.at(i);
+
+ if (! r.declaration())
+ break;
+ else if (! r.declaration()->scope())
+ break;
+ else if (! r.declaration()->scope()->isClassScope())
+ break;
+
+ if (Function *funTy = r.declaration()->type()->asFunctionType())
+ if (funTy->isVirtual())
+ return r.declaration();
+ }
+
+ for (int i = 0; i < results.size(); ++i) {
const LookupItem &r = results.at(i);
if (r.declaration())
--
GitLab