Changeset 561 for trunk/src/xmlpatterns/acceltree/qacceliterators_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/qacceliterators_p.h (modified) (11 diffs)

trunk/src/xmlpatterns/acceltree/qacceliterators_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$
 **
@@ -66 +66 @@
      * contains common functions and members.
      *
-     * @author Frans Englich<fenglich@trolltech.com>
+     * @author Frans Englich<f.com>
      */
     class AccelIterator : public QXmlNodeModelIndex::Iterator
@@ -111 +111 @@
      * @short Iterates along the @c ancestor or @c ancestor-or-self axis in an AccelTree.
      *
-     * @author Frans Englich<fenglich@trolltech.com>
+     * @author Frans Englich<f.com>
      */
     template<const bool IncludeSelf>
@@ -152 +152 @@
      * @short Iterates along the @c child axis in an AccelTree.
      *
-     * @author Frans Englich<fenglich@trolltech.com>
+     * @author Frans Englich<f.com>
      */
     class ChildIterator : public AccelIterator
@@ -191 +191 @@
      * @short Iterates along the sibling axes in an AccelTree.
      *
-     * @author Frans Englich<fenglich@trolltech.com>
+     * @author Frans Englich<f.com>
      */
     template<const bool IsFollowing>
@@ -263 +263 @@
      * AccelTree.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <f.com>
      */
     template<const bool IncludeSelf>
@@ -343 +343 @@
      * @short Implements axis @c following for the AccelTree.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <f.com>
      */
     class FollowingIterator : public AccelIterator
@@ -363 +363 @@
      * @short Implements axis @c preceding for the AccelTree.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <f.com>
      */
     class PrecedingIterator : public AccelIterator
@@ -388 +388 @@
      * @short Implements axis @c attribute for the AccelTree.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <f.com>
      */
     class AttributeIterator : public AccelIterator