realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Fix deprecated QRegExp

Browse Source 
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:
Simon De Backer 2020-09-18 23:05:42 +02:00
parent 271fd096e2
commit 402d2fbf4a
4 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sources/qetregexpvalidator.cpp
View File

@ -16,12 +16,15 @@
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 &regexp, QObject *parent) : QRegExpValidator(regexp, parent) {
QETRegExpValidator::QETRegExpValidator(
const QRegularExpression &regexp, 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);
}

10
sources/qetregexpvalidator.h
View File

@ -17,18 +17,18 @@
*/
#ifndef QET_REGEXP_VALIDATOR_H
#define QET_REGEXP_VALIDATOR_H
#include <QRegExpValidator>
#include <QRegularExpressionValidator>
/**
This class acts like a QRegExpValidator except it emits a signal when the
input validation fails.
This class acts like a QRegularExpressionValidator
except it emits a signal when the input validation fails.
*/
class QETRegExpValidator : public QRegExpValidator {
class QETRegExpValidator : public QRegularExpressionValidator {
Q_OBJECT
// constructors, destructor
public:
QETRegExpValidator(QObject *);
QETRegExpValidator(const QRegExp &, QObject *);
QETRegExpValidator(const QRegularExpression &, QObject *);
~QETRegExpValidator() override;
private:
QETRegExpValidator(const QETRegExpValidator &);

8
sources/qfilenameedit.cpp
View File

@ -18,7 +18,7 @@
#include "qfilenameedit.h"
#include "qetregexpvalidator.h"
#include <QKeyEvent>
#include <QRegExp>
#include <QRegularExpression>
#include <QToolTip>
/**
@ -36,7 +36,7 @@ QFileNameEdit::QFileNameEdit(QWidget *parent) : QLineEdit(parent) {
*/
QFileNameEdit::QFileNameEdit(const QString &contents, QWidget *parent) : QLineEdit(parent) {
init();
if (!contents.isEmpty() && regexp_.exactMatch(contents)) {
if (!contents.isEmpty() && regexp_==QRegularExpression(contents)) {
setText(contents);
}
}
@ -61,7 +61,7 @@ bool QFileNameEdit::isEmpty()
*/
bool QFileNameEdit::isValid()
{
return(regexp_.exactMatch(text()));
return(regexp_==QRegularExpression(text()));
}
/**
@ -69,7 +69,7 @@ bool QFileNameEdit::isValid()
*/
void QFileNameEdit::init()
{
regexp_ = QRegExp("^[0-9a-z_\\-\\.]+$", Qt::CaseSensitive);
regexp_ = QRegularExpression("^[0-9a-z_\\-\\.]+$");
validator_ = new QETRegExpValidator(regexp_, this);
setValidator(validator_);
tooltip_text_ = QString(

4
sources/qfilenameedit.h
View File

@ -18,8 +18,8 @@
#ifndef Q_FILENAME_EDIT_H
#define Q_FILENAME_EDIT_H
#include <QLineEdit>
#include <QRegExp>
#include <QString>
#include <QRegularExpression>
class QETRegExpValidator;
/**
This class represents a textfield dedicated to input a portable filename (not
@ -54,7 +54,7 @@ class QFileNameEdit : public QLineEdit {
// attributes
private:
QRegExp regexp_;
QRegularExpression regexp_;
QETRegExpValidator *validator_;
QString tooltip_text_;
};