mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-17 12:40:35 +01:00
Fix deprecated QRegExp
Use QRegularExpression instead. https://doc.qt.io/qt-5/qregularexpression.html#notes-for-qregexp-users This function was introduced in Qt 5
This commit is contained in:
@@ -1,27 +1,30 @@
|
||||
/*
|
||||
Copyright 2006-2020 The QElectroTech Team
|
||||
This file is part of QElectroTech.
|
||||
|
||||
|
||||
QElectroTech is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
|
||||
QElectroTech is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "qetregexpvalidator.h"
|
||||
#include <QRegularExpression>
|
||||
|
||||
/**
|
||||
Constructeur
|
||||
@param parent QObject parent
|
||||
*/
|
||||
QETRegExpValidator::QETRegExpValidator(QObject *parent) : QRegExpValidator(parent) {
|
||||
QETRegExpValidator::QETRegExpValidator(QObject *parent)
|
||||
: QRegularExpressionValidator(parent)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -29,7 +32,10 @@ QETRegExpValidator::QETRegExpValidator(QObject *parent) : QRegExpValidator(paren
|
||||
@param regexp Expression reguliere a valider
|
||||
@param parent QObject parent
|
||||
*/
|
||||
QETRegExpValidator::QETRegExpValidator(const QRegExp ®exp, QObject *parent) : QRegExpValidator(regexp, parent) {
|
||||
QETRegExpValidator::QETRegExpValidator(
|
||||
const QRegularExpression ®exp, QObject *parent) :
|
||||
QRegularExpressionValidator(regexp, parent)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -40,13 +46,15 @@ QETRegExpValidator::~QETRegExpValidator()
|
||||
}
|
||||
|
||||
/**
|
||||
@see QRegExpValidator::validate
|
||||
@see QRegularExpressionValidator::validate
|
||||
@see validationFailed()
|
||||
Emet le signal validationFailed si la validation echoue
|
||||
*/
|
||||
QValidator::State QETRegExpValidator::validate(QString &input, int &pos) const
|
||||
{
|
||||
QValidator::State result = QRegExpValidator::validate(input, pos);
|
||||
if (result == QValidator::Invalid) emit(validationFailed());
|
||||
QValidator::State result = QRegularExpressionValidator::validate(
|
||||
input, pos);
|
||||
if (result == QValidator::Invalid)
|
||||
emit(validationFailed());
|
||||
return(result);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user