GUI2/Window Builder: added a type alias for the builder widget function

wesnoth · Aug 15, 2017 · ae19f94 · ae19f94
1 parent bac6f1f
commit ae19f94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/gui/core/window_builder.cpp b/src/gui/core/window_builder.cpp
@@ -50,11 +50,9 @@
 namespace gui2
 {
 
-static std::map<std::string, std::function<builder_widget_ptr(config)> >&
-builder_widget_lookup()
+static std::map<std::string, widget_builder_func_t>& builder_widget_lookup()
 {
-	static std::map<std::string, std::function<builder_widget_ptr(config)> >
-	result;
+	static std::map<std::string, widget_builder_func_t> result;
 	return result;
 }
 
@@ -138,8 +136,7 @@ builder_widget::builder_widget(const config& cfg)
 }
 
 void
-register_builder_widget(const std::string& id,
-						std::function<builder_widget_ptr(config)> functor)
+register_builder_widget(const std::string& id, widget_builder_func_t functor)
 {
 	builder_widget_lookup().emplace(id, functor);
 }

diff --git a/src/gui/core/window_builder.hpp b/src/gui/core/window_builder.hpp
@@ -73,6 +73,8 @@ struct builder_widget
 typedef std::shared_ptr<builder_widget> builder_widget_ptr;
 typedef std::shared_ptr<const builder_widget> builder_widget_const_ptr;
 
+using widget_builder_func_t = std::function<builder_widget_ptr(config)>;
+
 /**
  * Registers a widget to be build.
  *
@@ -83,8 +85,7 @@ typedef std::shared_ptr<const builder_widget> builder_widget_const_ptr;
  * @param functor                 The functor to create the widget.
  */
 void
-register_builder_widget(const std::string& id,
-						std::function<builder_widget_ptr(config)> functor);
+register_builder_widget(const std::string& id, widget_builder_func_t functor);
 
 
 /**