From 3867897edd1090e2d9cba74325f8389c8d47b06d Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 8 Oct 2022 13:32:50 +0200 Subject: [PATCH] Gui: replace QRegExp with QRegularExpression --- src/Gui/DlgCreateNewPreferencePackImp.cpp | 4 ++-- src/Gui/DlgCreateNewPreferencePackImp.h | 4 ++-- src/Gui/QtAll.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Gui/DlgCreateNewPreferencePackImp.cpp b/src/Gui/DlgCreateNewPreferencePackImp.cpp index e32efbae5b..8e41ddffd2 100644 --- a/src/Gui/DlgCreateNewPreferencePackImp.cpp +++ b/src/Gui/DlgCreateNewPreferencePackImp.cpp @@ -48,8 +48,8 @@ DlgCreateNewPreferencePackImp::DlgCreateNewPreferencePackImp(QWidget* parent) { ui->setupUi(this); - QRegExp validNames(QString::fromUtf8("[^/\\\\?%*:|\"<>]+")); - _nameValidator.setRegExp(validNames); + QRegularExpression validNames(QString::fromUtf8("[^/\\\\?%*:|\"<>]+")); + _nameValidator.setRegularExpression(validNames); ui->lineEdit->setValidator(&_nameValidator); ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); connect(ui->treeWidget, &QTreeWidget::itemChanged, this, &DlgCreateNewPreferencePackImp::onItemChanged); diff --git a/src/Gui/DlgCreateNewPreferencePackImp.h b/src/Gui/DlgCreateNewPreferencePackImp.h index d154d31808..f322a6cd81 100644 --- a/src/Gui/DlgCreateNewPreferencePackImp.h +++ b/src/Gui/DlgCreateNewPreferencePackImp.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include "PreferencePackManager.h" @@ -72,7 +72,7 @@ private: std::unique_ptr ui; std::map _groups; std::vector _templates; - QRegExpValidator _nameValidator; + QRegularExpressionValidator _nameValidator; std::vector _existingPackNames; }; diff --git a/src/Gui/QtAll.h b/src/Gui/QtAll.h index bae0c25606..b22fcfc1c2 100644 --- a/src/Gui/QtAll.h +++ b/src/Gui/QtAll.h @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include