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

CppTools: Fix look-up of top-level virtual function declaration

Browse Source 
Fixes: QTCREATORBUG-25749
Change-Id: I7a9e8e406739931df253f14772361f575adbaa3f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-07-20 11:27:33 +02:00
parent 99ae8b19e6
commit a7756a72fd
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/cpptools/functionutils.cpp
View File

@@ -87,10 +87,26 @@ static bool isVirtualFunction_helper(const Function *function,
return;
}
for (int i = 0; i < c.first->baseClassCount(); ++i) {
const ClassOrNamespace * const base = context.lookupType(
c.first->baseClassAt(i)->name(), c.first->enclosingScope());
if (base && base->rootClass())
classes.append({base->rootClass(), c.second + 1});
const BaseClass * const baseClassSpec = c.first->baseClassAt(i);
const ClassOrNamespace * const base = context.lookupType(baseClassSpec->name(),
c.first->enclosingScope());
const Class *baseClass = nullptr;
if (base) {
baseClass = base->rootClass();
// Sometimes, BaseClass::rootClass() is null, and then the class is
// among the symbols. No idea why.
if (!baseClass) {
for (const auto s : base->symbols()) {
if (s->asClass() && Matcher::match(s->name(), baseClassSpec->name())) {
baseClass = s->asClass();
break;
}
}
}
}
if (baseClass)
classes.append({baseClass, c.second + 1});
}
}
};