From 90f42e6737544704a6a0be1d87d1c482b1cf57b8 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 30 Apr 2018 12:26:32 +0800 Subject: [PATCH] Refactor functions Add const to variables Remove debug messages --- src/base/bittorrent/torrenthandle.cpp | 54 +++++++++++++-------------- src/base/bittorrent/torrenthandle.h | 34 ++++++++--------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp index 4f49f5c88..e15f0a11b 100644 --- a/src/base/bittorrent/torrenthandle.cpp +++ b/src/base/bittorrent/torrenthandle.cpp @@ -1425,7 +1425,7 @@ void TorrentHandle::handleStateUpdate(const libt::torrent_status &nativeStatus) updateStatus(nativeStatus); } -void TorrentHandle::handleStorageMovedAlert(libtorrent::storage_moved_alert *p) +void TorrentHandle::handleStorageMovedAlert(const libtorrent::storage_moved_alert *p) { if (!isMoveInProgress()) { qWarning() << "Unexpected " << Q_FUNC_INFO << " call."; @@ -1469,7 +1469,7 @@ void TorrentHandle::handleStorageMovedAlert(libtorrent::storage_moved_alert *p) m_moveFinishedTriggers.takeFirst()(); } -void TorrentHandle::handleStorageMovedFailedAlert(libtorrent::storage_moved_failed_alert *p) +void TorrentHandle::handleStorageMovedFailedAlert(const libtorrent::storage_moved_failed_alert *p) { if (!isMoveInProgress()) { qWarning() << "Unexpected " << Q_FUNC_INFO << " call."; @@ -1489,7 +1489,7 @@ void TorrentHandle::handleStorageMovedFailedAlert(libtorrent::storage_moved_fail m_moveFinishedTriggers.takeFirst()(); } -void TorrentHandle::handleTrackerReplyAlert(libtorrent::tracker_reply_alert *p) +void TorrentHandle::handleTrackerReplyAlert(const libtorrent::tracker_reply_alert *p) { #if LIBTORRENT_VERSION_NUM < 10100 QString trackerUrl = QString::fromStdString(p->url); @@ -1504,32 +1504,32 @@ void TorrentHandle::handleTrackerReplyAlert(libtorrent::tracker_reply_alert *p) m_session->handleTorrentTrackerReply(this, trackerUrl); } -void TorrentHandle::handleTrackerWarningAlert(libtorrent::tracker_warning_alert *p) +void TorrentHandle::handleTrackerWarningAlert(const libtorrent::tracker_warning_alert *p) { #if LIBTORRENT_VERSION_NUM < 10100 - QString trackerUrl = QString::fromStdString(p->url); - QString message = QString::fromStdString(p->msg); + const QString trackerUrl = QString::fromStdString(p->url); + const QString message = QString::fromStdString(p->msg); #else - QString trackerUrl(p->tracker_url()); - QString message = QString::fromStdString(p->message()); + const QString trackerUrl = p->tracker_url(); + const QString message = QString::fromStdString(p->message()); #endif - qDebug("Received a tracker warning for %s: %s", qUtf8Printable(trackerUrl), qUtf8Printable(message)); + // Connection was successful now but there is a warning message m_trackerInfos[trackerUrl].lastMessage = message; // Store warning message m_session->handleTorrentTrackerWarning(this, trackerUrl); } -void TorrentHandle::handleTrackerErrorAlert(libtorrent::tracker_error_alert *p) +void TorrentHandle::handleTrackerErrorAlert(const libtorrent::tracker_error_alert *p) { #if LIBTORRENT_VERSION_NUM < 10100 - QString trackerUrl = QString::fromStdString(p->url); - QString message = QString::fromStdString(p->msg); + const QString trackerUrl = QString::fromStdString(p->url); + const QString message = QString::fromStdString(p->msg); #else - QString trackerUrl(p->tracker_url()); - QString message = QString::fromStdString(p->message()); + const QString trackerUrl = p->tracker_url(); + const QString message = QString::fromStdString(p->message()); #endif - qDebug("Received a tracker error for %s: %s", qUtf8Printable(trackerUrl), qUtf8Printable(message)); + m_trackerInfos[trackerUrl].lastMessage = message; if (p->status_code == 401) @@ -1538,7 +1538,7 @@ void TorrentHandle::handleTrackerErrorAlert(libtorrent::tracker_error_alert *p) m_session->handleTorrentTrackerError(this, trackerUrl); } -void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert *p) +void TorrentHandle::handleTorrentCheckedAlert(const libtorrent::torrent_checked_alert *p) { Q_UNUSED(p); qDebug("%s have just finished checking", qUtf8Printable(hash())); @@ -1561,7 +1561,7 @@ void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert m_session->handleTorrentChecked(this); } -void TorrentHandle::handleTorrentFinishedAlert(libtorrent::torrent_finished_alert *p) +void TorrentHandle::handleTorrentFinishedAlert(const libtorrent::torrent_finished_alert *p) { Q_UNUSED(p); qDebug("Got a torrent finished alert for %s", qUtf8Printable(name())); @@ -1588,7 +1588,7 @@ void TorrentHandle::handleTorrentFinishedAlert(libtorrent::torrent_finished_aler } } -void TorrentHandle::handleTorrentPausedAlert(libtorrent::torrent_paused_alert *p) +void TorrentHandle::handleTorrentPausedAlert(const libtorrent::torrent_paused_alert *p) { Q_UNUSED(p); updateStatus(); @@ -1596,13 +1596,13 @@ void TorrentHandle::handleTorrentPausedAlert(libtorrent::torrent_paused_alert *p m_session->handleTorrentPaused(this); } -void TorrentHandle::handleTorrentResumedAlert(libtorrent::torrent_resumed_alert *p) +void TorrentHandle::handleTorrentResumedAlert(const libtorrent::torrent_resumed_alert *p) { Q_UNUSED(p); m_session->handleTorrentResumed(this); } -void TorrentHandle::handleSaveResumeDataAlert(libtorrent::save_resume_data_alert *p) +void TorrentHandle::handleSaveResumeDataAlert(const libtorrent::save_resume_data_alert *p) { const bool useDummyResumeData = !(p && p->resume_data); libtorrent::entry dummyEntry; @@ -1636,7 +1636,7 @@ void TorrentHandle::handleSaveResumeDataAlert(libtorrent::save_resume_data_alert m_session->handleTorrentResumeDataReady(this, resumeData); } -void TorrentHandle::handleSaveResumeDataFailedAlert(libtorrent::save_resume_data_failed_alert *p) +void TorrentHandle::handleSaveResumeDataFailedAlert(const libtorrent::save_resume_data_failed_alert *p) { // if torrent has no metadata we should save dummy fastresume data // containing Magnet URI and qBittorrent own resume data only @@ -1646,7 +1646,7 @@ void TorrentHandle::handleSaveResumeDataFailedAlert(libtorrent::save_resume_data m_session->handleTorrentResumeDataFailed(this); } -void TorrentHandle::handleFastResumeRejectedAlert(libtorrent::fastresume_rejected_alert *p) +void TorrentHandle::handleFastResumeRejectedAlert(const libtorrent::fastresume_rejected_alert *p) { qDebug("/!\\ Fast resume failed for %s, reason: %s", qUtf8Printable(name()), p->message().c_str()); Logger *const logger = Logger::instance(); @@ -1665,7 +1665,7 @@ void TorrentHandle::handleFastResumeRejectedAlert(libtorrent::fastresume_rejecte } } -void TorrentHandle::handleFileRenamedAlert(libtorrent::file_renamed_alert *p) +void TorrentHandle::handleFileRenamedAlert(const libtorrent::file_renamed_alert *p) { #if LIBTORRENT_VERSION_NUM < 10100 QString newName = Utils::Fs::fromNativePath(QString::fromStdString(p->name)); @@ -1697,7 +1697,7 @@ void TorrentHandle::handleFileRenamedAlert(libtorrent::file_renamed_alert *p) m_moveFinishedTriggers.takeFirst()(); } -void TorrentHandle::handleFileRenameFailedAlert(libtorrent::file_rename_failed_alert *p) +void TorrentHandle::handleFileRenameFailedAlert(const libtorrent::file_rename_failed_alert *p) { Q_UNUSED(p); @@ -1706,7 +1706,7 @@ void TorrentHandle::handleFileRenameFailedAlert(libtorrent::file_rename_failed_a m_moveFinishedTriggers.takeFirst()(); } -void TorrentHandle::handleFileCompletedAlert(libtorrent::file_completed_alert *p) +void TorrentHandle::handleFileCompletedAlert(const libtorrent::file_completed_alert *p) { updateStatus(); @@ -1722,7 +1722,7 @@ void TorrentHandle::handleFileCompletedAlert(libtorrent::file_completed_alert *p } } -void TorrentHandle::handleStatsAlert(libtorrent::stats_alert *p) +void TorrentHandle::handleStatsAlert(const libtorrent::stats_alert *p) { Q_ASSERT(p->interval >= 1000); SpeedSample transferred(p->transferred[libt::stats_alert::download_payload] * 1000LL / p->interval, @@ -1730,7 +1730,7 @@ void TorrentHandle::handleStatsAlert(libtorrent::stats_alert *p) m_speedMonitor.addSample(transferred); } -void TorrentHandle::handleMetadataReceivedAlert(libt::metadata_received_alert *p) +void TorrentHandle::handleMetadataReceivedAlert(const libt::metadata_received_alert *p) { Q_UNUSED(p); qDebug("Metadata received for torrent %s.", qUtf8Printable(name())); diff --git a/src/base/bittorrent/torrenthandle.h b/src/base/bittorrent/torrenthandle.h index 6639385f1..32a6842fc 100644 --- a/src/base/bittorrent/torrenthandle.h +++ b/src/base/bittorrent/torrenthandle.h @@ -388,23 +388,23 @@ namespace BitTorrent void updateState(); void updateTorrentInfo(); - void handleStorageMovedAlert(libtorrent::storage_moved_alert *p); - void handleStorageMovedFailedAlert(libtorrent::storage_moved_failed_alert *p); - void handleTrackerReplyAlert(libtorrent::tracker_reply_alert *p); - void handleTrackerWarningAlert(libtorrent::tracker_warning_alert *p); - void handleTrackerErrorAlert(libtorrent::tracker_error_alert *p); - void handleTorrentCheckedAlert(libtorrent::torrent_checked_alert *p); - void handleTorrentFinishedAlert(libtorrent::torrent_finished_alert *p); - void handleTorrentPausedAlert(libtorrent::torrent_paused_alert *p); - void handleTorrentResumedAlert(libtorrent::torrent_resumed_alert *p); - void handleSaveResumeDataAlert(libtorrent::save_resume_data_alert *p); - void handleSaveResumeDataFailedAlert(libtorrent::save_resume_data_failed_alert *p); - void handleFastResumeRejectedAlert(libtorrent::fastresume_rejected_alert *p); - void handleFileRenamedAlert(libtorrent::file_renamed_alert *p); - void handleFileRenameFailedAlert(libtorrent::file_rename_failed_alert *p); - void handleFileCompletedAlert(libtorrent::file_completed_alert *p); - void handleMetadataReceivedAlert(libtorrent::metadata_received_alert *p); - void handleStatsAlert(libtorrent::stats_alert *p); + void handleStorageMovedAlert(const libtorrent::storage_moved_alert *p); + void handleStorageMovedFailedAlert(const libtorrent::storage_moved_failed_alert *p); + void handleTrackerReplyAlert(const libtorrent::tracker_reply_alert *p); + void handleTrackerWarningAlert(const libtorrent::tracker_warning_alert *p); + void handleTrackerErrorAlert(const libtorrent::tracker_error_alert *p); + void handleTorrentCheckedAlert(const libtorrent::torrent_checked_alert *p); + void handleTorrentFinishedAlert(const libtorrent::torrent_finished_alert *p); + void handleTorrentPausedAlert(const libtorrent::torrent_paused_alert *p); + void handleTorrentResumedAlert(const libtorrent::torrent_resumed_alert *p); + void handleSaveResumeDataAlert(const libtorrent::save_resume_data_alert *p); + void handleSaveResumeDataFailedAlert(const libtorrent::save_resume_data_failed_alert *p); + void handleFastResumeRejectedAlert(const libtorrent::fastresume_rejected_alert *p); + void handleFileRenamedAlert(const libtorrent::file_renamed_alert *p); + void handleFileRenameFailedAlert(const libtorrent::file_rename_failed_alert *p); + void handleFileCompletedAlert(const libtorrent::file_completed_alert *p); + void handleMetadataReceivedAlert(const libtorrent::metadata_received_alert *p); + void handleStatsAlert(const libtorrent::stats_alert *p); void resume_impl(bool forced, bool uploadMode); bool isMoveInProgress() const;