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>
This commit is contained in:
Marc Mutz 2020-04-30 14:20:53 +02:00
parent 48827dd41f
commit 3aed50d488
2 changed files with 8 additions and 6 deletions

View File

@ -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()
*/

View File

@ -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;