Changeset 561 for trunk/src/xmlpatterns/api/qxmlquery.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/api/qxmlquery.cpp (modified) (9 diffs)

trunk/src/xmlpatterns/api/qxmlquery.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$
 **
@@ -152 +152 @@
 
   \note For the current release, XSLT support should be considered
-        experimental. See section \l{QtXmlPatterns Module#XSLT
+        experimental. See section \l{#XSLT
         2.0}{XSLT conformance} for details.
 
@@ -232 +232 @@
  \value XQuery10 XQuery 1.0.
  \value XSLT20 XSLT 2.0
+
+
+
+
+
+
+
+
+
+
+
+
 
  \sa setQuery()
@@ -280 +292 @@
 
   \note The XSL-T support in this release is considered experimental.
-  See the \l{QtXmlPatterns Module#XSLT 2.0}{XSLT conformance} for
+  See the \l{#XSLT 2.0}{XSLT conformance} for
   details.
 
@@ -416 +428 @@
     }
 
-    d->queryURI = QXmlQueryPrivate::normalizeQueryURI(documentURI);
+    d->queryURI = Q::normalizeQueryURI(documentURI);
     d->expression(sourceCode);
 }
@@ -464 +476 @@
     Q_ASSERT_X(queryURI.isValid(), Q_FUNC_INFO, "The passed URI must be valid.");
 
-    const QUrl canonicalURI(QXmlQueryPrivate::normalizeQueryURI(queryURI));
+    const QUrl canonicalURI(Q::normalizeQueryURI(queryURI));
     Q_ASSERT(canonicalURI.isValid());
     Q_ASSERT(!canonicalURI.isRelative());
     Q_ASSERT(baseURI.isValid() || baseURI.isEmpty());
 
-    d->queryURI = QXmlQueryPrivate::normalizeQueryURI(baseURI.isEmpty() ? queryURI : baseURI);
+    d->queryURI = Q::normalizeQueryURI(baseURI.isEmpty() ? queryURI : baseURI);
 
     QPatternist::AutoPtr<QIODevice> result;
@@ -1040 +1052 @@
 
 /*!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   Returns a value indicating what this QXmlQuery is being used for.
   The default is QXmlQuery::XQuery10, which means the QXmlQuery is