From d6b69ca8fc7357c25c09f87a29a9ac427869ecbf Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Mon, 16 Jan 2023 01:08:02 -0800
Subject: [PATCH] move useful functions from uicommon to MiscUtils

---
 library/include/MiscUtils.h | 31 ++++++++++++++++++++++++++-----
 plugins/uicommon.h          | 18 ------------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index d089640ef..124987535 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -23,17 +23,20 @@ distribution.
 */
 
 #pragma once
+
 #include "Export.h"
+
 #include <algorithm>
-#include <iostream>
-#include <iomanip>
 #include <cctype>
 #include <climits>
-#include <stdint.h>
-#include <vector>
-#include <sstream>
 #include <cstdio>
+#include <iomanip>
+#include <iostream>
+#include <map>
 #include <memory>
+#include <sstream>
+#include <stdint.h>
+#include <vector>
 
 #if defined(_MSC_VER)
     #define DFHACK_FUNCTION_SIG __FUNCSIG__
@@ -338,6 +341,24 @@ inline typename T::mapped_type map_find(
     return (it == map.end()) ? defval : it->second;
 }
 
+template <class T, typename Fn>
+static void for_each_(std::vector<T> &v, Fn func)
+{
+    std::for_each(v.begin(), v.end(), func);
+}
+
+template <class T, class V, typename Fn>
+static void for_each_(std::map<T, V> &v, Fn func)
+{
+    std::for_each(v.begin(), v.end(), func);
+}
+
+template <class T, class V, typename Fn>
+static void transform_(const std::vector<T> &src, std::vector<V> &dst, Fn func)
+{
+    std::transform(src.begin(), src.end(), std::back_inserter(dst), func);
+}
+
 DFHACK_EXPORT bool prefix_matches(const std::string &prefix, const std::string &key, std::string *tail = NULL);
 
 template<typename T>
diff --git a/plugins/uicommon.h b/plugins/uicommon.h
index 03914b461..6179324d4 100644
--- a/plugins/uicommon.h
+++ b/plugins/uicommon.h
@@ -65,24 +65,6 @@ struct coord32_t
     }
 };
 
-template <class T, typename Fn>
-static void for_each_(vector<T> &v, Fn func)
-{
-    for_each(v.begin(), v.end(), func);
-}
-
-template <class T, class V, typename Fn>
-static void for_each_(map<T, V> &v, Fn func)
-{
-    for_each(v.begin(), v.end(), func);
-}
-
-template <class T, class V, typename Fn>
-static void transform_(const vector<T> &src, vector<V> &dst, Fn func)
-{
-    transform(src.begin(), src.end(), back_inserter(dst), func);
-}
-
 typedef int8_t UIColor;
 
 static inline void OutputString(UIColor color, int &x, int &y, const std::string &text,