From ffaa007e0e7cba8ed3f325a1d6bf0fc6b3ee72d4 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Thu, 30 Jun 2022 15:13:20 +0200 Subject: [PATCH] QDomDocument: some doc fixes - removed outdated docs about QXmlParseException (a leftover from SAX-based implementation) - replaced 0 with nullptr - fixed a typo Change-Id: I96362be8bb6a5f1b23eb8999416b6b04228e0a5f Reviewed-by: Kai Koehne (cherry picked from commit d4f631ce515576b3613f1b2ed3f4da137b9708a5) Reviewed-by: Qt Cherry-pick Bot --- src/xml/dom/qdom.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 86e8e69a869..b54590a2f86 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -6071,12 +6071,8 @@ bool QDomDocument::setContent(const QString& text, bool namespaceProcessing, QSt If a parse error occurs, this function returns \c false and the error message is placed in \c{*}\a{errorMsg}, the line number in \c{*}\a{errorLine} and the column number in \c{*}\a{errorColumn} - (unless the associated pointer is set to 0); otherwise this - function returns \c true. The various error messages are described in - the QXmlParseException class documentation. Note that, if you - want to display these error messages to your application's users, - they will be displayed in English unless they are explicitly - translated. + (unless the associated pointer is set to \c nullptr); otherwise this + function returns \c true. If \a namespaceProcessing is true, the function QDomNode::prefix() returns a string for all elements and attributes. It returns an @@ -6126,7 +6122,7 @@ bool QDomDocument::setContent(const QByteArray &data, bool namespaceProcessing, \note This method will try to open \a dev in read-only mode if it is not already open. In that case, the caller is responsible for calling close. This will change in Qt 7, which will no longer open \a dev. Applications - shoul therefore open the device themselves before calling setContent. + should therefore open the device themselves before calling setContent. */ bool QDomDocument::setContent(QIODevice* dev, bool namespaceProcessing, QString *errorMsg, int *errorLine, int *errorColumn) { @@ -6207,7 +6203,7 @@ bool QDomDocument::setContent(QIODevice* dev, QString *errorMsg, int *errorLine, If a parse error occurs, the error message is placed in \c{*}\a{errorMsg}, the line number in \c{*}\a{errorLine} and the column number in \c{*}\a{errorColumn} (unless - the associated pointer is set to 0). + the associated pointer is set to \c nullptr). \sa QXmlStreamReader */