diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-13 11:58:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-14 14:24:57 +0100 |
| commit | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch) | |
| tree | 8965835c375422d63b2ccfa927b31a56e64bda1d /src/corelib/xml/qxmlstream.cpp | |
| parent | d1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff) | |
| parent | e95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/concurrent/doc/qtconcurrent.qdocconf
src/corelib/doc/qtcore.qdocconf
src/corelib/global/qglobal.h
src/dbus/doc/qtdbus.qdocconf
src/dbus/qdbusmessage.h
src/gui/doc/qtgui.qdocconf
src/gui/image/qimagereader.cpp
src/network/doc/qtnetwork.qdocconf
src/opengl/doc/qtopengl.qdocconf
src/opengl/qgl.h
src/plugins/platforms/windows/qwindowswindow.cpp
src/printsupport/doc/qtprintsupport.qdocconf
src/sql/doc/qtsql.qdocconf
src/testlib/doc/qttestlib.qdocconf
src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
src/widgets/doc/qtwidgets.qdocconf
src/xml/doc/qtxml.qdocconf
Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
Diffstat (limited to 'src/corelib/xml/qxmlstream.cpp')
| -rw-r--r-- | src/corelib/xml/qxmlstream.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp index 455df4ec73d..4be4593e95b 100644 --- a/src/corelib/xml/qxmlstream.cpp +++ b/src/corelib/xml/qxmlstream.cpp @@ -1958,7 +1958,7 @@ QStringRef QXmlStreamReader::text() const } -/*! If the state() is \l DTD, this function returns the DTD's +/*! If the tokenType() is \l DTD, this function returns the DTD's notation declarations. Otherwise an empty vector is returned. The QXmlStreamNotationDeclarations class is defined to be a QVector @@ -1973,7 +1973,7 @@ QXmlStreamNotationDeclarations QXmlStreamReader::notationDeclarations() const } -/*! If the state() is \l DTD, this function returns the DTD's +/*! If the tokenType() is \l DTD, this function returns the DTD's unparsed (external) entity declarations. Otherwise an empty vector is returned. The QXmlStreamEntityDeclarations class is defined to be a QVector @@ -1990,7 +1990,7 @@ QXmlStreamEntityDeclarations QXmlStreamReader::entityDeclarations() const /*! \since 4.4 - If the state() is \l DTD, this function returns the DTD's + If the tokenType() is \l DTD, this function returns the DTD's name. Otherwise an empty string is returned. */ @@ -2005,7 +2005,7 @@ QStringRef QXmlStreamReader::dtdName() const /*! \since 4.4 - If the state() is \l DTD, this function returns the DTD's + If the tokenType() is \l DTD, this function returns the DTD's public identifier. Otherwise an empty string is returned. */ @@ -2020,7 +2020,7 @@ QStringRef QXmlStreamReader::dtdPublicId() const /*! \since 4.4 - If the state() is \l DTD, this function returns the DTD's + If the tokenType() is \l DTD, this function returns the DTD's system identifier. Otherwise an empty string is returned. */ @@ -2032,7 +2032,7 @@ QStringRef QXmlStreamReader::dtdSystemId() const return QStringRef(); } -/*! If the state() is \l StartElement, this function returns the +/*! If the tokenType() is \l StartElement, this function returns the element's namespace declarations. Otherwise an empty vector is returned. @@ -2845,7 +2845,7 @@ bool QXmlStreamReader::isStandaloneDocument() const /*! \since 4.4 - If the state() is \l StartDocument, this function returns the + If the tokenType() is \l StartDocument, this function returns the version string as specified in the XML declaration. Otherwise an empty string is returned. */ @@ -2860,7 +2860,7 @@ QStringRef QXmlStreamReader::documentVersion() const /*! \since 4.4 - If the state() is \l StartDocument, this function returns the + If the tokenType() is \l StartDocument, this function returns the encoding string as specified in the XML declaration. Otherwise an empty string is returned. */ |