From d200548661fc76635b639458b43776079d6f87e5 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 14 May 2015 16:04:23 +0300 Subject: [PATCH] Use QRegularExpression instead QRegExp. --HG-- branch : develop --- src/app/dialogs/app/dialogincrements.cpp | 3 ++- src/app/dialogs/app/dialogsavelayout.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/dialogs/app/dialogincrements.cpp b/src/app/dialogs/app/dialogincrements.cpp index 0e77a9b69..1c0c8103a 100644 --- a/src/app/dialogs/app/dialogincrements.cpp +++ b/src/app/dialogs/app/dialogincrements.cpp @@ -127,7 +127,8 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par } else { - QRegExpValidator *reg = new QRegExpValidator(QRegExp("\\w+([-+.']\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*")); + QRegularExpressionValidator *reg = + new QRegularExpressionValidator(QRegularExpression("\\w+([-+.']\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*")); ui->lineEditMail->setValidator(reg); HideColumns(ui->tableWidgetMeasurements); diff --git a/src/app/dialogs/app/dialogsavelayout.cpp b/src/app/dialogs/app/dialogsavelayout.cpp index 145f6d55a..3a37bba72 100644 --- a/src/app/dialogs/app/dialogsavelayout.cpp +++ b/src/app/dialogs/app/dialogsavelayout.cpp @@ -49,7 +49,7 @@ DialogSaveLayout::DialogSaveLayout(const QMap &formates, int c SCASSERT(bOk != nullptr); bOk->setEnabled(false); - QRegExpValidator *validator = new QRegExpValidator(QRegExp("^[\\w\\-. ]+$"), this); + QRegularExpressionValidator *validator = new QRegularExpressionValidator(QRegularExpression("^[\\w\\-. ]+$"), this); ui->lineEditFileName->setValidator(validator); ui->lineEditFileName->setText(fileName+"_");