remove some Qt3 compat bits from core

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/codecs/qtextcodec.cpp b/src/core/codecs/qtextcodec.cpp
index 5f4301a..0b94696 100644 (file)
--- a/src/core/codecs/qtextcodec.cpp
+++ b/src/core/codecs/qtextcodec.cpp
@@ -1071,11 +1071,6 @@ QTextCodec* QTextCodec::codecForMib(int mib)
 
     codec = createForMib(mib);
 
-    // Qt 3 used 1000 (mib for UCS2) as its identifier for the utf16 codec. Map
-    // this correctly for compatibility.
-    if (!codec && mib == 1000)
-        return codecForMib(1015);
-
     if (codec && cache)
         cache->insert(key, codec);
     return codec;

diff --git a/src/core/kernel/qmimedata.cpp b/src/core/kernel/qmimedata.cpp
index 26e7c8d..b7b9af7 100644 (file)
--- a/src/core/kernel/qmimedata.cpp
+++ b/src/core/kernel/qmimedata.cpp
@@ -144,12 +144,6 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QVariant::Ty
         }
         case QVariant::Url: {
             QByteArray ba = data.toByteArray();
-            // Qt 3.x will send text/uri-list with a trailing
-            // null-terminator (that is *not* sent for any other
-            // text/* mime-type), so chop it off
-            if (ba.endsWith('\0'))
-                ba.chop(1);
-
             QList<QByteArray> urls = ba.split('\n');
             QList<QVariant> list;
             for (int i = 0; i < urls.size(); ++i) {