Use the to/from Hex functions from QtCore

Change-Id: I51361cf78765d958a5eb48c6e05df6873979e6db
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 21 insertions, 37 deletions

diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp
index 3b1f09e502..2603c09b47 100644
--- a/src/qml/jsruntime/qv4globalobject.cpp
+++ b/src/qml/jsruntime/qv4globalobject.cpp
@@ -48,6 +48,7 @@
 #include <qv4jsir_p.h>
 #include <qv4codegen_p.h>
 #include "private/qlocale_tools_p.h"
+#include "private/qtools_p.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QString>
@@ -57,25 +58,8 @@
 #include <wtf/MathExtras.h>
 
 using namespace QV4;
-
-
-static inline char toHex(char c)
-{
-    static const char hexnumbers[] = "0123456789ABCDEF";
-    return hexnumbers[c & 0xf];
-}
-
-static int fromHex(QChar ch)
-{
-    ushort c = ch.unicode();
-    if ((c >= '0') && (c <= '9'))
-        return c - '0';
-    if ((c >= 'A') && (c <= 'F'))
-        return c - 'A' + 10;
-    if ((c >= 'a') && (c <= 'f'))
-        return c - 'a' + 10;
-    return -1;
-}
+using QtMiscUtils::toHexUpper;
+using QtMiscUtils::fromHex;
 
 static QString escape(const QString &input)
 {
@@ -94,16 +78,16 @@ static QString escape(const QString &input)
                 output.append(QChar(uc));
             } else {
                 output.append('%');
-                output.append(QLatin1Char(toHex(uc >> 4)));
-                output.append(QLatin1Char(toHex(uc)));
+                output.append(QLatin1Char(toHexUpper(uc >> 4)));
+                output.append(QLatin1Char(toHexUpper(uc)));
             }
         } else {
             output.append('%');
             output.append('u');
-            output.append(QLatin1Char(toHex(uc >> 12)));
-            output.append(QLatin1Char(toHex(uc >> 8)));
-            output.append(QLatin1Char(toHex(uc >> 4)));
-            output.append(QLatin1Char(toHex(uc)));
+            output.append(QLatin1Char(toHexUpper(uc >> 12)));
+            output.append(QLatin1Char(toHexUpper(uc >> 8)));
+            output.append(QLatin1Char(toHexUpper(uc >> 4)));
+            output.append(QLatin1Char(toHexUpper(uc)));
         }
     }
     return output;
@@ -120,10 +104,10 @@ static QString unescape(const QString &input)
         if ((c == '%') && (i + 1 < length)) {
             QChar a = input.at(i);
             if ((a == 'u') && (i + 4 < length)) {
-                int d3 = fromHex(input.at(i+1));
-                int d2 = fromHex(input.at(i+2));
-                int d1 = fromHex(input.at(i+3));
-                int d0 = fromHex(input.at(i+4));
+                int d3 = fromHex(input.at(i+1).unicode());
+                int d2 = fromHex(input.at(i+2).unicode());
+                int d1 = fromHex(input.at(i+3).unicode());
+                int d0 = fromHex(input.at(i+4).unicode());
                 if ((d3 != -1) && (d2 != -1) && (d1 != -1) && (d0 != -1)) {
                     ushort uc = ushort((d3 << 12) | (d2 << 8) | (d1 << 4) | d0);
                     result.append(QChar(uc));
@@ -132,8 +116,8 @@ static QString unescape(const QString &input)
                     result.append(c);
                 }
             } else {
-                int d1 = fromHex(a);
-                int d0 = fromHex(input.at(i+1));
+                int d1 = fromHex(a.unicode());
+                int d0 = fromHex(input.at(i+1).unicode());
                 if ((d1 != -1) && (d0 != -1)) {
                     c = (d1 << 4) | d0;
                     i += 2;
@@ -154,8 +138,8 @@ static const char uriUnescapedReserved[] = "-_.!~*'();/?:@&=+$,#";
 static void addEscapeSequence(QString &output, uchar ch)
 {
     output.append(QLatin1Char('%'));
-    output.append(QLatin1Char(toHex(ch >> 4)));
-    output.append(QLatin1Char(toHex(ch & 0xf)));
+    output.append(QLatin1Char(toHexUpper(ch >> 4)));
+    output.append(QLatin1Char(toHexUpper(ch & 0xf)));
 }
 
 static QString encode(const QString &input, const char *unescapedSet, bool *ok)
@@ -247,8 +231,8 @@ static QString decode(const QString &input, DecodeMode decodeMode, bool *ok)
             if (i + 2 >= length)
                 goto error;
 
-            int d1 = fromHex(input.at(i+1));
-            int d0 = fromHex(input.at(i+2));
+            int d1 = fromHex(input.at(i+1).unicode());
+            int d0 = fromHex(input.at(i+2).unicode());
             if ((d1 == -1) || (d0 == -1))
                 goto error;
 
@@ -282,8 +266,8 @@ static QString decode(const QString &input, DecodeMode decodeMode, bool *ok)
                     if (input.at(i) != percent)
                         goto error;
 
-                    d1 = fromHex(input.at(i+1));
-                    d0 = fromHex(input.at(i+2));
+                    d1 = fromHex(input.at(i+1).unicode());
+                    d0 = fromHex(input.at(i+2).unicode());
                     if ((d1 == -1) || (d0 == -1))
                         goto error;