Changeset 561 for trunk/src/network/access/qnetworkaccessfilebackend.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/network/access/qnetworkaccessfilebackend.cpp (modified) (10 diffs)

trunk/src/network/access/qnetworkaccessfilebackend.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 QtNetwork 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$
 **
@@ -44 +44 @@
 #include "qurlinfo.h"
 #include "qdir.h"
+
 
 #include <QtCore/QCoreApplication>
@@ -78 +79 @@
 
 QNetworkAccessFileBackend::QNetworkAccessFileBackend()
-    : totalBytes(0)
+    : )
 {
 }
@@ -109 +110 @@
     if (fileName.isEmpty()) {
         if (url.scheme() == QLatin1String("qrc"))
-            fileName = QLatin1String(":") + url.path();
+            fileName = QLatin1) + url.path();
         else
             fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery);
@@ -127 +128 @@
     case QNetworkAccessManager::PutOperation:
         mode = QIODevice::WriteOnly | QIODevice::Truncate;
+
+
+
         break;
     default:
@@ -153 +157 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void QNetworkAccessFileBackend::closeDownstreamChannel()
 {
     if (operation() == QNetworkAccessManager::GetOperation) {
         file.close();
-        //downstreamChannelClosed();
-    }
-}
-
-void QNetworkAccessFileBackend::closeUpstreamChannel()
-{
-    if (operation() == QNetworkAccessManager::PutOperation) {
-        file.close();
-        finished();
     }
 }
@@ -173 +208 @@
     Q_ASSERT(operation() == QNetworkAccessManager::GetOperation);
     return readMoreFromFile();
-}
-
-bool QNetworkAccessFileBackend::waitForUpstreamBytesWritten(int)
-{
-    Q_ASSERT_X(false, "QNetworkAccessFileBackend::waitForUpstreamBytesWritten",
-               "This function should never have been called, since there is never anything "
-               "left to be written!");
-    return false;
-}
-
-void QNetworkAccessFileBackend::upstreamReadyRead()
-{
-    Q_ASSERT_X(operation() == QNetworkAccessManager::PutOperation, "QNetworkAccessFileBackend",
-               "We're being told to upload data but operation isn't PUT!");
-
-    // there's more data to be written to the file
-    while (upstreamBytesAvailable()) {
-        // write everything and let QFile handle it
-        int written = file.write(readUpstream());
-
-        if (written < 0) {
-            // write error!
-            QString msg = QCoreApplication::translate("QNetworkAccessFileBackend", "Write error writing to %1: %2")
-                                                    .arg(url().toString(), file.errorString());
-            error(QNetworkReply::ProtocolFailure, msg);
-
-            finished();
-            return;
-        }
-
-        // successful write
-        file.flush();
-        upstreamBytesConsumed(written);
-    }
 }
 
@@ -263 +264 @@
         data.resize(actuallyRead);
         totalBytes += actuallyRead;
-        writeDownstreamData(data);
+
+        QByteDataBuffer list;
+        list.append(data);
+        data.clear(); // important because of implicit sharing!
+        writeDownstreamData(list);
     }
     return true;