From 1c79668c7db0375d62c627114374a49d1a994de4 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 22 Apr 2016 20:20:53 +0000 Subject: [PATCH] remove some Qt3 compat bits from core Signed-off-by: Ivailo Monev --- src/core/codecs/qtextcodec.cpp | 5 ----- src/core/kernel/qmimedata.cpp | 6 ------ 2 files changed, 11 deletions(-) diff --git a/src/core/codecs/qtextcodec.cpp b/src/core/codecs/qtextcodec.cpp index 5f4301a89..0b9469650 100644 --- 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 26e7c8d8c..b7b9af725 100644 --- 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 urls = ba.split('\n'); QList list; for (int i = 0; i < urls.size(); ++i) { -- 2.11.0