mirror of
https://github.com/godotengine/godot.git
synced 2025-10-20 00:13:30 +00:00
Replace NULL with nullptr
This commit is contained in:
parent
5f11e15571
commit
95a1400a2a
755 changed files with 5742 additions and 5742 deletions
|
@ -35,7 +35,7 @@
|
|||
#include "editor/editor_node.h"
|
||||
|
||||
GDScriptLanguageServer::GDScriptLanguageServer() {
|
||||
thread = NULL;
|
||||
thread = nullptr;
|
||||
thread_running = false;
|
||||
started = false;
|
||||
|
||||
|
@ -87,7 +87,7 @@ void GDScriptLanguageServer::start() {
|
|||
if (protocol.start(port, IP_Address("127.0.0.1")) == OK) {
|
||||
EditorNode::get_log()->add_message("--- GDScript language server started ---", EditorLog::MSG_TYPE_EDITOR);
|
||||
if (use_thread) {
|
||||
ERR_FAIL_COND(thread != NULL);
|
||||
ERR_FAIL_COND(thread != nullptr);
|
||||
thread_running = true;
|
||||
thread = Thread::create(GDScriptLanguageServer::thread_main, this);
|
||||
}
|
||||
|
@ -98,11 +98,11 @@ void GDScriptLanguageServer::start() {
|
|||
|
||||
void GDScriptLanguageServer::stop() {
|
||||
if (use_thread) {
|
||||
ERR_FAIL_COND(NULL == thread);
|
||||
ERR_FAIL_COND(nullptr == thread);
|
||||
thread_running = false;
|
||||
Thread::wait_to_finish(thread);
|
||||
memdelete(thread);
|
||||
thread = NULL;
|
||||
thread = nullptr;
|
||||
}
|
||||
protocol.stop();
|
||||
started = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue