ResourceEditor: Replace foreach with ranged for loop

Change-Id: I49f59b6cb42b331613092b0aac82dd9bc4197cfe
Reviewed-by: hjk <hjk@qt.io>

2 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index a5f70b24ae..a937ce1674 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -183,8 +183,8 @@ QString ResourceFile::contents() const
     QDomElement root = doc.createElement(QLatin1String("RCC"));
     doc.appendChild(root);
 
-    foreach (const Prefix *pref, m_prefix_list) {
-        FileList file_list = pref->file_list;
+    for (const Prefix *pref : m_prefix_list) {
+        const FileList file_list = pref->file_list;
         const QString &name = pref->name;
         const QString &lang = pref->lang;
 
@@ -194,7 +194,7 @@ QString ResourceFile::contents() const
         if (!lang.isEmpty())
             relt.setAttribute(QLatin1String("lang"), lang);
 
-        foreach (const File *f, file_list) {
+        for (const File *f : file_list) {
             const File &file = *f;
             QDomElement felt = doc.createElement(QLatin1String("file"));
             relt.appendChild(felt);
@@ -230,7 +230,7 @@ void ResourceFile::refresh()
 {
     for (int i = 0; i < prefixCount(); ++i) {
         const FileList &file_list = m_prefix_list.at(i)->file_list;
-        foreach (File *file, file_list)
+        for (File *file : file_list)
             file->checkExistence();
     }
 }
@@ -344,7 +344,7 @@ bool ResourceFile::renameFile(const QString &fileName, const QString &newFileNam
     FileList entries;
     for (int i = 0; i < prefixCount(); ++i) {
         const FileList &file_list = m_prefix_list.at(i)->file_list;
-        foreach (File *file, file_list) {
+        for (File *file : file_list) {
             if (file->name == fileName)
                 entries.append(file);
             if (file->name == newFileName)
@@ -356,15 +356,15 @@ bool ResourceFile::renameFile(const QString &fileName, const QString &newFileNam
 
     entries.at(0)->checkExistence();
     if (entries.at(0)->exists()) {
-        foreach (File *file, entries)
+        for (File *file : qAsConst(entries))
             file->setExists(true);
         success = Core::FileUtils::renameFile(Utils::FilePath::fromString(entries.at(0)->name),
                                               Utils::FilePath::fromString(newFileName));
     }
 
     if (success) {
-        bool exists = QFile::exists(newFileName);
-        foreach (File *file, entries) {
+        const bool exists = QFile::exists(newFileName);
+        for (File *file : qAsConst(entries)) {
             file->name = newFileName;
             file->setExists(exists);
         }
@@ -708,14 +708,14 @@ bool ResourceModel::iconFileExtension(const QString &path)
     static QStringList ext_list;
     if (ext_list.isEmpty()) {
         const QList<QByteArray> _ext_list = QImageReader::supportedImageFormats();
-        foreach (const QByteArray &ext, _ext_list) {
+        for (const QByteArray &ext : _ext_list) {
             QString dotExt = QString(QLatin1Char('.'));
             dotExt  += QString::fromLatin1(ext);
             ext_list.append(dotExt);
         }
     }
 
-    foreach (const QString &ext, ext_list) {
+    for (const QString &ext : qAsConst(ext_list)) {
         if (path.endsWith(ext, Qt::CaseInsensitive))
             return true;
     }
@@ -936,7 +936,7 @@ QStringList ResourceModel::existingFilesSubtracted(int prefixIndex, const QStrin
     QStringList uniqueList;
 
     if (prefixModelIdx.isValid()) {
-        foreach (const QString &file, fileNames) {
+        for (const QString &file : fileNames) {
             if (!m_resource_file.contains(prefixIndex, file) && !uniqueList.contains(file))
                 uniqueList.append(file);
         }
@@ -955,7 +955,7 @@ void ResourceModel::addFiles(int prefixIndex, const QStringList &fileNames, int
     if (!prefix_model_idx.isValid())
         return;
 
-    QStringList unique_list = existingFilesSubtracted(prefixIndex, fileNames);
+    const QStringList unique_list = existingFilesSubtracted(prefixIndex, fileNames);
 
     if (unique_list.isEmpty())
         return;
@@ -963,7 +963,7 @@ void ResourceModel::addFiles(int prefixIndex, const QStringList &fileNames, int
     const int cnt = m_resource_file.fileCount(prefixIndex);
     beginInsertRows(prefix_model_idx, cnt, cnt + unique_list.count() - 1); // ### FIXME
 
-    foreach (const QString &file, unique_list)
+    for (const QString &file : unique_list)
         m_resource_file.addFile(prefixIndex, file);
 
     const QFileInfo fi(unique_list.last());
@@ -1186,7 +1186,7 @@ public:
 void PrefixEntryBackup::restore() const
 {
     m_model->insertPrefix(m_prefixIndex, m_name, m_language);
-    foreach (const FileEntryBackup &entry, m_files) {
+    for (const FileEntryBackup &entry : m_files) {
         entry.restore();
     }
 }
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp
index e75e91f575..f90ccbef00 100644
--- a/src/plugins/resourceeditor/resourcenode.cpp
+++ b/src/plugins/resourceeditor/resourcenode.cpp
@@ -321,7 +321,7 @@ void ResourceTopLevelNode::addInternalNodes()
             QString parentFolderName;
             PrefixFolderLang folderId(prefix, QString(), lang);
             QStringList currentPathList;
-            foreach (const QString &pathElement, pathList) {
+            for (const QString &pathElement : qAsConst(pathList)) {
                 currentPathList << pathElement;
                 const QString folderName = currentPathList.join(QLatin1Char('/'));
                 folderId = PrefixFolderLang(prefix, folderName, lang);