Merge pull request #75666 from ronyeh/main.cpp-2

Rename `iconpath` => `icon_path` & `hasicon` => `has_icon`.

1 files changed, 7 insertions, 7 deletions

diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp
index be677f4da2..bef204cd49 100644
--- a/platform/macos/export/export_plugin.cpp
+++ b/platform/macos/export/export_plugin.cpp
@@ -1674,16 +1674,16 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 
 		if (file == "Contents/Resources/icon.icns") {
 			// See if there is an icon.
-			String iconpath;
+			String icon_path;
 			if (p_preset->get("application/icon") != "") {
-				iconpath = p_preset->get("application/icon");
+				icon_path = p_preset->get("application/icon");
 			} else {
-				iconpath = GLOBAL_GET("application/config/icon");
+				icon_path = GLOBAL_GET("application/config/icon");
 			}
 
-			if (!iconpath.is_empty()) {
-				if (iconpath.get_extension() == "icns") {
-					Ref<FileAccess> icon = FileAccess::open(iconpath, FileAccess::READ);
+			if (!icon_path.is_empty()) {
+				if (icon_path.get_extension() == "icns") {
+					Ref<FileAccess> icon = FileAccess::open(icon_path, FileAccess::READ);
 					if (icon.is_valid()) {
 						data.resize(icon->get_length());
 						icon->get_buffer(&data.write[0], icon->get_length());
@@ -1691,7 +1691,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 				} else {
 					Ref<Image> icon;
 					icon.instantiate();
-					err = ImageLoader::load_image(iconpath, icon);
+					err = ImageLoader::load_image(icon_path, icon);
 					if (err == OK && !icon->is_empty()) {
 						_make_icon(p_preset, icon, data);
 					}