d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-22 20:44:15 +00:00
Code Issues Projects Releases Wiki Activity

Use std::clamp() instead of various custom implementations

Browse Source 
PR #19501.
This commit is contained in:
Victor Chernyakin 2023-08-27 11:55:08 -07:00 committed by GitHub
parent d8a03cd8d8
commit e045b4678d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/application.cpp
View File

@ -427,12 +427,12 @@ void Application::setFileLoggerDeleteOld(const bool value)
int Application::fileLoggerMaxSize() const
{
const int val = m_storeFileLoggerMaxSize.get(DEFAULT_FILELOG_SIZE);
return std::min(std::max(val, MIN_FILELOG_SIZE), MAX_FILELOG_SIZE);
return std::clamp(val, MIN_FILELOG_SIZE, MAX_FILELOG_SIZE);
}
void Application::setFileLoggerMaxSize(const int bytes)
{
const int clampedValue = std::min(std::max(bytes, MIN_FILELOG_SIZE), MAX_FILELOG_SIZE);
const int clampedValue = std::clamp(bytes, MIN_FILELOG_SIZE, MAX_FILELOG_SIZE);
if (m_fileLogger)
m_fileLogger->setMaxSize(clampedValue);
m_storeFileLoggerMaxSize = clampedValue;
@ -441,12 +441,12 @@ void Application::setFileLoggerMaxSize(const int bytes)
int Application::fileLoggerAge() const
{
const int val = m_storeFileLoggerAge.get(1);
return std::min(std::max(val, 1), 365);
return std::clamp(val, 1, 365);
}
void Application::setFileLoggerAge(const int value)
{
m_storeFileLoggerAge = std::min(std::max(value, 1), 365);
m_storeFileLoggerAge = std::clamp(value, 1, 365);
}
int Application::fileLoggerAgeType() const

6
src/base/bittorrent/sessionimpl.cpp
View File

@ -266,11 +266,7 @@ namespace
{
return [lower, upper](const T value) -> T
{
if (value < lower)
return lower;
if (value > upper)
return upper;
return value;
return std::clamp(value, lower, upper);
};
}

3
src/base/preferences.cpp
View File

@ -29,6 +29,7 @@
#include "preferences.h"
#include <algorithm>
#include <chrono>
#ifdef Q_OS_MACOS
@ -2122,7 +2123,7 @@ int Preferences::addNewTorrentDialogSavePathHistoryLength() const
void Preferences::setAddNewTorrentDialogSavePathHistoryLength(const int value)
{
const int clampedValue = qBound(0, value, 99);
const int clampedValue = std::clamp(value, 0, 99);
const int oldValue = addNewTorrentDialogSavePathHistoryLength();
if (clampedValue == oldValue)
return;