From a88e34b21b07f70123926fcb5c505d6afdf99807 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 24 Dec 2018 18:54:34 +0100
Subject: style/quality only

No functional changes.

- add `override' everywhere where missing
- almost pass clang's `-Wweak-vtables'
- avoid some float/double conversions
- remove unused private members
- make signedness conversions explicit
- put stuff in right namespaces to aid analysis
---
 options/globals.cpp      |  3 ++-
 options/value-traits.hpp | 21 ++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'options')

diff --git a/options/globals.cpp b/options/globals.cpp
index 33327090..3bd185af 100644
--- a/options/globals.cpp
+++ b/options/globals.cpp
@@ -17,8 +17,9 @@ bool is_portable_installation()
     // must keep consistent between invocations
     static const bool ret = QFile::exists(OPENTRACK_BASE_PATH + "/portable.txt");
     return ret;
-#endif
+#else
     return false;
+#endif
 }
 
 saver_::~saver_()
diff --git a/options/value-traits.hpp b/options/value-traits.hpp
index f5b74f73..765740f6 100644
--- a/options/value-traits.hpp
+++ b/options/value-traits.hpp
@@ -79,26 +79,13 @@ struct value_traits : default_value_traits<t> {};
 template<>
 struct value_traits<double> : default_value_traits<double>
 {
-    static bool is_equal(value_type x, value_type y)
-    {
-        if (x == y)
-            return true;
-        else
-        {
-            using I = std::int64_t;
-            constexpr int K = 1000;
-
-            value_type x_, y_;
-
-            return I(std::modf(x, &x_) * K) == I(std::modf(y, &y_) * K) &&
-                   I(x_) == I(y_);
-        }
-    }
+    static bool is_equal(value_type x, value_type y) { return std::fabs(x - y) < 1e-6; }
 };
 
-template<> struct value_traits<float> : value_traits<float, double>
+template<>
+struct value_traits<float> : default_value_traits<float>
 {
-    static constexpr inline value_type pass_value(const value_type& x) { return x; }
+    static bool is_equal(value_type x, value_type y) { return std::fabs(x - y) < 1e-6f; }
 };
 
 template<>
-- 
cgit v1.2.3