mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: replace QRegExp with QRegularExpression

Browse source 
Qt 6 will drop support for QRegExp.
Use QRegularExpression instead.

The syntax for matches has changed and needed to be adjusted.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2021-10-25 16:48:47 -07:00
parent bb5866f49e
commit 73e9c099eb
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
desktop-widgets/preferences/preferences_language.cpp
View file

@ -95,14 +95,14 @@ void PreferencesLanguage::syncSettings()
refreshSettings();
QString qDateTimeWeb = tr("These will be used as is. This might not be what you intended.\nSee http://doc.qt.io/qt-5/qdatetime.html#toString");
QRegExp tfillegalchars("[^hHmszaApPt\\s:;\\.,]");
if (tfillegalchars.indexIn(ui->timeFormatEntry->currentText()) >= 0)
QRegularExpression tfillegalchars("[^hHmszaApPt\\s:;\\.,]");
if (tfillegalchars.match(ui->timeFormatEntry->currentText()).hasMatch())
QMessageBox::warning(this, tr("Literal characters"),
tr("Non-special character(s) in time format.\n") + qDateTimeWeb);
QRegExp dfillegalchars("[^dMy/\\s:;\\.,\\-]");
if (dfillegalchars.indexIn(ui->dateFormatEntry->currentText()) >= 0 ||
dfillegalchars.indexIn(ui->shortDateFormatEntry->text()) >= 0)
QRegularExpression dfillegalchars("[^dMy/\\s:;\\.,\\-]");
if (dfillegalchars.match(ui->dateFormatEntry->currentText()).hasMatch() ||
dfillegalchars.match(ui->shortDateFormatEntry->text()).hasMatch())
QMessageBox::warning(this, tr("Literal characters"),
tr("Non-special character(s) in date format.\n") + qDateTimeWeb);
}