diff options
author | Shane Kearns <shane.kearns@accenture.com> | 2011-07-04 17:03:25 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-05 14:10:16 +0200 |
commit | 8f222e2ad87efc26288932d8f78f96fe0de8ec27 (patch) | |
tree | 2250cbfdf762a0565613816811f863c7f26c5336 | |
parent | d010d0893a8796e2973327a06f71988ea5fde14d (diff) |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
-rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
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. |