Skip to content

Commit 8cded3c

Browse files
authored
Use better name for torrent IO error signal
PR #24510.
1 parent 1c2a69a commit 8cded3c

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

src/app/application.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ int Application::exec()
955955

956956
#ifndef DISABLE_GUI
957957
const auto *btSession = BitTorrent::Session::instance();
958-
connect(btSession, &BitTorrent::Session::fullDiskError, this
958+
connect(btSession, &BitTorrent::Session::torrentIOError, this
959959
, [this](const BitTorrent::Torrent *torrent, const QString &msg)
960960
{
961961
m_desktopIntegration->showNotification(tr("I/O Error", "i.e: Input/Output Error")

src/base/bittorrent/session.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@ namespace BitTorrent
491491
void categoryAdded(const QString &categoryName);
492492
void categoryRemoved(const QString &categoryName);
493493
void categoryOptionsChanged(const QString &categoryName);
494-
void fullDiskError(Torrent *torrent, const QString &msg);
495494
void IPFilterParsed(bool error, int ruleCount);
496495
void metadataDownloaded(const TorrentInfo &info);
497496
void restored();
@@ -502,6 +501,10 @@ namespace BitTorrent
502501
void subcategoriesSupportChanged();
503502
void tagAdded(const Tag &tag);
504503
void tagRemoved(const Tag &tag);
504+
void torrentsLoaded(const QList<Torrent *> &torrents);
505+
void torrentsUpdated(const QList<Torrent *> &torrents);
506+
void freeDiskSpaceChecked(qint64 result);
507+
505508
void torrentAboutToBeRemoved(Torrent *torrent);
506509
void torrentAdded(Torrent *torrent);
507510
void torrentCategoryChanged(Torrent *torrent, const QString &oldCategory);
@@ -512,22 +515,20 @@ namespace BitTorrent
512515
void torrentStarted(Torrent *torrent);
513516
void torrentSavePathChanged(Torrent *torrent);
514517
void torrentSavingModeChanged(Torrent *torrent);
515-
void torrentsLoaded(const QList<Torrent *> &torrents);
516-
void torrentsUpdated(const QList<Torrent *> &torrents);
517518
void torrentTagAdded(Torrent *torrent, const Tag &tag);
518519
void torrentTagRemoved(Torrent *torrent, const Tag &tag);
519520
void torrentContentFileRenamed(Torrent *torrent, int index, const Path &oldFilePath);
520521
void torrentContentFolderRenamed(Torrent *torrent, const Path &newFolderPath
521522
, const Path &oldFolderPath, const QHash<int, Path> &renamedFiles);
522523
void torrentContentFolderRenamingFailed(Torrent *torrent, const Path &newFolderPath, const Path &oldFolderPath
523524
, const QHash<int, Path> &renamedFiles, const QList<int> &failedFileIndexes);
524-
void trackerError(Torrent *torrent, const QString &tracker);
525+
void torrentIOError(Torrent *torrent, const QString &message);
525526
void trackersAdded(Torrent *torrent, const QList<TrackerEntry> &trackers);
526527
void trackersReset(Torrent *torrent, const QList<TrackerEntryStatus> &oldEntries, const QList<TrackerEntry> &newEntries);
527528
void trackersRemoved(Torrent *torrent, const QStringList &trackers);
528529
void trackerSuccess(Torrent *torrent, const QString &tracker);
529530
void trackerWarning(Torrent *torrent, const QString &tracker);
531+
void trackerError(Torrent *torrent, const QString &tracker);
530532
void trackerEntryStatusesUpdated(Torrent *torrent, const QHash<QString, TrackerEntryStatus> &updatedTrackers);
531-
void freeDiskSpaceChecked(qint64 result);
532533
};
533534
}

src/base/bittorrent/sessionimpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6093,7 +6093,7 @@ void SessionImpl::handleFileErrorAlert(const lt::file_error_alert *alert)
60936093
LogMsg(tr("File error alert. Torrent: \"%1\". File: \"%2\". Reason: \"%3\"")
60946094
.arg(torrent->name(), QString::fromUtf8(alert->filename()), msg)
60956095
, Log::WARNING);
6096-
emit fullDiskError(torrent, msg);
6096+
emit torrentIOError(torrent, msg);
60976097
}
60986098

60996099
m_recentErroredTorrentsTimer->start();

0 commit comments

Comments
 (0)