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

12
drivers/gles_common/rasterizer_array.h
View File

@ -63,7 +63,7 @@ public:
void free() {
if (_list) {
memdelete_arr(_list);
_list = 0;
_list = nullptr;
}
_size = 0;
_max_size = 0;
@ -115,7 +115,7 @@ template <class T>
class RasterizerArray {
public:
RasterizerArray() {
_list = 0;
_list = nullptr;
_size = 0;
_max_size = 0;
}
@ -127,7 +127,7 @@ public:
void free() {
if (_list) {
memdelete_arr(_list);
_list = 0;
_list = nullptr;
}
_size = 0;
_max_size = 0;
@ -158,7 +158,7 @@ public:
if (_size < _max_size) {
return &_list[_size++];
}
return 0;
return nullptr;
}
// several items at a time
@ -172,7 +172,7 @@ public:
// revert
_size = old_size;
return 0;
return nullptr;
}
int size() const { return _size; }
@ -281,7 +281,7 @@ public:
void free() {
if (_list) {
memdelete_arr(_list);
_list = 0;
_list = nullptr;
}
_size = 0;
_max_size = 0;

8
drivers/gles_common/rasterizer_canvas_batcher.h
View File

@ -464,7 +464,7 @@ public:
void reset_flush() {
// don't reset members that need to be preserved after flushing
// half way through a list of commands
curr_batch = 0;
curr_batch = nullptr;
batch_tex_id = -1;
texpixel_size = Vector2(1, 1);
contract_uvs = false;
@ -815,7 +815,7 @@ PREAMBLE(void)::batch_canvas_render_items_end() {
#endif
// batching render is deferred until after going through all the z_indices, joining all the items
get_this()->canvas_render_items_implementation(0, 0, _render_item_state.item_group_modulate,
get_this()->canvas_render_items_implementation(nullptr, 0, _render_item_state.item_group_modulate,
_render_item_state.item_group_light,
_render_item_state.item_group_base_transform);
@ -2517,7 +2517,7 @@ PREAMBLE(void)::flush_render_batches(RasterizerCanvas::Item *p_first_item, Raste
}
PREAMBLE(void)::render_joined_item_commands(const BItemJoined &p_bij, RasterizerCanvas::Item *p_current_clip, bool &r_reclip, typename T_STORAGE::Material *p_material, bool p_lit, const RenderItemState &p_ris) {
RasterizerCanvas::Item *item = 0;
RasterizerCanvas::Item *item = nullptr;
RasterizerCanvas::Item *first_item = bdata.item_refs[p_bij.first_item_ref].item;
// fill_state and bdata have once off setup per joined item, and a smaller reset on flush
@ -2700,7 +2700,7 @@ PREAMBLE(void)::join_sorted_items() {
// but it is stupidly complex to calculate later, which would probably be slower.
r->final_modulate = _render_item_state.final_modulate;
} else {
RAST_DEBUG_ASSERT(_render_item_state.joined_item != 0);
RAST_DEBUG_ASSERT(_render_item_state.joined_item != nullptr);
_render_item_state.joined_item->num_item_refs += 1;
_render_item_state.joined_item->bounding_rect = _render_item_state.joined_item->bounding_rect.merge(ci->global_rect_cache);