Skip to content

Commit f09ee01

Browse files
committed
Style: Begin integrating simple .clangd fixes
1 parent 2303ce8 commit f09ee01

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+43
-112
lines changed

.clangd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
Diagnostics:
66
Includes:
77
IgnoreHeader:
8-
- core/typedefs\.h # Our "main" header, featuring transitive includes; allow everywhere.
98
- \.compat\.inc
109
---
1110
# Header-specific conditions.

core/error/error_macros.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "error_macros.h"
3232

3333
#include "core/io/logger.h"
34+
#include "core/object/object_id.h"
3435
#include "core/os/os.h"
3536
#include "core/string/ustring.h"
3637

core/error/error_macros.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030

3131
#pragma once
3232

33-
#include "core/object/object_id.h"
3433
#include "core/typedefs.h"
3534

36-
#include <atomic> // We'd normally use safe_refcount.h, but that would cause circular includes.
35+
#include <atomic> // IWYU pragma: keep // Used in macro. We'd normally use `safe_refcount.h`, but that would cause circular includes.
3736

3837
class String;
38+
class ObjectID;
3939

4040
enum ErrorHandlerType {
4141
ERR_HANDLER_ERROR,

core/io/image.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "image.h"
3232

3333
#include "core/config/project_settings.h"
34-
#include "core/error/error_list.h"
3534
#include "core/error/error_macros.h"
3635
#include "core/io/image_loader.h"
3736
#include "core/io/resource_loader.h"

core/math/bvh.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
// and pairable_mask is either 0 if static, or set to all if non static
5252

5353
#include "bvh_tree.h"
54+
55+
#include "core/math/geometry_3d.h"
5456
#include "core/os/mutex.h"
5557

5658
#define BVHTREE_CLASS BVH_Tree<T, NUM_TREES, 2, MAX_ITEMS, USER_PAIR_TEST_FUNCTION, USER_CULL_TEST_FUNCTION, USE_PAIRS, BOUNDS, POINT>

core/math/bvh_abb.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
#pragma once
3232

33+
#include "core/math/aabb.h"
34+
3335
// special optimized version of axis aligned bounding box
3436
template <typename BOUNDS = AABB, typename POINT = Vector3>
3537
struct BVH_ABB {

core/math/bvh_tree.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040

4141
#include "core/math/aabb.h"
4242
#include "core/math/bvh_abb.h"
43-
#include "core/math/geometry_3d.h"
4443
#include "core/math/vector3.h"
4544
#include "core/templates/local_vector.h"
4645
#include "core/templates/pooled_list.h"

core/math/color_names.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
// the old way leaked memory
3737
// this is not used as often as for more performance to make sense
3838

39+
#include "core/math/color.h"
40+
3941
struct NamedColor {
4042
const char *name;
4143
Color color;

core/math/delaunay_3d.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,13 @@
3030

3131
#pragma once
3232

33-
#include "core/io/file_access.h"
3433
#include "core/math/aabb.h"
3534
#include "core/math/projection.h"
3635
#include "core/math/vector3.h"
36+
#include "core/templates/list.h"
3737
#include "core/templates/local_vector.h"
3838
#include "core/templates/oa_hash_map.h"
3939
#include "core/templates/vector.h"
40-
#include "core/variant/variant.h"
4140

4241
#include "thirdparty/misc/r128.h"
4342

core/math/disjoint_set.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#pragma once
3232

33-
#include "core/templates/rb_map.h"
33+
#include "core/templates/hash_map.h"
3434
#include "core/templates/vector.h"
3535

3636
/* This DisjointSet class uses Find with path compression and Union by rank */

0 commit comments

Comments
 (0)