Uri: Fix ambiguity around QChar constructors

QChar now accepts more types for construction, and that unraveled
concatenation of a Type/SecondaryType character with a QString.
To fix it, give the compiler a hint by casting to the enum's underlying
type (which also nicely documents that we _actually_ switch from enum
to character type).

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/uri.cpp b/lib/uri.cpp
index d8624796..c8843dda 100644
--- a/lib/uri.cpp
+++ b/lib/uri.cpp
@@ -186,14 +186,18 @@ QString Uri::primaryId() const
     if (primaryType_ == Empty || primaryType_ == Invalid)
         return {};
 
-    const auto& idStem = pathSegment(*this, 1);
-    return idStem.isEmpty() ? idStem : primaryType_ + idStem;
+    auto idStem = pathSegment(*this, 1);
+    if (!idStem.isEmpty())
+        idStem.push_front(char(primaryType_));
+    return idStem;
 }
 
 QString Uri::secondaryId() const
 {
-    const auto& idStem = pathSegment(*this, 3);
-    return idStem.isEmpty() ? idStem : secondaryType() + idStem;
+    auto idStem = pathSegment(*this, 3);
+    if (!idStem.isEmpty())
+        idStem.push_front(char(secondaryType()));
+    return idStem;
 }
 
 static const auto ActionKey = QStringLiteral("action");