Changeset 561 for trunk/src/xmlpatterns/acceltree/qacceltree.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/xmlpatterns/acceltree/qacceltree.cpp (modified) (8 diffs)

trunk/src/xmlpatterns/acceltree/qacceltree.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 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$
 **
@@ -43 +43 @@
 
 #include "qabstractxmlreceiver.h"
+
 #include "qacceliterators_p.h"
 #include "qacceltree_p.h"
@@ -56 +57 @@
 using namespace QPatternist;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void AccelTree::printStats(const NamePool::Ptr &np) const
 {
@@ -72 +104 @@
     {
         const BasicNodeData &v = basicData.at(i);
-        pDebug() << "|" << i
+        pDebug() <<  << i
                  << "\t\t|" << v.depth()
                  << "\t|" << v.size()
@@ -82 +114 @@
                  << "\t|";
         /*
-        pDebug() << "|" << QString().arg(i, 14)
-                 << "|" << QString().arg(v.depth(), 6)
-                 << "|" << QString().arg(v.size(), 6)
-                 << "|" << QString().arg(postNumber(i), 14)
-                 << "|" << QString().arg(v.kind(), 6)
-                 << "|";
+        pDebug() <<  << QString().arg(i, 14)
+                 <<  << QString().arg(v.depth(), 6)
+                 <<  << QString().arg(v.size(), 6)
+                 <<  << QString().arg(postNumber(i), 14)
+                 <<  << QString().arg(v.kind(), 6)
+                 << ;
                  */
     }
@@ -675 +707 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
 void AccelTree::copyChildren(const QXmlNodeModelIndex &node,
                              QAbstractXmlReceiver *const receiver,