1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge the makeEncoder/Decoder overloads.

Browse Source 
Change-Id: I9fdeeafe08dd70c0ab9ce26a2fce3b8d803ca280
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
This commit is contained in:
Lars Knoll 2012-01-15 21:36:56 +01:00 committed by Qt by Nokia
parent 6bf72a98ac
commit 1d7db25bd6
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/corelib/codecs/qtextcodec.cpp
View File

@ -1283,17 +1283,6 @@ QList<QByteArray> QTextCodec::aliases() const
adjust the remainingChars and invalidChars members of the struct.
*/
/*!
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.

7
src/corelib/codecs/qtextcodec.h
View File

@ -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;