diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-02-24 15:37:59 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-03-02 22:22:36 +0100 |
| commit | 62c7145390b0a98b83f901f193183b429df8cbf5 (patch) | |
| tree | 8ea6efd0b8ca43af47ea5f8e0b7fad0c34a1612b /src/corelib/text | |
| parent | 736213bf662b68c4e80075cef317e5a029b490dd (diff) | |
Fix QLatin1String(const char *) constructor to be constexpr
strlen() is not constexpr, use the QByteArrayView's
lengthHelperPointer() instead.
Change-Id: Ie49236edba3306e951402e6b776c15068cac0332
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qbytearrayview.h | 15 | ||||
| -rw-r--r-- | src/corelib/text/qstring.h | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/corelib/text/qbytearrayview.h b/src/corelib/text/qbytearrayview.h index 40205cae9c..03acaa50d8 100644 --- a/src/corelib/text/qbytearrayview.h +++ b/src/corelib/text/qbytearrayview.h @@ -100,6 +100,13 @@ struct IsContainerCompatibleWithQByteArrayView<T, std::enable_if_t< // Don't make an accidental copy constructor std::negation<std::is_same<std::decay_t<T>, QByteArrayView>>>>> : std::true_type {}; +// Used by QLatin1String too +template <typename Char> +static constexpr qsizetype lengthHelperPointer(const Char *data) noexcept +{ + return qsizetype(std::char_traits<Char>::length(data)); +} + } // namespace QtPrivate class Q_CORE_EXPORT QByteArrayView @@ -138,12 +145,6 @@ private: typename std::enable_if_t<QtPrivate::IsContainerCompatibleWithQByteArrayView<T>::value, bool>; - template <typename Char> - static constexpr qsizetype lengthHelperPointer(const Char *data) noexcept - { - return qsizetype(std::char_traits<Char>::length(data)); - } - template <typename Container> static constexpr qsizetype lengthHelperContainer(const Container &c) noexcept { @@ -185,7 +186,7 @@ public: template <typename Pointer, if_compatible_pointer<Pointer> = true> constexpr QByteArrayView(const Pointer &data) noexcept : QByteArrayView( - data, data ? lengthHelperPointer(data) : 0) {} + data, data ? QtPrivate::lengthHelperPointer(data) : 0) {} #endif #ifdef Q_QDOC diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 1c95b038c6..350659ed46 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -49,6 +49,7 @@ #include <QtCore/qchar.h> #include <QtCore/qbytearray.h> +#include <QtCore/qbytearrayview.h> #include <QtCore/qarraydata.h> #include <QtCore/qnamespace.h> #include <QtCore/qstringliteral.h> @@ -85,7 +86,8 @@ class QLatin1String public: constexpr inline QLatin1String() noexcept : m_size(0), m_data(nullptr) {} constexpr QLatin1String(std::nullptr_t) noexcept : QLatin1String() {} - constexpr inline explicit QLatin1String(const char *s) noexcept : m_size(s ? qsizetype(strlen(s)) : 0), m_data(s) {} + constexpr inline explicit QLatin1String(const char *s) noexcept + : m_size(s ? qsizetype(QtPrivate::lengthHelperPointer(s)) : 0), m_data(s) {} constexpr explicit QLatin1String(const char *f, const char *l) : QLatin1String(f, qsizetype(l - f)) {} constexpr inline explicit QLatin1String(const char *s, qsizetype sz) noexcept : m_size(sz), m_data(s) {} |