From e0bf0e45e1d82d0dc345827009d129389a4980a3 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Thu, 24 Aug 2017 07:08:21 +1100
Subject: [PATCH] GUI2: drop t-prefix from order_func typedef

---
 src/gui/widgets/generator.hpp         |  6 +++---
 src/gui/widgets/generator_private.hpp | 10 +++++-----
 src/gui/widgets/listbox.cpp           |  2 +-
 src/gui/widgets/listbox.hpp           |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/widgets/generator.hpp b/src/gui/widgets/generator.hpp
index dd640ca9d5ea..d6ce10abffbf 100644
--- a/src/gui/widgets/generator.hpp
+++ b/src/gui/widgets/generator.hpp
@@ -248,8 +248,8 @@ class generator_base : public widget
 					data,
 			const std::function<void(widget&)>& callback) = 0;
 
-	typedef std::function<bool (unsigned, unsigned)> torder_func;
-	virtual void set_order(const torder_func& order) = 0;
+	typedef std::function<bool (unsigned, unsigned)> order_func;
+	virtual void set_order(const order_func& order) = 0;
 
 	/***** ***** ***** ***** Inherited ***** ***** ***** *****/
 
@@ -381,6 +381,6 @@ class generator_base : public widget
 
 };
 
-using generator_sort_array = std::array<generator_base::torder_func, 2>;
+using generator_sort_array = std::array<generator_base::order_func, 2>;
 
 } // namespace gui2
diff --git a/src/gui/widgets/generator_private.hpp b/src/gui/widgets/generator_private.hpp
index 0490ef8eb957..dc9cde153f3b 100644
--- a/src/gui/widgets/generator_private.hpp
+++ b/src/gui/widgets/generator_private.hpp
@@ -996,11 +996,11 @@ class generator : public minimum_selection,
 	/** whether need to recalculate order_dirty_ */
 	mutable bool order_dirty_;
 
-	typedef std::function<bool (unsigned, unsigned)> torder_func;
-	torder_func order_func_;
+	typedef std::function<bool (unsigned, unsigned)> order_func;
+	order_func order_func_;
 
 
-	virtual void set_order(const torder_func& order) override
+	virtual void set_order(const order_func& order) override
 	{
 		order_func_ = order;
 		order_dirty_ = true;
@@ -1009,10 +1009,10 @@ class generator : public minimum_selection,
 
 	struct calculate_order_helper
 	{
-		const torder_func& order_func_;
+		const order_func& order_func_;
 		const child_list& items_;
 
-		calculate_order_helper(const torder_func& order_func, const child_list& items)
+		calculate_order_helper(const order_func& order_func, const child_list& items)
 			: order_func_(order_func)
 			, items_(items)
 		{
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 1aefa6473daa..57856a39c899 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -587,7 +587,7 @@ void listbox::order_by_column(unsigned column, widget& widget)
 	}
 }
 
-void listbox::order_by(const generator_base::torder_func& func)
+void listbox::order_by(const generator_base::order_func& func)
 {
 	generator_->set_order(func);
 
diff --git a/src/gui/widgets/listbox.hpp b/src/gui/widgets/listbox.hpp
index 532511d26dba..56aa0e1f98fe 100644
--- a/src/gui/widgets/listbox.hpp
+++ b/src/gui/widgets/listbox.hpp
@@ -262,7 +262,7 @@ class listbox : public scrollbar_container
 		list_builder_ = list_builder;
 	}
 
-	void order_by(const generator_base::torder_func& func);
+	void order_by(const generator_base::order_func& func);
 
 	void set_column_order(unsigned col, const generator_sort_array& func);