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 <marc.mutz@qt.io>
This commit is contained in:
parent
78119026c0
commit
5d336dad4b
@ -442,7 +442,8 @@ void QGtk3FileDialogHelper::applyOptions()
|
|||||||
if (opts->initialDirectory().isLocalFile())
|
if (opts->initialDirectory().isLocalFile())
|
||||||
setDirectory(opts->initialDirectory());
|
setDirectory(opts->initialDirectory());
|
||||||
|
|
||||||
foreach (const QUrl &filename, opts->initiallySelectedFiles())
|
const auto initiallySelected = opts->initiallySelectedFiles();
|
||||||
|
for (const QUrl &filename : initiallySelected)
|
||||||
selectFileInternal(filename);
|
selectFileInternal(filename);
|
||||||
|
|
||||||
const QString initialNameFilter = opts->initiallySelectedNameFilter();
|
const QString initialNameFilter = opts->initiallySelectedNameFilter();
|
||||||
@ -477,13 +478,13 @@ void QGtk3FileDialogHelper::setNameFilters(const QStringList &filters)
|
|||||||
_filters.clear();
|
_filters.clear();
|
||||||
_filterNames.clear();
|
_filterNames.clear();
|
||||||
|
|
||||||
foreach (const QString &filter, filters) {
|
for (const QString &filter : filters) {
|
||||||
GtkFileFilter *gtkFilter = gtk_file_filter_new();
|
GtkFileFilter *gtkFilter = gtk_file_filter_new();
|
||||||
const QString name = filter.left(filter.indexOf(u'('));
|
const QString name = filter.left(filter.indexOf(u'('));
|
||||||
const QStringList extensions = cleanFilterList(filter);
|
const QStringList extensions = cleanFilterList(filter);
|
||||||
|
|
||||||
gtk_file_filter_set_name(gtkFilter, qUtf8Printable(name.isEmpty() ? extensions.join(", "_L1) : name));
|
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_filter_add_pattern(gtkFilter, qUtf8Printable(ext));
|
||||||
|
|
||||||
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(gtkDialog), gtkFilter);
|
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(gtkDialog), gtkFilter);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user