Introduce TaskItem and Authenticator role.

Make sure every reply can use its own authenticator and
pass back the initial task item to the caller(task tracking).

Change-Id: I8b57dbf9d70f3061a91e436a578ec7e0c3138beb
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/libs/installer/downloadfiletask_p.h b/src/libs/installer/downloadfiletask_p.h
index 66b14767c..855b32813 100644
--- a/src/libs/installer/downloadfiletask_p.h
+++ b/src/libs/installer/downloadfiletask_p.h
@@ -61,14 +61,12 @@ struct Data
 {
     Data()
         : file(0), observer(0) {}
-    Data(QFile *f, FileTaskObserver *o)
-        : file(f), observer(o) {}
-    Data(QFile *f, FileTaskObserver *o, const QByteArray &e)
-        : file(f), observer(o), expectedCheckSum(e)
+    Data(QFile *f, FileTaskObserver *o, const FileTaskItem &fti)
+        : file(f), observer(o), taskItem(fti)
     {}
     QFile *file;
     FileTaskObserver *observer;
-    QByteArray expectedCheckSum;
+    FileTaskItem taskItem;
 };
 
 class Downloader : public QObject
@@ -81,7 +79,7 @@ public:
     ~Downloader();
 
     void download(QFutureInterface<FileTaskResult> &fi, const QList<FileTaskItem> &items,
-        const QAuthenticator &authenticator, QNetworkProxyFactory *networkProxyFactory);
+        QNetworkProxyFactory *networkProxyFactory);
 
 signals:
     void finished();
@@ -106,7 +104,6 @@ private:
     int m_finished;
     QNetworkAccessManager m_nam;
     QList<FileTaskItem> m_items;
-    QAuthenticator m_authenticator;
     QHash<QNetworkReply*, Data> m_downloads;
     QMultiHash<QNetworkReply*, QUrl> m_redirects;
 };