Changeset 561 for trunk/src/xmlpatterns/acceltree/qacceltree_p.h

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/xmlpatterns/acceltree/qacceltree_p.h (modified) (11 diffs)

trunk/src/xmlpatterns/acceltree/qacceltree_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 QtXmlPatterns 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$
 **
@@ -77 +77 @@
      * of staircase join, although that is only due to time constraints.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <f.com>
      * @see <a href="http://www.pathfinder-xquery.org/?q=research/xpath-accel">XPath
      * Accelerator</a>
@@ -90 +90 @@
      * XPath Evaluation in Any RDBMS, Torsten Grust</a>
      */
-    class AccelTree : public QAbstractXmlNodeModel
+    class AccelTree : public QAbstractXmlNodeModel
     {
+
     public:
         using QAbstractXmlNodeModel::createIndex;
@@ -100 +101 @@
         typedef qint8 Depth;
 
-        inline AccelTree(const QUrl &docURI,
-                         const QUrl &bURI) : m_documentURI(docURI),
-                                             m_baseURI(bURI)
-        {
-            /* Pre-allocate at least a little bit. */
-            // TODO. Do it according to what an average 4 KB doc contains.
-            basicData.reserve(100);
-            data.reserve(30);
-        }
+        AccelTree(const QUrl &docURI, const QUrl &bURI);
 
         /**
@@ -116 +109 @@
          * only used by those classes.
          *
-         * @author Frans Englich <fenglich@trolltech.com>
+         * @author Frans Englich <f.com>
          * @todo Can't m_kind be coded somewhere else? If m_name is invalid,
          * its bits can be used to distinguish the node types that doesn't have
@@ -129 +122 @@
         {
         public:
+
             inline BasicNodeData()
             {
@@ -217 +211 @@
 
             /**
-             * Technically it is sufficient with 8 bits. However, at least MSVC
+             * Technically it is sufficient with  bits. However, at least MSVC
              * 2005 miscompiles it such that QXmlNodeModelIndex::Text becomes
              * -64 instead of 64 with hilarious crashes as result.
@@ -281 +275 @@
 
         QVector<BasicNodeData> basicData;
+
 
         inline QUrl documentUri() const
@@ -382 +377 @@
     private:
         /**
+
+
+
+
+
          * Copies the children of @p node to @p receiver.
          */