Fix various compiler warnings in order to remove warn_off in the near future

Change-Id: Ic0492fbe31a1e134674bc6c20381f735dd6d5b7a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 0 insertions, 131 deletions

diff --git a/src/qml/qml/ftw/qhashedstring.cpp b/src/qml/qml/ftw/qhashedstring.cpp
index 40caaf379f..321e6ccb41 100644
--- a/src/qml/qml/ftw/qhashedstring.cpp
+++ b/src/qml/qml/ftw/qhashedstring.cpp
@@ -209,137 +209,6 @@ static inline bool isUnicodeNonCharacter(uint ucs4)
             || (ucs4 - 0xfdd0U) < 16;
 }
 
-static int utf8LengthFromUtf16(const QChar *uc, int len)
-{
-    int length = 0;
-
-    int surrogate_high = -1;
-
-    const QChar *ch = uc;
-    int invalid = 0;
-
-    const QChar *end = ch + len;
-    while (ch < end) {
-        uint u = ch->unicode();
-        if (surrogate_high >= 0) {
-            if (u >= 0xdc00 && u < 0xe000) {
-                u = (surrogate_high - 0xd800)*0x400 + (u - 0xdc00) + 0x10000;
-                surrogate_high = -1;
-            } else {
-                // high surrogate without low
-                ++ch;
-                ++invalid;
-                surrogate_high = -1;
-                continue;
-            }
-        } else if (u >= 0xdc00 && u < 0xe000) {
-            // low surrogate without high
-            ++ch;
-            ++invalid;
-            continue;
-        } else if (u >= 0xd800 && u < 0xdc00) {
-            surrogate_high = u;
-            ++ch;
-            continue;
-        }
-
-        if (u < 0x80) {
-            ++length;
-        } else {
-            if (u < 0x0800) {
-                ++length;
-            } else {
-                // is it one of the Unicode non-characters?
-                if (isUnicodeNonCharacter(u)) {
-                    ++length;
-                    ++ch;
-                    ++invalid;
-                    continue;
-                }
-
-                if (u > 0xffff) {
-                    ++length;
-                    ++length;
-                } else {
-                    ++length;
-                }
-                ++length;
-            }
-            ++length;
-        }
-        ++ch;
-    }
-
-    return length;
-}
-
-// Writes the utf8 version of uc to output.  uc is of length len.
-// There must be at least utf8LengthFromUtf16(uc, len) bytes in output.
-// A null terminator is not written.
-static void utf8FromUtf16(char *output, const QChar *uc, int len)
-{
-    uchar replacement = '?';
-    int surrogate_high = -1;
-
-    uchar* cursor = (uchar*)output;
-    const QChar *ch = uc;
-    int invalid = 0;
-
-    const QChar *end = ch + len;
-    while (ch < end) {
-        uint u = ch->unicode();
-        if (surrogate_high >= 0) {
-            if (u >= 0xdc00 && u < 0xe000) {
-                u = (surrogate_high - 0xd800)*0x400 + (u - 0xdc00) + 0x10000;
-                surrogate_high = -1;
-            } else {
-                // high surrogate without low
-                *cursor = replacement;
-                ++ch;
-                ++invalid;
-                surrogate_high = -1;
-                continue;
-            }
-        } else if (u >= 0xdc00 && u < 0xe000) {
-            // low surrogate without high
-            *cursor = replacement;
-            ++ch;
-            ++invalid;
-            continue;
-        } else if (u >= 0xd800 && u < 0xdc00) {
-            surrogate_high = u;
-            ++ch;
-            continue;
-        }
-
-        if (u < 0x80) {
-            *cursor++ = (uchar)u;
-        } else {
-            if (u < 0x0800) {
-                *cursor++ = 0xc0 | ((uchar) (u >> 6));
-            } else {
-                // is it one of the Unicode non-characters?
-                if (isUnicodeNonCharacter(u)) {
-                    *cursor++ = replacement;
-                    ++ch;
-                    ++invalid;
-                    continue;
-                }
-
-                if (u > 0xffff) {
-                    *cursor++ = 0xf0 | ((uchar) (u >> 18));
-                    *cursor++ = 0x80 | (((uchar) (u >> 12)) & 0x3f);
-                } else {
-                    *cursor++ = 0xe0 | (((uchar) (u >> 12)) & 0x3f);
-                }
-                *cursor++ = 0x80 | (((uchar) (u >> 6)) & 0x3f);
-            }
-            *cursor++ = 0x80 | ((uchar) (u&0x3f));
-        }
-        ++ch;
-    }
-}
-
 QHashedStringRef QHashedStringRef::mid(int offset, int length) const
 {
     Q_ASSERT(offset < m_length);