AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the operator<< | >> (QDataStream, QStringList)

Browse Source 
They aren't needed. The template version for QList in qdatastream.h is
sufficient.

This is binary compatible, since the functions were never exported. It's
also source compatible, provided no one tried to do:

    QDataStream & (*fptr)(QDataStream &, QStringList &) = &operator>>;

Change-Id: I8a4449b416154b34c007ef6abacf2b112451028f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Thiago Macieira 2014-12-16 17:21:48 -08:00
parent 41f7053b87
commit 3c9847a068
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/corelib/tools/qstringlist.cpp
View File

@ -516,28 +516,6 @@ QString QtPrivate::QStringList_join(const QStringList *that, const QChar *sep, i
the latter string list.
*/
#ifndef QT_NO_DATASTREAM
/*!
\fn QDataStream &operator>>(QDataStream &in, QStringList &list)
\relates QStringList
Reads a string list from the given \a in stream into the specified
\a list.
\sa {Serializing Qt Data Types}
*/
/*!
\fn QDataStream &operator<<(QDataStream &out, const QStringList &list)
\relates QStringList
Writes the given string \a list to the specified \a out stream.
\sa {Serializing Qt Data Types}
*/
#endif // QT_NO_DATASTREAM
#ifndef QT_NO_REGEXP
static int indexOfMutating(const QStringList *that, QRegExp &rx, int from)
{

11
src/corelib/tools/qstringlist.h
View File

@ -238,17 +238,6 @@ inline int QStringList::lastIndexOf(const QRegularExpression &rx, int from) cons
#endif // QT_NO_REGULAREXPRESSION
#endif // QT_BOOTSTRAPPED
#ifndef QT_NO_DATASTREAM
inline QDataStream &operator>>(QDataStream &in, QStringList &list)
{
return operator>>(in, static_cast<QList<QString> &>(list));
}
inline QDataStream &operator<<(QDataStream &out, const QStringList &list)
{
return operator<<(out, static_cast<const QList<QString> &>(list));
}
#endif // QT_NO_DATASTREAM
QT_END_NAMESPACE
#endif // QSTRINGLIST_H