From 50410a9fffe7828094be210fa62e4e0419c9aba6 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Wed, 23 Aug 2017 15:08:37 +1100
Subject: [PATCH] GUI2/Field: minor mostly cosmetic cleanup

---
 src/gui/auxiliary/field.hpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/gui/auxiliary/field.hpp b/src/gui/auxiliary/field.hpp
index 47142d5fd93d..d1a3cb42f8f1 100644
--- a/src/gui/auxiliary/field.hpp
+++ b/src/gui/auxiliary/field.hpp
@@ -232,7 +232,6 @@ class field_base
 	{
 	}
 
-
 	/** See widget_finalize. */
 	virtual void finalize_generic(window& window) = 0;
 
@@ -286,7 +285,7 @@ class field : public field_base
 		, callback_load_value_(callback_load_value)
 		, callback_save_value_(callback_save_value)
 	{
-		static_assert((!std::is_same<styled_widget, W>::value), "Second template argument cannot be styled_widget");
+		static_assert(!std::is_same<styled_widget, W>::value, "Second template argument cannot be styled_widget");
 	}
 
 	/**
@@ -307,10 +306,10 @@ class field : public field_base
 		: field_base(id, mandatory)
 		, value_(T())
 		, link_(linked_variable)
-		, callback_load_value_(std::function<T()>())
-		, callback_save_value_(std::function<void(CT)>())
+		, callback_load_value_(nullptr)
+		, callback_save_value_(nullptr)
 	{
-		static_assert((!std::is_same<styled_widget, W>::value), "Second template argument cannot be styled_widget");
+		static_assert(!std::is_same<styled_widget, W>::value, "Second template argument cannot be styled_widget");
 	}
 
 	/**
@@ -334,10 +333,10 @@ class field : public field_base
 		: field_base(id, mandatory)
 		, value_(value)
 		, link_(value_)
-		, callback_load_value_(std::function<T()>())
-		, callback_save_value_(std::function<void(CT)>())
+		, callback_load_value_(nullptr)
+		, callback_save_value_(nullptr)
 	{
-		static_assert((std::is_same<styled_widget, W>::value), "Second template argument must be styled_widget");
+		static_assert(std::is_same<styled_widget, W>::value, "Second template argument must be styled_widget");
 	}
 
 	/** Inherited from field_base. */
@@ -411,7 +410,7 @@ class field : public field_base
 	 * The variable linked to the field.
 	 *
 	 * When set determines the initial value and the final value is stored here
-	 * in the finallizer.
+	 * in the finalizer.
 	 */
 	T& link_;
 
@@ -634,7 +633,6 @@ class field_label : public field<std::string, styled_widget, const std::string&>
 				 const bool use_markup)
 		: field<std::string, styled_widget, const std::string&>(id, mandatory, text)
 		, use_markup_(use_markup)
-
 	{
 	}