kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 05:00:33 +01:00
Code Issues Actions Packages Projects Releases Wiki 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:04:48 +02:00
parent 859f6dd06d
commit 0b3238aac0
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/diagramposition.cpp
View File

@@ -1,17 +1,17 @@
/* /*
Copyright 2006-2020 The QElectroTech Team Copyright 2006-2020 The QElectroTech Team
This file is part of QElectroTech. This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
QElectroTech is distributed in the hope that it will be useful, QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
@@ -29,7 +29,7 @@
DiagramPosition::DiagramPosition(const QString &letter, unsigned int number) { DiagramPosition::DiagramPosition(const QString &letter, unsigned int number) {
// purifie les lettres // purifie les lettres
letter_ = letter.toUpper(); letter_ = letter.toUpper();
letter_.remove(QRegExp("[^A-Z]")); letter_.remove(QRegularExpression("[^A-Z]"));
number_ = number; number_ = number;
} }
@@ -64,7 +64,7 @@ QString DiagramPosition::toString()
return("-"); return("-");
} }
QSettings settings; QSettings settings;
if (settings.value("border-columns_0", true).toBool()){ if (settings.value("border-columns_0", true).toBool()){
return(QString("%1%2").arg(letter_).arg(number_ - 1)); return(QString("%1%2").arg(letter_).arg(number_ - 1));
}else{ }else{

11
sources/diagramposition.h
View File

@@ -1,17 +1,17 @@
/* /*
Copyright 2006-2020 The QElectroTech Team Copyright 2006-2020 The QElectroTech Team
This file is part of QElectroTech. This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or the Free Software Foundation, either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
QElectroTech is distributed in the hope that it will be useful, QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
@@ -19,7 +19,6 @@
#define DIAGRAM_POSITION_H #define DIAGRAM_POSITION_H
#include <QPointF> #include <QPointF>
#include <QString> #include <QString>
#include <QRegExp>
/** /**
This class stores the position of an electrical element on its parent diagram. This class stores the position of an electrical element on its parent diagram.
While exact coordinates can be stored for convenience, the concept of diagram While exact coordinates can be stored for convenience, the concept of diagram
@@ -31,7 +30,7 @@ class DiagramPosition {
public: public:
DiagramPosition(const QString & = "", unsigned int = 0); DiagramPosition(const QString & = "", unsigned int = 0);
virtual ~DiagramPosition(); virtual ~DiagramPosition();
// methods // methods
public: public:
QPointF position() const; QPointF position() const;
@@ -40,7 +39,7 @@ class DiagramPosition {
bool isOutOfBounds() const; bool isOutOfBounds() const;
unsigned int number()const {return number_;} unsigned int number()const {return number_;}
QString letter()const {return letter_;} QString letter()const {return letter_;}
// attributes // attributes
private: private:
QString letter_; QString letter_;