diff options
author | Ahmad Samir <a.samirh78@gmail.com> | 2023-05-29 00:55:59 +0300 |
---|---|---|
committer | Ahmad Samir <a.samirh78@gmail.com> | 2023-06-05 23:35:20 +0300 |
commit | 3ee289e40d1a7d3582cb1a3a304e681d2085bb82 (patch) | |
tree | 041797484bfaa5a351bd9f7c5ef071872232d4ff /src/widgets/dialogs/qfiledialog.cpp | |
parent | 794dbfe0a03cc70626ecab7b4efb089e21e6e9cf (diff) |
Misc.: fix narrowing conversion warnings
Using:
- range-for and iterator-based loops
- QList constructor that takes a pair of iterators
Found by using -Wshorten-64-to-32 clang compiler flag, or adding that
flag to the flags clangd uses, e.g. adding this to clangd's config file
(see https://clangd.llvm.org/config):
CompileFlags:
Add: [-Wshorten-64-to-32]
Pick-to: 6.6 6.5
Change-Id: I13ae65e09ab59a59f9e5c189ea27e4e16527df2d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets/dialogs/qfiledialog.cpp')
-rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index ffec02d938..18395e928a 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -1240,12 +1240,10 @@ QStringList QFileDialogPrivate::addDefaultSuffixToFiles(const QStringList &files QList<QUrl> QFileDialogPrivate::addDefaultSuffixToUrls(const QList<QUrl> &urlsToFix) const { QList<QUrl> urls; - const int numUrlsToFix = urlsToFix.size(); - urls.reserve(numUrlsToFix); - for (int i = 0; i < numUrlsToFix; ++i) { - QUrl url = urlsToFix.at(i); - // if the filename has no suffix, add the default suffix - const QString defaultSuffix = options->defaultSuffix(); + urls.reserve(urlsToFix.size()); + // if the filename has no suffix, add the default suffix + const QString defaultSuffix = options->defaultSuffix(); + for (QUrl url : urlsToFix) { if (!defaultSuffix.isEmpty()) { const QString urlPath = url.path(); const auto idx = urlPath.lastIndexOf(u'/'); @@ -1353,11 +1351,10 @@ QStringList qt_strip_filters(const QStringList &filters) #if QT_CONFIG(regularexpression) QStringList strippedFilters; static const QRegularExpression r(QString::fromLatin1(QPlatformFileDialogHelper::filterRegExp)); - const int numFilters = filters.size(); - strippedFilters.reserve(numFilters); - for (int i = 0; i < numFilters; ++i) { + strippedFilters.reserve(filters.size()); + for (const QString &filter : filters) { QString filterName; - auto match = r.match(filters[i]); + auto match = r.match(filter); if (match.hasMatch()) filterName = match.captured(1); strippedFilters.append(filterName.simplified()); @@ -1392,11 +1389,10 @@ void QFileDialog::setNameFilters(const QStringList &filters) { Q_D(QFileDialog); QStringList cleanedFilters; - const int numFilters = filters.size(); - cleanedFilters.reserve(numFilters); - for (int i = 0; i < numFilters; ++i) { - cleanedFilters << filters[i].simplified(); - } + cleanedFilters.reserve(filters.size()); + for (const QString &filter : filters) + cleanedFilters << filter.simplified(); + d->options->setNameFilters(cleanedFilters); if (!d->usingWidgets()) @@ -3355,8 +3351,10 @@ void QFileDialogPrivate::navigate(HistoryItem &historyItem) | QItemSelectionModel::Rows; selectionModel->select(historyItem.selection.constFirst(), flags | QItemSelectionModel::Clear | QItemSelectionModel::Current); - for (int i = 1, size = historyItem.selection.size(); i < size; ++i) - selectionModel->select(historyItem.selection.at(i), flags); + auto it = historyItem.selection.cbegin() + 1; + const auto end = historyItem.selection.cend(); + for (; it != end; ++it) + selectionModel->select(*it, flags); view->scrollTo(historyItem.selection.constFirst()); } @@ -3532,9 +3530,9 @@ void QFileDialogPrivate::_q_deleteCurrent() if (model->isReadOnly()) return; - QModelIndexList list = qFileDialogUi->listView->selectionModel()->selectedRows(); - for (int i = list.size() - 1; i >= 0; --i) { - QPersistentModelIndex index = list.at(i); + const QModelIndexList list = qFileDialogUi->listView->selectionModel()->selectedRows(); + for (auto it = list.crbegin(), end = list.crend(); it != end; ++it) { + QPersistentModelIndex index = *it; if (index == qFileDialogUi->listView->rootIndex()) continue; |