summaryrefslogtreecommitdiffstats
path: root/src/core/file_picker_controller.cpp
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2018-06-04 12:08:57 +0200
committerJüri Valdmann <juri.valdmann@qt.io>2018-06-06 06:10:38 +0000
commit542c5b698cb9586aac48cc4dda66a6a2f98c905e (patch)
treeedfdde1de98e132e6cb7bf4445638ed8f7ce8f3a /src/core/file_picker_controller.cpp
parent6cd3360c4d5283893eeb1efe43e329073709b48c (diff)
Use range-based for instead of Q_FOREACH
Change-Id: Ibf016b795ff98fddfa29fb5dc63924a2d2159d71 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/file_picker_controller.cpp')
-rw-r--r--src/core/file_picker_controller.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp
index 158ff7f67..3ded5ec41 100644
--- a/src/core/file_picker_controller.cpp
+++ b/src/core/file_picker_controller.cpp
@@ -70,7 +70,8 @@ void FilePickerController::accepted(const QVariant &files)
if (files.canConvert(QVariant::StringList)) {
stringList = files.toStringList();
} else if (files.canConvert<QList<QUrl> >()) {
- Q_FOREACH (const QUrl &url, files.value<QList<QUrl> >())
+ const QList<QUrl> urls = files.value<QList<QUrl>>();
+ for (const QUrl &url : urls)
stringList.append(url.toLocalFile());
} else {
qWarning("An unhandled type '%s' was provided in FilePickerController::accepted(QVariant)", files.typeName());
@@ -87,8 +88,8 @@ void FilePickerController::rejected()
static QStringList listRecursively(const QDir &dir)
{
QStringList ret;
- QFileInfoList infoList(dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden));
- Q_FOREACH (const QFileInfo &fileInfo, infoList) {
+ const QFileInfoList infoList(dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden));
+ for (const QFileInfo &fileInfo : infoList) {
if (fileInfo.isDir()) {
ret.append(fileInfo.absolutePath() + QStringLiteral("/.")); // Match chromium's behavior. See chrome/browser/file_select_helper.cc
ret.append(listRecursively(QDir(fileInfo.absoluteFilePath())));