1 files changed, 1 insertions, 54 deletions
diff --git a/WebCore/platform/qt/KURLQt.cpp b/WebCore/platform/qt/KURLQt.cpp
index 3bb3db2..ea1a795 100644
--- a/WebCore/platform/qt/KURLQt.cpp
+++ b/WebCore/platform/qt/KURLQt.cpp
@@ -19,22 +19,14 @@
  */
 #include "config.h"
 #include "KURL.h"
-#include "CString.h"
 #include "TextEncoding.h"
+#include <wtf/text/CString.h>
 
 #include "NotImplemented.h"
 #include "qurl.h"
 
 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,53 +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
     QString str = QString::fromRawData(reinterpret_cast<const QChar*>(m_string.characters()), m_string.length());
     QByteArray ba = str.toUtf8();
-#endif
 
     QUrl url = QUrl::fromEncoded(ba);
     return url;