diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-01-15 21:36:56 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-16 13:48:30 +0100 |
commit | 1d7db25bd6bbf1435066b3c0c5cb41389b789f9c (patch) | |
tree | fb8b33fb73a710de2ee2ec54f5070cf077616576 /src | |
parent | 6bf72a98ac24b07ffbcfe0097a7c2955689e2e66 (diff) |
Merge the makeEncoder/Decoder overloads.
Change-Id: I9fdeeafe08dd70c0ab9ce26a2fce3b8d803ca280
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 23 | ||||
-rw-r--r-- | src/corelib/codecs/qtextcodec.h | 7 |
2 files changed, 2 insertions, 28 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 83bb406ff1..465caea62f 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -1284,17 +1284,6 @@ QList<QByteArray> QTextCodec::aliases() const */ /*! - Creates a QTextDecoder which stores enough state to decode chunks - of \c{char *} data to create chunks of Unicode data. - - The caller is responsible for deleting the returned object. -*/ -QTextDecoder* QTextCodec::makeDecoder() const -{ - return new QTextDecoder(this); -} - -/*! Creates a QTextDecoder with a specified \a flags to decode chunks of \c{char *} data to create chunks of Unicode data. @@ -1307,18 +1296,6 @@ QTextDecoder* QTextCodec::makeDecoder(QTextCodec::ConversionFlags flags) const return new QTextDecoder(this, flags); } - -/*! - Creates a QTextEncoder which stores enough state to encode chunks - of Unicode data as \c{char *} data. - - The caller is responsible for deleting the returned object. -*/ -QTextEncoder* QTextCodec::makeEncoder() const -{ - return new QTextEncoder(this); -} - /*! Creates a QTextEncoder with a specified \a flags to encode chunks of Unicode data as \c{char *} data. diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index 97eba2009a..c4f1a09726 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -117,11 +117,8 @@ public: QByteArray fromUnicode(const QChar *in, int length, ConverterState *state = 0) const { return convertFromUnicode(in, length, state); } - // ### Qt 5: merge these functions. - QTextDecoder* makeDecoder() const; - QTextDecoder* makeDecoder(ConversionFlags flags) const; - QTextEncoder* makeEncoder() const; - QTextEncoder* makeEncoder(ConversionFlags flags) const; + QTextDecoder* makeDecoder(ConversionFlags flags = DefaultConversion) const; + QTextEncoder* makeEncoder(ConversionFlags flags = DefaultConversion) const; virtual QByteArray name() const = 0; virtual QList<QByteArray> aliases() const; |