RIS_ResourceItemDescriptorFromHeader: Fix build on Qt 5.7

manup · manup · commit 1d8b3fe8c732 · 2021-05-29T01:26:38.000+02:00
QLatin1String didn't have an end() method in older Qt versions.
diff --git a/rest_devices.cpp b/rest_devices.cpp
@@ -395,8 +395,9 @@ QVariantMap RIS_IntrospectButtonEventItem(const ResourceItemDescriptor &rid, con
 */
 bool RIS_ResourceItemDescriptorFromHeader(const QHttpRequestHeader &hdr, ResourceItemDescriptor *rid)
 {
+    const auto last = hdr.pathAt(hdr.pathComponentsCount() - 2);
     const char *beg = hdr.pathAt(4).data();
-    const char *end = hdr.pathAt(hdr.pathComponentsCount() - 2).end();
+    const char *end = last.data() + last.size();
 
     if (beg && end && beg < end)
     {

Original file line number	Diff line number	Diff line change
`@@ -395,8 +395,9 @@ QVariantMap RIS_IntrospectButtonEventItem(const ResourceItemDescriptor &rid, con`
`395`	`395`	`*/`
`396`	`396`	`bool RIS_ResourceItemDescriptorFromHeader(const QHttpRequestHeader &hdr, ResourceItemDescriptor *rid)`
`397`	`397`	`{`
	`398`	`+ const auto last = hdr.pathAt(hdr.pathComponentsCount() - 2);`
`398`	`399`	`const char *beg = hdr.pathAt(4).data();`
`399`		`- const char *end = hdr.pathAt(hdr.pathComponentsCount() - 2).end();`
	`400`	`+ const char *end = last.data() + last.size();`
`400`	`401`
`401`	`402`	`if (beg && end && beg < end)`
`402`	`403`	`{`