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 <kai.koehne@qt.io> (cherry picked from commit d4f631ce515576b3613f1b2ed3f4da137b9708a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
3de5d107dc
commit
ffaa007e0e
@ -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
|
If a parse error occurs, this function returns \c false and the error
|
||||||
message is placed in \c{*}\a{errorMsg}, the line number in
|
message is placed in \c{*}\a{errorMsg}, the line number in
|
||||||
\c{*}\a{errorLine} and the column number in \c{*}\a{errorColumn}
|
\c{*}\a{errorLine} and the column number in \c{*}\a{errorColumn}
|
||||||
(unless the associated pointer is set to 0); otherwise this
|
(unless the associated pointer is set to \c nullptr); otherwise this
|
||||||
function returns \c true. The various error messages are described in
|
function returns \c true.
|
||||||
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.
|
|
||||||
|
|
||||||
If \a namespaceProcessing is true, the function QDomNode::prefix()
|
If \a namespaceProcessing is true, the function QDomNode::prefix()
|
||||||
returns a string for all elements and attributes. It returns an
|
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
|
\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.
|
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
|
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)
|
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
|
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
|
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
|
\sa QXmlStreamReader
|
||||||
*/
|
*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user