From 859f6dd06db5f2cca20f11f5effc5b919b514394 Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Fri, 18 Sep 2020 23:04:43 +0200 Subject: [PATCH] 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 --- sources/diagramcontext.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sources/diagramcontext.cpp b/sources/diagramcontext.cpp index 2e0ddf8de..b7e711099 100644 --- a/sources/diagramcontext.cpp +++ b/sources/diagramcontext.cpp @@ -1,24 +1,25 @@ /* 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 . */ #include "diagramcontext.h" -#include #include "qet.h" #include +#include +#include /** @brief DiagramContext::add @@ -241,8 +242,9 @@ bool DiagramContext::stringLongerThan(const QString &a, const QString &b) { */ bool DiagramContext::keyIsAcceptable(const QString &key) const { - QRegExp re(DiagramContext::validKeyRegExp()); - return(re.exactMatch(key)); + QRegularExpression re(DiagramContext::validKeyRegExp()); + QRegularExpressionMatch match =re.match(key); + return match.hasMatch(); } QDebug operator <<(QDebug debug, const DiagramContext &context)