From 3aed50d48863dbfcfc14dbf6f961209467fc909b Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 30 Apr 2020 14:20:53 +0200
Subject: [PATCH] QUrlQuery: improve defaultQuery{Value,Pair}Delimiter()

- constexpr
- noexcept
- return char16_t (this converts implicitly to QChar, but allows use
  elsewhere, too)

[ChangeLog][QtCore][QUrlQuery] The defaultQueryValueDelimiter() and
defaultQueryPairDelimiter() functions now return char16_t instead of
QChar.

Change-Id: I4662f832a89ae9f4a984ea9349b5e0e212a09c95
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/io/qurlquery.cpp | 8 ++++++--
 src/corelib/io/qurlquery.h   | 6 ++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp
index 325a0c2ba3..b8a0d91332 100644
--- a/src/corelib/io/qurlquery.cpp
+++ b/src/corelib/io/qurlquery.cpp
@@ -768,18 +768,22 @@ void QUrlQuery::removeAllQueryItems(const QString &key)
 }
 
 /*!
-    \fn QChar QUrlQuery::defaultQueryValueDelimiter()
+    \fn QUrlQuery::defaultQueryValueDelimiter()
     Returns the default character for separating keys from values in the query,
     an equal sign ("=").
 
+    \note Prior to Qt 6, this function returned QChar.
+
     \sa setQueryDelimiters(), queryValueDelimiter(), defaultQueryPairDelimiter()
 */
 
 /*!
-    \fn QChar QUrlQuery::defaultQueryPairDelimiter()
+    \fn QUrlQuery::defaultQueryPairDelimiter()
     Returns the default character for separating keys-value pairs from each
     other, an ampersand ("&").
 
+    \note Prior to Qt 6, this function returned QChar.
+
     \sa setQueryDelimiters(), queryPairDelimiter(), defaultQueryValueDelimiter()
 */
 
diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h
index 0be2cafb0b..d91bd98e0d 100644
--- a/src/corelib/io/qurlquery.h
+++ b/src/corelib/io/qurlquery.h
@@ -102,10 +102,8 @@ public:
     QStringList allQueryItemValues(const QString &key, QUrl::ComponentFormattingOptions encoding = QUrl::PrettyDecoded) const;
     void removeAllQueryItems(const QString &key);
 
-    static QChar defaultQueryValueDelimiter()
-    { return QChar(ushort('=')); }
-    static QChar defaultQueryPairDelimiter()
-    { return QChar(ushort('&')); }
+    static constexpr char16_t defaultQueryValueDelimiter() noexcept { return u'='; }
+    static constexpr char16_t defaultQueryPairDelimiter() noexcept { return u'&'; }
 
 private:
     friend class QUrl;