kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-08-02 01:54:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix QRegularExpression API misuse in ElementsLocation::setXml (Qt6 path)

Browse Source 
The Qt6 branch of the #if QT_VERSION guard swapped QRegExp for
QRegularExpression but kept calling QRegExp-only methods
(exactMatch()/cap()), which QRegularExpression doesn't have.
Use the correct QRegularExpression API instead: match() returns
a QRegularExpressionMatch, tested with hasMatch() and read with
captured(n).
This commit is contained in:
scorpio810
2026-07-17 07:45:51 +00:00
committed by Laurent Trinques
parent fea4752a06
commit 62dc1e7c11
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/ElementsCollection/elementslocation.cpp
+4 -3
View File
@@ -804,14 +804,15 @@ bool ElementsLocation::setXml(const QDomDocument &xml_document) const
QString path_ = collectionPath(false); QString path_ = collectionPath(false);
QRegularExpression rx("^(.*)/(.*\\.elmt)$"); QRegularExpression rx("^(.*)/(.*\\.elmt)$");
QRegularExpressionMatch match = rx.match(path_);
if (rx.exactMatch(path_)) if (match.hasMatch())
{ {
return project() return project()
->embeddedElementCollection() ->embeddedElementCollection()
->addElementDefinition( ->addElementDefinition(
rx.cap(1), match.captured(1),
rx.cap(2), match.captured(2),
xml_document.documentElement()); xml_document.documentElement());
} }
else else