Changeset 561 for trunk/src/xml/sax/qxml.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/xml/sax/qxml.cpp (modified) (53 diffs)

trunk/src/xml/sax/qxml.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtXml module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -245 +245 @@
 {
 public:
+    QXmlParseExceptionPrivate()
+        : column(-1), line(-1)
+    {
+    }
+    QXmlParseExceptionPrivate(const QXmlParseExceptionPrivate &other)
+        : msg(other.msg), column(other.column), line(other.line),
+          pub(other.pub), sys(other.sys)
+    {
+    }
+
     QString msg;
     int column;
@@ -263 +273 @@
 class QXmlSimpleReaderPrivate
 {
+public:
+    ~QXmlSimpleReaderPrivate();
 private:
     // functions
-    QXmlSimpleReaderPrivate();
-    ~QXmlSimpleReaderPrivate();
+    QXmlSimpleReaderPrivate(QXmlSimpleReader *reader);
     void initIncrementalParsing();
 
@@ -303 +314 @@
     // used for parsing of entity references
     struct XmlRef {
-        XmlRef(const QString &_name = QString(), const QString &_value = QString())
+        XmlRef()
+            : index(0) {}
+        XmlRef(const QString &_name, const QString &_value)
             : name(_name), value(_value), index(0) {}
         bool isEmpty() const { return index == value.length(); }
@@ -349 +362 @@
 
     // helper classes
-    QXmlLocator *locator;
+    QScopedPointer<QXmlLocator> locator;
     QXmlNamespaceSupport namespaceSupport;
 
@@ -544 +557 @@
 QXmlParseException::QXmlParseException(const QString& name, int c, int l,
                                        const QString& p, const QString& s)
-{
-    d = new QXmlParseExceptionPrivate;
+    : d(new QXmlParseExceptionPrivate)
+{
     d->msg = name;
     d->column = c;
@@ -554 +567 @@
 
 /*!
+    Creates a copy of \a other.
+*/
+QXmlParseException::QXmlParseException(const QXmlParseException& other) :
+     d(new QXmlParseExceptionPrivate(*other.d))
+{
+
+}
+
+/*!
     Destroys the QXmlParseException.
 */
 QXmlParseException::~QXmlParseException()
 {
-    delete d;
 }
 
@@ -927 +948 @@
 void QXmlNamespaceSupport::reset()
 {
+    QXmlNamespaceSupportPrivate *newD = new QXmlNamespaceSupportPrivate;
     delete d;
-    d = new QXmlNamespaceSupportPrivate;
+    d = newD;
 }
 
@@ -1259 +1281 @@
     d = new QXmlInputSourcePrivate;
 
-    d->inputDevice = 0;
-    d->inputStream = 0;
-
-    setData(QString());
+    QT_TRY {
+        d->inputDevice = 0;
+        d->inputStream = 0;
+
+        setData(QString());
 #ifndef QT_NO_TEXTCODEC
-    d->encMapper = 0;
+        d->encMapper = 0;
 #endif
-    d->nextReturnedEndOfData = true; // first call to next() will call fetchData()
-
-    d->encodingDeclBytes.clear();
-    d->encodingDeclChars.clear();
-    d->lookingForEncodingDecl = true;
+        d->nextReturnedEndOfData = true; // first call to next() will call fetchData()
+
+        d->encodingDeclBytes.clear();
+        d->encodingDeclChars.clear();
+        d->lookingForEncodingDecl = true;
+    } QT_CATCH(...) {
+        delete(d);
+        QT_RETHROW;
+    }
 }
 
@@ -2108 +2135 @@
     QXmlReader::setLexicalHandler().
 
-    This interface's design is based on the the SAX2 extension
+    This interface's design is based on the SAX2 extension
     LexicalHandler.
 
@@ -2404 +2431 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 void QXmlDefaultHandler::setDocumentLocator(QXmlLocator*)
@@ -2413 +2440 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startDocument()
@@ -2423 +2450 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endDocument()
@@ -2433 +2460 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startPrefixMapping(const QString&, const QString&)
@@ -2443 +2470 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endPrefixMapping(const QString&)
@@ -2453 +2480 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startElement(const QString&, const QString&,
@@ -2464 +2491 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endElement(const QString&, const QString&,
@@ -2475 +2502 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::characters(const QString&)
@@ -2485 +2512 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::ignorableWhitespace(const QString&)
@@ -2495 +2522 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::processingInstruction(const QString&,
@@ -2506 +2533 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::skippedEntity(const QString&)
@@ -2516 +2543 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::warning(const QXmlParseException&)
@@ -2526 +2553 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::error(const QXmlParseException&)
@@ -2536 +2563 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::fatalError(const QXmlParseException&)
@@ -2546 +2573 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::notationDecl(const QString&, const QString&,
@@ -2557 +2584 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::unparsedEntityDecl(const QString&, const QString&,
@@ -2591 +2618 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startDTD(const QString&, const QString&, const QString&)
@@ -2601 +2628 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endDTD()
@@ -2611 +2638 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startEntity(const QString&)
@@ -2621 +2648 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endEntity(const QString&)
@@ -2631 +2658 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startCDATA()
@@ -2641 +2668 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endCDATA()
@@ -2651 +2678 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::comment(const QString&)
@@ -2661 +2688 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::attributeDecl(const QString&, const QString&, const QString&, const QString&, const QString&)
@@ -2671 +2698 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::internalEntityDecl(const QString&, const QString&)
@@ -2681 +2708 @@
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::externalEntityDecl(const QString&, const QString&, const QString&)
@@ -2714 +2741 @@
 }
 
-QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate()
-{
+QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader)
+{
+    q_ptr = reader;
     parseStack = 0;
+
+    locator.reset(new QXmlSimpleReaderLocator(reader));
+    entityRes  = 0;
+    dtdHnd     = 0;
+    contentHnd = 0;
+    errorHnd   = 0;
+    lexicalHnd = 0;
+    declHnd    = 0;
+
+    // default feature settings
+    useNamespaces = true;
+    useNamespacePrefixes = false;
+    reportWhitespaceCharData = true;
+    reportEntities = false;
 }
 
@@ -2726 +2768 @@
 void QXmlSimpleReaderPrivate::initIncrementalParsing()
 {
-    delete parseStack;
-    parseStack = new QStack<ParseState>;
+    if(parseStack)
+        parseStack->clear();
+    else
+        parseStack = new QStack<ParseState>;
 }
 
@@ -2969 +3013 @@
     \inmodule QtXml
     \ingroup xml-tools
-    \mainclass
+
 
     This XML reader is suitable for a wide range of applications. It
@@ -3013 +3057 @@
     parseContinue() function, until all the data has been processed.
 
-    A common way to perform incremental parsing is to connect the
-    \c readyRead() signal of the input source to a slot, and handle the
-    incoming data there. For example, the following code shows how a
-    parser for \l{http://web.resource.org/rss/1.0/}{RSS feeds} can be
-    used to incrementally parse data that it receives from a QHttp
-    object:
-
-    \snippet doc/src/snippets/xml/rsslisting/rsslisting.cpp 1
-
+    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(). For example, the following code could be used
-    to enable reporting of namespace prefixes to the content handler:
+    and setProperty().
+    
+    \snippet doc/src/snippets/code/src_xml_sax_qxml.cpp 0
 
     QXmlSimpleReader is not reentrant. If you want to use the class
     in threaded code, lock the code using QXmlSimpleReader with a
     locking mechanism, such as a QMutex.
-
-    \snippet doc/src/snippets/code/src_xml_sax_qxml.cpp 0
 */
 
@@ -3100 +3138 @@
 */
 QXmlSimpleReader::QXmlSimpleReader()
-{
-    d_ptr = new QXmlSimpleReaderPrivate();
-    Q_D(QXmlSimpleReader);
-    d->q_ptr = this;
-
-    d->locator = new QXmlSimpleReaderLocator(this);
-
-    d->entityRes  = 0;
-    d->dtdHnd     = 0;
-    d->contentHnd = 0;
-    d->errorHnd   = 0;
-    d->lexicalHnd = 0;
-    d->declHnd    = 0;
-
-    // default feature settings
-    d->useNamespaces = true;
-    d->useNamespacePrefixes = false;
-    d->reportWhitespaceCharData = true;
-    d->reportEntities = false;
+    : d_ptr(new QXmlSimpleReaderPrivate(this))
+{
 }
 
@@ -3126 +3147 @@
 QXmlSimpleReader::~QXmlSimpleReader()
 {
-    Q_D(QXmlSimpleReader);
-    delete d->locator;
-    delete d;
 }
 
@@ -3138 +3156 @@
     const QXmlSimpleReaderPrivate *d = d_func();
 
-    // Qt5 ###: Change these strings to qtsoftware.com
+    // Qt5 ###: Change these strings to qt.nokia.com
     if (ok != 0)
         *ok = true;
@@ -3193 +3211 @@
 {
     Q_D(QXmlSimpleReader);
-    // Qt5 ###: Change these strings to qtsoftware.com
+    // Qt5 ###: Change these strings to qt.nokia.com
     if (name == QLatin1String("http://xml.org/sax/features/namespaces")) {
         d->useNamespaces = enable;
@@ -3211 +3229 @@
 bool QXmlSimpleReader::hasFeature(const QString& name) const
 {
-    // Qt5 ###: Change these strings to qtsoftware.com
+    // Qt5 ###: Change these strings to qt.nokia.com
     if (name == QLatin1String("http://xml.org/sax/features/namespaces")
         || name == QLatin1String("http://xml.org/sax/features/namespace-prefixes")
@@ -3411 +3429 @@
     // call the handler
     if (d->contentHnd) {
-        d->contentHnd->setDocumentLocator(d->locator);
+        d->contentHnd->setDocumentLocator(d->locator.data());
         if (!d->contentHnd->startDocument()) {
             d->reportParseError(d->contentHnd->errorString());
@@ -5465 +5483 @@
                     if (skipIt) {
                         if (contentHnd) {
-                            if (!contentHnd->skippedEntity(QString::fromLatin1("%") + ref())) {
+                            if (!contentHnd->skippedEntity(QLatin1Char('%') + ref())) {
                                 reportParseError(contentHnd->errorString());
                                 return false;
@@ -5477 +5495 @@
                         } else if (parsePEReference_context == InDTD) {
                             // Included as PE
-                            if (!insertXmlRef(QString::fromLatin1(" ")+xmlRefString+QString::fromLatin1(" "), ref(), false))
+                            if (!insertXmlRef(QLatin1Char(' ') + xmlRefString + QLatin1Char(' '), ref(), false))
                                 return false;
                         }
@@ -6729 +6747 @@
                     parameterEntities.insert(name(), string());
                     if (declHnd) {
-                        if (!declHnd->internalEntityDecl(QString::fromLatin1("%")+name(), string())) {
+                        if (!declHnd->internalEntityDecl(QLatin1Char('%') + name(), string())) {
                             reportParseError(declHnd->errorString());
                             return false;
@@ -6741 +6759 @@
                     externParameterEntities.insert(name(), QXmlSimpleReaderPrivate::ExternParameterEntity(publicId, systemId));
                     if (declHnd) {
-                        if (!declHnd->externalEntityDecl(QString::fromLatin1("%")+name(), publicId, systemId)) {
+                        if (!declHnd->externalEntityDecl(QLatin1Char('%') + name(), publicId, systemId)) {
                             reportParseError(declHnd->errorString());
                             return false;
@@ -7865 +7883 @@
     if (inLiteral) {
         QString tmp = data;
-        xmlRefStack.push(XmlRef(name, tmp.replace(QLatin1String("\""),
-                            QLatin1String("&quot;")).replace(QLatin1String("'"), QLatin1String("&apos;"))));
+        xmlRefStack.push(XmlRef(name, tmp.replace(QLatin1Char('\"'),
+                            QLatin1String("&quot;")).replace(QLatin1Char('\''), QLatin1String("&apos;"))));
     } else {
         xmlRefStack.push(XmlRef(name, data));