Skip to content

Commit ace9af5

Browse files
w0xltprusnakjarolrod
committed
qt: Replace QRegExp with QRegularExpression
Co-authored-by: Pavol Rusnak <[email protected]> Co-authored-by: Jarol Rodriguez <[email protected]>
1 parent c378535 commit ace9af5

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/qt/guiutil.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
#include <QMouseEvent>
5757
#include <QPluginLoader>
5858
#include <QProgressDialog>
59+
#include <QRegularExpression>
5960
#include <QScreen>
6061
#include <QSettings>
6162
#include <QShortcut>
@@ -294,10 +295,11 @@ QString getDefaultDataDirectory()
294295

295296
QString ExtractFirstSuffixFromFilter(const QString& filter)
296297
{
297-
QRegExp filter_re(".* \\(\\*\\.(.*)[ \\)]");
298+
QRegularExpression filter_re(QStringLiteral(".* \\(\\*\\.(.*)[ \\)]"), QRegularExpression::InvertedGreedinessOption);
298299
QString suffix;
299-
if (filter_re.exactMatch(filter)) {
300-
suffix = filter_re.cap(1);
300+
QRegularExpressionMatch m = filter_re.match(filter);
301+
if (m.hasMatch()) {
302+
suffix = m.captured(1);
301303
}
302304
return suffix;
303305
}

src/qt/utilitydialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
#include <QCloseEvent>
2323
#include <QLabel>
2424
#include <QMainWindow>
25-
#include <QRegExp>
25+
#include <QRegularExpression>
26+
#include <QString>
2627
#include <QTextCursor>
2728
#include <QTextTable>
2829
#include <QVBoxLayout>
@@ -44,9 +45,8 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
4445
/// HTML-format the license message from the core
4546
QString licenseInfoHTML = QString::fromStdString(LicenseInfo());
4647
// Make URLs clickable
47-
QRegExp uri("<(.*)>", Qt::CaseSensitive, QRegExp::RegExp2);
48-
uri.setMinimal(true); // use non-greedy matching
49-
licenseInfoHTML.replace(uri, "<a href=\"\\1\">\\1</a>");
48+
QRegularExpression uri(QStringLiteral("<(.*)>"), QRegularExpression::InvertedGreedinessOption);
49+
licenseInfoHTML.replace(uri, QStringLiteral("<a href=\"\\1\">\\1</a>"));
5050
// Replace newlines with HTML breaks
5151
licenseInfoHTML.replace("\n", "<br>");
5252

0 commit comments

Comments
 (0)