From 6de72ecc776600282643547c62c9e2ba276e4159 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 22 Jun 2022 16:36:10 +0800 Subject: [PATCH] Make use of chrono literals from std library --- src/app/main.cpp | 5 ++++- src/base/bittorrent/bandwidthscheduler.cpp | 6 ++++-- src/base/bittorrent/session.cpp | 11 ++++++----- src/base/bittorrent/statistics.cpp | 2 +- src/base/http/server.cpp | 9 ++++++--- src/base/net/dnsupdater.cpp | 9 ++++++--- src/base/net/dnsupdater.h | 2 -- src/base/rss/rss_session.cpp | 9 +++++---- src/base/search/searchhandler.cpp | 6 +++++- src/base/settingsstorage.cpp | 6 +++++- src/base/torrentfileswatcher.cpp | 4 ++-- src/gui/mainwindow.cpp | 2 +- src/gui/properties/speedplotview.cpp | 4 ++-- src/gui/properties/speedplotview.h | 2 +- src/gui/properties/speedwidget.cpp | 1 - src/gui/shutdownconfirmdialog.cpp | 6 +++++- src/webui/api/appcontroller.cpp | 5 ++++- 17 files changed, 57 insertions(+), 32 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index f0579f0ee..97e6869a1 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -29,6 +29,7 @@ #include +#include #include #include @@ -79,6 +80,8 @@ Q_IMPORT_PLUGIN(QICOPlugin) #include "gui/utils.h" #endif +using namespace std::chrono_literals; + void displayVersion(); bool userAgreesWithLegalNotice(); void displayBadArgMessage(const QString &message); @@ -284,7 +287,7 @@ void showSplashScreen() painter.drawText(224 - painter.fontMetrics().horizontalAdvance(version), 270, version); QSplashScreen *splash = new QSplashScreen(splashImg); splash->show(); - QTimer::singleShot(1500, splash, &QObject::deleteLater); + QTimer::singleShot(1500ms, splash, &QObject::deleteLater); qApp->processEvents(); } #endif // DISABLE_GUI diff --git a/src/base/bittorrent/bandwidthscheduler.cpp b/src/base/bittorrent/bandwidthscheduler.cpp index d51cb3c74..ca4c5d5a3 100644 --- a/src/base/bittorrent/bandwidthscheduler.cpp +++ b/src/base/bittorrent/bandwidthscheduler.cpp @@ -29,14 +29,16 @@ #include "bandwidthscheduler.h" +#include #include #include #include -#include #include "base/preferences.h" +using namespace std::chrono_literals; + BandwidthScheduler::BandwidthScheduler(QObject *parent) : QObject(parent) , m_lastAlternative(false) @@ -51,7 +53,7 @@ void BandwidthScheduler::start() // Timeout regularly to accommodate for external system clock changes // eg from the user or from a timesync utility - m_timer.start(30000); + m_timer.start(30s); } bool BandwidthScheduler::isTimeForAlternative() const diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index 05b12d3a4..553ef2c32 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -30,6 +30,7 @@ #include "session.h" #include +#include #include #include #include @@ -107,6 +108,7 @@ #include "torrentimpl.h" #include "tracker.h" +using namespace std::chrono_literals; using namespace BitTorrent; const Path CATEGORIES_FILE_NAME {u"categories.json"_qs}; @@ -442,11 +444,11 @@ Session::Session(QObject *parent) m_port = Utils::Random::rand(1024, 65535); m_recentErroredTorrentsTimer->setSingleShot(true); - m_recentErroredTorrentsTimer->setInterval(1000); + m_recentErroredTorrentsTimer->setInterval(1s); connect(m_recentErroredTorrentsTimer, &QTimer::timeout , this, [this]() { m_recentErroredTorrents.clear(); }); - m_seedingLimitTimer->setInterval(10000); + m_seedingLimitTimer->setInterval(10s); connect(m_seedingLimitTimer, &QTimer::timeout, this, &Session::processShareLimits); initializeNativeSession(); @@ -497,7 +499,7 @@ Session::Session(QObject *parent) const int saveInterval = saveResumeDataInterval(); if (saveInterval > 0) { - m_resumeDataTimer->setInterval(saveInterval * 60 * 1000); + m_resumeDataTimer->setInterval(std::chrono::minutes(saveInterval)); m_resumeDataTimer->start(); } @@ -2907,7 +2909,7 @@ void Session::setSaveResumeDataInterval(const int value) if (value > 0) { - m_resumeDataTimer->setInterval(value * 60 * 1000); + m_resumeDataTimer->setInterval(std::chrono::minutes(value)); m_resumeDataTimer->start(); } else @@ -5243,7 +5245,6 @@ void Session::handleSessionStatsAlert(const lt::session_stats_alert *p) { Q_ASSERT(current >= previous); Q_ASSERT(interval >= 0); - using namespace std::chrono_literals; return (((current - previous) * lt::microseconds(1s).count()) / interval); }; diff --git a/src/base/bittorrent/statistics.cpp b/src/base/bittorrent/statistics.cpp index f755ec4c5..88186c59a 100644 --- a/src/base/bittorrent/statistics.cpp +++ b/src/base/bittorrent/statistics.cpp @@ -40,7 +40,7 @@ using namespace std::chrono_literals; using namespace BitTorrent; -const qint64 SAVE_INTERVAL = std::chrono::milliseconds(15min).count(); +const int SAVE_INTERVAL = std::chrono::milliseconds(15min).count(); Statistics::Statistics(Session *session) : QObject(session) diff --git a/src/base/http/server.cpp b/src/base/http/server.cpp index 5fec3d5e3..e7395de61 100644 --- a/src/base/http/server.cpp +++ b/src/base/http/server.cpp @@ -31,6 +31,7 @@ #include "server.h" #include +#include #include #include @@ -44,11 +45,13 @@ #include "base/utils/net.h" #include "connection.h" +using namespace std::chrono_literals; + namespace { - const int KEEP_ALIVE_DURATION = 7 * 1000; // milliseconds + const int KEEP_ALIVE_DURATION = std::chrono::milliseconds(7s).count(); const int CONNECTIONS_LIMIT = 500; - const int CONNECTIONS_SCAN_INTERVAL = 2; // seconds + const std::chrono::seconds CONNECTIONS_SCAN_INTERVAL {2}; QList safeCipherList() { @@ -81,7 +84,7 @@ Server::Server(IRequestHandler *requestHandler, QObject *parent) auto *dropConnectionTimer = new QTimer(this); connect(dropConnectionTimer, &QTimer::timeout, this, &Server::dropTimedOutConnection); - dropConnectionTimer->start(CONNECTIONS_SCAN_INTERVAL * 1000); + dropConnectionTimer->start(CONNECTIONS_SCAN_INTERVAL); } void Server::incomingConnection(const qintptr socketDescriptor) diff --git a/src/base/net/dnsupdater.cpp b/src/base/net/dnsupdater.cpp index 2fcffcdf6..e76a62871 100644 --- a/src/base/net/dnsupdater.cpp +++ b/src/base/net/dnsupdater.cpp @@ -37,8 +37,11 @@ #include "base/net/downloadmanager.h" #include "base/version.h" +using namespace std::chrono_literals; using namespace Net; +const std::chrono::seconds IP_CHECK_INTERVAL = 30min; + DNSUpdater::DNSUpdater(QObject *parent) : QObject(parent) , m_state(OK) @@ -52,14 +55,14 @@ DNSUpdater::DNSUpdater(QObject *parent) m_lastIP = QHostAddress(pref->getDNSLastIP()); // Start IP checking timer - m_ipCheckTimer.setInterval(IP_CHECK_INTERVAL_MS); + m_ipCheckTimer.setInterval(IP_CHECK_INTERVAL); connect(&m_ipCheckTimer, &QTimer::timeout, this, &DNSUpdater::checkPublicIP); m_ipCheckTimer.start(); // Check lastUpdate to avoid flooding if (!m_lastIPCheckTime.isValid() - || (m_lastIPCheckTime.secsTo(QDateTime::currentDateTime()) * 1000 > IP_CHECK_INTERVAL_MS)) - { + || (m_lastIPCheckTime.secsTo(QDateTime::currentDateTime()) > IP_CHECK_INTERVAL.count())) + { checkPublicIP(); } } diff --git a/src/base/net/dnsupdater.h b/src/base/net/dnsupdater.h index 5e03f8a20..e7141b82f 100644 --- a/src/base/net/dnsupdater.h +++ b/src/base/net/dnsupdater.h @@ -68,8 +68,6 @@ namespace Net FATAL }; - static const int IP_CHECK_INTERVAL_MS = 1800000; // 30 min - QString getUpdateUrl() const; void processIPUpdateReply(const QString &reply); diff --git a/src/base/rss/rss_session.cpp b/src/base/rss/rss_session.cpp index b6808a087..5dbc3ef84 100644 --- a/src/base/rss/rss_session.cpp +++ b/src/base/rss/rss_session.cpp @@ -30,6 +30,8 @@ #include "rss_session.h" +#include + #include #include #include @@ -48,7 +50,6 @@ #include "rss_folder.h" #include "rss_item.h" -const int MsecsPerMin = 60000; const QString CONF_FOLDER_NAME = u"rss"_qs; const QString DATA_FOLDER_NAME = u"rss/articles"_qs; const QString FEEDS_FILE_NAME = u"feeds.json"_qs; @@ -92,7 +93,7 @@ Session::Session() connect(&m_refreshTimer, &QTimer::timeout, this, &Session::refresh); if (isProcessingEnabled()) { - m_refreshTimer.start(refreshInterval() * MsecsPerMin); + m_refreshTimer.start(std::chrono::minutes(refreshInterval())); refresh(); } @@ -433,7 +434,7 @@ void Session::setProcessingEnabled(const bool enabled) m_storeProcessingEnabled = enabled; if (enabled) { - m_refreshTimer.start(refreshInterval() * MsecsPerMin); + m_refreshTimer.start(std::chrono::minutes(refreshInterval())); refresh(); } else @@ -480,7 +481,7 @@ void Session::setRefreshInterval(const int refreshInterval) if (m_storeRefreshInterval != refreshInterval) { m_storeRefreshInterval = refreshInterval; - m_refreshTimer.start(m_storeRefreshInterval * MsecsPerMin); + m_refreshTimer.start(std::chrono::minutes(m_storeRefreshInterval)); } } diff --git a/src/base/search/searchhandler.cpp b/src/base/search/searchhandler.cpp index 5c7fd8eb4..691d0b79e 100644 --- a/src/base/search/searchhandler.cpp +++ b/src/base/search/searchhandler.cpp @@ -29,6 +29,8 @@ #include "searchhandler.h" +#include + #include #include #include @@ -40,6 +42,8 @@ #include "base/utils/fs.h" #include "searchpluginmanager.h" +using namespace std::chrono_literals; + namespace { enum SearchResultColumn @@ -85,7 +89,7 @@ SearchHandler::SearchHandler(const QString &pattern, const QString &category, co m_searchTimeout->setSingleShot(true); connect(m_searchTimeout, &QTimer::timeout, this, &SearchHandler::cancelSearch); - m_searchTimeout->start(180000); // 3 min + m_searchTimeout->start(3min); // deferred start allows clients to handle starting-related signals QMetaObject::invokeMethod(this, [this]() { m_searchProcess->start(QIODevice::ReadOnly); } diff --git a/src/base/settingsstorage.cpp b/src/base/settingsstorage.cpp index 7df1e6b5e..9df947e6b 100644 --- a/src/base/settingsstorage.cpp +++ b/src/base/settingsstorage.cpp @@ -29,7 +29,9 @@ #include "settingsstorage.h" +#include #include + #include #include @@ -39,6 +41,8 @@ #include "profile.h" #include "utils/fs.h" +using namespace std::chrono_literals; + namespace { // Encapsulates serialization of settings in "atomic" way. @@ -73,7 +77,7 @@ SettingsStorage::SettingsStorage() : m_data {TransactionalSettings(u"qBittorrent"_qs).read()} { m_timer.setSingleShot(true); - m_timer.setInterval(5 * 1000); + m_timer.setInterval(5s); connect(&m_timer, &QTimer::timeout, this, &SettingsStorage::save); } diff --git a/src/base/torrentfileswatcher.cpp b/src/base/torrentfileswatcher.cpp index b6a5a7e48..8b28ed449 100644 --- a/src/base/torrentfileswatcher.cpp +++ b/src/base/torrentfileswatcher.cpp @@ -63,7 +63,7 @@ using namespace std::chrono_literals; -const std::chrono::duration WATCH_INTERVAL = 10s; +const std::chrono::seconds WATCH_INTERVAL {10}; const int MAX_FAILED_RETRIES = 5; const QString CONF_FILE_NAME = u"watched_folders.json"_qs; @@ -478,7 +478,7 @@ void TorrentFilesWatcher::Worker::removeWatchedFolder(const Path &path) void TorrentFilesWatcher::Worker::scheduleWatchedFolderProcessing(const Path &path) { - QTimer::singleShot(2000, this, [this, path]() + QTimer::singleShot(2s, this, [this, path]() { processWatchedFolder(path); }); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index a91b7eea7..b7ab276f3 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1762,7 +1762,7 @@ void MainWindow::createTrayIcon(const int retries) if (retries > 0) { LogMsg(tr("System tray icon is not available, retrying..."), Log::WARNING); - QTimer::singleShot(std::chrono::seconds(2), this, [this, retries]() + QTimer::singleShot(2s, this, [this, retries]() { if (Preferences::instance()->systemTrayEnabled()) createTrayIcon(retries - 1); diff --git a/src/gui/properties/speedplotview.cpp b/src/gui/properties/speedplotview.cpp index 9cf7a1f12..08f9785f0 100644 --- a/src/gui/properties/speedplotview.cpp +++ b/src/gui/properties/speedplotview.cpp @@ -267,7 +267,7 @@ quint64 SpeedPlotView::maxYValue() const if (!m_properties[static_cast(id)].enable) continue; - milliseconds duration {0ms}; + milliseconds duration {0}; for (int i = static_cast(queue.size()) - 1; i >= 0; --i) { maxYValue = std::max(maxYValue, queue[i].data[id]); @@ -360,7 +360,7 @@ void SpeedPlotView::paintEvent(QPaintEvent *) continue; QVector points; - milliseconds duration {0ms}; + milliseconds duration {0}; for (int i = static_cast(queue.size()) - 1; i >= 0; --i) { diff --git a/src/gui/properties/speedplotview.h b/src/gui/properties/speedplotview.h index 1beedcc97..7ef62f043 100644 --- a/src/gui/properties/speedplotview.h +++ b/src/gui/properties/speedplotview.h @@ -111,7 +111,7 @@ private: private: const milliseconds m_resolution; const milliseconds m_maxDuration; - milliseconds m_currentDuration {0ms}; + milliseconds m_currentDuration {0}; int m_counter = 0; SampleData m_accumulator {}; DataCircularBuffer m_sink {}; diff --git a/src/gui/properties/speedwidget.cpp b/src/gui/properties/speedwidget.cpp index 0df6fbb9f..417a9e6d0 100644 --- a/src/gui/properties/speedwidget.cpp +++ b/src/gui/properties/speedwidget.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #include "base/bittorrent/session.h" diff --git a/src/gui/shutdownconfirmdialog.cpp b/src/gui/shutdownconfirmdialog.cpp index 3355e783e..99f1643fc 100644 --- a/src/gui/shutdownconfirmdialog.cpp +++ b/src/gui/shutdownconfirmdialog.cpp @@ -29,6 +29,8 @@ #include "shutdownconfirmdialog.h" +#include + #include #include #include @@ -38,6 +40,8 @@ #include "ui_shutdownconfirmdialog.h" #include "utils.h" +using namespace std::chrono_literals; + ShutdownConfirmDialog::ShutdownConfirmDialog(QWidget *parent, const ShutdownDialogAction &action) : QDialog(parent) , m_ui(new Ui::ShutdownConfirmDialog) @@ -64,7 +68,7 @@ ShutdownConfirmDialog::ShutdownConfirmDialog(QWidget *parent, const ShutdownDial setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); move(Utils::Gui::screenCenter(this)); - m_timer.setInterval(1000); // 1sec + m_timer.setInterval(1s); connect(&m_timer, &QTimer::timeout, this, &ShutdownConfirmDialog::updateSeconds); } diff --git a/src/webui/api/appcontroller.cpp b/src/webui/api/appcontroller.cpp index 06da30405..1b27d923b 100644 --- a/src/webui/api/appcontroller.cpp +++ b/src/webui/api/appcontroller.cpp @@ -31,6 +31,7 @@ #include "appcontroller.h" #include +#include #include #include @@ -62,6 +63,8 @@ #include "base/version.h" #include "../webapplication.h" +using namespace std::chrono_literals; + void AppController::webapiVersionAction() { setResult(API_VERSION.toString()); @@ -93,7 +96,7 @@ void AppController::shutdownAction() // Special case handling for shutdown, we // need to reply to the Web UI before // actually shutting down. - QTimer::singleShot(100, qApp, &QCoreApplication::quit); + QTimer::singleShot(100ms, qApp, &QCoreApplication::quit); } void AppController::preferencesAction()