Changeset 561 for trunk/src/xmlpatterns/expr/qexpressionfactory.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/expr/qexpressionfactory.cpp (modified) (6 diffs)

trunk/src/xmlpatterns/expr/qexpressionfactory.cpp

@@ -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$
 **
@@ -82 +82 @@
                                                     const QXmlName &initialTemplateName)
 {
-    if(lang == QXmlQuery::XQuery10)
+    if(lang == QXmlQuery::XSLT20)
+    {
+        QByteArray query(expr.toUtf8());
+        QBuffer buffer(&query);
+        buffer.open(QIODevice::ReadOnly);
+
+        return createExpression(&buffer,
+                                context,
+                                lang,
+                                requiredType,
+                                queryURI,
+                                initialTemplateName);
+    }
+    else
     {
         return createExpression(Tokenizer::Ptr(new XQueryTokenizer(expr, queryURI)),
@@ -91 +104 @@
                                 initialTemplateName);
     }
-    else
-    {
-        Q_ASSERT(lang == QXmlQuery::XSLT20);
-        QByteArray query(expr.toUtf8());
-        QBuffer buffer(&query);
-        buffer.open(QIODevice::ReadOnly);
-
-        return createExpression(&buffer,
-                                context,
-                                lang,
-                                requiredType,
-                                queryURI,
-                                initialTemplateName);
-    }
 }
 
@@ -119 +118 @@
     Tokenizer::Ptr tokenizer;
 
-    if(lang == QXmlQuery::XQuery10)
-    {
-
+    if(lang == QXmlQuery::XSLT20)
+        tokenizer = Tokenizer::Ptr(new XSLTTokenizer(device, queryURI, context, context->namePool()));
+    else
         tokenizer = Tokenizer::Ptr(new XQueryTokenizer(QString::fromUtf8(device->readAll()), queryURI));
-    }
-    else
-    {
-        Q_ASSERT(lang == QXmlQuery::XSLT20);
-        tokenizer = Tokenizer::Ptr(new XSLTTokenizer(device, queryURI, context, context->namePool()));
-    }
 
     return createExpression(tokenizer, context, lang, requiredType, queryURI, initialTemplateName);