diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 14:31:34 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-31 10:32:47 +0200 |
commit | 8adb0dde1984438d52de4bcb610e4139558bd1a0 (patch) | |
tree | a6b75ff7581b4ab351d0897c4f5dacd66bb46497 /src/corelib/serialization | |
parent | e40320c552a9ccd4c1879a4da13c8d909b2cd21e (diff) |
QTextStream: purge deprecated API
All deprecated in 5.15, for removal in 6.0
Change-Id: I40415d388cfcf3e428bce3327297a775ec756eeb
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/serialization')
-rw-r--r-- | src/corelib/serialization/qtextstream.cpp | 37 | ||||
-rw-r--r-- | src/corelib/serialization/qtextstream.h | 37 |
2 files changed, 0 insertions, 74 deletions
diff --git a/src/corelib/serialization/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp index 9ba65ba02b..68ead1068b 100644 --- a/src/corelib/serialization/qtextstream.cpp +++ b/src/corelib/serialization/qtextstream.cpp @@ -3105,43 +3105,6 @@ QLocale QTextStream::locale() const return d->locale; } -#if QT_DEPRECATED_SINCE(5, 15) && !defined(Q_QDOC) -// Deprecated source compatible migration versions: -namespace QTextStreamFunctions { -QTextStream &bin(QTextStream &s) { return Qt::bin(s); } -QTextStream &oct(QTextStream &s) { return Qt::oct(s); } -QTextStream &dec(QTextStream &s) { return Qt::dec(s); } -QTextStream &hex(QTextStream &s) { return Qt::hex(s); } - -QTextStream &showbase(QTextStream &s) { return Qt::showbase(s); } -QTextStream &forcesign(QTextStream &s) { return Qt::forcesign(s); } -QTextStream &forcepoint(QTextStream &s) { return Qt::forcepoint(s); } -QTextStream &noshowbase(QTextStream &s) { return Qt::noshowbase(s); } -QTextStream &noforcesign(QTextStream &s) { return Qt::noforcesign(s); } -QTextStream &noforcepoint(QTextStream &s) { return Qt::noforcepoint(s); } - -QTextStream &uppercasebase(QTextStream &s) { return Qt::uppercasebase(s); } -QTextStream &uppercasedigits(QTextStream &s) { return Qt::uppercasedigits(s); } -QTextStream &lowercasebase(QTextStream &s) { return Qt::lowercasebase(s); } -QTextStream &lowercasedigits(QTextStream &s) { return Qt::lowercasedigits(s); } - -QTextStream &fixed(QTextStream &s) { return Qt::fixed(s); } -QTextStream &scientific(QTextStream &s) { return Qt::scientific(s); } - -QTextStream &left(QTextStream &s) { return Qt::left(s); } -QTextStream &right(QTextStream &s) { return Qt::right(s); } -QTextStream ¢er(QTextStream &s) { return Qt::center(s); } - -QTextStream &endl(QTextStream &s) { return Qt::endl(s); } -QTextStream &flush(QTextStream &s) { return Qt::flush(s); } -QTextStream &reset(QTextStream &s) { return Qt::reset(s); } - -QTextStream &ws(QTextStream &s) { return Qt::ws(s); } - -QTextStream &bom(QTextStream &s) { return Qt::bom(s); } -} // namespace QTextStreamFunctions -#endif - QT_END_NAMESPACE #ifndef QT_NO_QOBJECT diff --git a/src/corelib/serialization/qtextstream.h b/src/corelib/serialization/qtextstream.h index b196e9e935..e69c6a67dc 100644 --- a/src/corelib/serialization/qtextstream.h +++ b/src/corelib/serialization/qtextstream.h @@ -263,43 +263,6 @@ Q_CORE_EXPORT QTextStream &ws(QTextStream &s); } // namespace Qt -#if QT_DEPRECATED_SINCE(5, 15) -// This namespace only exists for 'using namespace' declarations. -namespace QTextStreamFunctions { -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::bin") QTextStream &bin(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::oct") QTextStream &oct(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::dec") QTextStream &dec(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::hex") QTextStream &hex(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::showbase") QTextStream &showbase(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::forcesign") QTextStream &forcesign(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::forcepoint") QTextStream &forcepoint(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::noshowbase") QTextStream &noshowbase(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::noforcesign") QTextStream &noforcesign(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::noforcepoint") QTextStream &noforcepoint(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::uppercasebase") QTextStream &uppercasebase(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::uppercasedigits") QTextStream &uppercasedigits(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::lowercasebase") QTextStream &lowercasebase(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::lowercasedigits") QTextStream &lowercasedigits(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::fixed") QTextStream &fixed(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::scientific") QTextStream &scientific(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::left") QTextStream &left(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::right") QTextStream &right(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::center") QTextStream ¢er(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::endl") QTextStream &endl(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::flush") QTextStream &flush(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::reset") QTextStream &reset(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::bom") QTextStream &bom(QTextStream &s); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X(5, 15, "Use Qt::ws") QTextStream &ws(QTextStream &s); -} // namespace QTextStreamFunctions - -QT_WARNING_PUSH -QT_WARNING_DISABLE_CLANG("-Wheader-hygiene") -// We use 'using namespace' as that doesn't cause -// conflicting definitions compiler errors. -using namespace QTextStreamFunctions; -QT_WARNING_POP -#endif // QT_DEPRECATED_SINCE(5, 15) - inline QTextStreamManipulator qSetFieldWidth(int width) { QTSMFI func = &QTextStream::setFieldWidth; |