diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-07-27 11:00:48 +0300 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-29 18:09:16 +0000 |
| commit | afb8ba3fd22ca86ec3438a04c08353c9ddcaca1a (patch) | |
| tree | 402f3126f5bfc6d41a7f14ee5a5f0db400ef2a59 /src/corelib/text/qstringview.h | |
| parent | 353a6946b19c5e4ee54cc37e4b34685cacd77a3c (diff) | |
QStringView: clean up storage_type
Now that all supported compilers support char16_t, we don't need the
storage_type == wchar_t hack for MSVC anymore.
Remove it. Adapt docs.
Change-Id: I55df6c8a9fa5a9c7e6f53ba89f3850956b369061
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src/corelib/text/qstringview.h')
| -rw-r--r-- | src/corelib/text/qstringview.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/text/qstringview.h b/src/corelib/text/qstringview.h index 5a3acaa8c0..0a82ac4201 100644 --- a/src/corelib/text/qstringview.h +++ b/src/corelib/text/qstringview.h @@ -62,9 +62,7 @@ struct IsCompatibleCharTypeHelper : std::integral_constant<bool, std::is_same<Char, QChar>::value || std::is_same<Char, ushort>::value || -#if defined(Q_COMPILER_UNICODE_STRINGS) std::is_same<Char, char16_t>::value || -#endif (std::is_same<Char, wchar_t>::value && sizeof(wchar_t) == sizeof(QChar))> {}; template <typename Char> struct IsCompatibleCharType @@ -105,11 +103,7 @@ struct IsCompatibleStdBasicString class QStringView { public: -#if defined(Q_OS_WIN) && !defined(Q_COMPILER_UNICODE_STRINGS) - typedef wchar_t storage_type; -#else typedef char16_t storage_type; -#endif typedef const QChar value_type; typedef std::ptrdiff_t difference_type; typedef qsizetype size_type; |