From 8f222e2ad87efc26288932d8f78f96fe0de8ec27 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Mon, 4 Jul 2011 17:03:25 +0100 Subject: Finish removal of QT3_SUPPORT from corelib/codecs Change 369696dc231450c774a5cc253d061aad2f3b6a19 removed a function from the header but not its implementation, causing a compile error. Change-Id: I5da45d8401f5779b1660e5baf4557f078e202bf5 Reviewed-on: http://codereview.qt.nokia.com/1092 Reviewed-by: Qt Sanity Bot Reviewed-by: Liang Qi --- src/corelib/codecs/qtextcodec.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src') diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 00a6a9fc9f..0f919fb401 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -1510,22 +1510,6 @@ QByteArray QTextEncoder::fromUnicode(const QChar *uc, int len) return result; } -#ifdef QT3_SUPPORT -/*! - \overload - - Converts \a lenInOut characters (not bytes) from \a uc, and returns the - result in a QByteArray. The number of characters read is returned in - the \a lenInOut parameter. -*/ -QByteArray QTextEncoder::fromUnicode(const QString& uc, int& lenInOut) -{ - QByteArray result = c->fromUnicode(uc.constData(), lenInOut, &state); - lenInOut = result.length(); - return result; -} -#endif - /*! \class QTextDecoder \brief The QTextDecoder class provides a state-based decoder. -- cgit v1.2.3