diff options
| -rw-r--r-- | src/corelib/xml/qxmlstream.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/xml/qxmlstream.h | 3 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index 6222a76f08..df2c2f998f 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -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() diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h index 90382c7fe5..ae6dd23551 100644 --- a/src/corelib/xml/qxmlstream.h +++ b/src/corelib/xml/qxmlstream.h @@ -301,8 +301,7 @@ public: IncludeChildElements, SkipChildElements }; - QString readElementText(ReadElementTextBehaviour behaviour); - QString readElementText(); + QString readElementText(ReadElementTextBehaviour behaviour = ErrorOnUnexpectedElement); QStringRef name() const; QStringRef namespaceUri() const; |