1 files changed, 16 insertions, 16 deletions

diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp
index 9fa08a0adb..ee02916a5f 100644
--- a/editor/editor_file_dialog.cpp
+++ b/editor/editor_file_dialog.cpp
@@ -131,11 +131,11 @@ void EditorFileDialog::_notification(int p_what) {
 		} break;
 
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			bool is_showing_hidden = EditorSettings::get_singleton()->get("filesystem/file_dialog/show_hidden_files");
+			bool is_showing_hidden = EDITOR_GET("filesystem/file_dialog/show_hidden_files");
 			if (show_hidden_files != is_showing_hidden) {
 				set_show_hidden_files(is_showing_hidden);
 			}
-			set_display_mode((DisplayMode)EditorSettings::get_singleton()->get("filesystem/file_dialog/display_mode").operator int());
+			set_display_mode((DisplayMode)EDITOR_GET("filesystem/file_dialog/display_mode").operator int());
 
 			// DO NOT CALL UPDATE FILE LIST HERE, ALL HUNDREDS OF HIDDEN DIALOGS WILL RESPOND, CALL INVALIDATE INSTEAD
 			invalidate();
@@ -740,7 +740,7 @@ void EditorFileDialog::update_file_name() {
 
 // DO NOT USE THIS FUNCTION UNLESS NEEDED, CALL INVALIDATE() INSTEAD.
 void EditorFileDialog::update_file_list() {
-	int thumbnail_size = EditorSettings::get_singleton()->get("filesystem/file_dialog/thumbnail_size");
+	int thumbnail_size = EDITOR_GET("filesystem/file_dialog/thumbnail_size");
 	thumbnail_size *= EDSCALE;
 	Ref<Texture2D> folder_thumbnail;
 	Ref<Texture2D> file_thumbnail;
@@ -1023,10 +1023,10 @@ void EditorFileDialog::set_current_path(const String &p_path) {
 	if (pos == -1) {
 		set_current_file(p_path);
 	} else {
-		String dir = p_path.substr(0, pos);
-		String file = p_path.substr(pos + 1, p_path.length());
-		set_current_dir(dir);
-		set_current_file(file);
+		String path_dir = p_path.substr(0, pos);
+		String path_file = p_path.substr(pos + 1, p_path.length());
+		set_current_dir(path_dir);
+		set_current_file(path_file);
 	}
 }
 
@@ -1614,26 +1614,26 @@ void EditorFileDialog::set_default_display_mode(DisplayMode p_mode) {
 }
 
 void EditorFileDialog::_save_to_recent() {
-	String dir = get_current_dir();
-	Vector<String> recent = EditorSettings::get_singleton()->get_recent_dirs();
+	String cur_dir = get_current_dir();
+	Vector<String> recent_new = EditorSettings::get_singleton()->get_recent_dirs();
 
 	const int max = 20;
 	int count = 0;
-	bool res = dir.begins_with("res://");
+	bool res = cur_dir.begins_with("res://");
 
-	for (int i = 0; i < recent.size(); i++) {
-		bool cres = recent[i].begins_with("res://");
-		if (recent[i] == dir || (res == cres && count > max)) {
-			recent.remove_at(i);
+	for (int i = 0; i < recent_new.size(); i++) {
+		bool cres = recent_new[i].begins_with("res://");
+		if (recent_new[i] == cur_dir || (res == cres && count > max)) {
+			recent_new.remove_at(i);
 			i--;
 		} else {
 			count++;
 		}
 	}
 
-	recent.insert(0, dir);
+	recent_new.insert(0, cur_dir);
 
-	EditorSettings::get_singleton()->set_recent_dirs(recent);
+	EditorSettings::get_singleton()->set_recent_dirs(recent_new);
 }
 
 void EditorFileDialog::set_disable_overwrite_warning(bool p_disable) {