From 8458cb23390eab99a1d0e45de2525745e2aed313 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas@users.noreply.github.com>
Date: Fri, 30 Sep 2016 15:51:03 +0200
Subject: [PATCH] Replace ace_common_fnc_stringRemoveWhiteSpace with
 CBA_fnc_removeWhitespace (#4222)

* Replace FUNC(stringRemoveWhiteSpace) with CBA_fnc_removeWhitespace, Depreacte ACE's

* Use QFUNC

* Bump required CBA version

* Change remove version to 3.110.0
---
 addons/common/functions/fnc_parseList.sqf                   | 2 +-
 addons/common/functions/fnc_stringRemoveWhiteSpace.sqf      | 2 ++
 addons/main/script_mod.hpp                                  | 2 +-
 addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf | 2 +-
 addons/tagging/functions/fnc_addCustomTag.sqf               | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/common/functions/fnc_parseList.sqf b/addons/common/functions/fnc_parseList.sqf
index fc92605682..40b16c1aa5 100644
--- a/addons/common/functions/fnc_parseList.sqf
+++ b/addons/common/functions/fnc_parseList.sqf
@@ -28,7 +28,7 @@ private _whitespaceList = [];
 
 {
     if (_removeWhitespace) then {
-        _whitespaceList pushBack ([_x] call FUNC(stringRemoveWhiteSpace));
+        _whitespaceList pushBack ([_x] call CBA_fnc_removeWhitespace);
     } else {
         _whitespaceList pushBack ([_x] call CBA_fnc_trim);
     };
diff --git a/addons/common/functions/fnc_stringRemoveWhiteSpace.sqf b/addons/common/functions/fnc_stringRemoveWhiteSpace.sqf
index 47c9375d43..51d43d71a9 100644
--- a/addons/common/functions/fnc_stringRemoveWhiteSpace.sqf
+++ b/addons/common/functions/fnc_stringRemoveWhiteSpace.sqf
@@ -17,4 +17,6 @@
 
 params ["_string"];
 
+ACE_DEPRECATED(QFUNC(stringRemoveWhiteSpace),"3.10.0","CBA_fnc_removeWhitespace");
+
 (_string splitString " ") joinString ""
diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
index 714eb26d98..6f9d0e5a6b 100644
--- a/addons/main/script_mod.hpp
+++ b/addons/main/script_mod.hpp
@@ -13,7 +13,7 @@
 
 // MINIMAL required version for the Mod. Components can specify others..
 #define REQUIRED_VERSION 1.62
-#define REQUIRED_CBA_VERSION {3,0,0}
+#define REQUIRED_CBA_VERSION {3,1,0}
 
 #ifdef COMPONENT_BEAUTIFIED
     #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)
diff --git a/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf b/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
index eb44a68f15..7603bd8458 100644
--- a/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
+++ b/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
@@ -36,7 +36,7 @@ if (_activated && local _logic) then {
     _missionRoot = str missionConfigFile select [0, count str missionConfigFile - 15];
 
     {
-        _x = [_x] call EFUNC(common,stringRemoveWhiteSpace);
+        _x = [_x] call CBA_fnc_removeWhitespace;
 
         if (isClass (missionConfigFile >> "CfgSounds" >> _x)) then {
             // CfgSounds accepts a leading backslash, but a double backslash
diff --git a/addons/tagging/functions/fnc_addCustomTag.sqf b/addons/tagging/functions/fnc_addCustomTag.sqf
index 455b33ffd8..252f3f6e19 100644
--- a/addons/tagging/functions/fnc_addCustomTag.sqf
+++ b/addons/tagging/functions/fnc_addCustomTag.sqf
@@ -47,7 +47,7 @@ if (_textures isEqualTo []) exitWith {
     ACE_LOGERROR_1("Failed adding custom tag: %1 - missing textures",_identifier);
 };
 
-_identifier = [_identifier] call EFUNC(common,stringRemoveWhiteSpace);
+_identifier = [_identifier] call CBA_fnc_removeWhitespace;
 _requiredItem = toLower _requiredItem;
 
 // Add