From c4a28048dd0b94b4aeca7563a83a3522e7b55b5e Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Fri, 15 May 2020 21:31:07 +0200
Subject: [PATCH] strings move CfgFunctions to PREPMAIN

---
 addons/strings/CfgEventHandlers.hpp |  5 +++++
 addons/strings/CfgFunctions.hpp     | 22 ----------------------
 addons/strings/XEH_PREP.sqf         | 16 ++++++++++++++++
 addons/strings/XEH_preInit.sqf      |  3 +++
 addons/strings/config.cpp           |  2 +-
 5 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 addons/strings/CfgEventHandlers.hpp
 delete mode 100644 addons/strings/CfgFunctions.hpp
 create mode 100644 addons/strings/XEH_PREP.sqf
 create mode 100644 addons/strings/XEH_preInit.sqf

diff --git a/addons/strings/CfgEventHandlers.hpp b/addons/strings/CfgEventHandlers.hpp
new file mode 100644
index 000000000..6b32ee79e
--- /dev/null
+++ b/addons/strings/CfgEventHandlers.hpp
@@ -0,0 +1,5 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
diff --git a/addons/strings/CfgFunctions.hpp b/addons/strings/CfgFunctions.hpp
deleted file mode 100644
index 5afd84a60..000000000
--- a/addons/strings/CfgFunctions.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-class CfgFunctions {
-    class CBA {
-        class Strings {
-            PATHTO_FNC(capitalize);
-            PATHTO_FNC(substring);
-            PATHTO_FNC(substr);
-            PATHTO_FNC(find);
-            PATHTO_FNC(floatToString);
-            PATHTO_FNC(formatElapsedTime);
-            PATHTO_FNC(formatNumber);
-            PATHTO_FNC(leftTrim);
-            PATHTO_FNC(removeWhitespace);
-            PATHTO_FNC(replace);
-            PATHTO_FNC(rightTrim);
-            PATHTO_FNC(split);
-            PATHTO_FNC(strLen);
-            PATHTO_FNC(trim);
-            PATHTO_FNC(sanitizeHTML);
-            PATHTO_FNC(decodeURL);
-        };
-    };
-};
diff --git a/addons/strings/XEH_PREP.sqf b/addons/strings/XEH_PREP.sqf
new file mode 100644
index 000000000..2e9ae17dc
--- /dev/null
+++ b/addons/strings/XEH_PREP.sqf
@@ -0,0 +1,16 @@
+PREPMAIN(capitalize);
+PREPMAIN(substring);
+PREPMAIN(substr);
+PREPMAIN(find);
+PREPMAIN(floatToString);
+PREPMAIN(formatElapsedTime);
+PREPMAIN(formatNumber);
+PREPMAIN(leftTrim);
+PREPMAIN(removeWhitespace);
+PREPMAIN(replace);
+PREPMAIN(rightTrim);
+PREPMAIN(split);
+PREPMAIN(strLen);
+PREPMAIN(trim);
+PREPMAIN(sanitizeHTML);
+PREPMAIN(decodeURL);
diff --git a/addons/strings/XEH_preInit.sqf b/addons/strings/XEH_preInit.sqf
new file mode 100644
index 000000000..43f1adee3
--- /dev/null
+++ b/addons/strings/XEH_preInit.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.sqf"
diff --git a/addons/strings/config.cpp b/addons/strings/config.cpp
index 4aca9c1b1..ad99befdb 100644
--- a/addons/strings/config.cpp
+++ b/addons/strings/config.cpp
@@ -14,4 +14,4 @@ class CfgPatches {
     };
 };
 
-#include "CfgFunctions.hpp"
+#include "CfgEventHandlers.hpp"