rcc: eradicate all Q_FOREACH loops
... by replacing them with C++11 ramge-for loops. Change-Id: I95a91ac36c2b2bef17bf12cf7f1676653a2d807d Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
parent
956021dbfc
commit
364e3eb680
@ -49,9 +49,9 @@ QT_BEGIN_NAMESPACE
|
|||||||
|
|
||||||
void dumpRecursive(const QDir &dir, QTextStream &out)
|
void dumpRecursive(const QDir &dir, QTextStream &out)
|
||||||
{
|
{
|
||||||
QFileInfoList entries = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot
|
const QFileInfoList entries = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot
|
||||||
| QDir::NoSymLinks);
|
| QDir::NoSymLinks);
|
||||||
foreach (const QFileInfo &entry, entries) {
|
for (const QFileInfo &entry : entries) {
|
||||||
if (entry.isDir()) {
|
if (entry.isDir()) {
|
||||||
dumpRecursive(entry.filePath(), out);
|
dumpRecursive(entry.filePath(), out);
|
||||||
} else {
|
} else {
|
||||||
@ -194,7 +194,7 @@ int runRcc(int argc, char *argv[])
|
|||||||
const bool projectRequested = parser.isSet(projectOption);
|
const bool projectRequested = parser.isSet(projectOption);
|
||||||
const QStringList filenamesIn = parser.positionalArguments();
|
const QStringList filenamesIn = parser.positionalArguments();
|
||||||
|
|
||||||
foreach (const QString &file, filenamesIn) {
|
for (const QString &file : filenamesIn) {
|
||||||
if (file == QLatin1String("-"))
|
if (file == QLatin1String("-"))
|
||||||
continue;
|
continue;
|
||||||
else if (!QFile::exists(file)) {
|
else if (!QFile::exists(file)) {
|
||||||
|
@ -612,9 +612,10 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
|
|||||||
for (ChildConstIterator it = cbegin; it != cend; ++it) {
|
for (ChildConstIterator it = cbegin; it != cend; ++it) {
|
||||||
if (it.key() == filename && it.value()->m_language == s->m_language &&
|
if (it.key() == filename && it.value()->m_language == s->m_language &&
|
||||||
it.value()->m_country == s->m_country) {
|
it.value()->m_country == s->m_country) {
|
||||||
foreach (const QString &name, m_fileNames)
|
for (const QString &name : qAsConst(m_fileNames)) {
|
||||||
qWarning("%s: Warning: potential duplicate alias detected: '%s'",
|
qWarning("%s: Warning: potential duplicate alias detected: '%s'",
|
||||||
qPrintable(name), qPrintable(filename));
|
qPrintable(name), qPrintable(filename));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user