diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-28 23:22:01 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-29 15:10:14 +0200 |
| commit | 369696dc231450c774a5cc253d061aad2f3b6a19 (patch) | |
| tree | b35d6a414ab59e1023135ee97cbffe73c7070134 /src/corelib/codecs/qtextcodec.h | |
| parent | 7b46ec16017d5b467b2b04e9d7e27ce1cee8659e (diff) | |
Remove QT3_SUPPORT from corelib/codecs
Change-Id: Ie674be85b64c5816ee0ad4bccc077943b7046136
Reviewed-on: http://codereview.qt.nokia.com/864
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/corelib/codecs/qtextcodec.h')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index 270e96aaf7..015c0941f2 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -134,17 +134,6 @@ protected: QTextCodec(); virtual ~QTextCodec(); -public: -#ifdef QT3_SUPPORT - static QT3_SUPPORT QTextCodec* codecForContent(const char*, int) { return 0; } - static QT3_SUPPORT const char* locale(); - static QT3_SUPPORT QTextCodec* codecForName(const char* hint, int) { return codecForName(QByteArray(hint)); } - QT3_SUPPORT QByteArray fromUnicode(const QString& uc, int& lenInOut) const; - QT3_SUPPORT QString toUnicode(const QByteArray&, int len) const; - QT3_SUPPORT QByteArray mimeName() const { return name(); } - static QT3_SUPPORT QTextCodec *codecForIndex(int i) { return codecForName(availableCodecs().value(i)); } -#endif - private: friend class QTextCodecCleanup; static QTextCodec *cftr; @@ -165,9 +154,6 @@ public: ~QTextEncoder(); QByteArray fromUnicode(const QString& str); QByteArray fromUnicode(const QChar *uc, int len); -#ifdef QT3_SUPPORT - QT3_SUPPORT QByteArray fromUnicode(const QString& uc, int& lenInOut); -#endif bool hasFailure() const; private: const QTextCodec *c; |