Skip to content

Commit

Permalink
Style: Apply clang-tidy to current code, add `readability-redundant-m…
Browse files Browse the repository at this point in the history
…ember-init`
  • Loading branch information
akien-mga committed Apr 4, 2022
1 parent 1abb5eb commit b78aa4f
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-nullptr,readability-braces-around-statements'
Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-nullptr,readability-braces-around-statements,readability-redundant-member-init'
WarningsAsErrors: ''
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
Expand Down
2 changes: 1 addition & 1 deletion drivers/gles3/texture_loader_gles3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RES ResourceFormatGLES2Texture::load(const String &p_path, const String &p_origi
uint8_t **row_p = memnew_arr(uint8_t *, height);

for (unsigned int i = 0; i < height; i++) {
row_p[i] = 0; //No colors any more, I want them to turn black
row_p[i] = nullptr; // No colors any more, I want them to turn black.
}

memdelete_arr(row_p);
Expand Down
5 changes: 1 addition & 4 deletions editor/plugins/collision_polygon_2d_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ void CollisionPolygon2DEditor::_set_node(Node *p_polygon) {
node = Object::cast_to<CollisionPolygon2D>(p_polygon);
}

CollisionPolygon2DEditor::CollisionPolygon2DEditor() :
AbstractPolygon2DEditor() {
node = nullptr;
}
CollisionPolygon2DEditor::CollisionPolygon2DEditor() {}

CollisionPolygon2DEditorPlugin::CollisionPolygon2DEditorPlugin() :
AbstractPolygon2DEditorPlugin(memnew(CollisionPolygon2DEditor), "CollisionPolygon2D") {
Expand Down
5 changes: 1 addition & 4 deletions editor/plugins/light_occluder_2d_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@ void LightOccluder2DEditor::_create_resource() {
_menu_option(MODE_CREATE);
}

LightOccluder2DEditor::LightOccluder2DEditor() :
AbstractPolygon2DEditor() {
node = nullptr;
}
LightOccluder2DEditor::LightOccluder2DEditor() {}

LightOccluder2DEditorPlugin::LightOccluder2DEditorPlugin() :
AbstractPolygon2DEditorPlugin(memnew(LightOccluder2DEditor), "LightOccluder2D") {
Expand Down
5 changes: 1 addition & 4 deletions editor/plugins/line_2d_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@ void Line2DEditor::_action_set_polygon(int p_idx, const Variant &p_previous, con
undo_redo->add_undo_method(node, "set_points", p_previous);
}

Line2DEditor::Line2DEditor() :
AbstractPolygon2DEditor() {
node = nullptr;
}
Line2DEditor::Line2DEditor() {}

Line2DEditorPlugin::Line2DEditorPlugin() :
AbstractPolygon2DEditorPlugin(memnew(Line2DEditor), "Line2D") {
Expand Down
5 changes: 1 addition & 4 deletions editor/plugins/navigation_polygon_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,7 @@ void NavigationPolygonEditor::_create_resource() {
_menu_option(MODE_CREATE);
}

NavigationPolygonEditor::NavigationPolygonEditor() :
AbstractPolygon2DEditor() {
node = nullptr;
}
NavigationPolygonEditor::NavigationPolygonEditor() {}

NavigationPolygonEditorPlugin::NavigationPolygonEditorPlugin() :
AbstractPolygon2DEditorPlugin(memnew(NavigationPolygonEditor), "NavigationRegion2D") {
Expand Down
3 changes: 1 addition & 2 deletions editor/plugins/physical_bone_3d_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ void PhysicalBone3DEditor::show() {
spatial_editor_hb->show();
}

PhysicalBone3DEditorPlugin::PhysicalBone3DEditorPlugin() :
physical_bone_editor() {}
PhysicalBone3DEditorPlugin::PhysicalBone3DEditorPlugin() {}

void PhysicalBone3DEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
Expand Down
4 changes: 1 addition & 3 deletions editor/plugins/polygon_2d_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1228,9 +1228,7 @@ Vector2 Polygon2DEditor::snap_point(Vector2 p_target) const {
return p_target;
}

Polygon2DEditor::Polygon2DEditor() :
AbstractPolygon2DEditor() {
node = nullptr;
Polygon2DEditor::Polygon2DEditor() {
snap_offset = EditorSettings::get_singleton()->get_project_metadata("polygon_2d_uv_editor", "snap_offset", Vector2());
snap_step = EditorSettings::get_singleton()->get_project_metadata("polygon_2d_uv_editor", "snap_step", Vector2(10, 10));
use_snap = EditorSettings::get_singleton()->get_project_metadata("polygon_2d_uv_editor", "snap_enabled", false);
Expand Down
4 changes: 1 addition & 3 deletions modules/navigation/godot_navigation_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,7 @@
} \
void GodotNavigationServer::MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1, T_2 D_2, T_3 D_3)

GodotNavigationServer::GodotNavigationServer() :
NavigationServer3D() {
}
GodotNavigationServer::GodotNavigationServer() {}

GodotNavigationServer::~GodotNavigationServer() {
flush_queries();
Expand Down
10 changes: 5 additions & 5 deletions modules/openxr/openxr_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ bool OpenXRAPI::load_supported_view_configuration_views(XrViewConfigurationType

for (uint32_t i = 0; i < view_count; i++) {
view_configuration_views[i].type = XR_TYPE_VIEW_CONFIGURATION_VIEW;
view_configuration_views[i].next = NULL;
view_configuration_views[i].next = nullptr;
}

result = xrEnumerateViewConfigurationViews(instance, system_id, p_configuration_type, view_count, &view_count, view_configuration_views);
Expand Down Expand Up @@ -680,10 +680,10 @@ bool OpenXRAPI::create_main_swapchain() {

for (uint32_t i = 0; i < view_count; i++) {
views[i].type = XR_TYPE_VIEW;
views[i].next = NULL;
views[i].next = nullptr;

projection_views[i].type = XR_TYPE_COMPOSITION_LAYER_PROJECTION_VIEW;
projection_views[i].next = NULL;
projection_views[i].next = nullptr;
projection_views[i].subImage.swapchain = swapchain;
projection_views[i].subImage.imageArrayIndex = i;
projection_views[i].subImage.imageRect.offset.x = 0;
Expand Down Expand Up @@ -1147,7 +1147,7 @@ bool OpenXRAPI::get_view_transform(uint32_t p_view, Transform3D &r_transform) {
}

// we don't have valid view info
if (views == NULL || !view_pose_valid) {
if (views == nullptr || !view_pose_valid) {
return false;
}

Expand All @@ -1167,7 +1167,7 @@ bool OpenXRAPI::get_view_projection(uint32_t p_view, double p_z_near, double p_z
}

// we don't have valid view info
if (views == NULL || !view_pose_valid) {
if (views == nullptr || !view_pose_valid) {
return false;
}

Expand Down
8 changes: 4 additions & 4 deletions modules/text_server_adv/text_server_adv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ _FORCE_INLINE_ TextServerAdvanced::FontGlyph TextServerAdvanced::rasterize_msdf(
if (RenderingServer::get_singleton() != nullptr) {
Ref<Image> img;
img.instantiate();
img->create_from_data(tex.texture_w, tex.texture_h, 0, Image::FORMAT_RGBA8, tex.imgdata);
img->create_from_data(tex.texture_w, tex.texture_h, false, Image::FORMAT_RGBA8, tex.imgdata);
if (tex.texture.is_null()) {
tex.texture.instantiate();
tex.texture->create_from_image(img);
Expand Down Expand Up @@ -1129,7 +1129,7 @@ _FORCE_INLINE_ TextServerAdvanced::FontGlyph TextServerAdvanced::rasterize_bitma
if (RenderingServer::get_singleton() != nullptr) {
Ref<Image> img;
img.instantiate();
img->create_from_data(tex.texture_w, tex.texture_h, 0, require_format, tex.imgdata);
img->create_from_data(tex.texture_w, tex.texture_h, false, require_format, tex.imgdata);

if (tex.texture.is_null()) {
tex.texture.instantiate();
Expand Down Expand Up @@ -2306,7 +2306,7 @@ void TextServerAdvanced::font_set_texture_image(const RID &p_font_rid, const Vec

Ref<Image> img;
img.instantiate();
img->create_from_data(tex.texture_w, tex.texture_h, 0, tex.format, tex.imgdata);
img->create_from_data(tex.texture_w, tex.texture_h, false, tex.format, tex.imgdata);

tex.texture = Ref<ImageTexture>();
tex.texture.instantiate();
Expand All @@ -2325,7 +2325,7 @@ Ref<Image> TextServerAdvanced::font_get_texture_image(const RID &p_font_rid, con
const FontTexture &tex = fd->cache[size]->textures[p_texture_index];
Ref<Image> img;
img.instantiate();
img->create_from_data(tex.texture_w, tex.texture_h, 0, tex.format, tex.imgdata);
img->create_from_data(tex.texture_w, tex.texture_h, false, tex.format, tex.imgdata);

return img;
}
Expand Down
8 changes: 4 additions & 4 deletions modules/text_server_fb/text_server_fb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ _FORCE_INLINE_ TextServerFallback::FontGlyph TextServerFallback::rasterize_msdf(
if (RenderingServer::get_singleton() != nullptr) {
Ref<Image> img;
img.instantiate();
img->create_from_data(tex.texture_w, tex.texture_h, 0, Image::FORMAT_RGBA8, tex.imgdata);
img->create_from_data(tex.texture_w, tex.texture_h, false, Image::FORMAT_RGBA8, tex.imgdata);
if (tex.texture.is_null()) {
tex.texture.instantiate();
tex.texture->create_from_image(img);
Expand Down Expand Up @@ -571,7 +571,7 @@ _FORCE_INLINE_ TextServerFallback::FontGlyph TextServerFallback::rasterize_bitma
if (RenderingServer::get_singleton() != nullptr) {
Ref<Image> img;
img.instantiate();
img->create_from_data(tex.texture_w, tex.texture_h, 0, require_format, tex.imgdata);
img->create_from_data(tex.texture_w, tex.texture_h, false, require_format, tex.imgdata);

if (tex.texture.is_null()) {
tex.texture.instantiate();
Expand Down Expand Up @@ -1467,7 +1467,7 @@ void TextServerFallback::font_set_texture_image(const RID &p_font_rid, const Vec

Ref<Image> img;
img.instantiate();
img->create_from_data(tex.texture_w, tex.texture_h, 0, tex.format, tex.imgdata);
img->create_from_data(tex.texture_w, tex.texture_h, false, tex.format, tex.imgdata);

tex.texture = Ref<ImageTexture>();
tex.texture.instantiate();
Expand All @@ -1486,7 +1486,7 @@ Ref<Image> TextServerFallback::font_get_texture_image(const RID &p_font_rid, con
const FontTexture &tex = fd->cache[size]->textures[p_texture_index];
Ref<Image> img;
img.instantiate();
img->create_from_data(tex.texture_w, tex.texture_h, 0, tex.format, tex.imgdata);
img->create_from_data(tex.texture_w, tex.texture_h, false, tex.format, tex.imgdata);

return img;
}
Expand Down
2 changes: 1 addition & 1 deletion scene/resources/texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ bool Texture3D::has_mipmaps() const {
if (GDVIRTUAL_REQUIRED_CALL(_has_mipmaps, ret)) {
return ret;
}
return 0;
return false;
}

Vector<Ref<Image>> Texture3D::get_data() const {
Expand Down

0 comments on commit b78aa4f

Please sign in to comment.