whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moc: use QList::removeIf 

Yes, the code now uses two loops, but it's slightly better than
erasing-during-iteration; the alternative is using e.g. a while loop and
advancing an iterator manually with operator++() (in two separate
locations, since there would be a `continue` statement) or with the
return value of QList::erase (in one location).

Change-Id: I119d0e61bc06396f2158ecf9f4ae84a76d9bce7b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
bb10
Ahmad Samir 2023-05-20 04:18:49 +03:00
parent a993510c9e
commit 8726b6a35a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1923,8 +1923,7 @@ void Moc::checkProperties(ClassDef *cdef)
// returning pointers, or const char * for QByteArray.
//
QDuplicateTracker<QByteArray> definedProperties(cdef->propertyList.size());
for (int i = 0; i < cdef->propertyList.size(); ++i) {
PropertyDef &p = cdef->propertyList[i];
auto hasNoAttributes = [&](const PropertyDef &p) {
if (definedProperties.hasSeen(p.name)) {
QByteArray msg = "The property '" + p.name + "' is defined multiple times in class " + cdef->classname + ".";
warning(msg.constData());
@ -1935,13 +1934,14 @@ void Moc::checkProperties(ClassDef *cdef)
", nor a READ accessor function nor an associated MEMBER variable. The property will be invalid.";
const auto &sym = p.location >= 0 ? symbolAt(p.location) : Symbol();
warning(sym, msg.constData());
if (p.write.isEmpty()) {
cdef->propertyList.removeAt(i);
--i;
}
continue;
if (p.write.isEmpty())
return true;
}
return false;
};
cdef->propertyList.removeIf(hasNoAttributes);
for (PropertyDef &p : cdef->propertyList) {
for (const FunctionDef &f : std::as_const(cdef->publicList)) {
if (f.name != p.read)
continue;