diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-30 10:01:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 10:01:11 +0200 |
| commit | 432b25d3649319517827dbf7bc275e81e0a2b92e (patch) | |
| tree | d0ed3596d938caca1123f00497c11fe6b9026633 /platform/ios/export/export_plugin.h | |
| parent | 0b5d7281b9936f17176187338ef9706410a8fc75 (diff) | |
| parent | 10a56981dc7bf2d0f0decd56a005ea1c2986e279 (diff) | |
Merge pull request #65066 from aaronfranke/str-path-join
Diffstat (limited to 'platform/ios/export/export_plugin.h')
| -rw-r--r-- | platform/ios/export/export_plugin.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/ios/export/export_plugin.h b/platform/ios/export/export_plugin.h index abda8e218a..639f2416a5 100644 --- a/platform/ios/export/export_plugin.h +++ b/platform/ios/export/export_plugin.h @@ -238,9 +238,9 @@ public: if (da->current_is_dir()) { if (p_check_directories) { - Vector<String> directory_files = list_plugin_config_files(p_path.plus_file(file), false); + Vector<String> directory_files = list_plugin_config_files(p_path.path_join(file), false); for (int i = 0; i < directory_files.size(); ++i) { - dir_files.push_back(file.plus_file(directory_files[i])); + dir_files.push_back(file.path_join(directory_files[i])); } } @@ -260,7 +260,7 @@ public: static Vector<PluginConfigIOS> get_plugins() { Vector<PluginConfigIOS> loaded_plugins; - String plugins_dir = ProjectSettings::get_singleton()->get_resource_path().plus_file("ios/plugins"); + String plugins_dir = ProjectSettings::get_singleton()->get_resource_path().path_join("ios/plugins"); if (DirAccess::exists(plugins_dir)) { Vector<String> plugins_filenames = list_plugin_config_files(plugins_dir, true); @@ -268,7 +268,7 @@ public: if (!plugins_filenames.is_empty()) { Ref<ConfigFile> config_file = memnew(ConfigFile); for (int i = 0; i < plugins_filenames.size(); i++) { - PluginConfigIOS config = PluginConfigIOS::load_plugin_config(config_file, plugins_dir.plus_file(plugins_filenames[i])); + PluginConfigIOS config = PluginConfigIOS::load_plugin_config(config_file, plugins_dir.path_join(plugins_filenames[i])); if (config.valid_config) { loaded_plugins.push_back(config); } else { |