summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHuang Jie <huangjie@uniontech.com>2021-03-03 17:44:21 +0800
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-03-30 15:11:14 +0000
commitda778d7ade955b0c5034e82864db03dbdb48acb7 (patch)
treefb41d2c8dc4007aa28775b9db349e26ff9cce829 /src
parentf930f6a7974d31754031463a77cdd7e560bff5f5 (diff)
Variable is Assigned a never used value in qt_make_filter_list()
Variable 'i' is assigned a value that is never used in qt_make_filter_list() Change-Id: Id845ecb5231b97a899443bdcb9f49cccb7f20bea Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 8a226cd76b96527970b1600f6975c13eccddf109) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/dialogs/qfiledialog.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index ad2a025090..931b8a69e3 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -1335,21 +1335,14 @@ QList<QUrl> QFileDialog::selectedUrls() const
*/
QStringList qt_make_filter_list(const QString &filter)
{
- QString f(filter);
-
- if (f.isEmpty())
+ if (filter.isEmpty())
return QStringList();
QString sep(QLatin1String(";;"));
- int i = f.indexOf(sep, 0);
- if (i == -1) {
- if (f.indexOf(QLatin1Char('\n'), 0) != -1) {
- sep = QLatin1Char('\n');
- i = f.indexOf(sep, 0);
- }
- }
+ if (!filter.contains(sep) && filter.contains(QLatin1Char('\n')))
+ sep = QLatin1Char('\n');
- return f.split(sep);
+ return filter.split(sep);
}
/*!