QNAM: Remove QNetworkAccessDataBackend

The QNetworkReplyDataImpl is now used instead.

3 files changed, 1 insertions, 130 deletions

diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index 9cd2096..4c21ba5 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -12,7 +12,6 @@ HEADERS += \
     access/qnetworkaccessmanager_p.h \
     access/qnetworkaccesscache_p.h \
     access/qnetworkaccessbackend_p.h \
-    access/qnetworkaccessdatabackend_p.h \
     access/qnetworkaccessdebugpipebackend_p.h \
     access/qnetworkaccesshttpbackend_p.h \
     access/qnetworkaccessfilebackend_p.h \
@@ -45,7 +44,6 @@ SOURCES += \
     access/qnetworkaccessmanager.cpp \
     access/qnetworkaccesscache.cpp \
     access/qnetworkaccessbackend.cpp \
-    access/qnetworkaccessdatabackend.cpp \
     access/qnetworkaccessdebugpipebackend.cpp \
     access/qnetworkaccessfilebackend.cpp \
     access/qnetworkaccesscachebackend.cpp \
diff --git a/src/network/access/qnetworkaccessdatabackend.cpp b/src/network/access/qnetworkaccessdatabackend.cpp
deleted file mode 100644
index efb6e3e..0000000
--- a/src/network/access/qnetworkaccessdatabackend.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtNetwork module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qnetworkaccessdatabackend_p.h"
-#include "qnetworkrequest.h"
-#include "qnetworkreply.h"
-#include "qurlinfo.h"
-#include "private/qdataurl_p.h"
-#include <qcoreapplication.h>
-
-QT_BEGIN_NAMESPACE
-
-QNetworkAccessBackend *
-QNetworkAccessDataBackendFactory::create(QNetworkAccessManager::Operation,
-                                         const QNetworkRequest &request) const
-{
-    if (request.url().scheme() == QLatin1String("data"))
-        return new QNetworkAccessDataBackend;
-
-    return 0;
-}
-
-QNetworkAccessDataBackend::QNetworkAccessDataBackend()
-{
-}
-
-QNetworkAccessDataBackend::~QNetworkAccessDataBackend()
-{
-}
-
-void QNetworkAccessDataBackend::open()
-{
-    QUrl uri = request().url();
-
-    if (operation() != QNetworkAccessManager::GetOperation &&
-        operation() != QNetworkAccessManager::HeadOperation) {
-        // data: doesn't support anything but GET
-        const QString msg = QCoreApplication::translate("QNetworkAccessDataBackend",
-                                                        "Operation not supported on %1")
-                      .arg(uri.toString());
-        error(QNetworkReply::ContentOperationNotPermittedError, msg);
-        finished();
-        return;
-    }
-
-    QPair<QString, QByteArray> decoded = qDecodeDataUrl(uri);
-
-    if (! decoded.first.isNull()) {
-        setHeader(QNetworkRequest::ContentTypeHeader, decoded.first);
-        setHeader(QNetworkRequest::ContentLengthHeader, decoded.second.size());
-        emit metaDataChanged();
-
-        QByteDataBuffer list;
-        list.append(decoded.second);
-        decoded.second.clear(); // important because of implicit sharing!
-        writeDownstreamData(list);
-
-        finished();
-        return;
-    }
-
-    // something wrong with this URI
-    const QString msg = QCoreApplication::translate("QNetworkAccessDataBackend",
-                                                    "Invalid URI: %1").arg(uri.toString());
-    error(QNetworkReply::ProtocolFailure, msg);
-    finished();
-}
-
-void QNetworkAccessDataBackend::closeDownstreamChannel()
-{
-}
-
-void QNetworkAccessDataBackend::closeUpstreamChannel()
-{
-}
-
-bool QNetworkAccessDataBackend::waitForDownstreamReadyRead(int)
-{
-    return false;
-}
-
-bool QNetworkAccessDataBackend::waitForUpstreamBytesWritten(int)
-{
-    return false;
-}
-
-QT_END_NAMESPACE
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index add75bf..85b0f92 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -52,7 +52,6 @@
 #include "qnetworkaccesshttpbackend_p.h"
 #include "qnetworkaccessftpbackend_p.h"
 #include "qnetworkaccessfilebackend_p.h"
-#include "qnetworkaccessdatabackend_p.h"
 #include "qnetworkaccessdebugpipebackend_p.h"
 #include "qnetworkreplydataimpl_p.h"
 #include "qnetworkreplyfileimpl_p.h"
@@ -70,7 +69,6 @@ QT_BEGIN_NAMESPACE
 Q_GLOBAL_STATIC(QNetworkAccessHttpBackendFactory, httpBackend)
 #endif // QT_NO_HTTP
 Q_GLOBAL_STATIC(QNetworkAccessFileBackendFactory, fileBackend)
-Q_GLOBAL_STATIC(QNetworkAccessDataBackendFactory, dataBackend)
 #ifndef QT_NO_FTP
 Q_GLOBAL_STATIC(QNetworkAccessFtpBackendFactory, ftpBackend)
 #endif // QT_NO_FTP
@@ -84,7 +82,7 @@ static void ensureInitialized()
 #ifndef QT_NO_HTTP
     (void) httpBackend();
 #endif // QT_NO_HTTP
-    (void) dataBackend();
+
 #ifndef QT_NO_FTP
     (void) ftpBackend();
 #endif