Cleanup

src/core/settings/float_setting.cpp

@@ -5,25 +5,26 @@
 
 #include "float_setting.h"
 #include "string_utils.h"
+#include "math_utils.h"
 
 namespace crown
 {
 
 static FloatSetting* g_float_settings_head = NULL;
 
-FloatSetting::FloatSetting(const char* name, const char* synopsis, float value, float min, float max) :
-	m_name(name),
-	m_synopsis(synopsis),
-	m_value(0),
-	m_min(min),
-	m_max(max),
-	m_next(NULL)
+FloatSetting::FloatSetting(const char* name, const char* synopsis, float value, float min, float max)
+	: _name(name)
+	, _synopsis(synopsis)
+	, _value(0)
+	, _min(min)
+	, _max(max)
+	, _next(NULL)
 {
 	*this = value;
 
 	if (g_float_settings_head != NULL)
 	{
-		m_next = g_float_settings_head;
+		_next = g_float_settings_head;
 	}
 
 	g_float_settings_head = this;
@@ -31,49 +32,37 @@ FloatSetting::FloatSetting(const char* name, const char* synopsis, float value,
 
 const char* FloatSetting::name() const
 {
-	return m_name;
+	return _name;
 }
 
 const char* FloatSetting::synopsis() const
 {
-	return m_synopsis;
+	return _synopsis;
 }
 
 float FloatSetting::value() const
 {
-	return m_value;
+	return _value;
 }
 
 float FloatSetting::min() const
 {
-	return m_min;
+	return _min;
 }
 
 float FloatSetting::max() const
 {
-	return m_max;
+	return _max;
 }
 
 FloatSetting::operator float()
 {
-	return m_value;
+	return _value;
 }
 
 FloatSetting& FloatSetting::operator=(const float value)
 {
-	if (value > m_max)
-	{
-		m_value = m_max;
-	}
-	else if (value < m_min)
-	{
-		m_value = m_min;
-	}
-	else
-	{
-		m_value = value;
-	}
-
+	_value = clamp(_min, _max, value);
 	return *this;
 }
 
@@ -88,7 +77,7 @@ FloatSetting* FloatSetting::find_setting(const char* name)
 			return head;
 		}
 
-		head = head->m_next;
+		head = head->_next;
 	}
 
 	return NULL;

src/core/settings/float_setting.h

@@ -15,34 +15,33 @@ class FloatSetting
 {
 public:
 
-							FloatSetting(const char* name, const char* synopsis, float value, float min, float max);
+	FloatSetting(const char* name, const char* synopsis, float value, float min, float max);
 
-	const char*				name() const;
-	const char*				synopsis() const;
+	const char* name() const;
+	const char* synopsis() const;
 
-	float					value() const;
-	float					min() const;
-	float					max() const;
+	float value() const;
+	float min() const;
+	float max() const;
 
-							operator float();
-
-	FloatSetting&			operator=(const float value);
+	operator float();
+	FloatSetting& operator=(const float value);
 
 public:
 
 	/// Returns the setting @name or NULL if not found.
-	static FloatSetting*	find_setting(const char* name);
+	static FloatSetting* find_setting(const char* name);
 
 private:
 
-	const char*				m_name;
-	const char*				m_synopsis;
+	const char* _name;
+	const char* _synopsis;
 
-	float					m_value;
-	float					m_min;
-	float					m_max;
+	float _value;
+	float _min;
+	float _max;
 
-	FloatSetting*			m_next;
+	FloatSetting* _next;
 };
 
 } // namespace crown

src/core/settings/int_setting.cpp

@@ -5,25 +5,26 @@
 
 #include "int_setting.h"
 #include "string_utils.h"
+#include "math_utils.h"
 
 namespace crown
 {
 
 static IntSetting* g_int_settings_head = NULL;
 
-IntSetting::IntSetting(const char* name, const char* synopsis, int32_t value, int32_t min, int32_t max) :
-	m_name(name),
-	m_synopsis(synopsis),
-	m_value(0),
-	m_min(min),
-	m_max(max),
-	m_next(NULL)
+IntSetting::IntSetting(const char* name, const char* synopsis, int32_t value, int32_t min, int32_t max)
+	: _name(name)
+	, _synopsis(synopsis)
+	, _value(0)
+	, _min(min)
+	, _max(max)
+	, _next(NULL)
 {
 	*this = value;
 
 	if (g_int_settings_head != NULL)
 	{
-		m_next = g_int_settings_head;
+		_next = g_int_settings_head;
 	}
 
 	g_int_settings_head = this;
@@ -31,49 +32,37 @@ IntSetting::IntSetting(const char* name, const char* synopsis, int32_t value, in
 
 const char* IntSetting::name() const
 {
-	return m_name;
+	return _name;
 }
 
 const char* IntSetting::synopsis() const
 {
-	return m_synopsis;
+	return _synopsis;
 }
 
 int32_t IntSetting::value() const
 {
-	return m_value;
+	return _value;
 }
 
 int32_t IntSetting::min() const
 {
-	return m_min;
+	return _min;
 }
 
 int32_t IntSetting::max() const
 {
-	return m_max;
+	return _max;
 }
 
 IntSetting::operator int()
 {
-	return m_value;
+	return _value;
 }
 
 IntSetting& IntSetting::operator=(const int32_t value)
 {
-	if (value > m_max)
-	{
-		m_value = m_max;
-	}
-	else if (value < m_min)
-	{
-		m_value = m_min;
-	}
-	else
-	{
-		m_value = value;
-	}
-
+	_value = clamp(_min, _max, value);
 	return *this;
 }
 
@@ -88,7 +77,7 @@ IntSetting*	IntSetting::find_setting(const char* name)
 			return head;
 		}
 
-		head = head->m_next;
+		head = head->_next;
 	}
 
 	return NULL;

src/core/settings/int_setting.h

@@ -15,34 +15,34 @@ class IntSetting
 {
 public:
 
-						IntSetting(const char* name, const char* synopsis, int32_t value, int32_t min, int32_t max);
+	IntSetting(const char* name, const char* synopsis, int32_t value, int32_t min, int32_t max);
 
-	const char*			name() const;
-	const char*			synopsis() const;
+	const char* name() const;
+	const char* synopsis() const;
 
-	int32_t				value() const;
-	int32_t				min() const;
-	int32_t				max() const;
+	int32_t value() const;
+	int32_t min() const;
+	int32_t max() const;
 
-						operator int();
+	operator int();
 
-	IntSetting&			operator=(const int32_t value);
+	IntSetting& operator=(const int32_t value);
 
 public:
 
 	/// Returns the setting @name or NULL if not found.
-	static IntSetting*	find_setting(const char* name);
+	static IntSetting* find_setting(const char* name);
 
 private:
 
-	const char*			m_name;
-	const char*			m_synopsis;
+	const char* _name;
+	const char* _synopsis;
 
-	int32_t				m_value;
-	int32_t				m_min;
-	int32_t				m_max;
+	int32_t _value;
+	int32_t _min;
+	int32_t _max;
 
-	IntSetting*			m_next;
+	IntSetting* _next;
 };
 
 } // namespace crown

src/core/settings/string_setting.cpp

@@ -11,17 +11,17 @@ namespace crown
 
 static StringSetting* g_string_settings_head = NULL;
 
-StringSetting::StringSetting(const char* name, const char* synopsis, const char* value) :
-	m_name(name),
-	m_synopsis(synopsis),
-	m_value(value),
-	m_next(NULL)
+StringSetting::StringSetting(const char* name, const char* synopsis, const char* value)
+	: _name(name)
+	, _synopsis(synopsis)
+	, _value(value)
+	, _next(NULL)
 {
 	*this = value;
 
 	if (g_string_settings_head != NULL)
 	{
-		m_next = g_string_settings_head;
+		_next = g_string_settings_head;
 	}
 
 	g_string_settings_head = this;
@@ -29,23 +29,22 @@ StringSetting::StringSetting(const char* name, const char* synopsis, const char*
 
 const char* StringSetting::name() const
 {
-	return m_name;
+	return _name;
 }
 
 const char* StringSetting::synopsis() const
 {
-	return m_synopsis;
+	return _synopsis;
 }
 
 const char*	StringSetting::value() const
 {
-	return m_value;
+	return _value;
 }
 
 StringSetting& StringSetting::operator=(const char* value)
 {
-	m_value = value;
-
+	_value = value;
 	return *this;
 }
 
@@ -60,7 +59,7 @@ StringSetting* StringSetting::find_setting(const char* name)
 			return head;
 		}
 
-		head = head->m_next;
+		head = head->_next;
 	}
 
 	return NULL;

src/core/settings/string_setting.h

@@ -15,14 +15,14 @@ class StringSetting
 {
 public:
 
-							StringSetting(const char* name, const char* synopsis, const char* value);
+	StringSetting(const char* name, const char* synopsis, const char* value);
 
-	const char*				name() const;
-	const char*				synopsis() const;
+	const char* name() const;
+	const char* synopsis() const;
 
-	const char*				value() const;
+	const char* value() const;
 
-	StringSetting&			operator=(const char* value);
+	StringSetting& operator=(const char* value);
 
 public:
 
@@ -31,11 +31,11 @@ public:
 
 private:
 
-	const char*				m_name;
-	const char*				m_synopsis;
-	const char*				m_value;
+	const char* _name;
+	const char* _synopsis;
+	const char* _value;
 
-	StringSetting*			m_next;
+	StringSetting* _next;
 };
 
 } // namespace crown