summaryrefslogtreecommitdiffstats
path: root/src/libraries/qmfclient/qmailmessage.cpp
diff options
context:
space:
mode:
authorChris Adams <chris.adams@qinetic.com.au>2021-01-18 15:29:32 +1000
committerChris Adams <chris.adams@qinetic.com.au>2021-04-08 10:38:51 +1000
commit7fb656e1e3741c17e6cd92fda4cdedb83883ff2f (patch)
treeb9f2b14f35a4b181808fdc159767da807cdb1f2c /src/libraries/qmfclient/qmailmessage.cpp
parenta8db671f00ebf5aa56e57d1bdf1511d9af22c809 (diff)
Fix QChar from unicode value conversions
Change-Id: I834645859e56a793f875892b038467c5d48291ef Reviewed-by: Christopher Adams <chris.adams@jolla.com> Reviewed-by: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
Diffstat (limited to 'src/libraries/qmfclient/qmailmessage.cpp')
-rw-r--r--src/libraries/qmfclient/qmailmessage.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index baf9dd54..38154eba 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -84,6 +84,9 @@ template<typename CharType>
inline bool asciiRepresentable(const CharType& value) { return ((value <= 127) && (value >= 0)); }
template<>
+inline bool asciiRepresentable<QChar>(const QChar& value) { return value.unicode() <= 127; }
+
+template<>
inline bool asciiRepresentable<unsigned char>(const unsigned char& value) { return (value <= 127); }
template<>
@@ -3343,7 +3346,7 @@ static bool unicodeConvertingCharset(const QByteArray& charset)
// See if this is a unicode-capable codec
if (QTextCodec* textCodec = QMailCodec::codecForName(charset, true))
{
- const QChar multiByteChar = 0x1234;
+ const QChar multiByteChar = static_cast<char16_t>(0x1234);
return textCodec->canEncode(multiByteChar);
}
else