summaryrefslogtreecommitdiff
path: root/platform/iphone
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-07-01 12:06:35 +0200
committerGitHub <noreply@github.com>2019-07-01 12:06:35 +0200
commitd17eac735cc84abd9afd1e083df1a4e8a2c8e656 (patch)
treed006c3a5457edbde9e4f9016b48d0968d70e3ce5 /platform/iphone
parentb62041d1f3b6428974d5be7ad9d378a445d432ac (diff)
parentd2833d4f4d891b6a0ee32a04f9d32a410b998b93 (diff)
Merge pull request #29815 from NilsIrl/plus_file_1
Replace ` + "/" + ` with `String::file_add()`
Diffstat (limited to 'platform/iphone')
-rw-r--r--platform/iphone/export/export.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp
index a9daa6ea5f..99ce2e8f87 100644
--- a/platform/iphone/export/export.cpp
+++ b/platform/iphone/export/export.cpp
@@ -564,7 +564,7 @@ Error EditorExportPlatformIOS::_walk_dir_recursive(DirAccess *p_da, FileHandler
dirs.push_back(path);
}
} else {
- Error err = p_handler(current_dir + "/" + path, p_userdata);
+ Error err = p_handler(current_dir.plus_file(path), p_userdata);
if (err) {
p_da->list_dir_end();
return err;
@@ -784,7 +784,7 @@ Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir
}
}
- String destination = destination_dir + "/" + asset.get_file();
+ String destination = destination_dir.plus_file(asset.get_file());
Error err = dir_exists ? da->copy_dir(asset, destination) : da->copy(asset, destination);
memdelete(da);
if (err) {