summaryrefslogtreecommitdiffstats
path: root/src/corelib/serialization
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-21 11:27:58 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-24 10:02:27 +0200
commit61a50b2b9b5bca5482e3ce981f4ed6d031a6255a (patch)
treec9a8ba3f505bd6d91f83bc66b8589064849c5dfc /src/corelib/serialization
parent27fcf66319605ed29d35de4034a41f05e8ba0a3b (diff)
Fix a number of qdoc warnings related to deprecation
Remove obsolete documentation. Change-Id: Iaf4b6f9852a883dea0f256c5c89e74f6ebbe85f3 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/serialization')
-rw-r--r--src/corelib/serialization/qtextstream.cpp144
-rw-r--r--src/corelib/serialization/qxmlstream.cpp117
2 files changed, 0 insertions, 261 deletions
diff --git a/src/corelib/serialization/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp
index fffdf2d82e..57d4e18ae6 100644
--- a/src/corelib/serialization/qtextstream.cpp
+++ b/src/corelib/serialization/qtextstream.cpp
@@ -2600,12 +2600,6 @@ QTextStream &QTextStream::operator<<(const void *ptr)
namespace Qt {
/*!
- \fn QTextStream &bin(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::bin() instead.
-*/
-
-/*!
Calls QTextStream::setIntegerBase(2) on \a stream and returns \a
stream.
@@ -2620,12 +2614,6 @@ QTextStream &bin(QTextStream &stream)
}
/*!
- \fn QTextStream &oct(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::oct() instead.
-*/
-
-/*!
Calls QTextStream::setIntegerBase(8) on \a stream and returns \a
stream.
@@ -2640,12 +2628,6 @@ QTextStream &oct(QTextStream &stream)
}
/*!
- \fn QTextStream &dec(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::dec() instead.
-*/
-
-/*!
Calls QTextStream::setIntegerBase(10) on \a stream and returns \a
stream.
@@ -2660,12 +2642,6 @@ QTextStream &dec(QTextStream &stream)
}
/*!
- \fn QTextStream &hex(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::hex() instead.
-*/
-
-/*!
Calls QTextStream::setIntegerBase(16) on \a stream and returns \a
stream.
@@ -2681,12 +2657,6 @@ QTextStream &hex(QTextStream &stream)
}
/*!
- \fn QTextStream &showbase(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::showbase() instead.
-*/
-
-/*!
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() |
QTextStream::ShowBase) on \a stream and returns \a stream.
@@ -2701,12 +2671,6 @@ QTextStream &showbase(QTextStream &stream)
}
/*!
- \fn QTextStream &forcesign(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::forcesign() instead.
-*/
-
-/*!
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() |
QTextStream::ForceSign) on \a stream and returns \a stream.
@@ -2721,12 +2685,6 @@ QTextStream &forcesign(QTextStream &stream)
}
/*!
- \fn QTextStream &forcepoint(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::forcepoint() instead.
-*/
-
-/*!
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() |
QTextStream::ForcePoint) on \a stream and returns \a stream.
@@ -2741,12 +2699,6 @@ QTextStream &forcepoint(QTextStream &stream)
}
/*!
- \fn QTextStream &noshowbase(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::noshowbase() instead.
-*/
-
-/*!
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() &
~QTextStream::ShowBase) on \a stream and returns \a stream.
@@ -2761,12 +2713,6 @@ QTextStream &noshowbase(QTextStream &stream)
}
/*!
- \fn QTextStream &noforcesign(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::noforcesign() instead.
-*/
-
-/*!
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() &
~QTextStream::ForceSign) on \a stream and returns \a stream.
@@ -2781,12 +2727,6 @@ QTextStream &noforcesign(QTextStream &stream)
}
/*!
- \fn QTextStream &noforcepoint(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::noforcepoint() instead.
-*/
-
-/*!
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() &
~QTextStream::ForcePoint) on \a stream and returns \a stream.
@@ -2801,12 +2741,6 @@ QTextStream &noforcepoint(QTextStream &stream)
}
/*!
- \fn QTextStream &uppercasebase(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::uppercasebase() instead.
-*/
-
-/*!
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() |
QTextStream::UppercaseBase) on \a stream and returns \a stream.
@@ -2821,12 +2755,6 @@ QTextStream &uppercasebase(QTextStream &stream)
}
/*!
- \fn QTextStream &uppercasedigits(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::uppercasedigits() instead.
-*/
-
-/*!
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() |
QTextStream::UppercaseDigits) on \a stream and returns \a stream.
@@ -2841,12 +2769,6 @@ QTextStream &uppercasedigits(QTextStream &stream)
}
/*!
- \fn QTextStream &lowercasebase(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::lowercasebase() instead.
-*/
-
-/*!
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() &
~QTextStream::UppercaseBase) on \a stream and returns \a stream.
@@ -2861,12 +2783,6 @@ QTextStream &lowercasebase(QTextStream &stream)
}
/*!
- \fn QTextStream &lowercasedigits(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::lowercasedigits() instead.
-*/
-
-/*!
Calls QTextStream::setNumberFlags(QTextStream::numberFlags() &
~QTextStream::UppercaseDigits) on \a stream and returns \a stream.
@@ -2881,12 +2797,6 @@ QTextStream &lowercasedigits(QTextStream &stream)
}
/*!
- \fn QTextStream &fixed(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::fixed() instead.
-*/
-
-/*!
Calls QTextStream::setRealNumberNotation(QTextStream::FixedNotation)
on \a stream and returns \a stream.
@@ -2901,12 +2811,6 @@ QTextStream &fixed(QTextStream &stream)
}
/*!
- \fn QTextStream &scientific(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::scientific() instead.
-*/
-
-/*!
Calls QTextStream::setRealNumberNotation(QTextStream::ScientificNotation)
on \a stream and returns \a stream.
@@ -2921,12 +2825,6 @@ QTextStream &scientific(QTextStream &stream)
}
/*!
- \fn QTextStream &left(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::left() instead.
-*/
-
-/*!
Calls QTextStream::setFieldAlignment(QTextStream::AlignLeft)
on \a stream and returns \a stream.
@@ -2941,12 +2839,6 @@ QTextStream &left(QTextStream &stream)
}
/*!
- \fn QTextStream &right(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::right() instead.
-*/
-
-/*!
Calls QTextStream::setFieldAlignment(QTextStream::AlignRight)
on \a stream and returns \a stream.
@@ -2961,12 +2853,6 @@ QTextStream &right(QTextStream &stream)
}
/*!
- \fn QTextStream &center(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::center() instead.
-*/
-
-/*!
Calls QTextStream::setFieldAlignment(QTextStream::AlignCenter)
on \a stream and returns \a stream.
@@ -2981,12 +2867,6 @@ QTextStream &center(QTextStream &stream)
}
/*!
- \fn QTextStream &endl(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::endl() instead.
-*/
-
-/*!
Writes '\\n' to the \a stream and flushes the stream.
Equivalent to
@@ -3006,12 +2886,6 @@ QTextStream &endl(QTextStream &stream)
}
/*!
- \fn QTextStream &flush(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::flush() instead.
-*/
-
-/*!
Calls QTextStream::flush() on \a stream and returns \a stream.
\since 5.14
@@ -3025,12 +2899,6 @@ QTextStream &flush(QTextStream &stream)
}
/*!
- \fn QTextStream &reset(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::reset() instead.
-*/
-
-/*!
Calls QTextStream::reset() on \a stream and returns \a stream.
\since 5.14
@@ -3044,12 +2912,6 @@ QTextStream &reset(QTextStream &stream)
}
/*!
- \fn QTextStream &ws(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::ws() instead.
-*/
-
-/*!
Calls \l {QTextStream::}{skipWhiteSpace()} on \a stream and returns \a stream.
\since 5.14
@@ -3088,12 +2950,6 @@ QTextStream &ws(QTextStream &stream)
namespace Qt {
/*!
- \fn QTextStream &bom(QTextStream &stream)
- \relates QTextStream
- \obsolete Use Qt::bom() instead.
-*/
-
-/*!
Toggles insertion of the Byte Order Mark on \a stream when QTextStream is
used with a UTF encoding.
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
index 7c075c9297..1296908110 100644
--- a/src/corelib/serialization/qxmlstream.cpp
+++ b/src/corelib/serialization/qxmlstream.cpp
@@ -2292,15 +2292,6 @@ QXmlStreamAttribute::QXmlStreamAttribute()
m_isDefault = false;
}
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-/*!
- Destructs an attribute.
- */
-QXmlStreamAttribute::~QXmlStreamAttribute()
-{
-}
-#endif
-
/*! Constructs an attribute in the namespace described with \a
namespaceUri with \a name and value \a value.
*/
@@ -2374,30 +2365,6 @@ QXmlStreamAttribute::QXmlStreamAttribute(const QString &qualifiedName, const QSt
not equal; otherwise returns \c false.
*/
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-/*!
- Creates a copy of \a other.
- */
-QXmlStreamAttribute::QXmlStreamAttribute(const QXmlStreamAttribute &other)
-{
- *this = other;
-}
-
-/*!
- Assigns \a other to this attribute.
- */
-QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &other)
-{
- m_name = other.m_name;
- m_namespaceUri = other.m_namespaceUri;
- m_qualifiedName = other.m_qualifiedName;
- m_value = other.m_value;
- m_isDefault = other.m_isDefault;
- return *this;
-}
-#endif
-
/*!
\class QXmlStreamAttributes
\inmodule QtCore
@@ -2453,34 +2420,6 @@ QXmlStreamNotationDeclaration::QXmlStreamNotationDeclaration()
{
}
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-/*!
- Creates a copy of \a other.
- */
-QXmlStreamNotationDeclaration::QXmlStreamNotationDeclaration(const QXmlStreamNotationDeclaration &other)
-{
- *this = other;
-}
-
-/*!
- Assigns \a other to this notation declaration.
- */
-QXmlStreamNotationDeclaration& QXmlStreamNotationDeclaration::operator=(const QXmlStreamNotationDeclaration &other)
-{
- m_name = other.m_name;
- m_systemId = other.m_systemId;
- m_publicId = other.m_publicId;
- return *this;
-}
-
-/*!
-Destructs this notation declaration.
-*/
-QXmlStreamNotationDeclaration::~QXmlStreamNotationDeclaration()
-{
-}
-#endif
-
/*! \fn QStringRef QXmlStreamNotationDeclaration::name() const
Returns the notation name.
@@ -2552,32 +2491,6 @@ QXmlStreamNamespaceDeclaration::QXmlStreamNamespaceDeclaration(const QString &pr
m_namespaceUri = namespaceUri;
}
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-/*!
- Creates a copy of \a other.
- */
-QXmlStreamNamespaceDeclaration::QXmlStreamNamespaceDeclaration(const QXmlStreamNamespaceDeclaration &other)
-{
- *this = other;
-}
-
-/*!
- Assigns \a other to this namespace declaration.
- */
-QXmlStreamNamespaceDeclaration& QXmlStreamNamespaceDeclaration::operator=(const QXmlStreamNamespaceDeclaration &other)
-{
- m_prefix = other.m_prefix;
- m_namespaceUri = other.m_namespaceUri;
- return *this;
-}
-/*!
-Destructs this namespace declaration.
-*/
-QXmlStreamNamespaceDeclaration::~QXmlStreamNamespaceDeclaration()
-{
-}
-#endif
-
/*! \fn QStringRef QXmlStreamNamespaceDeclaration::prefix() const
Returns the prefix.
@@ -2624,36 +2537,6 @@ QXmlStreamEntityDeclaration::QXmlStreamEntityDeclaration()
{
}
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-/*!
- Creates a copy of \a other.
- */
-QXmlStreamEntityDeclaration::QXmlStreamEntityDeclaration(const QXmlStreamEntityDeclaration &other)
-{
- *this = other;
-}
-
-/*!
- Assigns \a other to this entity declaration.
- */
-QXmlStreamEntityDeclaration& QXmlStreamEntityDeclaration::operator=(const QXmlStreamEntityDeclaration &other)
-{
- m_name = other.m_name;
- m_notationName = other.m_notationName;
- m_systemId = other.m_systemId;
- m_publicId = other.m_publicId;
- m_value = other.m_value;
- return *this;
-}
-
-/*!
- Destructs this entity declaration.
-*/
-QXmlStreamEntityDeclaration::~QXmlStreamEntityDeclaration()
-{
-}
-#endif
-
/*! \fn QXmlStreamStringRef::swap(QXmlStreamStringRef &other)
\since 5.6