kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-04-10 00:29:58 +02: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:05:47 +02:00
parent 4c54335301
commit 813014ec33
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sources/titleblock/templatelocation.cpp
View File

@@ -19,6 +19,8 @@
#include "templatescollection.h" #include "templatescollection.h"
#include "qetapp.h" #include "qetapp.h"
#include <QRegularExpression>
// make this class usable with QVariant // make this class usable with QVariant
int TitleBlockTemplateLocation::MetaTypeId = qRegisterMetaType<TitleBlockTemplateLocation>("TitleBlockTemplateLocation"); int TitleBlockTemplateLocation::MetaTypeId = qRegisterMetaType<TitleBlockTemplateLocation>("TitleBlockTemplateLocation");
@@ -98,9 +100,9 @@ bool TitleBlockTemplateLocation::isValid() const
void TitleBlockTemplateLocation::fromString(const QString &loc_str) { void TitleBlockTemplateLocation::fromString(const QString &loc_str) {
collection_ = QETApp::titleBlockTemplatesCollection(QUrl(loc_str).scheme()); collection_ = QETApp::titleBlockTemplatesCollection(QUrl(loc_str).scheme());
QRegExp name_from_url("^[^:]*:\\/\\/(.*)$"); QRegularExpression name_from_url("^[^:]*:\\/\\/(.*)$");
if (name_from_url.exactMatch(loc_str)) { if (name_from_url==QRegularExpression(loc_str)) {
name_ = name_from_url.capturedTexts().at(1); name_ = name_from_url.namedCaptureGroups().at(1);
} else { } else {
name_ = QString(); name_ = QString();
} }