1 files changed, 8 insertions, 19 deletions

diff --git a/platform/android/thread_jandroid.cpp b/platform/android/thread_jandroid.cpp
index 98b61ad755..13aa313ebf 100644
--- a/platform/android/thread_jandroid.cpp
+++ b/platform/android/thread_jandroid.cpp
@@ -48,17 +48,14 @@ pthread_key_t ThreadAndroid::thread_id_key = _create_thread_id_key();
 Thread::ID ThreadAndroid::next_thread_id = 0;
 
 Thread::ID ThreadAndroid::get_id() const {
-
 	return id;
 }
 
 Thread *ThreadAndroid::create_thread_jandroid() {
-
 	return memnew(ThreadAndroid);
 }
 
 void *ThreadAndroid::thread_callback(void *userdata) {
-
 	ThreadAndroid *t = reinterpret_cast<ThreadAndroid *>(userdata);
 	setup_thread();
 	ScriptServer::thread_enter(); //scripts may need to attach a stack
@@ -66,11 +63,10 @@ void *ThreadAndroid::thread_callback(void *userdata) {
 	pthread_setspecific(thread_id_key, (void *)memnew(ID(t->id)));
 	t->callback(t->user);
 	ScriptServer::thread_exit();
-	return NULL;
+	return nullptr;
 }
 
 Thread *ThreadAndroid::create_func_jandroid(ThreadCreateCallback p_callback, void *p_user, const Settings &) {
-
 	ThreadAndroid *tr = memnew(ThreadAndroid);
 	tr->callback = p_callback;
 	tr->user = p_user;
@@ -83,7 +79,6 @@ Thread *ThreadAndroid::create_func_jandroid(ThreadCreateCallback p_callback, voi
 }
 
 Thread::ID ThreadAndroid::get_thread_id_func_jandroid() {
-
 	void *value = pthread_getspecific(thread_id_key);
 
 	if (value)
@@ -95,39 +90,35 @@ Thread::ID ThreadAndroid::get_thread_id_func_jandroid() {
 }
 
 void ThreadAndroid::wait_to_finish_func_jandroid(Thread *p_thread) {
-
 	ThreadAndroid *tp = static_cast<ThreadAndroid *>(p_thread);
 	ERR_FAIL_COND(!tp);
 	ERR_FAIL_COND(tp->pthread == 0);
 
-	pthread_join(tp->pthread, NULL);
+	pthread_join(tp->pthread, nullptr);
 	tp->pthread = 0;
 }
 
 void ThreadAndroid::_thread_destroyed(void *value) {
-
 	/* The thread is being destroyed, detach it from the Java VM and set the mThreadKey value to NULL as required */
 	JNIEnv *env = (JNIEnv *)value;
-	if (env != NULL) {
+	if (env != nullptr) {
 		java_vm->DetachCurrentThread();
-		pthread_setspecific(jvm_key, NULL);
+		pthread_setspecific(jvm_key, nullptr);
 	}
 }
 
 pthread_key_t ThreadAndroid::jvm_key;
-JavaVM *ThreadAndroid::java_vm = NULL;
+JavaVM *ThreadAndroid::java_vm = nullptr;
 
 void ThreadAndroid::setup_thread() {
-
 	if (pthread_getspecific(jvm_key))
 		return; //already setup
 	JNIEnv *env;
-	java_vm->AttachCurrentThread(&env, NULL);
+	java_vm->AttachCurrentThread(&env, nullptr);
 	pthread_setspecific(jvm_key, (void *)env);
 }
 
 void ThreadAndroid::make_default(JavaVM *p_java_vm) {
-
 	java_vm = p_java_vm;
 	create_func = create_func_jandroid;
 	get_thread_id_func = get_thread_id_func_jandroid;
@@ -137,18 +128,16 @@ void ThreadAndroid::make_default(JavaVM *p_java_vm) {
 }
 
 JNIEnv *ThreadAndroid::get_env() {
-
 	if (!pthread_getspecific(jvm_key)) {
 		setup_thread();
 	}
 
-	JNIEnv *env = NULL;
-	java_vm->AttachCurrentThread(&env, NULL);
+	JNIEnv *env = nullptr;
+	java_vm->AttachCurrentThread(&env, nullptr);
 	return env;
 }
 
 ThreadAndroid::ThreadAndroid() {
-
 	pthread = 0;
 }