diff --git a/src/FinishedTorrents.cpp b/src/FinishedTorrents.cpp index b11fdde3b..0e66f203b 100644 --- a/src/FinishedTorrents.cpp +++ b/src/FinishedTorrents.cpp @@ -61,7 +61,6 @@ FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : par finishedList->header()->setContextMenuPolicy(Qt::CustomContextMenu); connect(finishedList->header(), SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayFinishedHoSMenu(const QPoint&))); connect(finishedList, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(notifyTorrentDoubleClicked(const QModelIndex&))); - connect(BTSession, SIGNAL(forceFinishedListUpdate()), this, SLOT(updateFinishedList())); actionDelete->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete.png"))); actionPreview_file->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/preview.png"))); actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png"))); diff --git a/src/bittorrent.h b/src/bittorrent.h index 871fb36fa..508fcd4c8 100644 --- a/src/bittorrent.h +++ b/src/bittorrent.h @@ -177,8 +177,6 @@ class bittorrent : public QObject { void updateFileSize(QString hash); void downloadFromUrlFailure(QString url, QString reason); void torrentFinishedChecking(QTorrentHandle& h); - void forceUnfinishedListUpdate(); - void forceFinishedListUpdate(); }; #endif diff --git a/src/downloadingTorrents.cpp b/src/downloadingTorrents.cpp index 6601162a0..e055c4e96 100644 --- a/src/downloadingTorrents.cpp +++ b/src/downloadingTorrents.cpp @@ -67,7 +67,7 @@ DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession) downloadList->hideColumn(HASH); loadHiddenColumns(); - connect(BTSession, SIGNAL(torrentFinishedChecking(QString)), this, SLOT(sortProgressColumn(QString))); + connect(BTSession, SIGNAL(torrentFinishedChecking(QTorrentHandle&)), this, SLOT(sortProgressColumn(QTorrentHandle&))); // Load last columns width for download list if(!loadColWidthDLList()) { @@ -674,12 +674,12 @@ void DownloadingTorrents::toggleDownloadListSortOrder(int index) { settings.setValue(QString::fromUtf8("DownloadListSortedCol"), misc::toQString(index)+sortOrderLetter); } -void DownloadingTorrents::sortProgressColumn(QString hash) { +void DownloadingTorrents::sortProgressColumn(QTorrentHandle& h) { + QString hash = h.hash(); int index = downloadList->header()->sortIndicatorSection(); if(index == PROGRESS) { int row = getRowFromHash(hash); if(row >= 0) { - QTorrentHandle h = BTSession->getTorrentHandle(hash); DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress())); Qt::SortOrder sortOrder = downloadList->header()->sortIndicatorOrder(); sortDownloadListFloat(index, sortOrder); diff --git a/src/downloadingTorrents.h b/src/downloadingTorrents.h index a6da17442..0c4c82b46 100644 --- a/src/downloadingTorrents.h +++ b/src/downloadingTorrents.h @@ -92,7 +92,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{ void updateFileSizeAndProgress(QString hash); void showPropertiesFromHash(QString hash); void hidePriorityColumn(bool hide); - void sortProgressColumn(QString hash); + void sortProgressColumn(QTorrentHandle& h); void loadLastSortedColumn(); void addTorrent(QString hash);