seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style: Replaces uses of 0/NULL by nullptr (C++11)

Browse Source 
Using clang-tidy's `modernize-use-nullptr`.
https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-nullptr.html
This commit is contained in:
Rémi Verschelde
2021-05-04 16:00:45 +02:00
parent 2b429b24b5
commit a828398655
633 changed files with 4454 additions and 4410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
servers/audio_server.cpp
View File

@ -44,7 +44,7 @@
#define MARK_EDITED
#endif
AudioDriver *AudioDriver::singleton = NULL;
AudioDriver *AudioDriver::singleton = nullptr;
AudioDriver *AudioDriver::get_singleton() {
return singleton;
}
@ -220,7 +220,7 @@ void AudioDriverManager::initialize(int p_driver) {
}
AudioDriver *AudioDriverManager::get_driver(int p_driver) {
ERR_FAIL_INDEX_V(p_driver, driver_count, NULL);
ERR_FAIL_INDEX_V(p_driver, driver_count, nullptr);
return drivers[p_driver];
}
@ -319,7 +319,7 @@ void AudioServer::_mix_step() {
bus->soloed = true;
} else {
bus = NULL;
bus = nullptr;
}
} while (bus);
@ -379,7 +379,7 @@ void AudioServer::_mix_step() {
//process send
Bus *send = NULL;
Bus *send = nullptr;
if (i > 0) {
//everything has a send save for master bus
@ -466,8 +466,8 @@ bool AudioServer::thread_has_channel_mix_buffer(int p_bus, int p_buffer) const {
}
AudioFrame *AudioServer::thread_get_channel_mix_buffer(int p_bus, int p_buffer) {
ERR_FAIL_INDEX_V(p_bus, buses.size(), NULL);
ERR_FAIL_INDEX_V(p_buffer, buses[p_bus]->channels.size(), NULL);
ERR_FAIL_INDEX_V(p_bus, buses.size(), nullptr);
ERR_FAIL_INDEX_V(p_buffer, buses[p_bus]->channels.size(), nullptr);
AudioFrame *data = buses.write[p_bus]->channels.write[p_buffer].buffer.ptrw();
@ -1065,11 +1065,11 @@ double AudioServer::get_time_since_last_mix() const {
return AudioDriver::get_singleton()->get_time_since_last_mix();
}
AudioServer *AudioServer::singleton = NULL;
AudioServer *AudioServer::singleton = nullptr;
void *AudioServer::audio_data_alloc(uint32_t p_data_len, const uint8_t *p_from_data) {
void *ad = memalloc(p_data_len);
ERR_FAIL_COND_V(!ad, NULL);
ERR_FAIL_COND_V(!ad, nullptr);
if (p_from_data) {
memcpy(ad, p_from_data, p_data_len);
}
@ -1330,7 +1330,7 @@ AudioServer::AudioServer() {
}
AudioServer::~AudioServer() {
singleton = NULL;
singleton = nullptr;
}
/////////////////////////////////