1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moc: only call checkSuperClasses() if the class inherits another

Browse Source 
I.e. if def.superclassList is empty, calling checkSuperClasses() is
no-op. Spotted by Fabian in code review.

Change-Id: I499baf1d2cf6dd08a26394221a48af991ccea4ad
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ahmad Samir 2023-05-22 23:45:52 +03:00
parent 10510c0405
commit c452a43b59
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/moc/moc.cpp
View File

@ -969,7 +969,9 @@ void Moc::parse()
if (!def.pluginData.iid.isEmpty())
def.pluginData.metaArgs = metaArgs;
checkSuperClasses(&def);
if (def.hasQObject && !def.superclassList.isEmpty())
checkSuperClasses(&def);
checkProperties(&def);
classList += def;
@ -1804,7 +1806,8 @@ bool Moc::until(Token target) {
void Moc::checkSuperClasses(ClassDef *def)
{
const QByteArray firstSuperclass = def->superclassList.value(0).first;
Q_ASSERT(!def->superclassList.isEmpty());
const QByteArray &firstSuperclass = def->superclassList.at(0).first;
if (!knownQObjectClasses.contains(firstSuperclass)) {
// enable once we /require/ include paths
@ -1828,8 +1831,7 @@ void Moc::checkSuperClasses(ClassDef *def)
};
const auto end = def->superclassList.cend();
auto it = std::next(def->superclassList.cbegin(),
!def->superclassList.isEmpty() ? 1 : 0);
auto it = def->superclassList.cbegin() + 1;
for (; it != end; ++it) {
const QByteArray &superClass = it->first;
if (knownQObjectClasses.contains(superClass)) {