diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index fdcf3ab7a..d203a60cd 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -4928,9 +4928,6 @@ void Session::handleStorageMovedAlert(const lt::storage_moved_alert *p) const QString torrentName = (torrent ? torrent->name() : QString {infoHash}); LogMsg(tr("\"%1\" is successfully moved to \"%2\".").arg(torrentName, newPath)); - if (torrent) - emit torrentStorageMoveFinished(torrent, newPath); - handleMoveTorrentStorageJobFinished(); } @@ -4949,9 +4946,6 @@ void Session::handleStorageMovedFailedAlert(const lt::storage_moved_failed_alert LogMsg(tr("Failed to move \"%1\" from \"%2\" to \"%3\". Reason: %4.") .arg(torrentName, currentLocation, currentJob.path, errorMessage), Log::CRITICAL); - if (torrent) - emit torrentStorageMoveFailed(torrent, currentJob.path, errorMessage); - handleMoveTorrentStorageJobFinished(); } diff --git a/src/base/bittorrent/session.h b/src/base/bittorrent/session.h index c411c412b..041d82d80 100644 --- a/src/base/bittorrent/session.h +++ b/src/base/bittorrent/session.h @@ -524,8 +524,6 @@ namespace BitTorrent void torrentResumed(TorrentHandle *torrent); void torrentSavePathChanged(TorrentHandle *torrent); void torrentSavingModeChanged(TorrentHandle *torrent); - void torrentStorageMoveFailed(TorrentHandle *torrent, const QString &targetPath, const QString &error); - void torrentStorageMoveFinished(TorrentHandle *torrent, const QString &newPath); void torrentsUpdated(const QVector &torrents); void torrentTagAdded(TorrentHandle *torrent, const QString &tag); void torrentTagRemoved(TorrentHandle *torrent, const QString &tag); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index d7ab5332d..63df6b285 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -208,8 +208,6 @@ MainWindow::MainWindow(QWidget *parent) connect(BitTorrent::Session::instance(), &BitTorrent::Session::downloadFromUrlFailed, this, &MainWindow::handleDownloadFromUrlFailure); connect(BitTorrent::Session::instance(), &BitTorrent::Session::speedLimitModeChanged, this, &MainWindow::updateAltSpeedsBtn); connect(BitTorrent::Session::instance(), &BitTorrent::Session::recursiveTorrentDownloadPossible, this, &MainWindow::askRecursiveTorrentDownloadConfirmation); - connect(BitTorrent::Session::instance(), &BitTorrent::Session::torrentStorageMoveFinished, this, &MainWindow::moveTorrentFinished); - connect(BitTorrent::Session::instance(), &BitTorrent::Session::torrentStorageMoveFailed, this, &MainWindow::moveTorrentFailed); qDebug("create tabWidget"); m_tabs = new HidableTabWidget(this); @@ -871,16 +869,6 @@ void MainWindow::finishedTorrent(BitTorrent::TorrentHandle *const torrent) const showNotificationBaloon(tr("Download completion"), tr("'%1' has finished downloading.", "e.g: xxx.avi has finished downloading.").arg(torrent->name())); } -void MainWindow::moveTorrentFinished(BitTorrent::TorrentHandle *const torrent, const QString &newPath) const -{ - showNotificationBaloon(tr("Torrent moving finished"), tr("'%1' has finished moving files to '%2'.").arg(torrent->name(), newPath)); -} - -void MainWindow::moveTorrentFailed(BitTorrent::TorrentHandle *const torrent, const QString &targetPath, const QString &error) const -{ - showNotificationBaloon(tr("Torrent moving failed"), tr("'%1' has failed moving files to '%2'. Reason: %3").arg(torrent->name(), targetPath, error)); -} - // Notification when disk is full void MainWindow::fullDiskError(BitTorrent::TorrentHandle *const torrent, const QString &msg) const { diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 41c852918..db0dd15ab 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -132,8 +132,6 @@ private slots: void addTorrentFailed(const QString &error) const; void torrentNew(BitTorrent::TorrentHandle *const torrent) const; void finishedTorrent(BitTorrent::TorrentHandle *const torrent) const; - void moveTorrentFinished(BitTorrent::TorrentHandle *const torrent, const QString &newPath) const; - void moveTorrentFailed(BitTorrent::TorrentHandle *const torrent, const QString &targetPath, const QString &error) const; void askRecursiveTorrentDownloadConfirmation(BitTorrent::TorrentHandle *const torrent); void optionsSaved(); #if defined(Q_OS_WIN) || defined(Q_OS_MACOS)