godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code 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

14
servers/physics/broad_phase_basic.cpp
View File

@@ -33,7 +33,7 @@
#include "core/print_string.h"
BroadPhaseSW::ID BroadPhaseBasic::create(CollisionObjectSW *p_object, int p_subindex, const AABB &p_aabb) {
ERR_FAIL_COND_V(p_object == NULL, 0);
ERR_FAIL_COND_V(p_object == nullptr, 0);
current++;
@@ -80,7 +80,7 @@ void BroadPhaseBasic::remove(ID p_id) {
CollisionObjectSW *BroadPhaseBasic::get_object(ID p_id) const {
const Map<ID, Element>::Element *E = element_map.find(p_id);
ERR_FAIL_COND_V(!E, NULL);
ERR_FAIL_COND_V(!E, nullptr);
return E->get().owner;
}
bool BroadPhaseBasic::is_static(ID p_id) const {
@@ -176,7 +176,7 @@ void BroadPhaseBasic::update() {
}
if (pair_ok && !E) {
void *data = NULL;
void *data = nullptr;
if (pair_callback) {
data = pair_callback(elem_A->owner, elem_A->subindex, elem_B->owner, elem_B->subindex, unpair_userdata);
if (data) {
@@ -194,8 +194,8 @@ BroadPhaseSW *BroadPhaseBasic::_create() {
BroadPhaseBasic::BroadPhaseBasic() {
current = 1;
unpair_callback = NULL;
unpair_userdata = NULL;
pair_callback = NULL;
pair_userdata = NULL;
unpair_callback = nullptr;
unpair_userdata = nullptr;
pair_callback = nullptr;
pair_userdata = nullptr;
}