From a0072ba39fb19158564322ae3f4595512a0c34dc Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Wed, 27 Jul 2022 17:34:12 -0500 Subject: Make some editor export methods const --- platform/android/export/export_plugin.cpp | 4 ++-- platform/android/export/export_plugin.h | 4 ++-- platform/ios/export/export_plugin.cpp | 6 +++--- platform/ios/export/export_plugin.h | 8 ++++---- platform/javascript/export/export_plugin.cpp | 2 +- platform/javascript/export/export_plugin.h | 4 ++-- platform/macos/export/export_plugin.cpp | 2 +- platform/macos/export/export_plugin.h | 4 ++-- platform/uwp/export/export_plugin.cpp | 4 ++-- platform/uwp/export/export_plugin.h | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) (limited to 'platform') diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index 2cfb152804..bdee68ef34 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -1671,7 +1671,7 @@ Vector EditorExportPlatformAndroid::get_enabled_abis(const Ref &p_preset, List *r_features) { +void EditorExportPlatformAndroid::get_preset_features(const Ref &p_preset, List *r_features) const { String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name"); if (driver == "opengl3") { r_features->push_back("etc"); @@ -3109,7 +3109,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref *r_features) { +void EditorExportPlatformAndroid::get_platform_features(List *r_features) const { r_features->push_back("mobile"); r_features->push_back("android"); } diff --git a/platform/android/export/export_plugin.h b/platform/android/export/export_plugin.h index 8fd2f0680d..1da3f68f9a 100644 --- a/platform/android/export/export_plugin.h +++ b/platform/android/export/export_plugin.h @@ -156,7 +156,7 @@ public: typedef Error (*EditorExportSaveFunction)(void *p_userdata, const String &p_path, const Vector &p_data, int p_file, int p_total, const Vector &p_enc_in_filters, const Vector &p_enc_ex_filters, const Vector &p_key); public: - virtual void get_preset_features(const Ref &p_preset, List *r_features) override; + virtual void get_preset_features(const Ref &p_preset, List *r_features) const override; virtual void get_export_options(List *r_options) override; @@ -231,7 +231,7 @@ public: Error export_project_helper(const Ref &p_preset, bool p_debug, const String &p_path, int export_format, bool should_sign, int p_flags); - virtual void get_platform_features(List *r_features) override; + virtual void get_platform_features(List *r_features) const override; virtual void resolve_platform_feature_priorities(const Ref &p_preset, HashSet &p_features) override; diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp index a2e80d33fd..85e8621aa0 100644 --- a/platform/ios/export/export_plugin.cpp +++ b/platform/ios/export/export_plugin.cpp @@ -32,7 +32,7 @@ #include "editor/editor_node.h" -void EditorExportPlatformIOS::get_preset_features(const Ref &p_preset, List *r_features) { +void EditorExportPlatformIOS::get_preset_features(const Ref &p_preset, List *r_features) const { String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name"); // Vulkan and OpenGL ES 3.0 both mandate ETC2 support. r_features->push_back("etc2"); @@ -43,7 +43,7 @@ void EditorExportPlatformIOS::get_preset_features(const Ref } } -Vector EditorExportPlatformIOS::_get_supported_architectures() { +Vector EditorExportPlatformIOS::_get_supported_architectures() const { Vector archs; archs.push_back(ExportArchitecture("arm64", true)); return archs; @@ -1155,7 +1155,7 @@ Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir return OK; } -Vector EditorExportPlatformIOS::_get_preset_architectures(const Ref &p_preset) { +Vector EditorExportPlatformIOS::_get_preset_architectures(const Ref &p_preset) const { Vector all_archs = _get_supported_architectures(); Vector enabled_archs; for (int i = 0; i < all_archs.size(); ++i) { diff --git a/platform/ios/export/export_plugin.h b/platform/ios/export/export_plugin.h index ce470bba78..07e30c1d00 100644 --- a/platform/ios/export/export_plugin.h +++ b/platform/ios/export/export_plugin.h @@ -106,8 +106,8 @@ class EditorExportPlatformIOS : public EditorExportPlatform { Error _export_loading_screen_file(const Ref &p_preset, const String &p_dest_dir); Error _export_icons(const Ref &p_preset, const String &p_iconset_dir); - Vector _get_supported_architectures(); - Vector _get_preset_architectures(const Ref &p_preset); + Vector _get_supported_architectures() const; + Vector _get_preset_architectures(const Ref &p_preset) const; void _add_assets_to_project(const Ref &p_preset, Vector &p_project_data, const Vector &p_additional_assets); Error _export_additional_assets(const String &p_out_dir, const Vector &p_assets, bool p_is_framework, bool p_should_embed, Vector &r_exported_assets); @@ -173,7 +173,7 @@ class EditorExportPlatformIOS : public EditorExportPlatform { } protected: - virtual void get_preset_features(const Ref &p_preset, List *r_features) override; + virtual void get_preset_features(const Ref &p_preset, List *r_features) const override; virtual void get_export_options(List *r_options) override; public: @@ -199,7 +199,7 @@ public: virtual bool can_export(const Ref &p_preset, String &r_error, bool &r_missing_templates) const override; - virtual void get_platform_features(List *r_features) override { + virtual void get_platform_features(List *r_features) const override { r_features->push_back("mobile"); r_features->push_back("ios"); } diff --git a/platform/javascript/export/export_plugin.cpp b/platform/javascript/export/export_plugin.cpp index e2ae45627e..a9912edef7 100644 --- a/platform/javascript/export/export_plugin.cpp +++ b/platform/javascript/export/export_plugin.cpp @@ -302,7 +302,7 @@ Error EditorExportPlatformJavaScript::_build_pwa(const Ref & return OK; } -void EditorExportPlatformJavaScript::get_preset_features(const Ref &p_preset, List *r_features) { +void EditorExportPlatformJavaScript::get_preset_features(const Ref &p_preset, List *r_features) const { if (p_preset->get("vram_texture_compression/for_desktop")) { r_features->push_back("s3tc"); } diff --git a/platform/javascript/export/export_plugin.h b/platform/javascript/export/export_plugin.h index e6ca5976df..fbaa3615cb 100644 --- a/platform/javascript/export/export_plugin.h +++ b/platform/javascript/export/export_plugin.h @@ -110,7 +110,7 @@ class EditorExportPlatformJavaScript : public EditorExportPlatform { static void _server_thread_poll(void *data); public: - virtual void get_preset_features(const Ref &p_preset, List *r_features) override; + virtual void get_preset_features(const Ref &p_preset, List *r_features) const override; virtual void get_export_options(List *r_options) override; @@ -130,7 +130,7 @@ public: virtual Error run(const Ref &p_preset, int p_option, int p_debug_flags) override; virtual Ref get_run_icon() const override; - virtual void get_platform_features(List *r_features) override { + virtual void get_platform_features(List *r_features) const override { r_features->push_back("web"); r_features->push_back(get_os_name().to_lower()); } diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp index fd0781ac50..209a3dee5b 100644 --- a/platform/macos/export/export_plugin.cpp +++ b/platform/macos/export/export_plugin.cpp @@ -37,7 +37,7 @@ #include "modules/modules_enabled.gen.h" // For regex. -void EditorExportPlatformMacOS::get_preset_features(const Ref &p_preset, List *r_features) { +void EditorExportPlatformMacOS::get_preset_features(const Ref &p_preset, List *r_features) const { if (p_preset->get("texture_format/s3tc")) { r_features->push_back("s3tc"); } diff --git a/platform/macos/export/export_plugin.h b/platform/macos/export/export_plugin.h index 4f4b17594c..21bc380d55 100644 --- a/platform/macos/export/export_plugin.h +++ b/platform/macos/export/export_plugin.h @@ -99,7 +99,7 @@ class EditorExportPlatformMacOS : public EditorExportPlatform { } protected: - virtual void get_preset_features(const Ref &p_preset, List *r_features) override; + virtual void get_preset_features(const Ref &p_preset, List *r_features) const override; virtual void get_export_options(List *r_options) override; virtual bool get_export_option_visibility(const String &p_option, const HashMap &p_options) const override; @@ -121,7 +121,7 @@ public: virtual bool can_export(const Ref &p_preset, String &r_error, bool &r_missing_templates) const override; - virtual void get_platform_features(List *r_features) override { + virtual void get_platform_features(List *r_features) const override { r_features->push_back("pc"); r_features->push_back("s3tc"); r_features->push_back("macos"); diff --git a/platform/uwp/export/export_plugin.cpp b/platform/uwp/export/export_plugin.cpp index 19b43d50be..7bf8a0f4c7 100644 --- a/platform/uwp/export/export_plugin.cpp +++ b/platform/uwp/export/export_plugin.cpp @@ -49,7 +49,7 @@ Ref EditorExportPlatformUWP::get_logo() const { return logo; } -void EditorExportPlatformUWP::get_preset_features(const Ref &p_preset, List *r_features) { +void EditorExportPlatformUWP::get_preset_features(const Ref &p_preset, List *r_features) const { r_features->push_back("s3tc"); r_features->push_back("etc"); switch ((int)p_preset->get("architecture/target")) { @@ -494,7 +494,7 @@ Error EditorExportPlatformUWP::export_project(const Ref &p_p return OK; } -void EditorExportPlatformUWP::get_platform_features(List *r_features) { +void EditorExportPlatformUWP::get_platform_features(List *r_features) const { r_features->push_back("pc"); r_features->push_back("uwp"); } diff --git a/platform/uwp/export/export_plugin.h b/platform/uwp/export/export_plugin.h index c1a1f8a935..5c50baf9c3 100644 --- a/platform/uwp/export/export_plugin.h +++ b/platform/uwp/export/export_plugin.h @@ -431,7 +431,7 @@ public: virtual Ref get_logo() const override; - virtual void get_preset_features(const Ref &p_preset, List *r_features) override; + virtual void get_preset_features(const Ref &p_preset, List *r_features) const override; virtual void get_export_options(List *r_options) override; @@ -439,7 +439,7 @@ public: virtual Error export_project(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override; - virtual void get_platform_features(List *r_features) override; + virtual void get_platform_features(List *r_features) const override; virtual void resolve_platform_feature_priorities(const Ref &p_preset, HashSet &p_features) override; -- cgit v1.2.3