From f9507dc475d9586f82391db7852bdd0c2005ce90 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 16 Jul 2024 21:29:26 +0200 Subject: [PATCH] Clang format everything again. --- core/locales.h | 4 +--- drivers/gles3/rasterizer_canvas_base_gles3.h | 4 +--- drivers/gles3/rasterizer_canvas_gles3.h | 4 +--- drivers/gles3/rasterizer_gles3.h | 4 +--- drivers/gles3/rasterizer_scene_gles3.h | 4 +--- drivers/gles3/rasterizer_storage_gles3.h | 4 +--- drivers/gles3/shader_cache_gles3.h | 4 +--- drivers/gles3/shader_compiler_gles3.h | 4 +--- drivers/gles3/shader_gles3.h | 4 +--- editor/editor_locale_dialog.h | 4 +--- editor/plugins/baked_lightmap_editor_plugin.h | 4 +--- editor/plugins/gi_probe_editor_plugin.h | 4 +--- editor/plugins/gpu_particles_2d_editor_plugin.h | 4 +--- editor_modules/denoise/denoise_wrapper.h | 4 +--- editor_modules/denoise/lightmap_denoiser.h | 4 +--- editor_modules/denoise/register_types.h | 4 +--- editor_modules/lightmapper_cpu/lightmapper_cpu.h | 4 +--- editor_modules/lightmapper_cpu/register_types.h | 4 +--- modules/xatlas_unwrap/register_types.h | 4 +--- platform/uwp/export_off/export.h | 4 +--- scene/2d/gpu_particles_2d.h | 4 +--- scene/3d/baked_lightmap.h | 4 +--- scene/3d/gi_probe.h | 4 +--- scene/3d/gpu_particles.h | 4 +--- scene/3d/lightmapper.h | 4 +--- scene/3d/lod.h | 4 +--- scene/3d/lod_manager.h | 4 +--- scene/3d/voxel_light_baker.h | 4 +--- 28 files changed, 28 insertions(+), 84 deletions(-) diff --git a/core/locales.h b/core/locales.h index 24e536d6b..045d37104 100644 --- a/core/locales.h +++ b/core/locales.h @@ -1,5 +1,6 @@ #ifndef LOCALES_H #define LOCALES_H + /*************************************************************************/ /* locales.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - // Windows has some weird locale identifiers which do not honor the ISO 639-1 // standardized nomenclature. Whenever those don't conflict with existing ISO // identifiers, we override them. diff --git a/drivers/gles3/rasterizer_canvas_base_gles3.h b/drivers/gles3/rasterizer_canvas_base_gles3.h index 969476b2f..443092895 100644 --- a/drivers/gles3/rasterizer_canvas_base_gles3.h +++ b/drivers/gles3/rasterizer_canvas_base_gles3.h @@ -1,5 +1,6 @@ #ifndef RASTERIZER_CANVAS_BASE_GLES3_H #define RASTERIZER_CANVAS_BASE_GLES3_H + /*************************************************************************/ /* rasterizer_canvas_base_gles3.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "rasterizer_storage_gles3.h" #include "servers/rendering/rasterizer.h" diff --git a/drivers/gles3/rasterizer_canvas_gles3.h b/drivers/gles3/rasterizer_canvas_gles3.h index 8fdda305d..dccf169d0 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.h +++ b/drivers/gles3/rasterizer_canvas_gles3.h @@ -1,5 +1,6 @@ #ifndef RASTERIZER_CANVAS_GLES3_H #define RASTERIZER_CANVAS_GLES3_H + /*************************************************************************/ /* rasterizer_canvas_gles3.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "drivers/gles_common/rasterizer_canvas_batcher.h" #include "rasterizer_canvas_base_gles3.h" diff --git a/drivers/gles3/rasterizer_gles3.h b/drivers/gles3/rasterizer_gles3.h index ac3315587..eee5359ec 100644 --- a/drivers/gles3/rasterizer_gles3.h +++ b/drivers/gles3/rasterizer_gles3.h @@ -1,5 +1,6 @@ #ifndef RASTERIZER_GLES3_H #define RASTERIZER_GLES3_H + /*************************************************************************/ /* rasterizer_gles3.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "rasterizer_canvas_gles3.h" #include "rasterizer_scene_gles3.h" #include "rasterizer_storage_gles3.h" diff --git a/drivers/gles3/rasterizer_scene_gles3.h b/drivers/gles3/rasterizer_scene_gles3.h index 98caaf2f8..7edd5e0c6 100644 --- a/drivers/gles3/rasterizer_scene_gles3.h +++ b/drivers/gles3/rasterizer_scene_gles3.h @@ -1,5 +1,6 @@ #ifndef RASTERIZER_SCENE_GLES3_H #define RASTERIZER_SCENE_GLES3_H + /*************************************************************************/ /* rasterizer_scene_gles3.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - /* Must come before shaders or the Windows build fails... */ #include "rasterizer_storage_gles3.h" diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h index cdd043937..012505bce 100644 --- a/drivers/gles3/rasterizer_storage_gles3.h +++ b/drivers/gles3/rasterizer_storage_gles3.h @@ -1,5 +1,6 @@ #ifndef RASTERIZER_STORAGE_GLES3_H #define RASTERIZER_STORAGE_GLES3_H + /*************************************************************************/ /* rasterizer_storage_gles3.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/containers/bitfield_dynamic.h" #include "core/containers/self_list.h" #include "drivers/gles_common/rasterizer_asserts.h" diff --git a/drivers/gles3/shader_cache_gles3.h b/drivers/gles3/shader_cache_gles3.h index d671a1150..3328e5b20 100644 --- a/drivers/gles3/shader_cache_gles3.h +++ b/drivers/gles3/shader_cache_gles3.h @@ -1,5 +1,6 @@ #ifndef SHADER_CACHE_GLES3_H #define SHADER_CACHE_GLES3_H + /*************************************************************************/ /* shader_cache_gles3.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/containers/local_vector.h" #include "core/object/reference.h" diff --git a/drivers/gles3/shader_compiler_gles3.h b/drivers/gles3/shader_compiler_gles3.h index ed1b60482..c022b8dcc 100644 --- a/drivers/gles3/shader_compiler_gles3.h +++ b/drivers/gles3/shader_compiler_gles3.h @@ -1,5 +1,6 @@ #ifndef SHADER_COMPILER_GLES3_H #define SHADER_COMPILER_GLES3_H + /*************************************************************************/ /* shader_compiler_gles3.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/containers/pair.h" #include "servers/rendering/shader_language.h" #include "servers/rendering/shader_types.h" diff --git a/drivers/gles3/shader_gles3.h b/drivers/gles3/shader_gles3.h index 12347e1f2..7ce82751e 100644 --- a/drivers/gles3/shader_gles3.h +++ b/drivers/gles3/shader_gles3.h @@ -1,5 +1,6 @@ #ifndef SHADER_GLES3_H #define SHADER_GLES3_H + /*************************************************************************/ /* shader_gles3.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/containers/hash_map.h" #include "core/containers/local_vector.h" #include "core/containers/og_hash_map.h" diff --git a/editor/editor_locale_dialog.h b/editor/editor_locale_dialog.h index 3eec48cba..5a25c6c18 100644 --- a/editor/editor_locale_dialog.h +++ b/editor/editor_locale_dialog.h @@ -1,5 +1,6 @@ #ifndef EDITOR_LOCALE_DIALOG_H #define EDITOR_LOCALE_DIALOG_H + /*************************************************************************/ /* editor_locale_dialog.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/string/translation.h" #include "scene/gui/dialogs.h" diff --git a/editor/plugins/baked_lightmap_editor_plugin.h b/editor/plugins/baked_lightmap_editor_plugin.h index d545f8aa1..5b45a1ee0 100644 --- a/editor/plugins/baked_lightmap_editor_plugin.h +++ b/editor/plugins/baked_lightmap_editor_plugin.h @@ -1,5 +1,6 @@ #ifndef BAKED_LIGHTMAP_EDITOR_PLUGIN_H #define BAKED_LIGHTMAP_EDITOR_PLUGIN_H + /*************************************************************************/ /* baked_lightmap_editor_plugin.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "editor/editor_node.h" #include "editor/editor_plugin.h" #include "scene/3d/baked_lightmap.h" diff --git a/editor/plugins/gi_probe_editor_plugin.h b/editor/plugins/gi_probe_editor_plugin.h index 1f7f525b6..d4a4e9cc5 100644 --- a/editor/plugins/gi_probe_editor_plugin.h +++ b/editor/plugins/gi_probe_editor_plugin.h @@ -1,5 +1,6 @@ #ifndef GI_PROBE_EDITOR_PLUGIN_H #define GI_PROBE_EDITOR_PLUGIN_H + /*************************************************************************/ /* gi_probe_editor_plugin.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "editor/editor_plugin.h" class ToolBoutton; diff --git a/editor/plugins/gpu_particles_2d_editor_plugin.h b/editor/plugins/gpu_particles_2d_editor_plugin.h index 795a2f19b..6fff01638 100644 --- a/editor/plugins/gpu_particles_2d_editor_plugin.h +++ b/editor/plugins/gpu_particles_2d_editor_plugin.h @@ -1,5 +1,6 @@ #ifndef PARTICLES_2D_EDITOR_PLUGIN_H #define PARTICLES_2D_EDITOR_PLUGIN_H + /*************************************************************************/ /* gpu_particles_2d_editor_plugin.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "editor/editor_node.h" #include "editor/editor_plugin.h" #include "scene/2d/collision_polygon_2d.h" diff --git a/editor_modules/denoise/denoise_wrapper.h b/editor_modules/denoise/denoise_wrapper.h index ddb5d99de..c0d9a7b4a 100644 --- a/editor_modules/denoise/denoise_wrapper.h +++ b/editor_modules/denoise/denoise_wrapper.h @@ -1,5 +1,6 @@ #ifndef DENOISE_WRAPPER_H #define DENOISE_WRAPPER_H + /*************************************************************************/ /* denoise_wrapper.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - void *oidn_denoiser_init(); bool oidn_denoise(void *device, float *p_floats, int p_width, int p_height); void oidn_denoiser_finish(void *device); diff --git a/editor_modules/denoise/lightmap_denoiser.h b/editor_modules/denoise/lightmap_denoiser.h index 658fbdcd4..8ce347c90 100644 --- a/editor_modules/denoise/lightmap_denoiser.h +++ b/editor_modules/denoise/lightmap_denoiser.h @@ -1,5 +1,6 @@ #ifndef LIGHTMAP_DENOISER_H #define LIGHTMAP_DENOISER_H + /*************************************************************************/ /* lightmap_denoiser.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/object/class_db.h" #include "scene/3d/lightmapper.h" diff --git a/editor_modules/denoise/register_types.h b/editor_modules/denoise/register_types.h index a65b454f3..20cb7f1dd 100644 --- a/editor_modules/denoise/register_types.h +++ b/editor_modules/denoise/register_types.h @@ -1,5 +1,6 @@ #ifndef DENOISE_REGISTER_TYPES_H #define DENOISE_REGISTER_TYPES_H + /*************************************************************************/ /* register_types.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "modules/register_module_types.h" void register_denoise_types(ModuleRegistrationLevel p_level); diff --git a/editor_modules/lightmapper_cpu/lightmapper_cpu.h b/editor_modules/lightmapper_cpu/lightmapper_cpu.h index 1028eed42..dc6873d71 100644 --- a/editor_modules/lightmapper_cpu/lightmapper_cpu.h +++ b/editor_modules/lightmapper_cpu/lightmapper_cpu.h @@ -1,5 +1,6 @@ #ifndef LIGHTMAPPER_CPU_H #define LIGHTMAPPER_CPU_H + /*************************************************************************/ /* lightmapper_cpu.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/containers/local_vector.h" #include "scene/3d/lightmapper.h" #include "scene/resources/mesh/mesh.h" diff --git a/editor_modules/lightmapper_cpu/register_types.h b/editor_modules/lightmapper_cpu/register_types.h index 832e19ac9..ba73d5c00 100644 --- a/editor_modules/lightmapper_cpu/register_types.h +++ b/editor_modules/lightmapper_cpu/register_types.h @@ -1,5 +1,6 @@ #ifndef LIGHTMAPPER_CPU_REGISTER_TYPES_H #define LIGHTMAPPER_CPU_REGISTER_TYPES_H + /*************************************************************************/ /* register_types.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "modules/register_module_types.h" void register_lightmapper_cpu_types(ModuleRegistrationLevel p_level); diff --git a/modules/xatlas_unwrap/register_types.h b/modules/xatlas_unwrap/register_types.h index 0a0c0e62f..8cbc2d1d6 100644 --- a/modules/xatlas_unwrap/register_types.h +++ b/modules/xatlas_unwrap/register_types.h @@ -1,5 +1,6 @@ #ifndef XATLAS_UNWRAP_REGISTER_TYPES_H #define XATLAS_UNWRAP_REGISTER_TYPES_H + /*************************************************************************/ /* register_types.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "modules/register_module_types.h" void register_xatlas_unwrap_types(ModuleRegistrationLevel p_level); diff --git a/platform/uwp/export_off/export.h b/platform/uwp/export_off/export.h index c71701e10..1e8c2f0fb 100644 --- a/platform/uwp/export_off/export.h +++ b/platform/uwp/export_off/export.h @@ -1,5 +1,6 @@ #ifndef UWP_EXPORT_H #define UWP_EXPORT_H + /*************************************************************************/ /* export.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - void register_uwp_exporter(); #endif // UWP_EXPORT_H diff --git a/scene/2d/gpu_particles_2d.h b/scene/2d/gpu_particles_2d.h index 8cae72e90..217070ffd 100644 --- a/scene/2d/gpu_particles_2d.h +++ b/scene/2d/gpu_particles_2d.h @@ -1,5 +1,6 @@ #ifndef PARTICLES_2D_H #define PARTICLES_2D_H + /*************************************************************************/ /* gpu_particles_2d.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/containers/rid.h" #include "scene/main/node_2d.h" #include "scene/resources/texture.h" diff --git a/scene/3d/baked_lightmap.h b/scene/3d/baked_lightmap.h index 80a31b675..0a1c4d176 100644 --- a/scene/3d/baked_lightmap.h +++ b/scene/3d/baked_lightmap.h @@ -1,5 +1,6 @@ #ifndef BAKED_LIGHTMAP_H #define BAKED_LIGHTMAP_H + /*************************************************************************/ /* baked_lightmap.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/containers/local_vector.h" #include "multimesh_instance.h" #include "scene/3d/light.h" diff --git a/scene/3d/gi_probe.h b/scene/3d/gi_probe.h index e363eb089..7dda0bbbf 100644 --- a/scene/3d/gi_probe.h +++ b/scene/3d/gi_probe.h @@ -1,5 +1,6 @@ #ifndef GI_PROBE_H #define GI_PROBE_H + /*************************************************************************/ /* gi_probe.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "multimesh_instance.h" #include "scene/3d/visual_instance.h" diff --git a/scene/3d/gpu_particles.h b/scene/3d/gpu_particles.h index f20163e27..30b77149b 100644 --- a/scene/3d/gpu_particles.h +++ b/scene/3d/gpu_particles.h @@ -1,5 +1,6 @@ #ifndef PARTICLES_H #define PARTICLES_H + /*************************************************************************/ /* gpu_particles.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/containers/rid.h" #include "scene/3d/visual_instance.h" #include "scene/resources/material/material.h" diff --git a/scene/3d/lightmapper.h b/scene/3d/lightmapper.h index c171bd7e7..818a82416 100644 --- a/scene/3d/lightmapper.h +++ b/scene/3d/lightmapper.h @@ -1,5 +1,6 @@ #ifndef LIGHTMAPPER_H #define LIGHTMAPPER_H + /*************************************************************************/ /* lightmapper.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "scene/resources/mesh/mesh.h" #if !defined(__aligned) diff --git a/scene/3d/lod.h b/scene/3d/lod.h index 957ae4124..33abb92a9 100644 --- a/scene/3d/lod.h +++ b/scene/3d/lod.h @@ -1,5 +1,6 @@ #ifndef LOD_H #define LOD_H + /*************************************************************************/ /* lod.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "scene/main/spatial.h" class LOD : public Spatial { diff --git a/scene/3d/lod_manager.h b/scene/3d/lod_manager.h index 713859ff8..e6b0fbc41 100644 --- a/scene/3d/lod_manager.h +++ b/scene/3d/lod_manager.h @@ -1,5 +1,6 @@ #ifndef LOD_MANAGER_H #define LOD_MANAGER_H + /*************************************************************************/ /* lod_manager.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "core/containers/local_vector.h" #include "core/os/mutex.h" diff --git a/scene/3d/voxel_light_baker.h b/scene/3d/voxel_light_baker.h index 36fb0e0b3..d577e2ac1 100644 --- a/scene/3d/voxel_light_baker.h +++ b/scene/3d/voxel_light_baker.h @@ -1,5 +1,6 @@ #ifndef VOXEL_LIGHT_BAKER_H #define VOXEL_LIGHT_BAKER_H + /*************************************************************************/ /* voxel_light_baker.h */ /*************************************************************************/ @@ -31,9 +32,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ - - - #include "scene/3d/mesh_instance.h" #include "scene/resources/mesh/multimesh.h"