diff options
Diffstat (limited to 'src/xml')
-rw-r--r-- | src/xml/doc/src/qtxml-index.qdoc | 2 | ||||
-rw-r--r-- | src/xml/dom/qdom.h | 4 | ||||
-rw-r--r-- | src/xml/qtxmlglobal.h | 4 | ||||
-rw-r--r-- | src/xml/sax/qxml.cpp | 4 | ||||
-rw-r--r-- | src/xml/sax/qxml.h | 4 |
5 files changed, 3 insertions, 15 deletions
diff --git a/src/xml/doc/src/qtxml-index.qdoc b/src/xml/doc/src/qtxml-index.qdoc index 2247ce5ace..ded8f3de3c 100644 --- a/src/xml/doc/src/qtxml-index.qdoc +++ b/src/xml/doc/src/qtxml-index.qdoc @@ -31,7 +31,7 @@ \brief The Qt XML module provides C++ implementations of the SAX and DOM standards for XML. The module is not actively maintained anymore. Please use - the QXmlStreamReader and QXmlStreamwriter classes in Qt Core instead. + the QXmlStreamReader and QXmlStreamWriter classes in Qt Core instead. To include the definitions of the module's classes, use the following directive: diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h index 36eee0caeb..f1c04a422d 100644 --- a/src/xml/dom/qdom.h +++ b/src/xml/dom/qdom.h @@ -45,8 +45,6 @@ #include <QtXml/qtxmlglobal.h> #include <QtCore/qstring.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -675,6 +673,4 @@ Q_XML_EXPORT QTextStream& operator<<(QTextStream&, const QDomNode&); QT_END_NAMESPACE -QT_END_HEADER - #endif // QDOM_H diff --git a/src/xml/qtxmlglobal.h b/src/xml/qtxmlglobal.h index fb86e57e9e..c7209ad054 100644 --- a/src/xml/qtxmlglobal.h +++ b/src/xml/qtxmlglobal.h @@ -44,8 +44,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -60,6 +58,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif // QTXMLGLOBAL_H diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 689c75774e..47e137976b 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -3037,10 +3037,10 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() A common way to perform incremental parsing is to connect the \c readyRead() signal of a \l{QNetworkReply} {network reply} a slot, and handle the incoming data there. See QNetworkAccessManager. - + Aspects of the parsing behavior can be adapted using setFeature() and setProperty(). - + \snippet code/src_xml_sax_qxml.cpp 0 QXmlSimpleReader is not reentrant. If you want to use the class diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index 069e344ce4..4ce2c26b05 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -50,8 +50,6 @@ #include <QtCore/qlist.h> #include <QtCore/qscopedpointer.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -417,6 +415,4 @@ inline int QXmlAttributes::count() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QXML_H |