Style: Begin integrating simple .clangd fixes

Repiteo · Feb 20, 2025 · 6d3f545 · 6d3f545
1 parent e567f49
commit 6d3f545
Show file tree

Hide file tree

Showing 65 changed files with 48 additions and 115 deletions.
diff --git a/.clangd b/.clangd
@@ -5,7 +5,6 @@
 Diagnostics:
   Includes:
     IgnoreHeader:
-      - core/typedefs\.h # Our "main" header, featuring transitive includes; allow everywhere.
       - \.compat\.inc
 ---
 # Header-specific conditions.

diff --git a/core/error/error_macros.cpp b/core/error/error_macros.cpp
@@ -31,6 +31,7 @@
 #include "error_macros.h"
 
 #include "core/io/logger.h"
+#include "core/object/object_id.h"
 #include "core/os/os.h"
 #include "core/string/ustring.h"
 

diff --git a/core/error/error_macros.h b/core/error/error_macros.h
@@ -31,12 +31,12 @@
 #ifndef ERROR_MACROS_H
 #define ERROR_MACROS_H
 
-#include "core/object/object_id.h"
 #include "core/typedefs.h"
 
-#include <atomic> // We'd normally use safe_refcount.h, but that would cause circular includes.
+#include <atomic> // IWYU pragma: keep // We'd normally use `safe_refcount.h`, but that would cause circular includes.
 
 class String;
+class ObjectID;
 
 enum ErrorHandlerType {
 	ERR_HANDLER_ERROR,

diff --git a/core/extension/gdextension_interface.h b/core/extension/gdextension_interface.h
@@ -35,6 +35,10 @@
  * Together with the JSON file, you should be able to generate any binder.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stddef.h>
 #include <stdint.h>
 
@@ -43,10 +47,6 @@ typedef uint32_t char32_t;
 typedef uint16_t char16_t;
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* VARIANT TYPES */
 
 typedef enum {

diff --git a/core/io/image.cpp b/core/io/image.cpp
@@ -31,7 +31,6 @@
 #include "image.h"
 
 #include "core/config/project_settings.h"
-#include "core/error/error_list.h"
 #include "core/error/error_macros.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"

diff --git a/core/math/bvh.h b/core/math/bvh.h
@@ -52,6 +52,8 @@
 // and pairable_mask is either 0 if static, or set to all if non static
 
 #include "bvh_tree.h"
+
+#include "core/math/geometry_3d.h"
 #include "core/os/mutex.h"
 
 #define BVHTREE_CLASS BVH_Tree<T, NUM_TREES, 2, MAX_ITEMS, USER_PAIR_TEST_FUNCTION, USER_CULL_TEST_FUNCTION, USE_PAIRS, BOUNDS, POINT>

diff --git a/core/math/bvh_abb.h b/core/math/bvh_abb.h
@@ -31,6 +31,8 @@
 #ifndef BVH_ABB_H
 #define BVH_ABB_H
 
+#include "core/math/aabb.h"
+
 // special optimized version of axis aligned bounding box
 template <typename BOUNDS = AABB, typename POINT = Vector3>
 struct BVH_ABB {

diff --git a/core/math/bvh_tree.h b/core/math/bvh_tree.h
@@ -41,7 +41,6 @@
 
 #include "core/math/aabb.h"
 #include "core/math/bvh_abb.h"
-#include "core/math/geometry_3d.h"
 #include "core/math/vector3.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/pooled_list.h"

diff --git a/core/math/color_names.inc b/core/math/color_names.inc
@@ -34,6 +34,8 @@
 // the old way leaked memory
 // this is not used as often as for more performance to make sense
 
+#include "core/math/color.h"
+
 struct NamedColor {
 	const char *name;
 	Color color;

diff --git a/core/math/delaunay_3d.h b/core/math/delaunay_3d.h
@@ -31,14 +31,13 @@
 #ifndef DELAUNAY_3D_H
 #define DELAUNAY_3D_H
 
-#include "core/io/file_access.h"
 #include "core/math/aabb.h"
 #include "core/math/projection.h"
 #include "core/math/vector3.h"
+#include "core/templates/list.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/oa_hash_map.h"
 #include "core/templates/vector.h"
-#include "core/variant/variant.h"
 
 #include "thirdparty/misc/r128.h"
 

diff --git a/core/math/disjoint_set.h b/core/math/disjoint_set.h
@@ -31,7 +31,7 @@
 #ifndef DISJOINT_SET_H
 #define DISJOINT_SET_H
 
-#include "core/templates/rb_map.h"
+#include "core/templates/hash_map.h"
 #include "core/templates/vector.h"
 
 /* This DisjointSet class uses Find with path compression and Union by rank */

diff --git a/core/math/geometry_3d.cpp b/core/math/geometry_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "geometry_3d.h"
 
+#include "core/templates/hash_map.h"
+
 void Geometry3D::get_closest_points_between_segments(const Vector3 &p_p0, const Vector3 &p_p1, const Vector3 &p_q0, const Vector3 &p_q1, Vector3 &r_ps, Vector3 &r_qt) {
 	// Based on David Eberly's Computation of Distance Between Line Segments algorithm.
 

diff --git a/core/math/geometry_3d.h b/core/math/geometry_3d.h
@@ -33,7 +33,6 @@
 
 #include "core/math/delaunay_3d.h"
 #include "core/math/face3.h"
-#include "core/object/object.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/vector.h"
 

diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h
@@ -36,8 +36,6 @@
 #include "core/math/random_pcg.h"
 #include "core/typedefs.h"
 
-#include "thirdparty/misc/pcg.h"
-
 #include <float.h>
 #include <math.h>
 

diff --git a/core/math/quick_hull.cpp b/core/math/quick_hull.cpp
@@ -30,6 +30,9 @@
 
 #include "quick_hull.h"
 
+#include "core/templates/hash_map.h"
+#include "core/templates/hash_set.h"
+
 uint32_t QuickHull::debug_stop_after = 0xFFFFFFFF;
 
 Error QuickHull::build(const Vector<Vector3> &p_points, Geometry3D::MeshData &r_mesh) {

diff --git a/core/math/static_raycaster.h b/core/math/static_raycaster.h
@@ -33,24 +33,14 @@
 
 #include "core/object/ref_counted.h"
 
-#if !defined(__aligned)
-
-#if defined(_WIN32) && defined(_MSC_VER)
-#define __aligned(...) __declspec(align(__VA_ARGS__))
-#else
-#define __aligned(...) __attribute__((aligned(__VA_ARGS__)))
-#endif
-
-#endif
-
 class StaticRaycaster : public RefCounted {
 	GDCLASS(StaticRaycaster, RefCounted)
 protected:
 	static StaticRaycaster *(*create_function)();
 
 public:
 	// Compatible with embree4 rays.
-	struct __aligned(16) Ray {
+	struct alignas(16) Ray {
 		const static unsigned int INVALID_GEOMETRY_ID = ((unsigned int)-1); // from rtcore_common.h
 
 		/*! Default construction does nothing. */

diff --git a/core/object/make_virtuals.py b/core/object/make_virtuals.py
@@ -212,8 +212,6 @@ def run(target, source, env):
 
 #include "core/object/script_instance.h"
 
-#include <utility>
-
 #ifdef TOOLS_ENABLED
 #define _GDVIRTUAL_TRACK(m_virtual, m_initialized)\\
 	if (_get_extension()->reloadable) {\\

diff --git a/core/os/memory.h b/core/os/memory.h
@@ -34,8 +34,7 @@
 #include "core/error/error_macros.h"
 #include "core/templates/safe_refcount.h"
 
-#include <stddef.h>
-#include <new>
+#include <new> // IWYU pragma: keep // `new` operators.
 #include <type_traits>
 
 class Memory {

diff --git a/core/os/semaphore.h b/core/os/semaphore.h
@@ -31,11 +31,8 @@
 #ifndef SEMAPHORE_H
 #define SEMAPHORE_H
 
-#include <cstdint>
-
 #ifdef THREADS_ENABLED
 
-#include "core/error/error_list.h"
 #include "core/typedefs.h"
 #ifdef DEBUG_ENABLED
 #include "core/error/error_macros.h"

diff --git a/core/string/translation_po.cpp b/core/string/translation_po.cpp
@@ -30,9 +30,9 @@
 
 #include "translation_po.h"
 
+#ifdef DEBUG_TRANSLATION_PO
 #include "core/io/file_access.h"
 
-#ifdef DEBUG_TRANSLATION_PO
 void TranslationPO::print_translation_map() {
 	Error err;
 	Ref<FileAccess> file = FileAccess::open("translation_map_print_test.txt", FileAccess::WRITE, &err);

diff --git a/core/string/ustring.h b/core/string/ustring.h
@@ -33,7 +33,7 @@
 
 // Note: _GODOT suffix added to header guard to avoid conflict with ICU header.
 
-#include "core/string/char_utils.h"
+#include "core/string/char_utils.h" // IWYU pragma: export
 #include "core/templates/cowdata.h"
 #include "core/templates/vector.h"
 #include "core/typedefs.h"

diff --git a/core/templates/cowdata.h b/core/templates/cowdata.h
@@ -38,7 +38,6 @@
 #include <string.h>
 #include <initializer_list>
 #include <type_traits>
-#include <utility>
 
 template <typename T>
 class Vector;

diff --git a/core/templates/hash_set.h b/core/templates/hash_set.h
@@ -31,11 +31,8 @@
 #ifndef HASH_SET_H
 #define HASH_SET_H
 
-#include "core/math/math_funcs.h"
 #include "core/os/memory.h"
-#include "core/templates/hash_map.h"
 #include "core/templates/hashfuncs.h"
-#include "core/templates/paged_allocator.h"
 
 /**
  * Implementation of Set using a bidi indexed hash map.

diff --git a/core/templates/local_vector.h b/core/templates/local_vector.h
@@ -281,7 +281,7 @@ class LocalVector {
 	}
 
 	void sort() {
-		sort_custom<_DefaultComparator<T>>();
+		sort_custom<Comparator<T>>();
 	}
 
 	void ordered_insert(T p_val) {

diff --git a/core/templates/lru.h b/core/templates/lru.h
@@ -31,7 +31,6 @@
 #ifndef LRU_H
 #define LRU_H
 
-#include "core/math/math_funcs.h"
 #include "hash_map.h"
 #include "list.h"
 

diff --git a/core/templates/oa_hash_map.h b/core/templates/oa_hash_map.h
@@ -31,7 +31,6 @@
 #ifndef OA_HASH_MAP_H
 #define OA_HASH_MAP_H
 
-#include "core/math/math_funcs.h"
 #include "core/os/memory.h"
 #include "core/templates/hashfuncs.h"
 #include "core/templates/pair.h"

diff --git a/core/templates/paged_allocator.h b/core/templates/paged_allocator.h
@@ -38,7 +38,7 @@
 #include "core/typedefs.h"
 
 #include <type_traits>
-#include <typeinfo>
+#include <typeinfo> // IWYU pragma: keep // Used in macro.
 
 template <typename T, bool thread_safe = false, uint32_t DEFAULT_PAGE_SIZE = 4096>
 class PagedAllocator {

diff --git a/core/templates/rid_owner.h b/core/templates/rid_owner.h
@@ -39,7 +39,7 @@
 #include "core/templates/safe_refcount.h"
 
 #include <stdio.h>
-#include <typeinfo>
+#include <typeinfo> // IWYU pragma: keep // Used in macro.
 
 #ifdef SANITIZERS_ENABLED
 #ifdef __has_feature

diff --git a/core/templates/safe_list.h b/core/templates/safe_list.h
@@ -37,7 +37,6 @@
 #include <atomic>
 #include <functional>
 #include <initializer_list>
-#include <type_traits>
 
 // Design goals for these classes:
 // - Accessing this list with an iterator will never result in a use-after free,

diff --git a/core/templates/safe_refcount.h b/core/templates/safe_refcount.h
@@ -38,7 +38,7 @@
 #endif
 
 #include <atomic>
-#include <type_traits>
+#include <type_traits> // IWYU pragma: keep // Used in macros.
 
 // Design goals for these classes:
 // - No automatic conversions or arithmetic operators,

diff --git a/core/templates/search_array.h b/core/templates/search_array.h
@@ -31,9 +31,9 @@
 #ifndef SEARCH_ARRAY_H
 #define SEARCH_ARRAY_H
 
-#include <core/templates/sort_array.h>
+#include "core/typedefs.h"
 
-template <typename T, typename Comparator = _DefaultComparator<T>>
+template <typename T, typename Comparator = Comparator<T>>
 class SearchArray {
 public:
 	Comparator compare;

diff --git a/core/templates/sort_array.h b/core/templates/sort_array.h
@@ -40,18 +40,13 @@
 		break;                                                        \
 	}
 
-template <typename T>
-struct _DefaultComparator {
-	_FORCE_INLINE_ bool operator()(const T &a, const T &b) const { return (a < b); }
-};
-
 #ifdef DEBUG_ENABLED
 #define SORT_ARRAY_VALIDATE_ENABLED true
 #else
 #define SORT_ARRAY_VALIDATE_ENABLED false
 #endif
 
-template <typename T, typename Comparator = _DefaultComparator<T>, bool Validate = SORT_ARRAY_VALIDATE_ENABLED>
+template <typename T, typename Comparator = Comparator<T>, bool Validate = SORT_ARRAY_VALIDATE_ENABLED>
 class SortArray {
 	enum {
 		INTROSORT_THRESHOLD = 16

diff --git a/core/templates/vector.h b/core/templates/vector.h
@@ -40,14 +40,11 @@
  */
 
 #include "core/error/error_macros.h"
-#include "core/os/memory.h"
 #include "core/templates/cowdata.h"
 #include "core/templates/search_array.h"
 #include "core/templates/sort_array.h"
 
-#include <climits>
 #include <initializer_list>
-#include <utility>
 
 template <typename T>
 class VectorWriteProxy {
@@ -112,7 +109,7 @@ class Vector {
 	_FORCE_INLINE_ bool has(const T &p_val) const { return find(p_val) != -1; }
 
 	void sort() {
-		sort_custom<_DefaultComparator<T>>();
+		sort_custom<Comparator<T>>();
 	}
 
 	template <typename Comparator, bool Validate = SORT_ARRAY_VALIDATE_ENABLED, typename... Args>
@@ -128,7 +125,7 @@ class Vector {
 	}
 
 	Size bsearch(const T &p_value, bool p_before) {
-		return bsearch_custom<_DefaultComparator<T>>(p_value, p_before);
+		return bsearch_custom<Comparator<T>>(p_value, p_before);
 	}
 
 	template <typename Comparator, typename Value, typename... Args>