Use ScriptExportMode enum in EditorExportPreset

Mickeon · Mickeon · commit edab5283d2ab · 2025-06-05T21:39:00.000+02:00
diff --git a/doc/classes/EditorExportPreset.xml b/doc/classes/EditorExportPreset.xml
@@ -129,7 +129,7 @@
 			</description>
 		</method>
 		<method name="get_script_export_mode" qualifiers="const">
-			<return type="int" />
+			<return type="int" enum="EditorExportPreset.ScriptExportMode" />
 			<description>
 				Returns script export mode.
 			</description>
diff --git a/editor/export/editor_export_preset.compat.inc b/editor/export/editor_export_preset.compat.inc
@@ -0,0 +1,41 @@
+/**************************************************************************/
+/*  editor_export_preset.compat.inc                                       */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef DISABLE_DEPRECATED
+
+int EditorExportPreset::_get_script_export_mode_bind_compat_107167() const {
+	return get_script_export_mode();
+}
+
+void EditorExportPreset::_bind_compatibility_methods() {
+	ClassDB::bind_compatibility_method(D_METHOD("get_script_export_mode"), &EditorExportPreset::_get_script_export_mode_bind_compat_107167);
+}
+
+#endif
diff --git a/editor/export/editor_export_preset.cpp b/editor/export/editor_export_preset.cpp
@@ -510,12 +510,12 @@ String EditorExportPreset::get_script_encryption_key() const {
 	return script_key;
 }
 
-void EditorExportPreset::set_script_export_mode(int p_mode) {
+void EditorExportPreset::set_script_export_mode(ScriptExportMode p_mode) {
 	script_mode = p_mode;
 	EditorExport::singleton->save_presets();
 }
 
-int EditorExportPreset::get_script_export_mode() const {
+EditorExportPreset::ScriptExportMode EditorExportPreset::get_script_export_mode() const {
 	return script_mode;
 }
 
diff --git a/editor/export/editor_export_preset.h b/editor/export/editor_export_preset.h
@@ -94,7 +94,7 @@ class EditorExportPreset : public RefCounted {
 	uint64_t seed = 0;
 
 	String script_key;
-	int script_mode = MODE_SCRIPT_BINARY_TOKENS_COMPRESSED;
+	ScriptExportMode script_mode = MODE_SCRIPT_BINARY_TOKENS_COMPRESSED;
 
 protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
@@ -179,8 +179,8 @@ class EditorExportPreset : public RefCounted {
 	void set_script_encryption_key(const String &p_key);
 	String get_script_encryption_key() const;
 
-	void set_script_export_mode(int p_mode);
-	int get_script_export_mode() const;
+	void set_script_export_mode(ScriptExportMode p_mode);
+	ScriptExportMode get_script_export_mode() const;
 
 	Variant _get_or_env(const StringName &p_name, const String &p_env_var) const {
 		return get_or_env(p_name, p_env_var);
diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp
@@ -417,7 +417,7 @@ void ProjectExportDialog::_edit_preset(int p_index) {
 		script_key_error->hide();
 	}
 
-	int script_export_mode = current->get_script_export_mode();
+	int script_export_mode = int(current->get_script_export_mode());
 	script_mode->select(script_export_mode);
 
 	updating = false;
@@ -652,7 +652,7 @@ bool ProjectExportDialog::_validate_script_encryption_key(const String &p_key) {
 	return is_valid;
 }
 
-void ProjectExportDialog::_script_export_mode_changed(int p_mode) {
+void ProjectExportDialog::_script_export_mode_changed(EditorExportPreset::ScriptExportMode p_mode) {
 	if (updating) {
 		return;
 	}
diff --git a/editor/export/project_export.h b/editor/export/project_export.h
@@ -202,7 +202,7 @@ class ProjectExportDialog : public ConfirmationDialog {
 	void _script_encryption_key_changed(const String &p_key);
 	bool _validate_script_encryption_key(const String &p_key);
 
-	void _script_export_mode_changed(int p_mode);
+	void _script_export_mode_changed(EditorExportPreset::ScriptExportMode p_mode);
 
 	void _open_key_help_link();
 
diff --git a/misc/extension_api_validation/4.4-stable.expected b/misc/extension_api_validation/4.4-stable.expected
@@ -267,3 +267,10 @@ Validate extension JSON: JSON file: Field was added in a way that breaks compati
 Validate extension JSON: JSON file: Field was added in a way that breaks compatibility 'classes/RichTextLabel/methods/push_underline': arguments
 
 Optional "color" argument added. Compatibility methods registered.
+
+
+GH-107167
+---------
+Validate extension JSON: Error: Field 'classes/EditorExportPreset/methods/get_script_export_mode': meta was removed.
+
+Change return type from `int` to `EditorExportPreset.ScriptExportMode` enum. Compatibility methods registered.
diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
@@ -78,8 +78,8 @@ Ref<GDScriptEditorTranslationParserPlugin> gdscript_translation_parser_plugin;
 class EditorExportGDScript : public EditorExportPlugin {
 	GDCLASS(EditorExportGDScript, EditorExportPlugin);
 
-	static constexpr int DEFAULT_SCRIPT_MODE = EditorExportPreset::MODE_SCRIPT_BINARY_TOKENS_COMPRESSED;
-	int script_mode = DEFAULT_SCRIPT_MODE;
+	static constexpr EditorExportPreset::ScriptExportMode DEFAULT_SCRIPT_MODE = EditorExportPreset::MODE_SCRIPT_BINARY_TOKENS_COMPRESSED;
+	EditorExportPreset::ScriptExportMode script_mode = DEFAULT_SCRIPT_MODE;
 
 protected:
 	virtual void _export_begin(const HashSet<String> &p_features, bool p_debug, const String &p_path, int p_flags) override {

Original file line number	Diff line number	Diff line change
`@@ -510,12 +510,12 @@ String EditorExportPreset::get_script_encryption_key() const {`
`510`	`510`	`return script_key;`
`511`	`511`	`}`
`512`	`512`
`513`		`-void EditorExportPreset::set_script_export_mode(int p_mode) {`
	`513`	`+void EditorExportPreset::set_script_export_mode(ScriptExportMode p_mode) {`
`514`	`514`	`script_mode = p_mode;`
`515`	`515`	`EditorExport::singleton->save_presets();`
`516`	`516`	`}`
`517`	`517`
`518`		`-int EditorExportPreset::get_script_export_mode() const {`
	`518`	`+EditorExportPreset::ScriptExportMode EditorExportPreset::get_script_export_mode() const {`
`519`	`519`	`return script_mode;`
`520`	`520`	`}`
`521`	`521`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ void ProjectExportDialog::_edit_preset(int p_index) {`
`417`	`417`	`script_key_error->hide();`
`418`	`418`	`}`
`419`	`419`
`420`		`- int script_export_mode = current->get_script_export_mode();`
	`420`	`+ int script_export_mode = int(current->get_script_export_mode());`
`421`	`421`	`script_mode->select(script_export_mode);`
`422`	`422`
`423`	`423`	`updating = false;`
`@@ -652,7 +652,7 @@ bool ProjectExportDialog::_validate_script_encryption_key(const String &p_key) {`
`652`	`652`	`return is_valid;`
`653`	`653`	`}`
`654`	`654`
`655`		`-void ProjectExportDialog::_script_export_mode_changed(int p_mode) {`
	`655`	`+void ProjectExportDialog::_script_export_mode_changed(EditorExportPreset::ScriptExportMode p_mode) {`
`656`	`656`	`if (updating) {`
`657`	`657`	`return;`
`658`	`658`	`}`