summaryrefslogtreecommitdiff
path: root/src/settingsdialoggeneral.cpp
diff options
context:
space:
mode:
authorJeremy Rimpo <jeremy.rimpo@servermonkey.com>2021-12-06 03:51:08 -0600
committerMikaƫl Capelle <capelle.mikael@gmail.com>2022-04-19 15:17:23 +0200
commitc4b2be45d29a247422e60bb8fdf1664c10384eee (patch)
tree729640dc3e5105fe6eea04a5a03451176fc91a7e /src/settingsdialoggeneral.cpp
parentec01532ecbd2d7c99d1b3bdd8cf261795df59327 (diff)
First pass for Qt6 compatibility
Diffstat (limited to 'src/settingsdialoggeneral.cpp')
-rw-r--r--src/settingsdialoggeneral.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index b0f40882..48045245 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -72,7 +72,7 @@ void GeneralSettingsTab::addLanguages()
QString::fromStdWString(AppConfig::translationPrefix()) +
"_([a-z]{2,3}(_[A-Z]{2,2})?).qm";
- const QRegExp exp(pattern);
+ const QRegularExpression exp(QRegularExpression::anchoredPattern(pattern));
QDirIterator iter(
QCoreApplication::applicationDirPath() + "/translations",
@@ -84,11 +84,12 @@ void GeneralSettingsTab::addLanguages()
iter.next();
const QString file = iter.fileName();
- if (!exp.exactMatch(file)) {
+ auto match = exp.match(file);
+ if (!match.hasMatch()) {
continue;
}
- const QString languageCode = exp.cap(1);
+ const QString languageCode = match.captured(1);
const QLocale locale(languageCode);
QString languageString = QString("%1 (%2)")
@@ -103,7 +104,7 @@ void GeneralSettingsTab::addLanguages()
}
}
- languages.push_back({languageString, exp.cap(1)});
+ languages.push_back({languageString, match.captured(1)});
}
if (!ui->languageBox->findText("English")) {