Skip to content

Commit

Permalink
GUI2/Field: minor mostly cosmetic cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Vultraz committed Aug 25, 2017
1 parent 85ed8a8 commit 50410a9
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions src/gui/auxiliary/field.hpp
Expand Up @@ -232,7 +232,6 @@ class field_base
{
}


/** See widget_finalize. */
virtual void finalize_generic(window& window) = 0;

Expand Down Expand Up @@ -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");
}

/**
Expand All @@ -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");
}

/**
Expand All @@ -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. */
Expand Down Expand Up @@ -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_;

Expand Down Expand Up @@ -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)

{
}

Expand Down

0 comments on commit 50410a9

Please sign in to comment.