Changeset 561 for trunk/src/corelib/xml

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/xml/make-parser.sh (modified) (1 diff)
• src/corelib/xml/qxmlstream.cpp (modified) (22 diffs)
• src/corelib/xml/qxmlstream.g (modified) (8 diffs)
• src/corelib/xml/qxmlstream.h (modified) (9 diffs)
• src/corelib/xml/qxmlstream_p.h (modified) (40 diffs)
• src/corelib/xml/qxmlutils.cpp (modified) (3 diffs)
• src/corelib/xml/qxmlutils_p.h (modified) (4 diffs)

trunk/src/corelib/xml/make-parser.sh

@@ -1 +1 @@
 #!/bin/sh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 me=$(dirname $0)
 mkdir -p $me/out
-(cd $me/out && ../../../../util/qlalr/qlalr --troll --no-debug --no-lines ../qxmlstream.g)
+(cd $me/out && ../../../../util/qlalr/qlalr -- --no-debug --no-lines ../qxmlstream.g)
 
 for f in $me/out/*.h; do
     n=$(basename $f)
-    p4 open $n
     cp $f $n
 done
 
-p4 revert -a ...
-p4 diff -dub ...
+git diff .
 

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("-->");
+
 }
 

trunk/src/corelib/xml/qxmlstream.g

@@ -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$
---
--- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
--- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 --
 ----------------------------------------------------------------------------
@@ -162 +159 @@
             cap = qMax(tos + extraCapacity + 1, cap << 1 );
             data = reinterpret_cast<T *>(qRealloc(data, cap * sizeof(T)));
+
         }
     }
@@ -247 +245 @@
 
 class QXmlStreamEntityResolver;
-
+#ifndef QT_NO_XMLSTREAMREADER
 class QXmlStreamReaderPrivate : public QXmlStreamReader_Table, public QXmlStreamPrivateTagStack{
     QXmlStreamReader *q_ptr;
@@ -918 +916 @@
 markup_list ::= markup_decl | space | pereference;
 markup_list ::= markup_list markup_decl | markup_list space | markup_list pereference;
+
 
 markup_decl ::= element_decl | attlist_decl | entity_decl | entity_done | notation_decl | processing_instruction | comment;
@@ -1534 +1533 @@
                     QStringRef namespaceUri = symString(attribute.value);
                     attributeStack.pop();
-                    if ((namespacePrefix == QLatin1String("xml")
-                         ^ namespaceUri == QLatin1String("http://www.w3.org/XML/1998/namespace"))
+                    if (()
+                         ^ ))
                         || namespaceUri == QLatin1String("http://www.w3.org/2000/xmlns/")
                         || namespaceUri.isEmpty()
@@ -1844 +1843 @@
     return false;
 }
-./
+#endif //QT_NO_XMLSTREAMREADER.xml
+
+./

trunk/src/corelib/xml/qxmlstream.h

@@ -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$
 **
@@ -43 +43 @@
 #define QXMLSTREAM_H
 
-#include <QtCore/QIODevice>
+#include <QtCore/>
 
 #ifndef QT_NO_XMLSTREAM
 
-#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QtCore/qstring.h>
+#include <QtCore/qvector.h>
+#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER
@@ -61 +62 @@
 //
 // The list of supported platforms is in:
-//   http://qtsoftware.com/developer/notes/supported_platforms
+//   http://qt
 //
 // These platforms do not support symbol moving nor duplication
@@ -322 +323 @@
     TokenType readNext();
 
+
+
+
     TokenType tokenType() const;
     QString tokenString() const;
@@ -349 +353 @@
 
     QXmlStreamAttributes attributes() const;
+
+
+
+
+
+
+
     QString readElementText();
 
@@ -393 +404 @@
     Q_DISABLE_COPY(QXmlStreamReader)
     Q_DECLARE_PRIVATE(QXmlStreamReader)
-    QXmlStreamReaderPrivate *d_ptr;
+    Qd_ptr;
 
 };
@@ -466 +477 @@
     Q_DISABLE_COPY(QXmlStreamWriter)
     Q_DECLARE_PRIVATE(QXmlStreamWriter)
-    QXmlStreamWriterPrivate *d_ptr;
+    Qd_ptr;
 };
 #endif // QT_NO_XMLSTREAMWRITER

trunk/src/corelib/xml/qxmlstream_p.h

@@ -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$
 **
@@ -51 +51 @@
 //
 
+
 #ifndef QXMLSTREAM_P_H
 #define QXMLSTREAM_P_H
+
+
+
+
 
 class QXmlStreamReader_Table
@@ -117 +122 @@
 
     ACCEPT_STATE = 416,
-    RULE_COUNT = 269,
+    RULE_COUNT = 2,
     STATE_COUNT = 427,
     TERMINAL_COUNT = 57,
@@ -127 +132 @@
   };
 
-  static const char  *const spell [];
-  static const int            lhs [];
-  static const int            rhs [];
-  static const int   goto_default [];
-  static const int action_default [];
-  static const int   action_index [];
-  static const int    action_info [];
-  static const int   action_check [];
+  static const char  *const spell [];
+  static const             lhs [];
+  static const             rhs [];
+  static const    goto_default [];
+  static const  action_default [];
+  static const    action_index [];
+  static const     action_info [];
+  static const    action_check [];
 
   static inline int nt_action (int state, int nt)
   {
-    const int *const goto_index = &action_index [GOTO_INDEX_OFFSET];
-    const int *const goto_check = &action_check [GOTO_CHECK_OFFSET];
-
-    const int yyn = goto_index [state] + nt;
-
-    if (yyn < 0 || goto_check [yyn] != nt)
+    const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;
+    if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)
       return goto_default [nt];
 
-    const int *const goto_info = &action_info [GOTO_INFO_OFFSET];
-    return goto_info [yyn];
+    return action_info [GOTO_INFO_OFFSET + yyn];
   }
 
@@ -170 +170 @@
   "IDREFS", "ENTITIES", "NMTOKEN", "NMTOKENS", "<?xml", "version", 0};
 
-const int QXmlStreamReader_Table::lhs [] = {
+const t QXmlStreamReader_Table::lhs [] = {
   57, 57, 59, 59, 59, 59, 59, 59, 59, 59, 
   67, 68, 64, 72, 72, 72, 75, 66, 66, 66, 
-  66, 79, 78, 80, 80, 80, 80, 80, 80, 81, 
-  81, 81, 81, 81, 81, 81, 87, 83, 88, 88, 
-  88, 88, 91, 92, 93, 93, 93, 93, 94, 94, 
-  96, 96, 96, 97, 97, 98, 98, 99, 99, 100, 
-  100, 89, 89, 95, 90, 101, 101, 103, 103, 103, 
-  103, 103, 103, 103, 103, 103, 103, 104, 105, 105, 
-  105, 105, 107, 108, 109, 109, 84, 84, 110, 110, 
-  112, 112, 85, 85, 85, 65, 65, 76, 114, 63, 
-  115, 116, 86, 86, 86, 117, 117, 117, 117, 117, 
+  66, 79, 78, 80, 80, 80, 80, 80, 80, 8, 
+  81, 81, 81, 81, 81, 81, 8, 88, 
+  88, 88, , 94, 
+  9, 
+  100, , 103, 103, 
+  103, 103, 103, 103, 103, 103, 103, 10, 105, 
+  105, 105, 10, 110, 
+  11, 
+  , 117, 117, 117, 117, 
   117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 
-  117, 117, 117, 117, 117, 117, 117, 117, 118, 118, 
-  119, 119, 119, 119, 119, 119, 119, 119, 122, 70, 
-  70, 70, 70, 123, 124, 123, 124, 123, 124, 123, 
-  124, 126, 126, 126, 126, 126, 126, 126, 126, 126, 
+  117, 117, 117, 117, 117, 117, 117, 117, 11, 118, 
+  11, 
+  70, 70, 70, , 
+  12, 126, 126, 126, 126, 126, 126, 126, 126, 
   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 
-  126, 126, 126, 125, 73, 113, 113, 113, 113, 127, 
-  128, 127, 128, 127, 128, 127, 128, 129, 129, 129, 
+  126, 126, 126, 12, 
+  12, 129, 129, 
   129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 
   129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 
-  129, 129, 106, 106, 106, 106, 131, 132, 131, 132, 
-  131, 131, 132, 132, 133, 133, 133, 133, 135, 71, 
-  71, 71, 136, 136, 137, 62, 60, 61, 138, 121, 
-  82, 130, 134, 120, 139, 139, 139, 139, 58, 58, 
-  58, 58, 58, 58, 58, 58, 58, 58, 74, 69, 
-  69, 77, 111, 102, 102, 102, 102, 102, 140};
-
-const int QXmlStreamReader_Table:: rhs[] = {
+  129, 129, 1, 
+  13, 
+  71, 71, , 
+  , 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, , 
+  69, 77, 111, 102, 102, 102, 102, 102, 140};
+
+const [] = {
   2, 1, 4, 2, 2, 2, 2, 2, 2, 0, 
   1, 1, 9, 2, 4, 0, 4, 4, 6, 6, 
-  4, 1, 3, 1, 1, 1, 2, 2, 2, 1, 
-  1, 1, 1, 1, 1, 1, 4, 4, 1, 1, 
-  1, 1, 1, 2, 1, 1, 1, 0, 2, 2, 
-  2, 6, 6, 1, 5, 1, 5, 3, 5, 0, 
-  1, 6, 8, 4, 2, 1, 5, 1, 1, 1, 
-  1, 1, 1, 1, 1, 6, 7, 1, 2, 2, 
-  1, 4, 3, 3, 1, 2, 5, 6, 4, 6, 
-  3, 5, 5, 3, 4, 4, 5, 2, 3, 2, 
-  2, 4, 5, 5, 7, 1, 1, 1, 1, 1, 
+  4, 1, 3, 1, 1, 1, 2, 2, 2, , 
+  1, 1, 1, 1, 1, 1, , 1, 
+  1, 1, 1, , 2, 
+  2, , 
+  , 1, 1, 
+  1, 1, 1, 1, 1, , 2, 
+  , 
+  , 
+  2, , 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  2, 2, 2, 2, 1, 1, 1, 1, 1, 2, 
-  2, 3, 3, 2, 2, 2, 2, 1, 1, 1, 
+  , 
+  2, , 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 2, 2, 3, 3, 2, 
-  2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, , 
+  2, 2, 2, , 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 2, 2, 3, 3, 2, 2, 2, 2, 
-  1, 1, 1, 1, 1, 1, 1, 1, 5, 0, 
-  1, 3, 1, 3, 2, 4, 3, 5, 1, 3, 
-  3, 3, 3, 4, 1, 1, 2, 2, 2, 4, 
-  2, 2, 2, 2, 2, 2, 2, 0, 1, 0, 
-  1, 1, 1, 1, 1, 1, 1, 1, 2};
-
-const int QXmlStreamReader_Table::action_default [] = {
-  10, 258, 0, 2, 1, 0, 124, 116, 118, 119, 
-  126, 128, 122, 11, 113, 107, 0, 108, 127, 110, 
-  114, 112, 120, 123, 125, 106, 109, 111, 117, 115, 
-  130, 121, 239, 12, 253, 135, 249, 252, 0, 129, 
-  139, 256, 16, 251, 137, 136, 0, 255, 138, 258, 
-  230, 257, 254, 0, 0, 263, 0, 246, 245, 0, 
-  248, 247, 244, 240, 98, 262, 0, 235, 0, 0, 
-  259, 96, 97, 100, 0, 131, 133, 132, 134, 0, 
-  0, 260, 0, 0, 175, 0, 172, 164, 166, 167, 
-  141, 153, 170, 161, 155, 156, 152, 158, 162, 160, 
-  168, 171, 151, 154, 157, 159, 165, 163, 173, 169, 
-  149, 174, 0, 143, 147, 145, 150, 140, 148, 0, 
-  146, 142, 144, 0, 15, 14, 261, 0, 22, 21, 
-  260, 0, 0, 20, 0, 0, 31, 36, 30, 0, 
-  32, 260, 0, 33, 0, 24, 0, 34, 0, 26, 
-  35, 25, 0, 241, 40, 39, 260, 42, 48, 260, 
-  41, 0, 43, 260, 48, 260, 0, 260, 0, 48, 
-  0, 47, 45, 46, 50, 51, 260, 260, 0, 56, 
-  260, 53, 260, 0, 57, 0, 54, 260, 52, 260, 
-  0, 55, 64, 0, 260, 60, 260, 0, 58, 61, 
-  62, 0, 260, 0, 0, 59, 63, 44, 49, 65, 
-  0, 38, 0, 0, 260, 0, 93, 94, 0, 0, 
-  0, 0, 260, 0, 209, 200, 202, 204, 177, 189, 
-  207, 198, 192, 190, 193, 188, 195, 197, 205, 208, 
-  187, 191, 194, 196, 201, 199, 203, 206, 210, 212, 
-  211, 185, 0, 0, 242, 179, 183, 181, 0, 0, 
-  92, 186, 176, 184, 0, 182, 178, 180, 91, 0, 
-  95, 0, 0, 0, 0, 0, 260, 85, 260, 0, 
-  261, 0, 86, 0, 88, 68, 73, 72, 69, 70, 
-  71, 260, 74, 75, 0, 0, 0, 268, 267, 265, 
-  266, 264, 66, 260, 0, 260, 0, 0, 67, 76, 
-  260, 0, 260, 0, 0, 77, 0, 78, 0, 81, 
-  84, 0, 0, 214, 224, 223, 0, 226, 228, 227, 
-  225, 0, 243, 216, 220, 218, 222, 213, 221, 0, 
-  219, 215, 217, 0, 80, 79, 0, 82, 0, 83, 
-  87, 99, 0, 37, 0, 0, 0, 0, 90, 89, 
-  0, 102, 23, 27, 29, 28, 0, 0, 260, 261, 
-  0, 260, 0, 105, 104, 260, 0, 103, 101, 0, 
-  0, 18, 260, 17, 0, 19, 0, 0, 250, 0, 
-  260, 0, 238, 0, 231, 237, 0, 236, 233, 260, 
-  260, 261, 232, 234, 0, 260, 0, 229, 260, 0, 
-  260, 0, 230, 0, 0, 13, 269, 9, 5, 8, 
-  4, 0, 7, 258, 6, 0, 3};
-
-const int QXmlStreamReader_Table::goto_default [] = {
+  1, 1, , 2, 2, 2, 
+  , 
+  , 
+  3, 3, 3, , 
+  , 
+  1, 1, 1, 1, 1, 1, 1, 1, 2};
+
+const t QXmlStreamReader_Table::action_default [] = {
+  10, 25, 
+  12, 
+  11, 
+  13, 
+  1, 
+  23, 0, 
+  24, 0, 0, 
+  2, 0, 
+  0, 26, 
+  14, 
+  16, 
+  1, 0, 
+  14, 0, 22, 21, 
+  26, 0, 
+  3, 0, 26, 
+  3, 
+  4, 
+  0, 4, 
+  26, 
+  0, 5, 
+  6, 
+  0, 3, 0, 0, 
+  0, 0, 26, 
+  20, 
+  18, 
+  21, 0, 0, 
+  9, 0, 
+  9, 0, 
+  26, 
+  7, 
+  26, 
+  26, 
+  8, 
+  22, 0, 
+  2, 
+  8, 
+  0, 10, 
+  0, 26, 0, 
+  0, 18, 26, 0, 
+  26, 
+  26, 0, 
+  26, 9, 5, 8, 
+  4, 0, 7, 25, 6, 0, 3};
+
+const t QXmlStreamReader_Table::goto_default [] = {
   2, 4, 3, 49, 388, 43, 37, 52, 47, 41, 
   249, 53, 127, 84, 393, 81, 85, 126, 42, 46, 
@@ -284 +284 @@
   50, 51, 59, 0};
 
-const int QXmlStreamReader_Table::action_index [] = {
+const t QXmlStreamReader_Table::action_index [] = {
   -21, -57, 33, 119, 960, 70, -57, -57, -57, -57, 
   -57, -57, -57, -57, -57, -57, 105, -57, -57, -57, 
@@ -373 +373 @@
   -84, -84, -84, 3, -84, 98, -84};
 
-const int QXmlStreamReader_Table::action_info [] = {
+const t QXmlStreamReader_Table::action_info [] = {
   65, 332, 65, 405, 392, 385, 377, 65, 414, 410, 
   415, 55, 397, 374, 373, 217, 206, 408, 65, 65, 
@@ -507 +507 @@
   0, 0, 0, 0, 0, 0, 0, 0};
 
-const int QXmlStreamReader_Table::action_check [] = {
+const t QXmlStreamReader_Table::action_check [] = {
   26, 18, 26, 14, 4, 4, 4, 26, 24, 14, 
   4, 26, 4, 4, 4, 4, 22, 55, 26, 26, 
@@ -653 +653 @@
             cap = qMax(tos + extraCapacity + 1, cap << 1 );
             data = reinterpret_cast<T *>(qRealloc(data, cap * sizeof(T)));
+
         }
     }
@@ -738 +739 @@
 
 class QXmlStreamEntityResolver;
-
+#ifndef QT_NO_XMLSTREAMREADER
 class QXmlStreamReaderPrivate : public QXmlStreamReader_Table, public QXmlStreamPrivateTagStack{
     QXmlStreamReader *q_ptr;
@@ -1355 +1356 @@
         break;
 
-        case 36:
+        case 3:
             if (!scanString(spell[EMPTY], EMPTY, false)
                 && !scanString(spell[ANY], ANY, false)
                 && atEnd) {
-                resume(36);
-                return false;
-            }
-        break;
-
-        case 42:
+                resume(3);
+                return false;
+            }
+        break;
+
+        case 4:
             if (!scanString(spell[PCDATA], PCDATA, false) && atEnd) {
-                resume(42);
-                return false;
-            }
-        break;
-
-        case 67: {
+                resume(4);
+                return false;
+            }
+        break;
+
+        case 6: {
             lastAttributeIsCData = true;
         } break;
 
-        case 77:
+        case 7:
             if (!scanAfterDefaultDecl() && atEnd) {
-                resume(77);
-                return false;
-            }
-        break;
-
-        case 82:
+                resume(7);
+                return false;
+            }
+        break;
+
+        case 8:
                 sym(1) = sym(2);
                 lastAttributeValue.clear();
                 lastAttributeIsCData = false;
                 if (!scanAttType() && atEnd) {
-                    resume(82);
+                    resume(8);
                     return false;
                 }
         break;
 
-        case 83: {
+        case 8: {
             DtdAttribute &dtdAttribute = dtdAttributes.push();
             dtdAttribute.tagName.clear();
@@ -1413 +1414 @@
         } break;
 
-        case 87: {
+        case 8: {
             if (referenceToUnparsedEntityDetected && !standalone)
                 break;
@@ -1433 +1434 @@
         } break;
 
-        case 88: {
+        case 8: {
             if (!scanPublicOrSystem() && atEnd) {
-                resume(88);
+                resume(8);
                 return false;
             }
@@ -1443 +1444 @@
         } break;
 
-        case 89: {
+        case : {
             if (!scanPublicOrSystem() && atEnd) {
-                resume(89);
+                resume();
                 return false;
             }
@@ -1454 +1455 @@
         } break;
 
-        case 90: {
+        case 9: {
             if (!scanNData() && atEnd) {
-                resume(90);
+                resume(9);
                 return false;
             }
@@ -1464 +1465 @@
         } break;
 
-        case 91: {
+        case 9: {
             if (!scanNData() && atEnd) {
-                resume(91);
+                resume(9);
                 return false;
             }
@@ -1475 +1476 @@
         } break;
 
-        case 92: {
+        case 9: {
             EntityDeclaration &entityDeclaration = entityDeclarations.top();
             entityDeclaration.notationName = symString(3);
@@ -1483 +1484 @@
         //fall through
 
-        case 93:
-        case 94: {
+        case 9:
+        case 9: {
             if (referenceToUnparsedEntityDetected && !standalone) {
                 entityDeclarations.pop();
@@ -1502 +1503 @@
         } break;
 
-        case 95: {
+        case 9: {
             setType(QXmlStreamReader::ProcessingInstruction);
             int pos = sym(4).pos + sym(4).len;
@@ -1515 +1516 @@
                     raiseWellFormedError(QXmlStream::tr("%1 is an invalid processing instruction name.").arg(piTarget));
             } else if (type != QXmlStreamReader::Invalid){
-                resume(95);
-                return false;
-            }
-        } break;
-
-        case 96:
+                resume(9);
+                return false;
+            }
+        } break;
+
+        case 9:
             setType(QXmlStreamReader::ProcessingInstruction);
             processingInstructionTarget = symString(3);
@@ -1527 +1528 @@
         break;
 
-        case 97:
+        case 9:
             if (!scanAfterLangleBang() && atEnd) {
-                resume(97);
-                return false;
-            }
-        break;
-
-        case 98:
+                resume(9);
+                return false;
+            }
+        break;
+
+        case 9:
             if (!scanUntil("--")) {
-                resume(98);
-                return false;
-            }
-        break;
-
-        case 99: {
+                resume(9);
+                return false;
+            }
+        break;
+
+        case : {
             setType(QXmlStreamReader::Comment);
             int pos = sym(1).pos + 4;
@@ -1547 +1548 @@
         } break;
 
-        case 100: {
+        case 10: {
             setType(QXmlStreamReader::Characters);
             isCDATA = true;
@@ -1555 +1556 @@
                 text = QStringRef(&textBuffer, pos, textBuffer.size() - pos - 3);
             } else {
-                resume(100);
-                return false;
-            }
-        } break;
-
-        case 101: {
+                resume(10);
+                return false;
+            }
+        } break;
+
+        case 10: {
             if (!scanPublicOrSystem() && atEnd) {
-                resume(101);
+                resume(10);
                 return false;
             }
@@ -1569 +1570 @@
         } break;
 
-        case 102: {
+        case 10: {
             NotationDeclaration &notationDeclaration = notationDeclarations.top();
             notationDeclaration.systemId = symString(3);
@@ -1575 +1576 @@
         } break;
 
-        case 103: {
+        case 10: {
             NotationDeclaration &notationDeclaration = notationDeclarations.top();
             notationDeclaration.systemId.clear();
@@ -1581 +1582 @@
         } break;
 
-        case 104: {
+        case 10: {
             NotationDeclaration &notationDeclaration = notationDeclarations.top();
             checkPublicLiteral((notationDeclaration.publicId = symString(3)));
@@ -1587 +1588 @@
         } break;
 
-        case 128:
+        case 12:
             isWhitespace = false;
             // fall through
 
-        case 129:
+        case 1:
             sym(1).len += fastScanContentCharList();
             if (atEnd && !inParseEntity) {
-                resume(129);
+                resume(1);
                 return false;
             }
         break;
 
-        case 138:
+        case 13:
             if (!textBuffer.isEmpty()) {
                 setType(QXmlStreamReader::Characters);
@@ -1606 +1607 @@
         break;
 
-        case 139:
         case 140:
+
             clearSym();
         break;
 
-        case 141:
         case 142:
+
             sym(1) = sym(2);
         break;
 
-        case 143:
         case 144:
         case 145:
         case 146:
+
             sym(1).len += sym(2).len;
         break;
 
-        case 172:
+        case 17:
             if (normalizeLiterals)
                 textBuffer.data()[textBuffer.size()-1] = QLatin1Char(' ');
         break;
 
-        case 173:
+        case 17:
             sym(1).len += fastScanLiteralContent();
             if (atEnd) {
-                resume(173);
-                return false;
-            }
-        break;
-
-        case 174: {
+                resume(17);
+                return false;
+            }
+        break;
+
+        case 17: {
             if (!QXmlUtils::isPublicID(symString(1).toString())) {
                 raiseWellFormedError(QXmlStream::tr("%1 is an invalid PUBLIC identifier.").arg(symString(1).toString()));
-                resume(174);
-                return false;
-            }
-        } break;
-
-        case 175:
+                resume(175);
+                return false;
+            }
+        } break;
+
         case 176:
+
             clearSym();
         break;
 
-        case 177:
         case 178:
+
             sym(1) = sym(2);
         break;
 
-        case 179:
         case 180:
         case 181:
         case 182:
+
             sym(1).len += sym(2).len;
         break;
 
-        case 212:
         case 213:
+
             clearSym();
         break;
 
-        case 214:
         case 215:
+
             sym(1) = sym(2);
             lastAttributeValue = symString(1);
         break;
 
-        case 216:
         case 217:
         case 218:
         case 219:
+
             sym(1).len += sym(2).len;
         break;
 
-        case 228: {
+        case 22: {
             QStringRef prefix = symPrefix(1);
             if (prefix.isEmpty() && symString(1) == QLatin1String("xmlns") && namespaceProcessing) {
@@ -1749 +1750 @@
         } break;
 
-        case 234: {
+        case 23: {
             normalizeLiterals = true;
             Tag &tag = tagStack_push();
@@ -1759 +1760 @@
         } break;
 
-        case 235:
+        case 23:
             isEmptyElement = true;
         // fall through
 
-        case 236:
+        case 23:
             setType(QXmlStreamReader::StartElement);
             resolveTag();
@@ -1771 +1772 @@
         break;
 
-        case 237: {
+        case 23: {
             setType(QXmlStreamReader::EndElement);
             Tag &tag = tagStack_pop();
@@ -1782 +1783 @@
         } break;
 
-        case 238:
+        case 23:
             if (entitiesMustBeDeclared()) {
                 raiseWellFormedError(QXmlStream::tr("Entity '%1' not declared.").arg(unresolvedEntity));
@@ -1791 +1792 @@
         break;
 
-        case 239: {
+        case 2: {
             sym(1).len += sym(2).len + 1;
             QString reference = symString(2).toString();
@@ -1830 +1831 @@
         } break;
 
-        case 240: {
+        case 24: {
             sym(1).len += sym(2).len + 1;
             QString reference = symString(2).toString();
@@ -1849 +1850 @@
         } break;
 
-        case 241:
+        case 24:
             sym(1).len += sym(2).len + 1;
         break;
 
-        case 242: {
+        case 24: {
             sym(1).len += sym(2).len + 1;
             QString reference = symString(2).toString();
@@ -1889 +1890 @@
         } break;
 
-        case 243: {
+        case 24: {
             if (uint s = resolveCharRef(3)) {
                 if (s >= 0xffff)
@@ -1903 +1904 @@
         } break;
 
-        case 246:
         case 247:
+
             sym(1).len += sym(2).len;
         break;
 
-        case 258:
+        case 25:
             sym(1).len += fastScanSpace();
             if (atEnd) {
-                resume(258);
-                return false;
-            }
-        break;
-
-        case 261: {
+                resume(25);
+                return false;
+            }
+        break;
+
+        case 26: {
             sym(1).len += fastScanName(&sym(1).prefix);
             if (atEnd) {
-                resume(261);
-                return false;
-            }
-        } break;
-
-        case 262:
+                resume(26);
+                return false;
+            }
+        } break;
+
+        case 26:
             sym(1).len += fastScanName();
             if (atEnd) {
-                resume(262);
-                return false;
-            }
-        break;
-
-        case 263:
+                resume(263);
+                return false;
+            }
+        break;
+
         case 264:
         case 265:
         case 266:
         case 267:
+
             sym(1).len += fastScanNMTOKEN();
             if (atEnd) {
-                resume(267);
+                resume(26);
                 return false;
             }
@@ -1958 +1959 @@
     return false;
 }
+
+
 
 #endif // QXMLSTREAM_P_H

trunk/src/corelib/xml/qxmlutils.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$
 **
 ****************************************************************************/
 
-#include <QRegExp>
-#include <QString>
+#include <>
+#include <>
 
 #include "qxmlutils_p.h"

trunk/src/corelib/xml/qxmlutils_p.h

@@ -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$
 **
@@ -54 +54 @@
 //
 
-#include <QtCore/QString>
+#include <QtCore/>
 
 QT_BEGIN_NAMESPACE