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

Removed QXmlStreamReader::readElementText overload

Browse Source 
The version without argument was kept for binary compatibility when
the configurable ReadElementTextBehaviour was introduced. It is now
dropped in favour of using a default argument value.

Change-Id: Ic08c41d5a5aad9f22df7fc37a2d53ffbc6df1fe9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Thorbjørn Lindeijer 2012-04-12 22:21:56 +02:00 committed by Qt by Nokia
parent 8427ff09ab
commit 06a5904c8f
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/xml/qxmlstream.cpp
View File

@ -2092,7 +2092,7 @@ void QXmlStreamReader::addExtraNamespaceDeclarations(const QXmlStreamNamespaceDe
The \a behaviour defines what happens in case anything else is
read before reaching EndElement. The function can include the text from
child elements (useful for example for HTML), ignore child elements, or
raise an UnexpectedElementError and return what was read so far.
raise an UnexpectedElementError and return what was read so far (default).
\since 4.6
*/
@ -2133,16 +2133,6 @@ QString QXmlStreamReader::readElementText(ReadElementTextBehaviour behaviour)
return QString();
}
/*!
\overload readElementText()
Calling this function is equivalent to calling readElementText(ErrorOnUnexpectedElement).
*/
QString QXmlStreamReader::readElementText()
{
return readElementText(ErrorOnUnexpectedElement);
}
/*! Raises a custom error with an optional error \a message.
\sa error(), errorString()

3
src/corelib/xml/qxmlstream.h
View File

@ -301,8 +301,7 @@ public:
IncludeChildElements,
SkipChildElements
};
QString readElementText(ReadElementTextBehaviour behaviour);
QString readElementText();
QString readElementText(ReadElementTextBehaviour behaviour = ErrorOnUnexpectedElement);
QStringRef name() const;
QStringRef namespaceUri() const;