From 5d336dad4b5f73aa967b11e27e9e0551f86ba8d1 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Mon, 7 Aug 2023 18:19:08 +0300 Subject: [PATCH] GTK3 platformtheme: port from Q_FOREACH to ranged-for setNameFilters(): the container parameter referes to a local const conatiner at the call site. The other two loops are straightforward ports, iterating over local const containers. Task-number: QTBUG-115796 Change-Id: I42a89af311b75e98c75f955f9a706a4b29cad5e3 Reviewed-by: Marc Mutz --- src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp index 08419ec7dc7..348afacff7f 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp +++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp @@ -442,7 +442,8 @@ void QGtk3FileDialogHelper::applyOptions() if (opts->initialDirectory().isLocalFile()) setDirectory(opts->initialDirectory()); - foreach (const QUrl &filename, opts->initiallySelectedFiles()) + const auto initiallySelected = opts->initiallySelectedFiles(); + for (const QUrl &filename : initiallySelected) selectFileInternal(filename); const QString initialNameFilter = opts->initiallySelectedNameFilter(); @@ -477,13 +478,13 @@ void QGtk3FileDialogHelper::setNameFilters(const QStringList &filters) _filters.clear(); _filterNames.clear(); - foreach (const QString &filter, filters) { + for (const QString &filter : filters) { GtkFileFilter *gtkFilter = gtk_file_filter_new(); const QString name = filter.left(filter.indexOf(u'(')); const QStringList extensions = cleanFilterList(filter); gtk_file_filter_set_name(gtkFilter, qUtf8Printable(name.isEmpty() ? extensions.join(", "_L1) : name)); - foreach (const QString &ext, extensions) + for (const QString &ext : extensions) gtk_file_filter_add_pattern(gtkFilter, qUtf8Printable(ext)); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(gtkDialog), gtkFilter);