Update src/3rdparty/webkit from trunk.

Imported from 839d8709327f925aacb3b6362c06152594def97e
in branch qtwebkit-2.0 of repository
git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git

Rubber-stamped-by: Simon Hausmann

1 files changed, 2 insertions, 54 deletions

diff --git a/src/3rdparty/webkit/WebCore/platform/qt/KURLQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/KURLQt.cpp
index 1f62006..72dea91 100644
--- a/src/3rdparty/webkit/WebCore/platform/qt/KURLQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/qt/KURLQt.cpp
@@ -27,14 +27,6 @@
 
 namespace WebCore {
 
-#if QT_VERSION < 0x040500
-static const char hexnumbers[] = "0123456789ABCDEF";
-static inline char toHex(char c)
-{
-    return hexnumbers[c & 0xf];
-}
-#endif
-
 KURL::KURL(const QUrl& url)
 {
     *this = KURL(KURL(), url.toEncoded().constData(), UTF8Encoding());
@@ -42,52 +34,8 @@ KURL::KURL(const QUrl& url)
 
 KURL::operator QUrl() const
 {
-#if QT_VERSION < 0x040500
-    unsigned length = m_string.length();
-
-    QByteArray ba;
-    ba.reserve(length);
-
-    int path = -1;
-    int host = m_string.find("://");
-    if (host != -1) {
-        host += 3;
-
-        path = m_string.find('/', host);
-    }
-
-    for (unsigned i = 0; i < length; ++i) {
-        const char chr = static_cast<char>(m_string[i]);
-
-        switch (chr) {
-            encode:
-            case '{':
-            case '}':
-            case '|':
-            case '\\':
-            case '^':
-            case '`':
-                ba.append('%');
-                ba.append(toHex((chr & 0xf0) >> 4));
-                ba.append(toHex(chr & 0xf));
-                break;
-            case '[':
-            case ']':
-                // special case: if this is the host part, don't encode
-                // otherwise, encode
-                if (host == -1 || (path != -1 && i >= path))
-                    goto encode;
-                // fall through
-            default:
-                ba.append(chr);
-                break;
-        }
-    }
-#else
-    // Qt 4.5 or later
-    // No need for special encoding
-    QByteArray ba = m_string.utf8().data();
-#endif
+    QString str = QString::fromRawData(reinterpret_cast<const QChar*>(m_string.characters()), m_string.length());
+    QByteArray ba = str.toUtf8();
 
     QUrl url = QUrl::fromEncoded(ba);
     return url;