Changeset 561 for trunk/src/xmlpatterns/api/qabstractxmlnodemodel.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/api/qabstractxmlnodemodel.h (modified) (8 diffs)

trunk/src/xmlpatterns/api/qabstractxmlnodemodel.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -45 +45 @@
 #include <QtXmlPatterns/QXmlName>
 #include <QtCore/QSharedData>
+#include <QtCore/QScopedPointer>
 
 QT_BEGIN_HEADER
@@ -57 +58 @@
 class QAbstractXmlNodeModelPrivate;
 class QAbstractXmlReceiver;
+class QSourceLocation;
 class QUrl;
 class QXmlName;
@@ -70 +72 @@
     class Item;
     class ItemType;
+    class XsdValidatedXmlNodeModel;
     template<typename TResult, typename TSource, typename TMapper, typename Context> class ItemMappingIterator;
     template<typename TResult, typename TSource, typename TMapper> class SequenceMappingIterator;
@@ -316 +319 @@
                             const NodeCopySettings &) const;
 
+    QSourceLocation sourceLocation(const QXmlNodeModelIndex &index) const;
+
 protected:
 
@@ -340 +345 @@
     }
 
-    QAbstractXmlNodeModelPrivate *d_ptr;
+    QScopedPointer<QAbstractXmlNodeModelPrivate> d_ptr;
 private:
     friend class QPatternist::ItemMappingIterator<QXmlNodeModelIndex, QXmlNodeModelIndex, const QAbstractXmlNodeModel *, QExplicitlySharedDataPointer<QPatternist::DynamicContext> >;
     friend class QPatternist::SequenceMappingIterator<QXmlNodeModelIndex, QXmlNodeModelIndex, const QAbstractXmlNodeModel *>;
+    friend class QPatternist::XsdValidatedXmlNodeModel;
 
     inline QExplicitlySharedDataPointer<QAbstractXmlForwardIterator<QXmlNodeModelIndex> > mapToSequence(const QXmlNodeModelIndex &ni,