summaryrefslogtreecommitdiff
path: root/utils/rbutilqt/gui
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-07-25 20:04:22 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2021-12-24 18:05:53 +0100
commit9e28474e47d1cdcb432bb43b32b06f693f4fca3f (patch)
tree58dbfd2d43e152e582b2364a8c4f1a25d68869bd /utils/rbutilqt/gui
parent72071d108cca08caa199708b6929a959032fc094 (diff)
downloadrockbox-9e28474e47d1cdcb432bb43b32b06f693f4fca3f.tar.gz
rockbox-9e28474e47d1cdcb432bb43b32b06f693f4fca3f.zip
rbutil: Replace QRegExp with QRegularExpression.
The former is not part of Qt6 anymore, while the latter has been introduced with Qt5. We don't support Qt4 anymore, so move to QRegularExpression. Change-Id: Icc15ef422790f3740660c5581294aa0536f46b1f
Diffstat (limited to 'utils/rbutilqt/gui')
-rw-r--r--utils/rbutilqt/gui/changelog.cpp6
-rw-r--r--utils/rbutilqt/gui/selectiveinstallwidget.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/utils/rbutilqt/gui/changelog.cpp b/utils/rbutilqt/gui/changelog.cpp
index 79d601e412..9005b9e474 100644
--- a/utils/rbutilqt/gui/changelog.cpp
+++ b/utils/rbutilqt/gui/changelog.cpp
@@ -60,10 +60,10 @@ QString Changelog::parseChangelogFile(QString filename)
60 line = c.readLine(); 60 line = c.readLine();
61 text.append("<ul>"); 61 text.append("<ul>");
62 while(line.startsWith("*")) { 62 while(line.startsWith("*")) {
63 QString t = line.remove(QRegExp("^\\*")); 63 QString t = line.remove(QRegularExpression("^\\*"));
64 t.replace(QRegExp("FS#(\\d+)"), 64 t.replace(QRegularExpression("FS#(\\d+)"),
65 "<a href='http://www.rockbox.org/tracker/task/\\1'>FS#\\1</a>"); 65 "<a href='http://www.rockbox.org/tracker/task/\\1'>FS#\\1</a>");
66 t.replace(QRegExp("G#(\\d+)"), 66 t.replace(QRegularExpression("G#(\\d+)"),
67 "<a href='http://gerrit.rockbox.org/r/\\1'>G#\\1</a>"); 67 "<a href='http://gerrit.rockbox.org/r/\\1'>G#\\1</a>");
68 text.append(QString("<li>%1</li>").arg(t)); 68 text.append(QString("<li>%1</li>").arg(t));
69 line = c.readLine(); 69 line = c.readLine();
diff --git a/utils/rbutilqt/gui/selectiveinstallwidget.cpp b/utils/rbutilqt/gui/selectiveinstallwidget.cpp
index 9bfe7414a3..a0504c0f40 100644
--- a/utils/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/utils/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -334,7 +334,7 @@ void SelectiveInstallWidget::installBootloader(void)
334 PlayerBuildInfo::DisplayName).toString() 334 PlayerBuildInfo::DisplayName).toString()
335 + " Firmware Backup"; 335 + " Firmware Backup";
336 // remove invalid character(s) 336 // remove invalid character(s)
337 targetFolder.remove(QRegExp("[:/]")); 337 targetFolder.remove(QRegularExpression("[:/]"));
338 if(QMessageBox::question(this, tr("Create Bootloader backup"), 338 if(QMessageBox::question(this, tr("Create Bootloader backup"),
339 tr("You can create a backup of the original bootloader " 339 tr("You can create a backup of the original bootloader "
340 "file. Press \"Yes\" to select an output folder on your " 340 "file. Press \"Yes\" to select an output folder on your "