From ef262fdc8218a890eeec37d179acca50a3b4ebbe Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Mon, 1 Oct 2012 15:27:47 +0300 Subject: [PATCH] Preview picture gathering adapted to new onDownloadFinished events. --- src/gui/UBFeaturesWidget.cpp | 5 +++-- src/gui/UBFeaturesWidget.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp index c0728127..6ee337cf 100644 --- a/src/gui/UBFeaturesWidget.cpp +++ b/src/gui/UBFeaturesWidget.cpp @@ -235,7 +235,7 @@ void UBFeaturesWidget::onDisplayMetadata( QMap metadata ) if (!imageGatherer) imageGatherer = new UBDownloadHttpFile(0, this); - connect(imageGatherer, SIGNAL(downloadFinished(int, bool, QUrl, QString, QByteArray, QPointF, QSize, bool)), this, SLOT(onPreviewLoaded(int, bool, QUrl, QString, QByteArray, QPointF, QSize, bool))); + connect(imageGatherer, SIGNAL(downloadFinished(int, bool, QUrl, QUrl, QString, QByteArray, QPointF, QSize, bool)), this, SLOT(onPreviewLoaded(int, bool, QUrl, QUrl, QString, QByteArray, QPointF, QSize, bool))); // We send here the request and store its reply in order to be able to cancel it if needed imageGatherer->get(QUrl(metadata["Url"]), QPoint(0,0), QSize(), false); @@ -262,10 +262,11 @@ void UBFeaturesWidget::onDisplayMetadata( QMap metadata ) } -void UBFeaturesWidget::onPreviewLoaded(int id, bool pSuccess, QUrl sourceUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground) +void UBFeaturesWidget::onPreviewLoaded(int id, bool pSuccess, QUrl sourceUrl, QUrl originalUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground) { Q_UNUSED(id); Q_UNUSED(pSuccess); + Q_UNUSED(originalUrl); Q_UNUSED(isBackground); Q_UNUSED(pSize); Q_UNUSED(pPos); diff --git a/src/gui/UBFeaturesWidget.h b/src/gui/UBFeaturesWidget.h index e4fb9775..b94b3136 100644 --- a/src/gui/UBFeaturesWidget.h +++ b/src/gui/UBFeaturesWidget.h @@ -79,7 +79,7 @@ signals: void sendFileNameList(const QStringList lst); private slots: - void onPreviewLoaded(int id, bool pSuccess, QUrl sourceUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground); + void onPreviewLoaded(int id, bool pSuccess, QUrl sourceUrl, QUrl originalUrl, QString pContentTypeHeader, QByteArray pData, QPointF pPos, QSize pSize, bool isBackground); void currentSelected( const QModelIndex & ); void searchStarted( const QString & ); void createNewFolder();