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

trunk/src/xmlpatterns/api/qxmlquery_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$
 **
@@ -55 +55 @@
 #include <QAbstractMessageHandler>
 #include <QAbstractUriResolver>
-#include <QCoreApplication>
 #include <QPointer>
 #include <QSourceLocation>
@@ -143 +142 @@
         if(!m_functionFactory)
         {
-            if(queryLanguage == QXmlQuery::XQuery10)
+            if(queryLanguage == QXmlQuery::XSLT20)
+                m_functionFactory = QPatternist::FunctionFactoryCollection::xslt20Factory(namePool.d);
+            else
                 m_functionFactory = QPatternist::FunctionFactoryCollection::xpath20Factory(namePool.d);
-            else
-            {
-                Q_ASSERT(queryLanguage == QXmlQuery::XSLT20);
-                m_functionFactory = QPatternist::FunctionFactoryCollection::xslt20Factory(namePool.d);
-            }
         }
 
@@ -165 +161 @@
         if(!contextItem.isNull())
             m_staticContext = QPatternist::StaticContext::Ptr(new QPatternist::StaticFocusContext(QPatternist::AtomicValue::qtToXDMType(contextItem), m_staticContext));
+
+
+
+
+
+
+
+
 
         return m_staticContext;
@@ -208 +212 @@
     }
 
-
-    static inline QUrl normalizeQueryURI(const QUrl &uri)
-    {
-        Q_ASSERT_X(uri.isEmpty() || uri.isValid(), Q_FUNC_INFO,
-                   "The URI passed to QXmlQuery::setQuery() must be valid or empty.");
-        if(uri.isEmpty())
-            return QUrl::fromLocalFile(QCoreApplication::applicationFilePath());
-        else if(uri.isRelative())
-            return QUrl::fromLocalFile(QCoreApplication::applicationFilePath()).resolved(uri);
-        else
-            return uri;
-    }
-
     void setRequiredType(const QPatternist::SequenceType::Ptr &seqType)
     {
@@ -277 +268 @@
 
         return m_expr;
+
+
+
+
+
     }
 
@@ -322 +318 @@
     QPatternist::FunctionFactory::Ptr           m_functionFactory;
     QPatternist::NetworkAccessDelegator::Ptr    m_networkAccessDelegator;
+
+
 };