QHttpNetworkReply: Change dataReadProgress to qint64.

Task-number: QTBUG-20890
Change-Id: I36d942d26247c99eb70c035da48dc0afa6afc591
Reviewed-on: http://codereview.qt.nokia.com/3316
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>

diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 14219d4..a6bf3fc 100644 (file)
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -147,8 +147,7 @@ Q_SIGNALS:
     void finished();
     void finishedWithError(QNetworkReply::NetworkError errorCode, const QString &detail = QString());
     void headerChanged();
-    // FIXME we need to change this to qint64!
-    void dataReadProgress(int done, int total);
+    void dataReadProgress(qint64 done, qint64 total);
     void dataSendProgress(qint64 done, qint64 total);
     void cacheCredentials(const QHttpNetworkRequest &request, QAuthenticator *authenticator);
 #ifndef QT_NO_NETWORKPROXY

diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp
index 71227c8..d7eeb1c 100644 (file)
--- a/src/network/access/qhttpthreaddelegate.cpp
+++ b/src/network/access/qhttpthreaddelegate.cpp
@@ -310,7 +310,7 @@ void QHttpThreadDelegate::startRequest()
                 this, SLOT(finishedWithErrorSlot(QNetworkReply::NetworkError,QString)));
         // some signals are only interesting when normal asynchronous style is used
         connect(httpReply,SIGNAL(readyRead()), this, SLOT(readyReadSlot()));
-        connect(httpReply,SIGNAL(dataReadProgress(int, int)), this, SLOT(dataReadProgressSlot(int,int)));
+        connect(httpReply,SIGNAL(dataReadProgress(qint64, qint64)), this, SLOT(dataReadProgressSlot(qint64,qint64)));
         connect(httpReply, SIGNAL(cacheCredentials(QHttpNetworkRequest,QAuthenticator*)),
                 this, SLOT(cacheCredentialsSlot(QHttpNetworkRequest,QAuthenticator*)));
 #ifndef QT_NO_OPENSSL
@@ -507,7 +507,7 @@ void QHttpThreadDelegate::synchronousHeaderChangedSlot()
 }
 
 
-void QHttpThreadDelegate::dataReadProgressSlot(int done, int total)
+void QHttpThreadDelegate::dataReadProgressSlot(qint64 done, qint64 total)
 {
     // If we don't have a download buffer don't attempt to go this codepath
     // It is not used by QNetworkAccessHttpBackend

diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h
index c49cef2..15c76b1 100644 (file)
--- a/src/network/access/qhttpthreaddelegate_p.h
+++ b/src/network/access/qhttpthreaddelegate_p.h
@@ -154,7 +154,7 @@ protected slots:
     void synchronousFinishedWithErrorSlot(QNetworkReply::NetworkError errorCode, const QString &detail = QString());
     void headerChangedSlot();
     void synchronousHeaderChangedSlot();
-    void dataReadProgressSlot(int done, int total);
+    void dataReadProgressSlot(qint64 done, qint64 total);
     void cacheCredentialsSlot(const QHttpNetworkRequest &request, QAuthenticator *authenticator);
 #ifndef QT_NO_OPENSSL
     void sslErrorsSlot(const QList<QSslError> &errors);