diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-07-25 20:04:22 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-24 18:05:53 +0100 |
commit | 9e28474e47d1cdcb432bb43b32b06f693f4fca3f (patch) | |
tree | 58dbfd2d43e152e582b2364a8c4f1a25d68869bd | |
parent | 72071d108cca08caa199708b6929a959032fc094 (diff) | |
download | rockbox-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
-rw-r--r-- | utils/rbutilqt/base/bootloaderinstallipod.cpp | 4 | ||||
-rw-r--r-- | utils/rbutilqt/base/bootloaderinstallsansa.cpp | 4 | ||||
-rw-r--r-- | utils/rbutilqt/base/talkgenerator.cpp | 7 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttsfestival.cpp | 4 | ||||
-rw-r--r-- | utils/rbutilqt/base/utils.cpp | 40 | ||||
-rw-r--r-- | utils/rbutilqt/configure.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/gui/changelog.cpp | 6 | ||||
-rw-r--r-- | utils/rbutilqt/gui/selectiveinstallwidget.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/installtalkwindow.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/rbutilqt.cpp | 4 | ||||
-rw-r--r-- | utils/rbutilqt/sysinfo.cpp | 3 |
11 files changed, 41 insertions, 37 deletions
diff --git a/utils/rbutilqt/base/bootloaderinstallipod.cpp b/utils/rbutilqt/base/bootloaderinstallipod.cpp index 807c6e870b..f94813f99f 100644 --- a/utils/rbutilqt/base/bootloaderinstallipod.cpp +++ b/utils/rbutilqt/base/bootloaderinstallipod.cpp | |||
@@ -233,10 +233,10 @@ bool BootloaderInstallIpod::ipodInitialize(struct ipod_t *ipod) | |||
233 | sprintf(ipod->diskname, "\\\\.\\PhysicalDrive%i", devicename.toInt()); | 233 | sprintf(ipod->diskname, "\\\\.\\PhysicalDrive%i", devicename.toInt()); |
234 | #elif defined(Q_OS_MACX) | 234 | #elif defined(Q_OS_MACX) |
235 | sprintf(ipod->diskname, "%s", | 235 | sprintf(ipod->diskname, "%s", |
236 | qPrintable(devicename.remove(QRegExp("s[0-9]+$")))); | 236 | qPrintable(devicename.remove(QRegularExpression("s[0-9]+$")))); |
237 | #else | 237 | #else |
238 | sprintf(ipod->diskname, "%s", | 238 | sprintf(ipod->diskname, "%s", |
239 | qPrintable(devicename.remove(QRegExp("[0-9]+$")))); | 239 | qPrintable(devicename.remove(QRegularExpression("[0-9]+$")))); |
240 | #endif | 240 | #endif |
241 | LOG_INFO() << "ipodpatcher: overriding scan, using" | 241 | LOG_INFO() << "ipodpatcher: overriding scan, using" |
242 | << ipod->diskname; | 242 | << ipod->diskname; |
diff --git a/utils/rbutilqt/base/bootloaderinstallsansa.cpp b/utils/rbutilqt/base/bootloaderinstallsansa.cpp index b1f0167e42..d4a2799f73 100644 --- a/utils/rbutilqt/base/bootloaderinstallsansa.cpp +++ b/utils/rbutilqt/base/bootloaderinstallsansa.cpp | |||
@@ -243,10 +243,10 @@ bool BootloaderInstallSansa::sansaInitialize(struct sansa_t *sansa) | |||
243 | sprintf(sansa->diskname, "\\\\.\\PhysicalDrive%i", devicename.toInt()); | 243 | sprintf(sansa->diskname, "\\\\.\\PhysicalDrive%i", devicename.toInt()); |
244 | #elif defined(Q_OS_MACX) | 244 | #elif defined(Q_OS_MACX) |
245 | sprintf(sansa->diskname, | 245 | sprintf(sansa->diskname, |
246 | "%s", qPrintable(devicename.remove(QRegExp("s[0-9]+$")))); | 246 | "%s", qPrintable(devicename.remove(QRegularExpression("s[0-9]+$")))); |
247 | #else | 247 | #else |
248 | sprintf(sansa->diskname, | 248 | sprintf(sansa->diskname, |
249 | "%s", qPrintable(devicename.remove(QRegExp("[0-9]+$")))); | 249 | "%s", qPrintable(devicename.remove(QRegularExpression("[0-9]+$")))); |
250 | #endif | 250 | #endif |
251 | LOG_INFO() << "sansapatcher: overriding scan, using" | 251 | LOG_INFO() << "sansapatcher: overriding scan, using" |
252 | << sansa->diskname; | 252 | << sansa->diskname; |
diff --git a/utils/rbutilqt/base/talkgenerator.cpp b/utils/rbutilqt/base/talkgenerator.cpp index 9139ceb274..0ba2587fac 100644 --- a/utils/rbutilqt/base/talkgenerator.cpp +++ b/utils/rbutilqt/base/talkgenerator.cpp | |||
@@ -263,9 +263,10 @@ QString TalkGenerator::correctString(QString s) | |||
263 | int i = 0; | 263 | int i = 0; |
264 | int max = m_corrections.size(); | 264 | int max = m_corrections.size(); |
265 | while(i < max) { | 265 | while(i < max) { |
266 | corrected = corrected.replace(QRegExp(m_corrections.at(i).search, | 266 | corrected = corrected.replace(QRegularExpression(m_corrections.at(i).search, |
267 | m_corrections.at(i).modifier.contains("i") | 267 | m_corrections.at(i).modifier.contains("i") |
268 | ? Qt::CaseInsensitive : Qt::CaseSensitive), | 268 | ? QRegularExpression::NoPatternOption |
269 | : QRegularExpression::CaseInsensitiveOption), | ||
269 | m_corrections.at(i).replace); | 270 | m_corrections.at(i).replace); |
270 | i++; | 271 | i++; |
271 | } | 272 | } |
@@ -329,7 +330,7 @@ void TalkGenerator::setLang(QString name) | |||
329 | co.search = items.at(3); | 330 | co.search = items.at(3); |
330 | co.replace = items.at(4); | 331 | co.replace = items.at(4); |
331 | // Qt uses backslash for back references, Perl uses dollar sign. | 332 | // Qt uses backslash for back references, Perl uses dollar sign. |
332 | co.replace.replace(QRegExp("\\$(\\d+)"), "\\\\1"); | 333 | co.replace.replace(QRegularExpression("\\$(\\d+)"), "\\\\1"); |
333 | co.modifier = items.at(5); | 334 | co.modifier = items.at(5); |
334 | m_corrections.append(co); | 335 | m_corrections.append(co); |
335 | } | 336 | } |
diff --git a/utils/rbutilqt/base/ttsfestival.cpp b/utils/rbutilqt/base/ttsfestival.cpp index d0ca400909..6acd423506 100644 --- a/utils/rbutilqt/base/ttsfestival.cpp +++ b/utils/rbutilqt/base/ttsfestival.cpp | |||
@@ -294,8 +294,8 @@ QString TTSFestival::getVoiceInfo(QString voice) | |||
294 | } | 294 | } |
295 | else | 295 | else |
296 | { | 296 | { |
297 | response = response.remove(QRegExp("(description \"*\")", | 297 | response = response.remove(QRegularExpression("(description \".*\")", |
298 | Qt::CaseInsensitive, QRegExp::Wildcard)); | 298 | QRegularExpression::CaseInsensitiveOption)); |
299 | LOG_INFO() << "voiceInfo w/o descr:" << response; | 299 | LOG_INFO() << "voiceInfo w/o descr:" << response; |
300 | response = response.remove(')'); | 300 | response = response.remove(')'); |
301 | #if QT_VERSION >= 0x050e00 | 301 | #if QT_VERSION >= 0x050e00 |
diff --git a/utils/rbutilqt/base/utils.cpp b/utils/rbutilqt/base/utils.cpp index f2d3f04887..5a9432c69c 100644 --- a/utils/rbutilqt/base/utils.cpp +++ b/utils/rbutilqt/base/utils.cpp | |||
@@ -118,7 +118,8 @@ QString Utils::resolvePathCase(QString path) | |||
118 | // need to filter using QRegExp as QStringList::filter(QString) | 118 | // need to filter using QRegExp as QStringList::filter(QString) |
119 | // matches any substring | 119 | // matches any substring |
120 | QString expr = QString("^" + elems.at(i) + "$"); | 120 | QString expr = QString("^" + elems.at(i) + "$"); |
121 | QRegExp rx = QRegExp(expr, Qt::CaseInsensitive); | 121 | QRegularExpression rx = QRegularExpression(expr, |
122 | QRegularExpression::CaseInsensitiveOption); | ||
122 | QStringList a = direlems.filter(rx); | 123 | QStringList a = direlems.filter(rx); |
123 | 124 | ||
124 | if(a.size() != 1) | 125 | if(a.size() != 1) |
@@ -403,9 +404,10 @@ QString Utils::checkEnvironment(bool permission) | |||
403 | */ | 404 | */ |
404 | QString Utils::trimVersionString(QString s) | 405 | QString Utils::trimVersionString(QString s) |
405 | { | 406 | { |
406 | QRegExp r = QRegExp(".*([\\d\\.]+\\d+[a-z]?).*"); | 407 | QRegularExpression r = QRegularExpression("^\\D*([\\d\\.]+\\d+[a-z]?).*"); |
407 | if(r.indexIn(s) != -1) { | 408 | QRegularExpressionMatch match = r.match(s); |
408 | return r.cap(1); | 409 | if(match.hasMatch()) { |
410 | return match.captured(1); | ||
409 | } | 411 | } |
410 | return s; | 412 | return s; |
411 | } | 413 | } |
@@ -428,15 +430,15 @@ int Utils::compareVersionStrings(QString s1, QString s2) | |||
428 | 430 | ||
429 | while(!a.isEmpty() || !b.isEmpty()) { | 431 | while(!a.isEmpty() || !b.isEmpty()) { |
430 | // trim all leading non-digits and non-dots (dots are removed afterwards) | 432 | // trim all leading non-digits and non-dots (dots are removed afterwards) |
431 | a.remove(QRegExp("^[^\\d\\.]*")); | 433 | a.remove(QRegularExpression("^[^\\d\\.]*")); |
432 | b.remove(QRegExp("^[^\\d\\.]*")); | 434 | b.remove(QRegularExpression("^[^\\d\\.]*")); |
433 | 435 | ||
434 | // trim all trailing non-digits for conversion (QString::toInt() | 436 | // trim all trailing non-digits for conversion (QString::toInt() |
435 | // requires this). Copy strings first as replace() changes the string. | 437 | // requires this). Copy strings first as replace() changes the string. |
436 | QString numa = a; | 438 | QString numa = a; |
437 | QString numb = b; | 439 | QString numb = b; |
438 | numa.remove(QRegExp("\\D+.*$")); | 440 | numa.remove(QRegularExpression("\\D+.*$")); |
439 | numb.remove(QRegExp("\\D+.*$")); | 441 | numb.remove(QRegularExpression("\\D+.*$")); |
440 | 442 | ||
441 | // convert to number | 443 | // convert to number |
442 | bool ok1, ok2; | 444 | bool ok1, ok2; |
@@ -455,15 +457,15 @@ int Utils::compareVersionStrings(QString s1, QString s2) | |||
455 | return (vala > valb) ? -1 : 1; | 457 | return (vala > valb) ? -1 : 1; |
456 | 458 | ||
457 | // trim leading digits. | 459 | // trim leading digits. |
458 | a.remove(QRegExp("^\\d*")); | 460 | a.remove(QRegularExpression("^\\d*")); |
459 | b.remove(QRegExp("^\\d*")); | 461 | b.remove(QRegularExpression("^\\d*")); |
460 | 462 | ||
461 | // If only one of the following characters is a dot that one is | 463 | // If only one of the following characters is a dot that one is |
462 | // "greater" then anything else. Make sure it's followed by a number, | 464 | // "greater" then anything else. Make sure it's followed by a number, |
463 | // Otherwise it might be the end of the string or suffix. Do this | 465 | // Otherwise it might be the end of the string or suffix. Do this |
464 | // before version addon characters check to avoid stopping too early. | 466 | // before version addon characters check to avoid stopping too early. |
465 | bool adot = a.contains(QRegExp("^[a-zA-Z]*\\.[0-9]")); | 467 | bool adot = a.contains(QRegularExpression("^[a-zA-Z]*\\.[0-9]")); |
466 | bool bdot = b.contains(QRegExp("^[a-zA-Z]*\\.[0-9]")); | 468 | bool bdot = b.contains(QRegularExpression("^[a-zA-Z]*\\.[0-9]")); |
467 | if(adot && !bdot) | 469 | if(adot && !bdot) |
468 | return -1; | 470 | return -1; |
469 | if(!adot && bdot) | 471 | if(!adot && bdot) |
@@ -473,17 +475,17 @@ int Utils::compareVersionStrings(QString s1, QString s2) | |||
473 | // (version numbers like 1.2b.3 aren't handled). | 475 | // (version numbers like 1.2b.3 aren't handled). |
474 | QChar ltra; | 476 | QChar ltra; |
475 | QChar ltrb; | 477 | QChar ltrb; |
476 | if(a.contains(QRegExp("^[a-zA-Z]"))) | 478 | if(a.contains(QRegularExpression("^[a-zA-Z]"))) |
477 | ltra = a.at(0); | 479 | ltra = a.at(0); |
478 | if(b.contains(QRegExp("^[a-zA-Z]"))) | 480 | if(b.contains(QRegularExpression("^[a-zA-Z]"))) |
479 | ltrb = b.at(0); | 481 | ltrb = b.at(0); |
480 | if(ltra != ltrb) | 482 | if(ltra != ltrb) |
481 | return (ltra < ltrb) ? 1 : -1; | 483 | return (ltra < ltrb) ? 1 : -1; |
482 | 484 | ||
483 | // both are identical or no addon characters, ignore. | 485 | // both are identical or no addon characters, ignore. |
484 | // remove modifiers and following dot. | 486 | // remove modifiers and following dot. |
485 | a.remove(QRegExp("^[a-zA-Z]*\\.")); | 487 | a.remove(QRegularExpression("^[a-zA-Z]*\\.")); |
486 | b.remove(QRegExp("^[a-zA-Z]*\\.")); | 488 | b.remove(QRegularExpression("^[a-zA-Z]*\\.")); |
487 | } | 489 | } |
488 | 490 | ||
489 | // no differences found. | 491 | // no differences found. |
@@ -630,7 +632,7 @@ QString Utils::resolveMountPoint(QString device) | |||
630 | 632 | ||
631 | #if defined(Q_OS_WIN32) | 633 | #if defined(Q_OS_WIN32) |
632 | QString result; | 634 | QString result; |
633 | unsigned int driveno = device.replace(QRegExp("^.*([0-9]+)"), "\\1").toInt(); | 635 | unsigned int driveno = device.replace(QRegularExpression("^.*([0-9]+)"), "\\1").toInt(); |
634 | 636 | ||
635 | int letter; | 637 | int letter; |
636 | for(letter = 'A'; letter <= 'Z'; letter++) { | 638 | for(letter = 'A'; letter <= 'Z'; letter++) { |
@@ -800,8 +802,8 @@ QMap<QString, QList<int> > Utils::findRunningProcess(QStringList names) | |||
800 | QStringList k(processlist.keys()); | 802 | QStringList k(processlist.keys()); |
801 | #if defined(Q_OS_WIN32) | 803 | #if defined(Q_OS_WIN32) |
802 | // the process name might be truncated. Allow the extension to be partial. | 804 | // the process name might be truncated. Allow the extension to be partial. |
803 | int index = k.indexOf(QRegExp(names.at(i) + "(\\.(e(x(e?)?)?)?)?", | 805 | int index = k.indexOf(QRegularExpression(names.at(i) + "(\\.(e(x(e?)?)?)?)?", |
804 | Qt::CaseInsensitive)); | 806 | QRegularExpression::CaseInsensitiveOption)); |
805 | #else | 807 | #else |
806 | int index = k.indexOf(names.at(i)); | 808 | int index = k.indexOf(names.at(i)); |
807 | #endif | 809 | #endif |
diff --git a/utils/rbutilqt/configure.cpp b/utils/rbutilqt/configure.cpp index 14080a552c..892b327419 100644 --- a/utils/rbutilqt/configure.cpp +++ b/utils/rbutilqt/configure.cpp | |||
@@ -557,7 +557,7 @@ QStringList Config::findLanguageFiles() | |||
557 | QDir resDir(":/lang"); | 557 | QDir resDir(":/lang"); |
558 | fileNames += resDir.entryList(QStringList("*.qm"), QDir::Files, QDir::Name); | 558 | fileNames += resDir.entryList(QStringList("*.qm"), QDir::Files, QDir::Name); |
559 | 559 | ||
560 | QRegExp exp("^rbutil_(.*)\\.qm"); | 560 | QRegularExpression exp("^rbutil_(.*)\\.qm"); |
561 | for(int i = 0; i < fileNames.size(); i++) { | 561 | for(int i = 0; i < fileNames.size(); i++) { |
562 | QString a = fileNames.at(i); | 562 | QString a = fileNames.at(i); |
563 | a.replace(exp, "\\1"); | 563 | a.replace(exp, "\\1"); |
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 " |
diff --git a/utils/rbutilqt/installtalkwindow.cpp b/utils/rbutilqt/installtalkwindow.cpp index 5499b9533c..f735a36e95 100644 --- a/utils/rbutilqt/installtalkwindow.cpp +++ b/utils/rbutilqt/installtalkwindow.cpp | |||
@@ -58,7 +58,7 @@ void InstallTalkWindow::saveSettings(void) | |||
58 | for(int i = 0; i < si.size(); i++) { | 58 | for(int i = 0; i < si.size(); i++) { |
59 | if(si.at(i).column() == 0) { | 59 | if(si.at(i).column() == 0) { |
60 | QString current = fsm->filePath(si.at(i)); | 60 | QString current = fsm->filePath(si.at(i)); |
61 | foldersToTalk.append(current.remove(QRegExp("^" + mp))); | 61 | foldersToTalk.append(current.remove(QRegularExpression("^" + mp))); |
62 | } | 62 | } |
63 | } | 63 | } |
64 | RbSettings::setValue(RbSettings::TalkFolders, foldersToTalk); | 64 | RbSettings::setValue(RbSettings::TalkFolders, foldersToTalk); |
diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp index 16735dc83a..91704db4b2 100644 --- a/utils/rbutilqt/rbutilqt.cpp +++ b/utils/rbutilqt/rbutilqt.cpp | |||
@@ -303,8 +303,8 @@ void RbUtilQt::about() | |||
303 | while(!r.atEnd()) { | 303 | while(!r.atEnd()) { |
304 | QString line = r.readLine(); | 304 | QString line = r.readLine(); |
305 | // filter out header. | 305 | // filter out header. |
306 | line.remove(QRegExp("^ +.*")); | 306 | line.remove(QRegularExpression("^ +.*")); |
307 | line.remove(QRegExp("^People.*")); | 307 | line.remove(QRegularExpression("^People.*")); |
308 | about.browserCredits->append(line); | 308 | about.browserCredits->append(line); |
309 | } | 309 | } |
310 | credits.close(); | 310 | credits.close(); |
diff --git a/utils/rbutilqt/sysinfo.cpp b/utils/rbutilqt/sysinfo.cpp index 7d05bb8c9a..b753c628f0 100644 --- a/utils/rbutilqt/sysinfo.cpp +++ b/utils/rbutilqt/sysinfo.cpp | |||
@@ -18,6 +18,7 @@ | |||
18 | 18 | ||
19 | #include <QDialog> | 19 | #include <QDialog> |
20 | #include <QDir> | 20 | #include <QDir> |
21 | #include <QRegularExpression> | ||
21 | #include "sysinfo.h" | 22 | #include "sysinfo.h" |
22 | #include "ui_sysinfofrm.h" | 23 | #include "ui_sysinfofrm.h" |
23 | #include "system.h" | 24 | #include "system.h" |
@@ -77,7 +78,7 @@ QString Sysinfo::getInfo(Sysinfo::InfoType type) | |||
77 | info += "</table>"; | 78 | info += "</table>"; |
78 | info += "<hr/>"; | 79 | info += "<hr/>"; |
79 | if(type == InfoText) { | 80 | if(type == InfoText) { |
80 | info.replace(QRegExp("(<[^>]+>)+"),"\n"); | 81 | info.replace(QRegularExpression("(<[^>]+>)+"), "\n"); |
81 | } | 82 | } |
82 | 83 | ||
83 | return info; | 84 | return info; |