Changeset 561 for trunk/src/xmlpatterns/acceltree/qacceltreeresourceloader.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/acceltree/qacceltreeresourceloader.cpp (modified) (12 diffs)

trunk/src/xmlpatterns/acceltree/qacceltreeresourceloader.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$
 **
@@ -47 +47 @@
 #include <QtNetwork/QNetworkRequest>
 
-#include "qacceltreebuilder_p.h"
 #include "qatomicstring_p.h"
 #include "qautoptr_p.h"
@@ -58 +57 @@
 using namespace QPatternist;
 
-static inline uint qHash(const QUrl &uri)
-{
-        return qHash(uri.toString());
-}
-
 AccelTreeResourceLoader::AccelTreeResourceLoader(const NamePool::Ptr &np,
-                                                 const NetworkAccessDelegator::Ptr &manager) : m_namePool(np)
-                                                                                             , m_networkAccessDelegator(manager)
+                                                 const NetworkAccessDelegator::Ptr &manager,
+                                                 AccelTreeBuilder<true>::Features features)
+    : m_namePool(np)
+    , m_networkAccessDelegator(manager)
+    , m_features(features)
 {
     Q_ASSERT(m_namePool);
@@ -75 +72 @@
 {
     Q_ASSERT(uri.isValid());
-    AccelTreeBuilder<true> builder(uri, uri, m_namePool, context.data());
+    AccelTreeBuilder<true> builder(uri, uri, m_namePool, context.data());
 
     const AutoPtr<QNetworkReply> reply(load(uri, m_networkAccessDelegator, context));
@@ -89 +86 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QNetworkReply *AccelTreeResourceLoader::load(const QUrl &uri,
                                              const NetworkAccessDelegator::Ptr &networkDelegator,
-                                             const ReportContext::Ptr &context)
+                                             const ReportContext::Ptr &context)
 {
     return load(uri,
                 networkDelegator->managerFor(uri),
-                context);
+                context);
 }
 
 QNetworkReply *AccelTreeResourceLoader::load(const QUrl &uri,
                                              QNetworkAccessManager *const networkManager,
-                                             const ReportContext::Ptr &context)
+                                             const ReportContext::Ptr &context, ErrorHandling errorHandling)
+
 {
     Q_ASSERT(networkManager);
@@ -112 +126 @@
     networkLoop.connect(reply, SIGNAL(finished()), SLOT(finished()));
 
-    if(networkLoop.exec())
+    if(networkLoop.exec())
     {
         const QString errorMessage(escape(reply->errorString()));
@@ -121 +135 @@
         const QSourceLocation location(uri);
 
-        if(context)
+        if(context)
             context->error(errorMessage, ReportContext::FODC0002, location);
 
@@ -131 +145 @@
 
 bool AccelTreeResourceLoader::streamToReceiver(QIODevice *const dev,
-                                               QAbstractXmlReceiver *const receiver,
+                                                *const receiver,
                                                const NamePool::Ptr &np,
                                                const ReportContext::Ptr &context,
@@ -155 +169 @@
                 /* Send the name. */
                 receiver->startElement(np->allocateQName(reader.namespaceUri().toString(), reader.name().toString(),
-                                                         reader.prefix().toString()));
+                                                         reader.prefix().toString()));
 
                 /* Send namespace declarations. */
@@ -259 +273 @@
         if(retrieveDocument(uri, context))
             return m_loadedDocuments.value(uri)->root(QXmlNodeModelIndex()); /* Pass in dummy object. We know AccelTree doesn't use it. */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         else
             return Item();