diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-16 17:21:48 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-20 07:47:19 +0100 |
| commit | 3c9847a068dc86e44b7a2dcbae80cdab308ffa4a (patch) | |
| tree | c3afcecd5b70815d533ac872443389d9896f0b1e /src/corelib/tools | |
| parent | 41f7053b8735798b7f788f912cd4f9f1c50b100d (diff) | |
Remove the operator<< | >> (QDataStream, QStringList)
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>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qstringlist.cpp | 22 | ||||
| -rw-r--r-- | src/corelib/tools/qstringlist.h | 11 |
2 files changed, 0 insertions, 33 deletions
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index 5b2eb1de09..192306c059 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -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) { diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index fc86b196d7..cce67820f8 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -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 |