summaryrefslogtreecommitdiff
path: root/servers/navigation_server_3d.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-04-02 14:52:36 +0200
committerGitHub <noreply@github.com>2020-04-02 14:52:36 +0200
commit058a0afdeca83145d58a95c426dd01216c397ea9 (patch)
treebe0cd59e5a90926e9d653fed9f3b1b77e735ca2f /servers/navigation_server_3d.cpp
parent5f11e1557156617366d2c316a97716172103980d (diff)
parent95a1400a2ac9de1a29fa305f45b928ce8e3044bd (diff)
Merge pull request #37338 from lupoDharkael/nullprt
Replace NULL with nullptr
Diffstat (limited to 'servers/navigation_server_3d.cpp')
-rw-r--r--servers/navigation_server_3d.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/servers/navigation_server_3d.cpp b/servers/navigation_server_3d.cpp
index 3e7a8e816e..67a4d0e413 100644
--- a/servers/navigation_server_3d.cpp
+++ b/servers/navigation_server_3d.cpp
@@ -34,7 +34,7 @@
#include "navigation_server_3d.h"
-NavigationServer3D *NavigationServer3D::singleton = NULL;
+NavigationServer3D *NavigationServer3D::singleton = nullptr;
void NavigationServer3D::_bind_methods() {
@@ -87,21 +87,21 @@ NavigationServer3D *NavigationServer3D::get_singleton_mut() {
}
NavigationServer3D::NavigationServer3D() {
- ERR_FAIL_COND(singleton != NULL);
+ ERR_FAIL_COND(singleton != nullptr);
singleton = this;
}
NavigationServer3D::~NavigationServer3D() {
- singleton = NULL;
+ singleton = nullptr;
}
-NavigationServer3DCallback NavigationServer3DManager::create_callback = NULL;
+NavigationServer3DCallback NavigationServer3DManager::create_callback = nullptr;
void NavigationServer3DManager::set_default_server(NavigationServer3DCallback p_callback) {
create_callback = p_callback;
}
NavigationServer3D *NavigationServer3DManager::new_default_server() {
- ERR_FAIL_COND_V(create_callback == NULL, NULL);
+ ERR_FAIL_COND_V(create_callback == nullptr, nullptr);
return create_callback();
}