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

Replace Q_FOREACH() with ranged-for loops

Browse Source 
In the process, fix two coding-style violations: while loops whose
empty bodies were given as a semicolon rather than as empty braces.
Also ditch some spurious braces.

Change-Id: I2734077f4f54985c4e8d81f846c1fa6fac4f529d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Edward Welbourne 2021-07-05 15:04:29 +02:00
parent e1b3a46302
commit 31e094922c
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/benchmarks/corelib/io/qfile/main.cpp
View File

@ -265,9 +265,9 @@ void tst_qfile::readBigFile()
QFSFileEngine fse(tempDir.filename); QFSFileEngine fse(tempDir.filename);
fse.open(QIODevice::ReadOnly|textMode|bufferedMode); fse.open(QIODevice::ReadOnly|textMode|bufferedMode);
QBENCHMARK { QBENCHMARK {
//qWarning() << fse.supportsExtension(QAbstractFileEngine::AtEndExtension); //qWarning() << fse.supportsExtension(QAbstractFileEngine::AtEndExtension);
while(fse.read(buffer, blockSize)); while (fse.read(buffer, blockSize)) {}
fse.seek(0); fse.seek(0);
} }
fse.close(); fse.close();
} }
@ -526,21 +526,20 @@ void tst_qfile::readSmallFiles()
switch (testType) { switch (testType) {
case(QFileBenchmark): { case(QFileBenchmark): {
QList<QFile*> fileList; QList<QFile*> fileList;
Q_FOREACH(QString file, files) { for (const QString &file : files) {
QFile *f = new QFile(tempDir.filePath(file)); QFile *f = new QFile(tempDir.filePath(file));
f->open(QIODevice::ReadOnly|textMode|bufferedMode); f->open(QIODevice::ReadOnly|textMode|bufferedMode);
fileList.append(f); fileList.append(f);
} }
QBENCHMARK { QBENCHMARK {
Q_FOREACH(QFile *file, fileList) { for (QFile *const file : qAsConst(fileList)) {
while (!file->atEnd()) { while (!file->atEnd())
file->read(buffer, blockSize); file->read(buffer, blockSize);
}
} }
} }
Q_FOREACH(QFile *file, fileList) { for (QFile *const file : qAsConst(fileList)) {
file->close(); file->close();
delete file; delete file;
} }
@ -549,19 +548,18 @@ void tst_qfile::readSmallFiles()
#ifdef QT_BUILD_INTERNAL #ifdef QT_BUILD_INTERNAL
case(QFSFileEngineBenchmark): { case(QFSFileEngineBenchmark): {
QList<QFSFileEngine*> fileList; QList<QFSFileEngine*> fileList;
Q_FOREACH(QString file, files) { for (const QString &file : files) {
QFSFileEngine *fse = new QFSFileEngine(tempDir.filePath(file)); QFSFileEngine *fse = new QFSFileEngine(tempDir.filePath(file));
fse->open(QIODevice::ReadOnly|textMode|bufferedMode); fse->open(QIODevice::ReadOnly|textMode|bufferedMode);
fileList.append(fse); fileList.append(fse);
} }
QBENCHMARK { QBENCHMARK {
Q_FOREACH(QFSFileEngine *fse, fileList) { for (QFSFileEngine *const fse : qAsConst(fileList))
while (fse->read(buffer, blockSize)); while (fse->read(buffer, blockSize)) {}
}
} }
Q_FOREACH(QFSFileEngine *fse, fileList) { for (QFSFileEngine *const fse : qAsConst(fileList)) {
fse->close(); fse->close();
delete fse; delete fse;
} }
@ -569,22 +567,20 @@ void tst_qfile::readSmallFiles()
break; break;
#endif #endif
case(PosixBenchmark): { case(PosixBenchmark): {
QList<FILE*> fileList; QList<FILE *> fileList;
Q_FOREACH(QString file, files) { for (const QString &file : files)
fileList.append(::fopen(QFile::encodeName(tempDir.filePath(file)).constData(), "rb")); fileList.append(::fopen(QFile::encodeName(tempDir.filePath(file)).constData(), "rb"));
}
QBENCHMARK { QBENCHMARK {
Q_FOREACH(FILE* cfile, fileList) { for (FILE *const cfile : qAsConst(fileList)) {
while(!feof(cfile)) while (!feof(cfile))
[[maybe_unused]] auto f = ::fread(buffer, blockSize, 1, cfile); [[maybe_unused]] auto f = ::fread(buffer, blockSize, 1, cfile);
::fseek(cfile, 0, SEEK_SET); ::fseek(cfile, 0, SEEK_SET);
} }
} }
Q_FOREACH(FILE* cfile, fileList) { for (FILE *const cfile : qAsConst(fileList))
::fclose(cfile); ::fclose(cfile);
}
} }
break; break;
case(QFileFromPosixBenchmark): { case(QFileFromPosixBenchmark): {