From 746dddc0673d7261f19b1e056e90e6e3a49ef33a Mon Sep 17 00:00:00 2001
From: reduz <reduzio@gmail.com>
Date: Fri, 13 May 2022 15:04:37 +0200
Subject: Replace most uses of Map by HashMap

* Map is unnecessary and inefficient in almost every case.
* Replaced by the new HashMap.
* Renamed Map to RBMap and Set to RBSet for cases that still make sense
  (order matters) but use is discouraged.

There were very few cases where replacing by HashMap was undesired because
keeping the key order was intended.
I tried to keep those (as RBMap) as much as possible, but might have missed
some. Review appreciated!
---
 platform/android/api/java_class_wrapper.h | 6 +++---
 platform/android/api/jni_singleton.h      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'platform/android/api')

diff --git a/platform/android/api/java_class_wrapper.h b/platform/android/api/java_class_wrapper.h
index 96b7b48e48..ac8d6585d3 100644
--- a/platform/android/api/java_class_wrapper.h
+++ b/platform/android/api/java_class_wrapper.h
@@ -63,7 +63,7 @@ class JavaClass : public RefCounted {
 		ARG_TYPE_MASK = (1 << 16) - 1
 	};
 
-	Map<StringName, Variant> constant_map;
+	RBMap<StringName, Variant> constant_map;
 
 	struct MethodInfo {
 		bool _static = false;
@@ -174,7 +174,7 @@ class JavaClass : public RefCounted {
 	bool _call_method(JavaObject *p_instance, const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error, Variant &ret);
 
 	friend class JavaClassWrapper;
-	Map<StringName, List<MethodInfo>> methods;
+	HashMap<StringName, List<MethodInfo>> methods;
 	jclass _class;
 #endif
 
@@ -207,7 +207,7 @@ class JavaClassWrapper : public Object {
 	GDCLASS(JavaClassWrapper, Object);
 
 #ifdef ANDROID_ENABLED
-	Map<String, Ref<JavaClass>> class_cache;
+	RBMap<String, Ref<JavaClass>> class_cache;
 	friend class JavaClass;
 	jclass activityClass;
 	jmethodID findClass;
diff --git a/platform/android/api/jni_singleton.h b/platform/android/api/jni_singleton.h
index 74ca10e5e2..8a0e021157 100644
--- a/platform/android/api/jni_singleton.h
+++ b/platform/android/api/jni_singleton.h
@@ -48,13 +48,13 @@ class JNISingleton : public Object {
 	};
 
 	jobject instance;
-	Map<StringName, MethodData> method_map;
+	RBMap<StringName, MethodData> method_map;
 #endif
 
 public:
 	virtual Variant callp(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) override {
 #ifdef ANDROID_ENABLED
-		Map<StringName, MethodData>::Element *E = method_map.find(p_method);
+		RBMap<StringName, MethodData>::Element *E = method_map.find(p_method);
 
 		// Check the method we're looking for is in the JNISingleton map and that
 		// the arguments match.
-- 
cgit v1.2.3