diff --git a/sources/diagramposition.cpp b/sources/diagramposition.cpp index df4632a2d..cfdae4a9b 100644 --- a/sources/diagramposition.cpp +++ b/sources/diagramposition.cpp @@ -1,17 +1,17 @@ /* 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 . */ @@ -29,7 +29,7 @@ DiagramPosition::DiagramPosition(const QString &letter, unsigned int number) { // purifie les lettres letter_ = letter.toUpper(); - letter_.remove(QRegExp("[^A-Z]")); + letter_.remove(QRegularExpression("[^A-Z]")); number_ = number; } @@ -64,7 +64,7 @@ QString DiagramPosition::toString() return("-"); } QSettings settings; - + if (settings.value("border-columns_0", true).toBool()){ return(QString("%1%2").arg(letter_).arg(number_ - 1)); }else{ diff --git a/sources/diagramposition.h b/sources/diagramposition.h index b6eb7e79e..8d2add4e8 100644 --- a/sources/diagramposition.h +++ b/sources/diagramposition.h @@ -1,17 +1,17 @@ /* 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 . */ @@ -19,7 +19,6 @@ #define DIAGRAM_POSITION_H #include #include -#include /** 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 @@ -31,7 +30,7 @@ class DiagramPosition { public: DiagramPosition(const QString & = "", unsigned int = 0); virtual ~DiagramPosition(); - + // methods public: QPointF position() const; @@ -40,7 +39,7 @@ class DiagramPosition { bool isOutOfBounds() const; unsigned int number()const {return number_;} QString letter()const {return letter_;} - + // attributes private: QString letter_;