From deffdbe8816b1411cc205a2f55a34e5e162e12f6 Mon Sep 17 00:00:00 2001 From: FranciscoPombal Date: Wed, 7 Oct 2020 12:51:32 +0100 Subject: [PATCH] Change some types (uint -> int) in Session class --- src/base/bittorrent/session.cpp | 10 +++++----- src/base/bittorrent/session.h | 12 ++++++------ src/webui/api/appcontroller.cpp | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index a63df5d85..06ff1003e 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -498,7 +498,7 @@ Session::Session(QObject *parent) // Regular saving of fastresume data connect(m_resumeDataTimer, &QTimer::timeout, this, [this]() { generateResumeData(); }); - const uint saveInterval = saveResumeDataInterval(); + const int saveInterval = saveResumeDataInterval(); if (saveInterval > 0) { m_resumeDataTimer->setInterval(saveInterval * 60 * 1000); m_resumeDataTimer->start(); @@ -581,12 +581,12 @@ void Session::setAppendExtensionEnabled(const bool enabled) } } -uint Session::refreshInterval() const +int Session::refreshInterval() const { return m_refreshInterval; } -void Session::setRefreshInterval(const uint value) +void Session::setRefreshInterval(const int value) { if (value != refreshInterval()) { m_refreshInterval = value; @@ -2619,12 +2619,12 @@ void Session::setBandwidthSchedulerEnabled(const bool enabled) } } -uint Session::saveResumeDataInterval() const +int Session::saveResumeDataInterval() const { return m_saveResumeDataInterval; } -void Session::setSaveResumeDataInterval(const uint value) +void Session::setSaveResumeDataInterval(const int value) { if (value == m_saveResumeDataInterval) return; diff --git a/src/base/bittorrent/session.h b/src/base/bittorrent/session.h index 0dae94349..5935d06cf 100644 --- a/src/base/bittorrent/session.h +++ b/src/base/bittorrent/session.h @@ -276,8 +276,8 @@ namespace BitTorrent void setTrackerEnabled(bool enabled); bool isAppendExtensionEnabled() const; void setAppendExtensionEnabled(bool enabled); - uint refreshInterval() const; - void setRefreshInterval(uint value); + int refreshInterval() const; + void setRefreshInterval(int value); bool isPreallocationEnabled() const; void setPreallocationEnabled(bool enabled); QString torrentExportDirectory() const; @@ -302,8 +302,8 @@ namespace BitTorrent bool isBandwidthSchedulerEnabled() const; void setBandwidthSchedulerEnabled(bool enabled); - uint saveResumeDataInterval() const; - void setSaveResumeDataInterval(uint value); + int saveResumeDataInterval() const; + void setSaveResumeDataInterval(int value); int port() const; void setPort(int port); bool useRandomPort() const; @@ -697,7 +697,7 @@ namespace BitTorrent CachedSettingValue m_isAddTorrentPaused; CachedSettingValue m_isKeepTorrentTopLevelFolder; CachedSettingValue m_isAppendExtensionEnabled; - CachedSettingValue m_refreshInterval; + CachedSettingValue m_refreshInterval; CachedSettingValue m_isPreallocationEnabled; CachedSettingValue m_torrentExportDirectory; CachedSettingValue m_finishedTorrentExportDirectory; @@ -707,7 +707,7 @@ namespace BitTorrent CachedSettingValue m_altGlobalUploadSpeedLimit; CachedSettingValue m_isAltGlobalSpeedLimitEnabled; CachedSettingValue m_isBandwidthSchedulerEnabled; - CachedSettingValue m_saveResumeDataInterval; + CachedSettingValue m_saveResumeDataInterval; CachedSettingValue m_port; CachedSettingValue m_useRandomPort; CachedSettingValue m_networkInterface; diff --git a/src/webui/api/appcontroller.cpp b/src/webui/api/appcontroller.cpp index e6dc71ada..069788529 100644 --- a/src/webui/api/appcontroller.cpp +++ b/src/webui/api/appcontroller.cpp @@ -268,7 +268,7 @@ void AppController::preferencesAction() // Current network interface address data["current_interface_address"] = BitTorrent::Session::instance()->networkInterfaceAddress(); // Save resume data interval - data["save_resume_data_interval"] = static_cast(session->saveResumeDataInterval()); + data["save_resume_data_interval"] = session->saveResumeDataInterval(); // Recheck completed torrents data["recheck_completed_torrents"] = pref->recheckTorrentsOnCompletion(); // Resolve peer countries