Unify http- and percent- encode/decode

There was a percent-prefixed version, which was exposed, and a http-prefixed version which was not (only to GDNative).
This commit keeps the percent-prefixed versions, but with the http-prefixed implementations.

3 files changed, 2 insertions, 37 deletions

diff --git a/modules/gdnative/gdnative/string.cpp b/modules/gdnative/gdnative/string.cpp
index 7f5dbc12be..ab0f0e0a50 100644
--- a/modules/gdnative/gdnative/string.cpp
+++ b/modules/gdnative/gdnative/string.cpp
@@ -1168,24 +1168,6 @@ godot_string GDAPI godot_string_c_unescape(const godot_string *p_self) {
 	return result;
 }
 
-godot_string GDAPI godot_string_http_escape(const godot_string *p_self) {
-	const String *self = (const String *)p_self;
-	godot_string result;
-	String return_value = self->http_escape();
-	memnew_placement(&result, String(return_value));
-
-	return result;
-}
-
-godot_string GDAPI godot_string_http_unescape(const godot_string *p_self) {
-	const String *self = (const String *)p_self;
-	godot_string result;
-	String return_value = self->http_unescape();
-	memnew_placement(&result, String(return_value));
-
-	return result;
-}
-
 godot_string GDAPI godot_string_json_escape(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
 	godot_string result;
diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json
index a8919f7130..434dacffd5 100644
--- a/modules/gdnative/gdnative_api.json
+++ b/modules/gdnative/gdnative_api.json
@@ -5468,20 +5468,6 @@
         ]
       },
       {
-        "name": "godot_string_http_escape",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_string_http_unescape",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"]
-        ]
-      },
-      {
         "name": "godot_string_json_escape",
         "return_type": "godot_string",
         "arguments": [
diff --git a/modules/gdnative/include/gdnative/string.h b/modules/gdnative/include/gdnative/string.h
index 73245160c1..8fc59e21da 100644
--- a/modules/gdnative/include/gdnative/string.h
+++ b/modules/gdnative/include/gdnative/string.h
@@ -228,17 +228,14 @@ godot_string GDAPI godot_string_simplify_path(const godot_string *p_self);
 godot_string GDAPI godot_string_c_escape(const godot_string *p_self);
 godot_string GDAPI godot_string_c_escape_multiline(const godot_string *p_self);
 godot_string GDAPI godot_string_c_unescape(const godot_string *p_self);
-godot_string GDAPI godot_string_http_escape(const godot_string *p_self);
-godot_string GDAPI godot_string_http_unescape(const godot_string *p_self);
+godot_string GDAPI godot_string_percent_decode(const godot_string *p_self);
+godot_string GDAPI godot_string_percent_encode(const godot_string *p_self);
 godot_string GDAPI godot_string_json_escape(const godot_string *p_self);
 godot_string GDAPI godot_string_word_wrap(const godot_string *p_self, godot_int p_chars_per_line);
 godot_string GDAPI godot_string_xml_escape(const godot_string *p_self);
 godot_string GDAPI godot_string_xml_escape_with_quotes(const godot_string *p_self);
 godot_string GDAPI godot_string_xml_unescape(const godot_string *p_self);
 
-godot_string GDAPI godot_string_percent_decode(const godot_string *p_self);
-godot_string GDAPI godot_string_percent_encode(const godot_string *p_self);
-
 godot_bool GDAPI godot_string_is_valid_float(const godot_string *p_self);
 godot_bool GDAPI godot_string_is_valid_hex_number(const godot_string *p_self, godot_bool p_with_prefix);
 godot_bool GDAPI godot_string_is_valid_html_color(const godot_string *p_self);