Fix QRegularExpression

-add isValid
-add debug

sources/factory/elementpicturefactory.cpp

@@ -569,11 +569,23 @@ void ElementPictureFactory::setPainterStyle(const QDomElement &dom, QPainter &pa
 #pragma message("@TODO remove code for QT 5.14 or later")
 	const QStringList styles = dom.attribute("style").split(";", Qt::SkipEmptyParts);
 #endif
-	QRegularExpression rx("^\\s*([a-z-]+)\\s*:\\s*([a-zA-Z-]+)\\s*$");
+	QRegularExpression rx("^(?<name>[a-z-]+): (?<value>[a-z-]+)$");
+	if (!rx.isValid())
+	{
+		qWarning() <<"this is an error in the code"
+			  << rx.errorString()
+			  << rx.patternErrorOffset();
+		return;
+	}
 	for (QString style : styles) {
-		if (rx==QRegularExpression(style)) {
-			QString style_name = rx.namedCaptureGroups().at(1);
-			QString style_value = rx.namedCaptureGroups().at(2);
+		QRegularExpressionMatch match = rx.match(style);
+		if (!match.hasMatch())
+		{
+			qDebug()<<"no Match"
+			       <<style;
+		}else {
+			QString style_name = match.captured("name");
+			QString style_value = match.captured("value");
 			if (style_name == "line-style") {
 				if (style_value == "dashed") pen.setStyle(Qt::DashLine);
 				else if (style_value == "dotted") pen.setStyle(Qt::DotLine);

sources/qetapp.cpp

@@ -2102,14 +2102,28 @@ template <class T> void QETApp::addWindowsListToMenu(
 	or -1 if none could be found.
 */
 int QETApp::projectIdFromString(const QString &url) {
-	QRegularExpression embedded("^project([0-9]+)\\+embed.*$", QRegularExpression::CaseInsensitiveOption);
-	if (embedded==QRegularExpression(url)) {
+	QRegularExpression embedded(
+				"^project(?<project_id>[0-9]+)\\+embed.*$",
+				QRegularExpression::CaseInsensitiveOption);
+	if (!embedded.isValid())
+	{
+		qWarning() <<"this is an error in the code"
+			  << embedded.errorString()
+			  << embedded.patternErrorOffset();
+		return(-1);
+	}
+	QRegularExpressionMatch match = embedded.match(url);
+	if (!match.hasMatch())
+	{
+		qDebug()<<"no Match => return"
+		       <<url;
+		return(-1);
+	}
 	bool conv_ok = false;
-		int project_id = embedded.namedCaptureGroups().at(1).toInt(&conv_ok);
+	int project_id = match.captured("project_id").toUInt(&conv_ok);
 	if (conv_ok) {
 		return(project_id);
 	}
-	}
 	return(-1);
 }
 

sources/qfilenameedit.cpp

@@ -20,6 +20,7 @@
 #include <QKeyEvent>
 #include <QRegularExpression>
 #include <QToolTip>
+#include <QtDebug>
 
 /**
 	Constructeur
@@ -36,7 +37,7 @@ QFileNameEdit::QFileNameEdit(QWidget *parent) : QLineEdit(parent) {
 */
 QFileNameEdit::QFileNameEdit(const QString &contents, QWidget *parent) : QLineEdit(parent) {
 	init();
-	if (!contents.isEmpty() && regexp_==QRegularExpression(contents)) {
+	if (!contents.isEmpty() && regexp_.match(contents).hasMatch()) {
 		setText(contents);
 	}
 }
@@ -61,7 +62,7 @@ bool QFileNameEdit::isEmpty()
 */
 bool QFileNameEdit::isValid()
 {
-	return(regexp_==QRegularExpression(text()));
+	return(regexp_.match(text()).hasMatch());
 }
 
 /**