summaryrefslogtreecommitdiffstats
path: root/examples/assistant
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-03-18 22:07:41 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-03-19 11:03:11 +0100
commitdb14f7047ba45cff42adb73eac0bce4034dd4a03 (patch)
treebb0c66df445cf389e63098f2ba7a603c03e0ed7c /examples/assistant
parentaa1cdb8a6138501aa76e7d208afac6598dad27a6 (diff)
Migrate away from QRegExp
It will be moved to Qt5Compat, avoid depending on it where not necessary. Remove usages in Qt Designer, windeployqt and examples. Change-Id: I5f5efc6999e60d995ebbc81fcaf80e7be08711b2 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples/assistant')
-rw-r--r--examples/assistant/simpletextviewer/findfiledialog.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/examples/assistant/simpletextviewer/findfiledialog.cpp b/examples/assistant/simpletextviewer/findfiledialog.cpp
index cf64e9a6a..c9cfc8e09 100644
--- a/examples/assistant/simpletextviewer/findfiledialog.cpp
+++ b/examples/assistant/simpletextviewer/findfiledialog.cpp
@@ -59,6 +59,7 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
+#include <QRegularExpression>
#include <QToolButton>
#include <QTreeWidget>
#include <QTreeWidgetItem>
@@ -129,8 +130,10 @@ void FindFileDialog::update()
void FindFileDialog::findFiles()
{
- QRegExp filePattern(fileNameComboBox->currentText() + "*");
- filePattern.setPatternSyntax(QRegExp::Wildcard);
+ QString wildCard = fileNameComboBox->currentText();
+ if (!wildCard.endsWith('*'))
+ wildCard += '*';
+ QRegularExpression filePattern(QRegularExpression::wildcardToRegularExpression(wildCard));
QDir directory(directoryComboBox->currentText());
@@ -138,7 +141,7 @@ void FindFileDialog::findFiles()
QStringList matchingFiles;
for (const QString &file : allFiles) {
- if (filePattern.exactMatch(file))
+ if (filePattern.match(file).hasMatch())
matchingFiles << file;
}
showFiles(matchingFiles);