From 813014ec3378234fba17748a862441f7e5de1f37 Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Fri, 18 Sep 2020 23:05:47 +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/titleblock/templatelocation.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sources/titleblock/templatelocation.cpp b/sources/titleblock/templatelocation.cpp index 95c40a717..3a20f7ef5 100644 --- a/sources/titleblock/templatelocation.cpp +++ b/sources/titleblock/templatelocation.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 . */ @@ -19,6 +19,8 @@ #include "templatescollection.h" #include "qetapp.h" +#include + // make this class usable with QVariant int TitleBlockTemplateLocation::MetaTypeId = qRegisterMetaType("TitleBlockTemplateLocation"); @@ -97,10 +99,10 @@ bool TitleBlockTemplateLocation::isValid() const */ void TitleBlockTemplateLocation::fromString(const QString &loc_str) { collection_ = QETApp::titleBlockTemplatesCollection(QUrl(loc_str).scheme()); - - QRegExp name_from_url("^[^:]*:\\/\\/(.*)$"); - if (name_from_url.exactMatch(loc_str)) { - name_ = name_from_url.capturedTexts().at(1); + + QRegularExpression name_from_url("^[^:]*:\\/\\/(.*)$"); + if (name_from_url==QRegularExpression(loc_str)) { + name_ = name_from_url.namedCaptureGroups().at(1); } else { name_ = QString(); }