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/corelib/codecs/qtextcodec.h | |
| 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/corelib/codecs/qtextcodec.h')
| -rw-r--r-- | src/corelib/codecs/qtextcodec.h | 7 |
1 files changed, 2 insertions, 5 deletions
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; |