diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-29 12:11:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 12:11:27 +0200 |
| commit | aac354709d4e60cf9f1b1f49c297c1787193e23f (patch) | |
| tree | c999fd674266f2c76f7a79df6cbfd3e664aa4ced /platform/javascript/display_server_javascript.cpp | |
| parent | c11502711ec6f918a4352d8650e46b34a295081e (diff) | |
| parent | 5b1602084610790d095e53dbce4fb2e5034fc96a (diff) | |
| download | redot-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/display_server_javascript.cpp')
| -rw-r--r-- | platform/javascript/display_server_javascript.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp index fa6f5c1e9e..0031650360 100644 --- a/platform/javascript/display_server_javascript.cpp +++ b/platform/javascript/display_server_javascript.cpp @@ -399,7 +399,7 @@ void DisplayServerJavaScript::cursor_set_custom_image(const RES &p_cursor, Curso godot_js_display_cursor_set_custom_shape(godot2dom_cursor(p_shape), png.ptr(), len, p_hotspot.x, p_hotspot.y); } else { - godot_js_display_cursor_set_custom_shape(godot2dom_cursor(p_shape), NULL, 0, 0, 0); + godot_js_display_cursor_set_custom_shape(godot2dom_cursor(p_shape), nullptr, 0, 0, 0); } cursor_set_shape(cursor_shape); @@ -771,8 +771,8 @@ DisplayServerJavaScript::DisplayServerJavaScript(const String &p_rendering_drive #define SET_EM_CALLBACK(target, ev, cb) \ result = emscripten_set_##ev##_callback(target, nullptr, true, &cb); \ EM_CHECK(ev) -#define SET_EM_WINDOW_CALLBACK(ev, cb) \ - result = emscripten_set_##ev##_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, false, &cb); \ +#define SET_EM_WINDOW_CALLBACK(ev, cb) \ + result = emscripten_set_##ev##_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, nullptr, false, &cb); \ EM_CHECK(ev) // These callbacks from Emscripten's html5.h suffice to access most // JavaScript APIs. |