Skip to content

Commit 89a3112

Browse files
committed
Style: Apply clang-tidy fixes
• `modernize-use-default-member-init` and `readability-redundant-member-init` • Minor adjustments to `.clang-tidy` to improve syntax & remove redundancies
1 parent 1bffd6c commit 89a3112

21 files changed

+37
-47
lines changed

.clang-tidy

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
---
2-
Checks: >-
3-
-*,
4-
cppcoreguidelines-pro-type-member-init,
5-
modernize-redundant-void-arg,
6-
modernize-use-bool-literals,
7-
modernize-use-default-member-init,
8-
modernize-use-nullptr,
9-
readability-braces-around-statements,
10-
readability-redundant-member-init
11-
WarningsAsErrors: ''
1+
Checks:
2+
- -*
3+
- cppcoreguidelines-pro-type-member-init
4+
- modernize-redundant-void-arg
5+
- modernize-use-bool-literals
6+
- modernize-use-default-member-init
7+
- modernize-use-nullptr
8+
- readability-braces-around-statements
9+
- readability-redundant-member-init
1210
HeaderFileExtensions: ['', h, hh, hpp, hxx, inc, glsl]
1311
ImplementationFileExtensions: [c, cc, cpp, cxx, m, mm, java]
1412
HeaderFilterRegex: (core|doc|drivers|editor|main|modules|platform|scene|servers|tests)/
@@ -19,4 +17,3 @@ CheckOptions:
1917
modernize-use-bool-literals.IgnoreMacros: false
2018
modernize-use-default-member-init.IgnoreMacros: false
2119
modernize-use-default-member-init.UseAssignment: true
22-
...

core/typedefs.h

-2
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,4 @@ struct BuildIndexSequence<0, Is...> : IndexSequence<Is...> {};
315315
#define ___gd_is_defined(val) ____gd_is_defined(__GDARG_PLACEHOLDER_##val)
316316
#define GD_IS_DEFINED(x) ___gd_is_defined(x)
317317

318-
#define FORCE_SEMICOLON ;
319-
320318
#endif // TYPEDEFS_H

core/variant/variant.cpp

+4-8
Original file line numberDiff line numberDiff line change
@@ -2719,8 +2719,7 @@ Variant::Variant(const Vector<Plane> &p_array) :
27192719
}
27202720
}
27212721

2722-
Variant::Variant(const Vector<Face3> &p_face_array) :
2723-
type(NIL) {
2722+
Variant::Variant(const Vector<Face3> &p_face_array) {
27242723
PackedVector3Array vertices;
27252724
int face_count = p_face_array.size();
27262725
vertices.resize(face_count * 3);
@@ -2739,8 +2738,7 @@ Variant::Variant(const Vector<Face3> &p_face_array) :
27392738
*this = vertices;
27402739
}
27412740

2742-
Variant::Variant(const Vector<Variant> &p_array) :
2743-
type(NIL) {
2741+
Variant::Variant(const Vector<Variant> &p_array) {
27442742
Array arr;
27452743
arr.resize(p_array.size());
27462744
for (int i = 0; i < p_array.size(); i++) {
@@ -2749,8 +2747,7 @@ Variant::Variant(const Vector<Variant> &p_array) :
27492747
*this = arr;
27502748
}
27512749

2752-
Variant::Variant(const Vector<StringName> &p_array) :
2753-
type(NIL) {
2750+
Variant::Variant(const Vector<StringName> &p_array) {
27542751
PackedStringArray v;
27552752
int len = p_array.size();
27562753
v.resize(len);
@@ -2908,8 +2905,7 @@ Variant::Variant(const IPAddress &p_address) :
29082905
memnew_placement(_data._mem, String(p_address));
29092906
}
29102907

2911-
Variant::Variant(const Variant &p_variant) :
2912-
type(NIL) {
2908+
Variant::Variant(const Variant &p_variant) {
29132909
reference(p_variant);
29142910
}
29152911

core/variant/variant.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -814,8 +814,7 @@ class Variant {
814814
static void unregister_types();
815815

816816
Variant(const Variant &p_variant);
817-
_FORCE_INLINE_ Variant() :
818-
type(NIL) {}
817+
_FORCE_INLINE_ Variant() {}
819818
_FORCE_INLINE_ ~Variant() {
820819
clear();
821820
}

drivers/vulkan/rendering_device_driver_vulkan.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4017,7 +4017,7 @@ RDD::UniformSetID RenderingDeviceDriverVulkan::uniform_set_create(VectorView<Bou
40174017
}
40184018

40194019
// Need a descriptor pool.
4020-
DescriptorSetPools::Iterator pool_sets_it = {};
4020+
DescriptorSetPools::Iterator pool_sets_it;
40214021
VkDescriptorPool vk_pool = _descriptor_set_pool_find_or_create(pool_key, &pool_sets_it);
40224022
DEV_ASSERT(vk_pool);
40234023
pool_sets_it->value[vk_pool]++;

drivers/vulkan/rendering_device_driver_vulkan.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ class RenderingDeviceDriverVulkan : public RenderingDeviceDriver {
487487
struct UniformSetInfo {
488488
VkDescriptorSet vk_descriptor_set = VK_NULL_HANDLE;
489489
VkDescriptorPool vk_descriptor_pool = VK_NULL_HANDLE;
490-
DescriptorSetPools::Iterator pool_sets_it = {};
490+
DescriptorSetPools::Iterator pool_sets_it;
491491
};
492492

493493
public:

editor/editor_node.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ class EditorNode : public Node {
789789

790790
struct AdditiveNodeEntry {
791791
Node *node = nullptr;
792-
NodePath parent = NodePath();
792+
NodePath parent;
793793
Node *owner = nullptr;
794794
int index = 0;
795795
// Used if the original parent node is lost

editor/gui/editor_quick_open_dialog.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,9 @@ QuickOpenDisplayMode QuickOpenResultContainer::get_adaptive_display_mode(const V
649649

650650
for (const StringName &type : grid_preferred_types) {
651651
for (const StringName &base_type : p_base_types) {
652-
if (base_type == type || ClassDB::is_parent_class(base_type, type))
652+
if (base_type == type || ClassDB::is_parent_class(base_type, type)) {
653653
return QuickOpenDisplayMode::GRID;
654+
}
654655
}
655656
}
656657

editor/plugins/tiles/tile_set_atlas_source_editor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class TileSetAtlasSourceEditor : public HSplitContainer {
9191
TileSetAtlasSourceEditor *tiles_set_atlas_source_editor = nullptr;
9292

9393
Ref<TileSetAtlasSource> tile_set_atlas_source;
94-
RBSet<TileSelection> tiles = RBSet<TileSelection>();
94+
RBSet<TileSelection> tiles;
9595

9696
protected:
9797
bool _set(const StringName &p_name, const Variant &p_value);

modules/betsy/image_compress_betsy.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ class BetsyCompressor : public Object {
9191
RenderingDevice *compress_rd = nullptr;
9292
RenderingContextDriver *compress_rcd = nullptr;
9393
HashMap<String, BetsyShader> cached_shaders;
94-
RID src_sampler = RID();
94+
RID src_sampler;
9595

9696
// Format-specific resources.
97-
RID dxt1_encoding_table_buffer = RID();
97+
RID dxt1_encoding_table_buffer;
9898

9999
void _init();
100100
void _assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id);

modules/navigation/nav_agent.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class NavAgent : public NavRid {
6767
uint32_t avoidance_mask = 1;
6868
real_t avoidance_priority = 1.0;
6969

70-
Callable avoidance_callback = Callable();
70+
Callable avoidance_callback;
7171

7272
bool agent_dirty = true;
7373

modules/openxr/extensions/openxr_extension_wrapper_extension.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,7 @@ void OpenXRExtensionWrapperExtension::register_extension_wrapper() {
298298
OpenXRAPI::register_extension_wrapper(this);
299299
}
300300

301-
OpenXRExtensionWrapperExtension::OpenXRExtensionWrapperExtension() :
302-
Object(), OpenXRExtensionWrapper() {
301+
OpenXRExtensionWrapperExtension::OpenXRExtensionWrapperExtension() {
303302
openxr_api.instantiate();
304303
}
305304

scene/3d/skeleton_3d.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class Skeleton3D : public Node3D {
162162
Vector<int> parentless_bones;
163163
AHashMap<String, int> name_to_bone_index;
164164

165-
mutable StringName concatenated_bone_names = StringName();
165+
mutable StringName concatenated_bone_names;
166166
void _update_bone_names() const;
167167

168168
void _make_dirty();

scene/3d/skeleton_ik_3d.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class SkeletonIK3D : public SkeletonModifier3D {
131131
real_t min_distance = 0.01;
132132
int max_iterations = 10;
133133

134-
Variant target_node_override_ref = Variant();
134+
Variant target_node_override_ref;
135135
FabrikInverseKinematic::Task *task = nullptr;
136136

137137
#ifndef DISABLE_DEPRECATED

scene/gui/code_edit.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -251,13 +251,13 @@ class CodeEdit : public TextEdit {
251251
Ref<Texture2D> completion_color_bg;
252252

253253
Color breakpoint_color = Color(1, 1, 1);
254-
Ref<Texture2D> breakpoint_icon = Ref<Texture2D>();
254+
Ref<Texture2D> breakpoint_icon;
255255

256256
Color bookmark_color = Color(1, 1, 1);
257-
Ref<Texture2D> bookmark_icon = Ref<Texture2D>();
257+
Ref<Texture2D> bookmark_icon;
258258

259259
Color executing_line_color = Color(1, 1, 1);
260-
Ref<Texture2D> executing_line_icon = Ref<Texture2D>();
260+
Ref<Texture2D> executing_line_icon;
261261

262262
Color line_number_color = Color(1, 1, 1);
263263

scene/gui/text_edit.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class TextEdit : public Control {
139139
Variant metadata;
140140
bool clickable = false;
141141

142-
Ref<Texture2D> icon = Ref<Texture2D>();
142+
Ref<Texture2D> icon;
143143
String text = "";
144144
Color color = Color(1, 1, 1);
145145
};

scene/resources/2d/skeleton/skeleton_modification_stack_2d.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class SkeletonModificationStack2D : public Resource {
6464
execution_mode_physics_process
6565
};
6666

67-
Vector<Ref<SkeletonModification2D>> modifications = Vector<Ref<SkeletonModification2D>>();
67+
Vector<Ref<SkeletonModification2D>> modifications;
6868

6969
void setup();
7070
void execute(float p_delta, int p_execution_mode);

scene/resources/2d/tile_set.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ class TileData : public Object {
836836
bool flip_v = false;
837837
bool transpose = false;
838838
Vector2i texture_origin;
839-
Ref<Material> material = Ref<Material>();
839+
Ref<Material> material;
840840
Color modulate = Color(1.0, 1.0, 1.0, 1.0);
841841
int z_index = 0;
842842
int y_sort_origin = 0;

servers/rendering/renderer_rd/storage_rd/texture_storage.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ class TextureStorage : public RendererTextureStorage {
102102
/* Canvas Texture API */
103103

104104
struct CanvasTextureCache {
105-
RID diffuse = RID();
106-
RID normal = RID();
107-
RID specular = RID();
105+
RID diffuse;
106+
RID normal;
107+
RID specular;
108108
};
109109

110110
class CanvasTexture {

servers/rendering/shader_language.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ class ShaderLanguage {
12131213
struct ShaderCompileInfo {
12141214
HashMap<StringName, FunctionInfo> functions;
12151215
Vector<ModeInfo> render_modes;
1216-
VaryingFunctionNames varying_function_names = VaryingFunctionNames();
1216+
VaryingFunctionNames varying_function_names;
12171217
HashSet<String> shader_types;
12181218
GlobalShaderUniformGetTypeFunc global_shader_uniform_type_func = nullptr;
12191219
bool is_include = false;

tests/servers/test_navigation_server_3d.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CallableMock : public Object {
4949
}
5050

5151
unsigned function1_calls{ 0 };
52-
Variant function1_latest_arg0{};
52+
Variant function1_latest_arg0;
5353
};
5454

5555
static inline Array build_array() {

0 commit comments

Comments
 (0)