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

Moc: fix narrowing conversion warnings with iterators/algorithms

Browse Source 
Drive-by change: check a QList isn't empty before using first()

Pick-to: 6.5
Change-Id: I24171d17244ae96ad5779d721c65d33e5489f5f3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ahmad Samir 2023-05-18 18:24:00 +03:00
parent 26dd7fe4ed
commit 10510c0405
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1070,12 +1070,13 @@ static QByteArrayList requiredQtContainers(const QList<ClassDef> &classes)
void Moc::generate(FILE *out, FILE *jsonOutput)
{
QByteArray fn = filename;
int i = filename.size()-1;
while (i > 0 && filename.at(i - 1) != '/' && filename.at(i - 1) != '\\')
--i; // skip path
if (i >= 0)
fn = filename.mid(i);
QByteArrayView fn = QByteArrayView(filename);
auto isSlash = [](char ch) { return ch == '/' || ch == '\\'; };
auto rit = std::find_if(fn.crbegin(), fn.crend(), isSlash);
if (rit != fn.crend())
fn = fn.last(rit - fn.crbegin());
fprintf(out, "/****************************************************************************\n"
"** Meta object code from reading C++ file '%s'\n**\n" , fn.constData());
fprintf(out, "** Created by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , mocOutputRevision, QT_VERSION_STR);
@ -1141,7 +1142,7 @@ void Moc::generate(FILE *out, FILE *jsonOutput)
fprintf(out, "QT_WARNING_DISABLE_GCC(\"-Wuseless-cast\")\n");
fputs("", out);
for (i = 0; i < classList.size(); ++i) {
for (int i = 0; i < classList.size(); ++i) {
Generator generator(&classList[i], metaTypes, knownQObjectClasses, knownGadgets, out, requireCompleteTypes);
generator.generateCode();
}
@ -1818,8 +1819,19 @@ void Moc::checkSuperClasses(ClassDef *def)
#endif
return;
}
for (int i = 1; i < def->superclassList.size(); ++i) {
const QByteArray superClass = def->superclassList.at(i).first;
auto isRegisteredInterface = [&def](QByteArrayView super) {
auto matchesSuperClass = [&super](const auto &ifaces) {
return !ifaces.isEmpty() && ifaces.first().className == super;
};
return std::any_of(def->interfaceList.cbegin(), def->interfaceList.cend(), matchesSuperClass);
};
const auto end = def->superclassList.cend();
auto it = std::next(def->superclassList.cbegin(),
!def->superclassList.isEmpty() ? 1 : 0);
for (; it != end; ++it) {
const QByteArray &superClass = it->first;
if (knownQObjectClasses.contains(superClass)) {
const QByteArray msg
= "Class "
@ -1833,14 +1845,7 @@ void Moc::checkSuperClasses(ClassDef *def)
}
if (interface2IdMap.contains(superClass)) {
bool registeredInterface = false;
for (int i = 0; i < def->interfaceList.size(); ++i)
if (def->interfaceList.at(i).constFirst().className == superClass) {
registeredInterface = true;
break;
}
if (!registeredInterface) {
if (!isRegisteredInterface(superClass)) {
const QByteArray msg
= "Class "
+ def->classname