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

Moc: fix narrowing conversion warnings with range-for loops 

Pick-to: 6.6 6.5
Change-Id: I6dee1a6ae82c33bd6523734ee32ab4c83835f9d8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
bb10
Ahmad Samir 2023-05-18 22:56:09 +03:00 committed by Fabian Kosmale
parent c88961bcf4
commit db9e206dee
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/moc/generator.cpp
View File

@ -134,8 +134,8 @@ int Generator::stridx(const QByteArray &s)
static int aggregateParameterCount(const QList<FunctionDef> &list)
{
int sum = 0;
for (int i = 0; i < list.size(); ++i)
sum += int(list.at(i).arguments.size()) + 1; // +1 for return type
for (const FunctionDef &def : list)
sum += int(def.arguments.size()) + 1; // +1 for return type
return sum;
}
@ -539,8 +539,7 @@ void Generator::generateCode()
// because we definitely printed something above, this section doesn't need comma control
for (const QList<FunctionDef> &methodContainer :
{ cdef->signalList, cdef->slotList, cdef->methodList }) {
for (int i = 0; i< methodContainer.size(); ++i) {
const FunctionDef& fdef = methodContainer.at(i);
for (const FunctionDef &fdef : methodContainer) {
fprintf(out, ",\n // method '%s'\n %s",
fdef.name.constData(), stringForType(fdef.type.name, false).constData());
for (const auto &argument: fdef.arguments)

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

@ -1191,8 +1191,8 @@ void Moc::generate(FILE *out, FILE *jsonOutput)
fprintf(out, "QT_WARNING_DISABLE_GCC(\"-Wuseless-cast\")\n");
fputs("", out);
for (int i = 0; i < classList.size(); ++i) {
Generator generator(this, &classList[i], metaTypes, knownQObjectClasses, knownGadgets, out,
for (ClassDef &def : classList) {
Generator generator(this, &def, metaTypes, knownQObjectClasses, knownGadgets, out,
requireCompleteTypes);
generator.generateCode();