Changeset 561 for trunk/src/corelib/xml/qxmlstream.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/corelib/xml/qxmlstream.cpp (modified) (22 diffs)

trunk/src/corelib/xml/qxmlstream.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtCore 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -53 +53 @@
 #include "qxmlutils_p.h"
 #include <qdebug.h>
-#include <QFile>
+#include <>
 #include <stdio.h>
 #include <qtextcodec.h>
@@ -59 +59 @@
 #include <qbuffer.h>
 #ifndef QT_BOOTSTRAPPED
-#include <QCoreApplication>
+#include <>
 #else
 // This specialization of Q_DECLARE_TR_FUNCTIONS is not in qcoreapplication.h,
@@ -130 +130 @@
 
 /*!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     \enum QXmlStreamReader::Error
 
@@ -245 +260 @@
   well-formed XML via a simple streaming API.
 
-  \mainclass
+
   \ingroup xml-tools
 
@@ -299 +314 @@
 
   The \l{QXmlStream Bookmarks Example} illustrates how to use the
-  recursive descent technique with a subclassed stream reader to read
-  an XML bookmark file (XBEL).
+  recursive descent technique 
+  a.
 
   \section1 Namespaces
@@ -335 +350 @@
   new data with the next call to readNext().
 
-  For example, if you read data from the network using QHttp, you
-  would connect its \l{QHttp::readyRead()}{readyRead()} signal to a
-  custom slot. In this slot, you read all available data with
-  \l{QHttp::readAll()}{readAll()} and pass it to the XML stream reader
-  using addData(). Then you call your custom parsing function that
-  reads the XML events from the reader.
+  For example, if your application reads data from the network using a
+  \l{QNetworkAccessManager} {network access manager}, you would issue
+  a \l{QNetworkRequest} {network request} to the manager and receive a
+  \l{QNetworkReply} {network reply} in return. Since a QNetworkReply
+  is a QIODevice, you connect its \l{QNetworkReply::readyRead()}
+  {readyRead()} signal to a custom slot, e.g. \c{slotReadyRead()} in
+  the code snippet shown in the discussion for QNetworkAccessManager.
+  In this slot, you read all available data with
+  \l{QNetworkReply::readAll()} {readAll()} and pass it to the XML
+  stream reader using addData(). Then you call your custom parsing
+  function that reads the XML events from the reader.
 
   \section1 Performance and memory consumption
@@ -430 +450 @@
     if (d->deleteDevice)
         delete d->device;
-    delete d;
 }
 
@@ -569 +588 @@
   QXmlStreamReader::Invalid.
 
-  The exception is when error() return PrematureEndOfDocumentError.
+  The exception is when error() return PrematureEndOfDocumentError.
   This error is reported when the end of an otherwise well-formed
   chunk of XML is reached, but the chunk doesn't represent a complete
@@ -618 +637 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*
  * Use the following Perl script to generate the error string index list:
@@ -630 +699 @@
     $counter += length 1 + $_;
 }
-print "    \"\\0\";\n\nstatic const int QXmlStreamReader_tokenTypeString_indices[] = {\n    ";
+print "    \"\\0\";\n\nstatic const t QXmlStreamReader_tokenTypeString_indices[] = {\n    ";
 for ($j = 0; $j < $i; ++$j) {
     printf "$sizes[$j], ";
@@ -661 +730 @@
     "DTD\0"
     "EntityReference\0"
-    "ProcessingInstruction\0"
-    "\0";
-
-static const int QXmlStreamReader_tokenTypeString_indices[] = {
+    "ProcessingInstruction\0";
+
+static const short QXmlStreamReader_tokenTypeString_indices[] = {
     0, 8, 16, 30, 42, 55, 66, 77, 85, 89, 105, 0
 };
@@ -820 +888 @@
     stack_size <<= 1;
     sym_stack = reinterpret_cast<Value*> (qRealloc(sym_stack, stack_size * sizeof(Value)));
+
     state_stack = reinterpret_cast<int*> (qRealloc(state_stack, stack_size * sizeof(int)));
+
 }
 
@@ -2018 +2088 @@
   The function concatenates text() when it reads either \l Characters
   or EntityReference tokens, but skips ProcessingInstruction and \l
-  Comment. In case anything else is read before reaching EndElement,
-  the function returns what it read so far and raises an
-  UnexpectedElementError. If the current token is not StartElement, an
-  empty string is returned.
- */
-QString QXmlStreamReader::readElementText()
+  Comment. If the current token is not StartElement, an empty string is
+  returned.
+
+  The \a behaviour defines what happens in case anything else is
+  read before reaching EndElement. The function can include the text from
+  child elements (useful for example for HTML), ignore child elements, or
+  raise an UnexpectedElementError and return what was read so far.
+
+  \since 4.6
+ */
+QString QXmlStreamReader::readElementText(ReadElementTextBehaviour behaviour)
 {
     Q_D(QXmlStreamReader);
@@ -2039 +2114 @@
             case Comment:
                 break;
+
+
+
+
+
+
+
+
+
             default:
-                if (!d->error)
-                    d->raiseError(UnexpectedElementError, QXmlStream::tr("Expected character data."));
-                return result;
+                if (d->error || behaviour == ErrorOnUnexpectedElement) {
+                    if (!d->error)
+                        d->raiseError(UnexpectedElementError, QXmlStream::tr("Expected character data."));
+                    return result;
+                }
             }
         }
     }
     return QString();
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -2789 +2885 @@
   simple streaming API.
 
-  \mainclass
-  \inmodule QtXml
   \ingroup xml-tools
 
@@ -2849 +2943 @@
 
   The \l{QXmlStream Bookmarks Example} illustrates how to use a
-  subclassed stream writer to write an XML bookmark file (XBEL) that
+  stream writer to write an XML bookmark file (XBEL) that
   was previously read in by a QXmlStreamReader.
 
@@ -3059 +3153 @@
         int n = ++namespacePrefixCount;
         forever {
-            s = QLatin1String("n") + QString::number(n++);
+            s = QLatin1) + QString::number(n++);
             int j = namespaceDeclarations.size() - 2;
             while (j >= 0 && namespaceDeclarations.at(j).prefix != s)
@@ -3132 +3226 @@
 QXmlStreamWriter::~QXmlStreamWriter()
 {
-    Q_D(QXmlStreamWriter);
-    delete d;
 }
 
@@ -3412 +3504 @@
     Q_D(QXmlStreamWriter);
     Q_ASSERT(!text.contains(QLatin1String("--")) && !text.endsWith(QLatin1Char('-')));
-    if (!d->finishStartElement() && d->autoFormatting)
+    if (!d->finishStartElement() && d->autoFormatting)
         d->indent(d->tagStack.size());
     d->write("<!--");
     d->write(text);
     d->write("-->");
+
 }