From 3862511a9ad294918682dccf7765f43df166e0d7 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Sat, 31 Jul 2021 17:20:12 -0400
Subject: settings: Use std::clamp where possible

Addresses PR review

Co-authored-by: PixelyIon <pixelyion@protonmail.com>
---
 src/common/settings.h | 48 +++++++++---------------------------------------
 1 file changed, 9 insertions(+), 39 deletions(-)

(limited to 'src/common/settings.h')

diff --git a/src/common/settings.h b/src/common/settings.h
index 4432b5ddd..69f4adaeb 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <algorithm>
 #include <array>
 #include <atomic>
 #include <chrono>
@@ -168,15 +169,7 @@ public:
      * @param value The desired value
      */
     void SetValue(const Type& value) override {
-        Type temp;
-        if (value < minimum) {
-            temp = minimum;
-        } else if (value > maximum) {
-            temp = maximum;
-        } else {
-            temp = value;
-        }
-        std::swap(this->global, temp);
+        this->global = std::clamp(value, minimum, maximum);
     }
 
     /**
@@ -186,15 +179,7 @@ public:
      * @returns A reference to the setting's value
      */
     const Type& operator=(const Type& value) override {
-        Type temp;
-        if (value < minimum) {
-            temp = minimum;
-        } else if (value > maximum) {
-            temp = maximum;
-        } else {
-            temp = value;
-        }
-        std::swap(this->global, temp);
+        this->global = std::clamp(value, minimum, maximum);
         return this->global;
     }
 
@@ -342,19 +327,11 @@ public:
      * @param value The desired value
      */
     void SetValue(const Type& value) override {
-        Type temp;
-        if (value < this->minimum) {
-            temp = this->minimum;
-        } else if (value > this->maximum) {
-            temp = this->maximum;
-        } else {
-            temp = value;
-        }
+        const Type temp = std::clamp(value, this->minimum, this->maximum);
         if (this->use_global) {
-            std::swap(this->global, temp);
-        } else {
-            std::swap(this->custom, temp);
+            this->global = temp;
         }
+        this->custom = temp;
     }
 
     /**
@@ -365,19 +342,12 @@ public:
      * @returns A reference to the setting's value
      */
     const Type& operator=(const Type& value) override {
-        Type temp;
-        if (value < this->minimum) {
-            temp = this->minimum;
-        } else if (value > this->maximum) {
-            temp = this->maximum;
-        } else {
-            temp = value;
-        }
+        const Type temp = std::clamp(value, this->minimum, this->maximum);
         if (this->use_global) {
-            std::swap(this->global, temp);
+            this->global = temp;
             return this->global;
         }
-        std::swap(this->custom, temp);
+        this->custom = temp;
         return this->custom;
     }
 };
-- 
cgit v1.2.3