summaryrefslogtreecommitdiffstats
path: root/platform/javascript/api/javascript_tools_editor_plugin.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-04-29 12:11:27 +0200
committerGitHub <noreply@github.com>2021-04-29 12:11:27 +0200
commitaac354709d4e60cf9f1b1f49c297c1787193e23f (patch)
treec999fd674266f2c76f7a79df6cbfd3e664aa4ced /platform/javascript/api/javascript_tools_editor_plugin.cpp
parentc11502711ec6f918a4352d8650e46b34a295081e (diff)
parent5b1602084610790d095e53dbce4fb2e5034fc96a (diff)
downloadredot-engine-aac354709d4e60cf9f1b1f49c297c1787193e23f.tar.gz
Merge pull request #48292 from akien-mga/stay-modern
Replace remaining uses of `NULL` with `nullptr`
Diffstat (limited to 'platform/javascript/api/javascript_tools_editor_plugin.cpp')
-rw-r--r--platform/javascript/api/javascript_tools_editor_plugin.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/platform/javascript/api/javascript_tools_editor_plugin.cpp b/platform/javascript/api/javascript_tools_editor_plugin.cpp
index 8355faccc2..7a2c2b2335 100644
--- a/platform/javascript/api/javascript_tools_editor_plugin.cpp
+++ b/platform/javascript/api/javascript_tools_editor_plugin.cpp
@@ -65,10 +65,10 @@ void JavaScriptToolsEditorPlugin::_download_zip(Variant p_v) {
FileAccess *src_f;
zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
- zipFile zip = zipOpen2("/tmp/project.zip", APPEND_STATUS_CREATE, NULL, &io);
+ zipFile zip = zipOpen2("/tmp/project.zip", APPEND_STATUS_CREATE, nullptr, &io);
String base_path = resource_path.substr(0, resource_path.rfind("/")) + "/";
_zip_recursive(resource_path, base_path, zip);
- zipClose(zip, NULL);
+ zipClose(zip, nullptr);
godot_js_editor_download_file("/tmp/project.zip", "project.zip", "application/zip");
}
@@ -88,12 +88,12 @@ void JavaScriptToolsEditorPlugin::_zip_file(String p_path, String p_base_path, z
String path = p_path.replace_first(p_base_path, "");
zipOpenNewFileInZip(p_zip,
path.utf8().get_data(),
- NULL,
- NULL,
+ nullptr,
+ nullptr,
0,
- NULL,
+ nullptr,
0,
- NULL,
+ nullptr,
Z_DEFLATED,
Z_DEFAULT_COMPRESSION);
zipWriteInFileInZip(p_zip, data.ptr(), data.size());
@@ -116,12 +116,12 @@ void JavaScriptToolsEditorPlugin::_zip_recursive(String p_path, String p_base_pa
String path = cs.replace_first(p_base_path, "") + "/";
zipOpenNewFileInZip(p_zip,
path.utf8().get_data(),
- NULL,
- NULL,
+ nullptr,
+ nullptr,
0,
- NULL,
+ nullptr,
0,
- NULL,
+ nullptr,
Z_DEFLATED,
Z_DEFAULT_COMPRESSION);
zipCloseFileInZip(p_zip);