kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 22:00:35 +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:01:38 +02:00
parent c7f138a0e3
commit 0a46b83dca
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sources/ElementsCollection/elementslocation.cpp
View File

@@ -144,9 +144,9 @@ bool ElementsLocation::operator!=(const ElementsLocation &other) const
*/ */
QString ElementsLocation::baseName() const QString ElementsLocation::baseName() const
{ {
QRegExp regexp("^.*([^/]+)\\.elmt$"); QRegularExpression regexp("^.*([^/]+)\\.elmt$");
if (regexp.exactMatch(m_collection_path)) { if (regexp==QRegularExpression(m_collection_path)) {
return(regexp.capturedTexts().at(1)); return(regexp.namedCaptureGroups().at(1));
} }
return(QString()); return(QString());
} }
@@ -241,17 +241,19 @@ void ElementsLocation::setPath(const QString &path)
//The path start with project, we get the project and the path from the string //The path start with project, we get the project and the path from the string
else if (tmp_path.startsWith("project")) else if (tmp_path.startsWith("project"))
{ {
QRegExp rx("^project([0-9]+)\\+(embed:\\/\\/.*)$", Qt::CaseInsensitive); QRegularExpression rx
if (rx.exactMatch(tmp_path)) ("^project([0-9]+)\\+(embed:\\/\\/.*)$",
QRegularExpression::CaseInsensitiveOption);
if (rx==QRegularExpression(tmp_path))
{ {
bool conv_ok; bool conv_ok;
uint project_id = rx.capturedTexts().at(1).toUInt(&conv_ok); uint project_id = rx.namedCaptureGroups().at(1).toUInt(&conv_ok);
if (conv_ok) if (conv_ok)
{ {
QETProject *project = QETApp::project(project_id); QETProject *project = QETApp::project(project_id);
if (project) if (project)
{ {
m_collection_path = rx.capturedTexts().at(2); m_collection_path = rx.namedCaptureGroups().at(2);
m_project = project; m_project = project;
} }
} }
@@ -351,11 +353,11 @@ bool ElementsLocation::addToPath(const QString &string)
ElementsLocation ElementsLocation::parent() const ElementsLocation ElementsLocation::parent() const
{ {
ElementsLocation copy(*this); ElementsLocation copy(*this);
QRegExp re1("^([a-z]+://)(.*)/*$"); QRegularExpression re1("^([a-z]+://)(.*)/*$");
if (re1.exactMatch(m_collection_path)) { if (re1==QRegularExpression(m_collection_path)) {
QString path_proto = re1.capturedTexts().at(1); QString path_proto = re1.namedCaptureGroups().at(1);
QString path_path = re1.capturedTexts().at(2); QString path_path = re1.namedCaptureGroups().at(2);
QString parent_path = path_path.remove(QRegExp("/*[^/]+$")); QString parent_path = path_path.remove(QRegularExpression("/*[^/]+$"));
copy.setPath(path_proto + parent_path); copy.setPath(path_proto + parent_path);
} }
return(copy); return(copy);
@@ -718,14 +720,14 @@ bool ElementsLocation::setXml(const QDomDocument &xml_document) const
else else
{ {
QString path_ = collectionPath(false); QString path_ = collectionPath(false);
QRegExp rx ("^(.*)/(.*\\.elmt)$"); QRegularExpression rx ("^(.*)/(.*\\.elmt)$");
if (rx.exactMatch(path_)) { if (rx==QRegularExpression(path_)) {
return project() return project()
->embeddedElementCollection() ->embeddedElementCollection()
->addElementDefinition( ->addElementDefinition(
rx.cap(1), rx.namedCaptureGroups().at(1),
rx.cap(2), rx.namedCaptureGroups().at(2),
xml_document xml_document
.documentElement()); .documentElement());
} }