diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-02 14:52:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 14:52:36 +0200 |
| commit | 058a0afdeca83145d58a95c426dd01216c397ea9 (patch) | |
| tree | be0cd59e5a90926e9d653fed9f3b1b77e735ca2f /platform/android/api | |
| parent | 5f11e1557156617366d2c316a97716172103980d (diff) | |
| parent | 95a1400a2ac9de1a29fa305f45b928ce8e3044bd (diff) | |
Merge pull request #37338 from lupoDharkael/nullprt
Replace NULL with nullptr
Diffstat (limited to 'platform/android/api')
| -rw-r--r-- | platform/android/api/api.cpp | 4 | ||||
| -rw-r--r-- | platform/android/api/java_class_wrapper.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/api/api.cpp b/platform/android/api/api.cpp index 7efb545524..ef11b12971 100644 --- a/platform/android/api/api.cpp +++ b/platform/android/api/api.cpp @@ -34,7 +34,7 @@ #include "java_class_wrapper.h" #if !defined(ANDROID_ENABLED) -static JavaClassWrapper *java_class_wrapper = NULL; +static JavaClassWrapper *java_class_wrapper = nullptr; #endif void register_android_api() { @@ -73,7 +73,7 @@ Variant JavaObject::call(const StringName &, const Variant **, int, Callable::Ca return Variant(); } -JavaClassWrapper *JavaClassWrapper::singleton = NULL; +JavaClassWrapper *JavaClassWrapper::singleton = nullptr; Ref<JavaClass> JavaClassWrapper::wrap(const String &) { return Ref<JavaClass>(); diff --git a/platform/android/api/java_class_wrapper.h b/platform/android/api/java_class_wrapper.h index d7322deb81..59fcd94b4d 100644 --- a/platform/android/api/java_class_wrapper.h +++ b/platform/android/api/java_class_wrapper.h @@ -236,7 +236,7 @@ public: Ref<JavaClass> wrap(const String &p_class); #ifdef ANDROID_ENABLED - JavaClassWrapper(jobject p_activity = NULL); + JavaClassWrapper(jobject p_activity = nullptr); #else JavaClassWrapper(); #endif |