3 files changed, 16 insertions, 19 deletions
diff --git a/src/corelib/codecs/qlatincodec.cpp b/src/corelib/codecs/qlatincodec.cpp
index 463c5a56ae..55e6f0ba4d 100644
--- a/src/corelib/codecs/qlatincodec.cpp
+++ b/src/corelib/codecs/qlatincodec.cpp
@@ -62,7 +62,7 @@ QByteArray QLatin1Codec::convertFromUnicode(const QChar *ch, int len, ConverterS
     char *d = r.data();
     int invalid = 0;
     for (int i = 0; i < len; ++i) {
-        if (ch[i] > 0xff) {
+        if (ch[i] > QChar(0xff)) {
             d[i] = replacement;
             ++invalid;
         } else {
@@ -112,28 +112,28 @@ QString QLatin15Codec::convertToUnicode(const char* chars, int len, ConverterSta
     while(len--) {
         switch(uc->unicode()) {
             case 0xa4:
-                *uc = 0x20ac;
+                *uc = QChar(0x20ac);
                 break;
             case 0xa6:
-                *uc = 0x0160;
+                *uc = QChar(0x0160);
                 break;
             case 0xa8:
-                *uc = 0x0161;
+                *uc = QChar(0x0161);
                 break;
             case 0xb4:
-                *uc = 0x017d;
+                *uc = QChar(0x017d);
                 break;
             case 0xb8:
-                *uc = 0x017e;
+                *uc = QChar(0x017e);
                 break;
             case 0xbc:
-                *uc = 0x0152;
+                *uc = QChar(0x0152);
                 break;
             case 0xbd:
-                *uc = 0x0153;
+                *uc = QChar(0x0153);
                 break;
             case 0xbe:
-                *uc = 0x0178;
+                *uc = QChar(0x0178);
                 break;
             default:
                 break;
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 85cfcdbf48..8639e4f2f0 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -544,11 +544,9 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name)
 #if !QT_CONFIG(icu)
     QTextCodecCache *cache = &globalData->codecCache;
     QTextCodec *codec;
-    if (cache) {
-        codec = cache->value(name);
-        if (codec)
-            return codec;
-    }
+    codec = cache->value(name);
+    if (codec)
+        return codec;
 
     for (TextCodecListConstIt it = globalData->allCodecs.constBegin(), cend = globalData->allCodecs.constEnd(); it != cend; ++it) {
         QTextCodec *cursor = *it;
@@ -560,8 +558,7 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name)
         QList<QByteArray> aliases = cursor->aliases();
         for (ByteArrayListConstIt ait = aliases.constBegin(), acend = aliases.constEnd(); ait != acend; ++ait) {
             if (qTextCodecNameMatch(*ait, name)) {
-                if (cache)
-                    cache->insert(name, cursor);
+                cache->insert(name, cursor);
                 return cursor;
             }
         }
diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp
index 85736fdf02..af36bd7e2f 100644
--- a/src/corelib/codecs/qutfcodec.cpp
+++ b/src/corelib/codecs/qutfcodec.cpp
@@ -951,10 +951,10 @@ QString QUtf32::convertToUnicode(const char *chars, int len, QTextCodec::Convert
             }
             uint code = (endian == BigEndianness) ? qFromBigEndian<quint32>(tuple) : qFromLittleEndian<quint32>(tuple);
             if (QChar::requiresSurrogates(code)) {
-                *qch++ = QChar::highSurrogate(code);
-                *qch++ = QChar::lowSurrogate(code);
+                *qch++ = QChar(QChar::highSurrogate(code));
+                *qch++ = QChar(QChar::lowSurrogate(code));
             } else {
-                *qch++ = code;
+                *qch++ = QChar(code);
             }
             num = 0;
         }