diff options
| author | mae <qt-info@nokia.com> | 2009-05-05 12:24:01 (GMT) |
|---|---|---|
| committer | mae <qt-info@nokia.com> | 2009-05-05 12:24:01 (GMT) |
| commit | ccb2ac0353c6560d0ee3ce64da583b2ff6a66a06 (patch) | |
| tree | 3d43e3dbc1c25658e226e18a946b77e13e635531 /src/corelib/codecs/qtextcodec.h | |
| parent | 6cbbc22cb8493120ccd01b62028866995e9f5cd7 (diff) | |
| parent | 5eef8717c9862befe8b6529cbb111c0b30529f48 (diff) | |
| download | Qt-ccb2ac0353c6560d0ee3ce64da583b2ff6a66a06.zip Qt-ccb2ac0353c6560d0ee3ce64da583b2ff6a66a06.tar.gz Qt-ccb2ac0353c6560d0ee3ce64da583b2ff6a66a06.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/codecs/qtextcodec.h')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index e32650f..83097a5 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -82,6 +82,9 @@ public: static QTextCodec *codecForHtml(const QByteArray &ba); static QTextCodec *codecForHtml(const QByteArray &ba, QTextCodec *defaultCodec); + static QTextCodec *codecForUtfText(const QByteArray &ba); + static QTextCodec *codecForUtfText(const QByteArray &ba, QTextCodec *defaultCodec); + QTextDecoder* makeDecoder() const; QTextEncoder* makeEncoder() const; |