From da778d7ade955b0c5034e82864db03dbdb48acb7 Mon Sep 17 00:00:00 2001 From: Huang Jie Date: Wed, 3 Mar 2021 17:44:21 +0800 Subject: [PATCH] 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 Reviewed-by: Edward Welbourne (cherry picked from commit 8a226cd76b96527970b1600f6975c13eccddf109) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/dialogs/qfiledialog.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index ad2a025090c..931b8a69e3f 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -1335,21 +1335,14 @@ QList 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); } /*!