diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-06-30 15:13:20 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-07-05 11:31:48 +0200 |
| commit | d4f631ce515576b3613f1b2ed3f4da137b9708a5 (patch) | |
| tree | 60ad79039fa20b1d2b015d2cb29142679d20ce69 | |
| parent | 58fd12a487cd2c628d713d1c42f8b53f8c4e9550 (diff) | |
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
Pick-to: 6.4 6.3 6.2
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/xml/dom/qdom.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 70b470aed8..2db31e4646 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -6110,12 +6110,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 @@ -6165,7 +6161,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) { @@ -6246,7 +6242,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 */ |