diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-03-01 15:34:44 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-03-01 21:10:57 +0100 |
| commit | ebb833d7f70465844e474583571770ad14adcebf (patch) | |
| tree | 97618bf52495e84db5ea6165a3ad0fb29b69807d /src/corelib/text/qstringview.h | |
| parent | 81a748efb742092f5a0a1c33b8340478e52cc79f (diff) | |
Apply q20::remove_cvref_t around the code
Found in API review. It's not BC-critical, but let's get this into 6.5
to minimize the diff to our future LTS.
Pick-to: 6.5
Change-Id: Iaa63afad1d31f6edef29e1185897d925f47a094d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/text/qstringview.h')
| -rw-r--r-- | src/corelib/text/qstringview.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/text/qstringview.h b/src/corelib/text/qstringview.h index fa2ad80a46..20b61f1865 100644 --- a/src/corelib/text/qstringview.h +++ b/src/corelib/text/qstringview.h @@ -11,6 +11,7 @@ #include <QtCore/qutf8stringview.h> #include <string> +#include <QtCore/q20type_traits.h> #if defined(Q_OS_DARWIN) || defined(Q_QDOC) Q_FORWARD_DECLARE_CF_TYPE(CFString); @@ -34,7 +35,7 @@ struct IsCompatibleCharTypeHelper (std::is_same<Char, wchar_t>::value && sizeof(wchar_t) == sizeof(QChar))> {}; template <typename Char> struct IsCompatibleCharType - : IsCompatibleCharTypeHelper<typename std::remove_cv<typename std::remove_reference<Char>::type>::type> {}; + : IsCompatibleCharTypeHelper<q20::remove_cvref_t<Char>> {}; template <typename Pointer> struct IsCompatiblePointerHelper : std::false_type {}; @@ -43,7 +44,7 @@ struct IsCompatiblePointerHelper<Char*> : IsCompatibleCharType<Char> {}; template <typename Pointer> struct IsCompatiblePointer - : IsCompatiblePointerHelper<typename std::remove_cv<typename std::remove_reference<Pointer>::type>::type> {}; + : IsCompatiblePointerHelper<q20::remove_cvref_t<Pointer>> {}; template <typename T, typename Enable = void> struct IsContainerCompatibleWithQStringView : std::false_type {}; |