From 53b795696888ee9e82af138545995bf3a02f9ba8 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 10 Apr 2021 15:58:14 +0800 Subject: [PATCH] Clean up code and remove unused parameters/variables. --- src/base/bittorrent/session.cpp | 7 +++---- src/base/bittorrent/torrentimpl.cpp | 2 +- src/gui/mainwindow.cpp | 16 ++++++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index 0041092c5..9aefb3a30 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -3766,14 +3766,13 @@ void Session::updateSeedingLimitTimer() } } -void Session::handleTorrentShareLimitChanged(TorrentImpl *const torrent) +void Session::handleTorrentShareLimitChanged(TorrentImpl *const) { updateSeedingLimitTimer(); } -void Session::handleTorrentNameChanged(TorrentImpl *const torrent) +void Session::handleTorrentNameChanged(TorrentImpl *const) { - Q_UNUSED(torrent); } void Session::handleTorrentSavePathChanged(TorrentImpl *const torrent) @@ -4653,11 +4652,11 @@ void Session::handleSessionStatsAlert(const lt::session_stats_alert *p) m_status.diskWriteQueue = stats[m_metricIndices.peer.numPeersDownDisk]; m_status.peersCount = stats[m_metricIndices.peer.numPeersConnected]; - const int64_t numBlocksRead = stats[m_metricIndices.disk.numBlocksRead]; m_cacheStatus.totalUsedBuffers = stats[m_metricIndices.disk.diskBlocksInUse]; m_cacheStatus.jobQueueLength = stats[m_metricIndices.disk.queuedDiskJobs]; #if (LIBTORRENT_VERSION_NUM < 20000) + const int64_t numBlocksRead = stats[m_metricIndices.disk.numBlocksRead]; const int64_t numBlocksCacheHits = stats[m_metricIndices.disk.numBlocksCacheHits]; m_cacheStatus.readRatio = static_cast(numBlocksCacheHits) / std::max((numBlocksCacheHits + numBlocksRead), 1); #endif diff --git a/src/base/bittorrent/torrentimpl.cpp b/src/base/bittorrent/torrentimpl.cpp index 3b0b0f9b1..f653b7f71 100644 --- a/src/base/bittorrent/torrentimpl.cpp +++ b/src/base/bittorrent/torrentimpl.cpp @@ -1887,7 +1887,7 @@ void TorrentImpl::handleFileCompletedAlert(const lt::file_completed_alert *p) } #if (LIBTORRENT_VERSION_NUM >= 20003) -void TorrentImpl::handleFilePrioAlert(const lt::file_prio_alert *p) +void TorrentImpl::handleFilePrioAlert(const lt::file_prio_alert *) { if (m_nativeHandle.need_save_resume_data()) m_session->handleTorrentNeedSaveResumeData(this); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 47f848ea0..ae9b913c3 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1664,11 +1664,14 @@ void MainWindow::reloadTorrentStats(const QVector &torren void MainWindow::showNotificationBaloon(const QString &title, const QString &msg) const { - if (!isNotificationsEnabled()) return; + if (!isNotificationsEnabled()) + return; + #if (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)) && defined(QT_DBUS_LIB) - OrgFreedesktopNotificationsInterface notifications("org.freedesktop.Notifications", - "/org/freedesktop/Notifications", - QDBusConnection::sessionBus()); + OrgFreedesktopNotificationsInterface notifications(QLatin1String("org.freedesktop.Notifications") + , QLatin1String("/org/freedesktop/Notifications") + , QDBusConnection::sessionBus()); + // Testing for 'notifications.isValid()' isn't helpful here. // If the notification daemon is configured to run 'as needed' // the above check can be false if the daemon wasn't started @@ -1679,8 +1682,9 @@ void MainWindow::showNotificationBaloon(const QString &title, const QString &msg // to start their daemons at the session startup and have it sit // idling for the whole session. const QVariantMap hints {{QLatin1String("desktop-entry"), QLatin1String("org.qbittorrent.qBittorrent")}}; - QDBusPendingReply reply = notifications.Notify("qBittorrent", 0, "qbittorrent", title, - msg, QStringList(), hints, getNotificationTimeout()); + QDBusPendingReply reply = notifications.Notify(QLatin1String("qBittorrent"), 0 + , QLatin1String("qbittorrent"), title, msg, {}, hints, getNotificationTimeout()); + reply.waitForFinished(); if (!reply.isError()) return;