4 files changed, 15 insertions, 14 deletions

diff --git a/platform/osx/export/export_plugin.cpp b/platform/osx/export/export_plugin.cpp
index 465925524c..9309b9f89b 100644
--- a/platform/osx/export/export_plugin.cpp
+++ b/platform/osx/export/export_plugin.cpp
@@ -51,7 +51,7 @@ void EditorExportPlatformOSX::get_preset_features(const Ref<EditorExportPreset>
 	r_features->push_back("64");
 }
 
-bool EditorExportPlatformOSX::get_export_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const {
+bool EditorExportPlatformOSX::get_export_option_visibility(const String &p_option, const HashMap<StringName, Variant> &p_options) const {
 	// These options are not supported by built-in codesign, used on non macOS host.
 	if (!OS::get_singleton()->has_feature("macos")) {
 		if (p_option == "codesign/identity" || p_option == "codesign/timestamp" || p_option == "codesign/hardened_runtime" || p_option == "codesign/custom_options" || p_option.begins_with("notarization/")) {
diff --git a/platform/osx/export/export_plugin.h b/platform/osx/export/export_plugin.h
index 013e5eaa71..c90c5c29b2 100644
--- a/platform/osx/export/export_plugin.h
+++ b/platform/osx/export/export_plugin.h
@@ -101,7 +101,7 @@ class EditorExportPlatformOSX : public EditorExportPlatform {
 protected:
 	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) override;
 	virtual void get_export_options(List<ExportOption> *r_options) override;
-	virtual bool get_export_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
+	virtual bool get_export_option_visibility(const String &p_option, const HashMap<StringName, Variant> &p_options) const override;
 
 public:
 	virtual String get_name() const override { return "macOS"; }
@@ -127,7 +127,7 @@ public:
 		r_features->push_back("macos");
 	}
 
-	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, Set<String> &p_features) override {
+	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, RBSet<String> &p_features) override {
 	}
 
 	EditorExportPlatformOSX();
diff --git a/platform/osx/export/plist.cpp b/platform/osx/export/plist.cpp
index d089233b80..36de9dd34b 100644
--- a/platform/osx/export/plist.cpp
+++ b/platform/osx/export/plist.cpp
@@ -140,10 +140,11 @@ size_t PListNode::get_asn1_size(uint8_t p_len_octets) const {
 		} break;
 		case PList::PLNodeType::PL_NODE_TYPE_DICT: {
 			size_t size = 0;
-			for (const Map<String, Ref<PListNode>>::Element *it = data_dict.front(); it; it = it->next()) {
+
+			for (const KeyValue<String, Ref<PListNode>> &E : data_dict) {
 				size += 1 + _asn1_size_len(p_len_octets); // Sequence.
-				size += 1 + _asn1_size_len(p_len_octets) + it->key().utf8().length(); //Key.
-				size += 1 + _asn1_size_len(p_len_octets) + it->value()->get_asn1_size(p_len_octets); // Value.
+				size += 1 + _asn1_size_len(p_len_octets) + E.key.utf8().length(); //Key.
+				size += 1 + _asn1_size_len(p_len_octets) + E.value->get_asn1_size(p_len_octets); // Value.
 			}
 			return size;
 		} break;
@@ -225,13 +226,13 @@ bool PListNode::store_asn1(PackedByteArray &p_stream, uint8_t p_len_octets) cons
 		case PList::PLNodeType::PL_NODE_TYPE_DICT: {
 			p_stream.push_back(0x31); // Set.
 			store_asn1_size(p_stream, p_len_octets);
-			for (const Map<String, Ref<PListNode>>::Element *it = data_dict.front(); it; it = it->next()) {
-				CharString cs = it->key().utf8();
+			for (const KeyValue<String, Ref<PListNode>> &E : data_dict) {
+				CharString cs = E.key.utf8();
 				uint32_t size = cs.length();
 
 				// Sequence.
 				p_stream.push_back(0x30);
-				uint32_t seq_size = 2 * (1 + _asn1_size_len(p_len_octets)) + size + it->value()->get_asn1_size(p_len_octets);
+				uint32_t seq_size = 2 * (1 + _asn1_size_len(p_len_octets)) + size + E.value->get_asn1_size(p_len_octets);
 				if (p_len_octets > 1) {
 					p_stream.push_back(0x80 + p_len_octets);
 				}
@@ -252,7 +253,7 @@ bool PListNode::store_asn1(PackedByteArray &p_stream, uint8_t p_len_octets) cons
 					p_stream.push_back(cs[i]);
 				}
 				// Value.
-				valid = valid && it->value()->store_asn1(p_stream, p_len_octets);
+				valid = valid && E.value->store_asn1(p_stream, p_len_octets);
 			}
 		} break;
 	}
@@ -317,12 +318,12 @@ void PListNode::store_text(String &p_stream, uint8_t p_indent) const {
 		case PList::PLNodeType::PL_NODE_TYPE_DICT: {
 			p_stream += String("\t").repeat(p_indent);
 			p_stream += "<dict>\n";
-			for (const Map<String, Ref<PListNode>>::Element *it = data_dict.front(); it; it = it->next()) {
+			for (const KeyValue<String, Ref<PListNode>> &E : data_dict) {
 				p_stream += String("\t").repeat(p_indent + 1);
 				p_stream += "<key>";
-				p_stream += it->key();
+				p_stream += E.key;
 				p_stream += "</key>\n";
-				it->value()->store_text(p_stream, p_indent + 1);
+				E.value->store_text(p_stream, p_indent + 1);
 			}
 			p_stream += String("\t").repeat(p_indent);
 			p_stream += "</dict>\n";
diff --git a/platform/osx/export/plist.h b/platform/osx/export/plist.h
index fb4aaaa935..ba9eaec196 100644
--- a/platform/osx/export/plist.h
+++ b/platform/osx/export/plist.h
@@ -83,7 +83,7 @@ public:
 
 	CharString data_string;
 	Vector<Ref<PListNode>> data_array;
-	Map<String, Ref<PListNode>> data_dict;
+	HashMap<String, Ref<PListNode>> data_dict;
 	union {
 		int32_t data_int;
 		bool data_bool;