From 51ebe365c3b0dd7ed2f2d6e9a6bb0c3ccf84d5dd Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Tue, 25 Sep 2012 11:58:25 +0300 Subject: [PATCH] UBDownloadHttpFile "downloadFinished" signal changed to use new interface of boardController. --- src/core/UBDownloadManager.cpp | 4 ++-- src/core/UBDownloadManager.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/UBDownloadManager.cpp b/src/core/UBDownloadManager.cpp index efed5d2c..ee576505 100644 --- a/src/core/UBDownloadManager.cpp +++ b/src/core/UBDownloadManager.cpp @@ -367,7 +367,7 @@ void UBDownloadManager::startFileDownload(sDownloadFileDesc desc) { UBDownloadHttpFile* http = new UBDownloadHttpFile(desc.id, this); connect(http, SIGNAL(downloadProgress(int, qint64,qint64)), this, SLOT(onDownloadProgress(int,qint64,qint64))); - connect(http, SIGNAL(downloadFinished(int, bool, QUrl, QString, QByteArray, QPointF, QSize, bool)), this, SLOT(onDownloadFinished(int, bool, QUrl, QString, QByteArray, QPointF, QSize, bool))); + connect(http, SIGNAL(downloadFinished(int, bool, QUrl, QUrl, QString, QByteArray, QPointF, QSize, bool)), this, SLOT(onDownloadFinished(int, bool, QUrl, QUrl, QString, QByteArray, QPointF, QSize, bool))); //the desc.srcUrl is encoded. So we have to decode it before. QUrl url; @@ -558,7 +558,7 @@ void UBDownloadHttpFile::onDownloadFinished(bool pSuccess, QUrl sourceUrl, QStri if(pSuccess) { // Notify the end of the download - emit downloadFinished(mId, pSuccess, sourceUrl, pContentTypeHeader, pData, pPos, pSize, isBackground); + emit downloadFinished(mId, pSuccess, sourceUrl, sourceUrl, pContentTypeHeader, pData, pPos, pSize, isBackground); } else { diff --git a/src/core/UBDownloadManager.h b/src/core/UBDownloadManager.h index 13d94825..8b233a0f 100644 --- a/src/core/UBDownloadManager.h +++ b/src/core/UBDownloadManager.h @@ -76,7 +76,7 @@ public: signals: void downloadProgress(int id, qint64 current,qint64 total); - void downloadFinished(int id, bool pSuccess, QUrl sourceUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground); + void downloadFinished(int id, bool pSuccess, QUrl sourceUrl, QUrl contentUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground); void downloadError(int id); private slots: