From b5ae1237e33d27b6acad5b6bb301b5bf1ec0ab50 Mon Sep 17 00:00:00 2001
From: Simon De Backer <simondebacker@msn.com>
Date: Wed, 23 Sep 2020 21:36:48 +0200
Subject: [PATCH] Fix QRegularExpression

-add isValid
-add debug
---
 .../ElementsCollection/elementslocation.cpp   |  3 ++-
 sources/titleblock/templatelocation.cpp       | 26 ++++++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/sources/ElementsCollection/elementslocation.cpp b/sources/ElementsCollection/elementslocation.cpp
index addbf8e85..0baede257 100644
--- a/sources/ElementsCollection/elementslocation.cpp
+++ b/sources/ElementsCollection/elementslocation.cpp
@@ -253,7 +253,8 @@ void ElementsLocation::setPath(const QString &path)
 		QRegularExpressionMatch match = re.match(tmp_path);
 		if (!match.hasMatch())
 		{
-			qDebug()<<"no Match => return";
+			qDebug()<<"no Match => return"
+			       <<tmp_path;
 			return;
 		}
 		bool conv_ok;
diff --git a/sources/titleblock/templatelocation.cpp b/sources/titleblock/templatelocation.cpp
index 3a20f7ef5..781ba8aac 100644
--- a/sources/titleblock/templatelocation.cpp
+++ b/sources/titleblock/templatelocation.cpp
@@ -97,15 +97,29 @@ bool TitleBlockTemplateLocation::isValid() const
 /**
 	@param loc_str String describing the location of a title block template.
 */
-void TitleBlockTemplateLocation::fromString(const QString &loc_str) {
+void TitleBlockTemplateLocation::fromString(const QString &loc_str)
+{
 	collection_ = QETApp::titleBlockTemplatesCollection(QUrl(loc_str).scheme());
 
-	QRegularExpression name_from_url("^[^:]*:\\/\\/(.*)$");
-	if (name_from_url==QRegularExpression(loc_str)) {
-		name_ = name_from_url.namedCaptureGroups().at(1);
-	} else {
-		name_ = QString();
+	QRegularExpression name_from_url("//*(?<name>.*)");
+	if (!name_from_url.isValid())
+	{
+		qWarning() <<"this is an error in the code"
+			  << name_from_url.errorString()
+			  << name_from_url.patternErrorOffset();
+		return;
 	}
+
+	QRegularExpressionMatch match = name_from_url.match(loc_str);
+	if (!match.hasMatch())
+	{
+		qDebug()<<"no Match => return"
+			<<loc_str;
+		name_ = QString();
+		return;
+	}
+
+	name_ = match.captured("name");
 }
 
 /**