Merge pull request #9765 from Noshyaar/pr-clang

Clang-formatting *.cpp and *.h (some files excluded)

26 files changed, 24 insertions, 26 deletions

diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp
index 0cb7aa8745..2abdbe9d0a 100644
--- a/drivers/gles2/rasterizer_gles2.cpp
+++ b/drivers/gles2/rasterizer_gles2.cpp
@@ -31,8 +31,8 @@
 
 #include "rasterizer_gles2.h"
 #include "gl_context/context_gl.h"
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "servers/visual/particle_system_sw.h"
 #include "servers/visual/shader_language.h"
 #include <stdio.h>
diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp
index 42d4572b7f..56d9f2cc47 100644
--- a/drivers/gles3/rasterizer_canvas_gles3.cpp
+++ b/drivers/gles3/rasterizer_canvas_gles3.cpp
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "rasterizer_canvas_gles3.h"
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "rasterizer_scene_gles3.h"
 #include "servers/visual/visual_server_raster.h"
 #ifndef GLES_OVER_GL
diff --git a/drivers/png/resource_saver_png.cpp b/drivers/png/resource_saver_png.cpp
index ff3128d476..4f1f318aee 100644
--- a/drivers/png/resource_saver_png.cpp
+++ b/drivers/png/resource_saver_png.cpp
@@ -30,8 +30,8 @@
 #include "resource_saver_png.h"
 
 #include "core/image.h"
-#include "project_settings.h"
 #include "os/file_access.h"
+#include "project_settings.h"
 #include "scene/resources/texture.h"
 
 #include <png.h>
diff --git a/drivers/rtaudio/audio_driver_rtaudio.cpp b/drivers/rtaudio/audio_driver_rtaudio.cpp
index 4dee796060..da998db66f 100644
--- a/drivers/rtaudio/audio_driver_rtaudio.cpp
+++ b/drivers/rtaudio/audio_driver_rtaudio.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "audio_driver_rtaudio.h"
 
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 #ifdef RTAUDIO_ENABLED
 
diff --git a/drivers/xaudio2/audio_driver_xaudio2.cpp b/drivers/xaudio2/audio_driver_xaudio2.cpp
index da6de79592..a1ca2c678e 100644
--- a/drivers/xaudio2/audio_driver_xaudio2.cpp
+++ b/drivers/xaudio2/audio_driver_xaudio2.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "audio_driver_xaudio2.h"
 
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 const char *AudioDriverXAudio2::get_name() const {
 	return "XAudio2";
diff --git a/editor/animation_editor.h b/editor/animation_editor.h
index 128481c837..88cc446853 100644
--- a/editor/animation_editor.h
+++ b/editor/animation_editor.h
@@ -45,7 +45,6 @@
 #include "scene/animation/animation_cache.h"
 #include "scene/resources/animation.h"
 #include "scene_tree_editor.h"
-#include "scene_tree_editor.h"
 
 class AnimationKeyEdit;
 class AnimationCurveEdit;
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp
index f1b4828a3e..1e1327d72f 100644
--- a/modules/gdscript/gd_editor.cpp
+++ b/modules/gdscript/gd_editor.cpp
@@ -30,8 +30,8 @@
 #include "editor/editor_settings.h"
 #include "gd_compiler.h"
 #include "gd_script.h"
-#include "project_settings.h"
 #include "os/file_access.h"
+#include "project_settings.h"
 #ifdef TOOLS_ENABLED
 #include "editor/editor_file_system.h"
 #include "editor/editor_settings.h"
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index ca62122342..fe87433a89 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -29,11 +29,11 @@
 /*************************************************************************/
 #include "gd_script.h"
 #include "gd_compiler.h"
-#include "project_settings.h"
 #include "global_constants.h"
 #include "io/file_access_encrypted.h"
 #include "os/file_access.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 ///////////////////////////
 
diff --git a/modules/openssl/stream_peer_openssl.h b/modules/openssl/stream_peer_openssl.h
index 10e02202aa..b1da5e1d95 100644
--- a/modules/openssl/stream_peer_openssl.h
+++ b/modules/openssl/stream_peer_openssl.h
@@ -30,9 +30,9 @@
 #ifndef STREAM_PEER_OPEN_SSL_H
 #define STREAM_PEER_OPEN_SSL_H
 
-#include "project_settings.h"
 #include "io/stream_peer_ssl.h"
 #include "os/file_access.h"
+#include "project_settings.h"
 
 #include "thirdparty/misc/curl_hostcheck.h"
 
diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp
index f4af5026de..977062dd14 100644
--- a/modules/theora/video_stream_theora.cpp
+++ b/modules/theora/video_stream_theora.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "video_stream_theora.h"
 
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 #include "thirdparty/misc/yuv2rgb.h"
 
diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp
index 619ed8f6c0..595cc817b6 100644
--- a/modules/visual_script/visual_script.cpp
+++ b/modules/visual_script/visual_script.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "visual_script.h"
 
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "scene/main/node.h"
 #include "visual_script_nodes.h"
 
diff --git a/modules/visual_script/visual_script_func_nodes.cpp b/modules/visual_script/visual_script_func_nodes.cpp
index c42e784fbc..c438edd21f 100644
--- a/modules/visual_script/visual_script_func_nodes.cpp
+++ b/modules/visual_script/visual_script_func_nodes.cpp
@@ -29,9 +29,9 @@
 /*************************************************************************/
 #include "visual_script_func_nodes.h"
 
-#include "project_settings.h"
 #include "io/resource_loader.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 #include "visual_script_nodes.h"
diff --git a/modules/webm/video_stream_webm.cpp b/modules/webm/video_stream_webm.cpp
index ff0bca0fc5..72f10b4f45 100644
--- a/modules/webm/video_stream_webm.cpp
+++ b/modules/webm/video_stream_webm.cpp
@@ -34,8 +34,8 @@
 
 #include "mkvparser/mkvparser.h"
 
-#include "project_settings.h"
 #include "os/file_access.h"
+#include "project_settings.h"
 
 #include "thirdparty/misc/yuv2rgb.h"
 
diff --git a/platform/android/audio_driver_jandroid.cpp b/platform/android/audio_driver_jandroid.cpp
index cf1ea169b3..d293f3ed30 100644
--- a/platform/android/audio_driver_jandroid.cpp
+++ b/platform/android/audio_driver_jandroid.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "audio_driver_jandroid.h"
 
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "thread_jandroid.h"
 
 #ifndef ANDROID_NATIVE_ACTIVITY
diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp
index 4e4fd8074c..71db03049a 100644
--- a/platform/android/godot_android.cpp
+++ b/platform/android/godot_android.cpp
@@ -36,9 +36,9 @@
 #include <GLES2/gl2.h>
 
 #include "file_access_android.h"
-#include "project_settings.h"
 #include "main/main.h"
 #include "os_android.h"
+#include "project_settings.h"
 #include <android/log.h>
 #include <android/sensor.h>
 #include <android/window.h>
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp
index bd234fa4a2..0508989d2f 100644
--- a/platform/android/java_glue.cpp
+++ b/platform/android/java_glue.cpp
@@ -36,11 +36,11 @@
 #include "dir_access_jandroid.h"
 #include "file_access_android.h"
 #include "file_access_jandroid.h"
-#include "project_settings.h"
 #include "java_class_wrapper.h"
 #include "main/input_default.h"
 #include "main/main.h"
 #include "os_android.h"
+#include "project_settings.h"
 #include "thread_jandroid.h"
 #include <unistd.h>
 
diff --git a/servers/audio/audio_driver_dummy.cpp b/servers/audio/audio_driver_dummy.cpp
index e20990cdce..0f15b43b41 100644
--- a/servers/audio/audio_driver_dummy.cpp
+++ b/servers/audio/audio_driver_dummy.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "audio_driver_dummy.h"
 
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 Error AudioDriverDummy::init() {
 
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
index 253bf6e2ee..5303aea6d0 100644
--- a/servers/audio_server.cpp
+++ b/servers/audio_server.cpp
@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "audio_server.h"
-#include "project_settings.h"
 #include "io/resource_loader.h"
 #include "os/file_access.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "servers/audio/effects/audio_effect_compressor.h"
 #ifdef TOOLS_ENABLED
 
diff --git a/servers/physics/space_sw.cpp b/servers/physics/space_sw.cpp
index 9e84fce000..5679fc8f60 100644
--- a/servers/physics/space_sw.cpp
+++ b/servers/physics/space_sw.cpp
@@ -29,8 +29,8 @@
 /*************************************************************************/
 #include "space_sw.h"
 #include "collision_solver_sw.h"
-#include "project_settings.h"
 #include "physics_server_sw.h"
+#include "project_settings.h"
 
 _FORCE_INLINE_ static bool _match_object_type_query(CollisionObjectSW *p_object, uint32_t p_collision_layer, uint32_t p_type_mask) {
 
diff --git a/servers/physics/space_sw.h b/servers/physics/space_sw.h
index 6c6c433230..dc7799d992 100644
--- a/servers/physics/space_sw.h
+++ b/servers/physics/space_sw.h
@@ -36,8 +36,8 @@
 #include "body_sw.h"
 #include "broad_phase_sw.h"
 #include "collision_object_sw.h"
-#include "project_settings.h"
 #include "hash_map.h"
+#include "project_settings.h"
 #include "typedefs.h"
 
 class PhysicsDirectSpaceStateSW : public PhysicsDirectSpaceState {
diff --git a/servers/physics_2d/physics_2d_server_sw.cpp b/servers/physics_2d/physics_2d_server_sw.cpp
index 6eb1106de8..c20d0d14a2 100644
--- a/servers/physics_2d/physics_2d_server_sw.cpp
+++ b/servers/physics_2d/physics_2d_server_sw.cpp
@@ -31,8 +31,8 @@
 #include "broad_phase_2d_basic.h"
 #include "broad_phase_2d_hash_grid.h"
 #include "collision_solver_2d_sw.h"
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "script_language.h"
 
 RID Physics2DServerSW::shape_create(ShapeType p_shape) {
diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.h b/servers/physics_2d/physics_2d_server_wrap_mt.h
index 5b00416b61..8b6609d119 100644
--- a/servers/physics_2d/physics_2d_server_wrap_mt.h
+++ b/servers/physics_2d/physics_2d_server_wrap_mt.h
@@ -31,8 +31,8 @@
 #define PHYSICS2DSERVERWRAPMT_H
 
 #include "command_queue_mt.h"
-#include "project_settings.h"
 #include "os/thread.h"
+#include "project_settings.h"
 #include "servers/physics_2d_server.h"
 
 #ifdef DEBUG_SYNC
diff --git a/servers/physics_2d/space_2d_sw.h b/servers/physics_2d/space_2d_sw.h
index c5bdfa3323..4bd81c054f 100644
--- a/servers/physics_2d/space_2d_sw.h
+++ b/servers/physics_2d/space_2d_sw.h
@@ -36,8 +36,8 @@
 #include "body_pair_2d_sw.h"
 #include "broad_phase_2d_sw.h"
 #include "collision_object_2d_sw.h"
-#include "project_settings.h"
 #include "hash_map.h"
+#include "project_settings.h"
 #include "typedefs.h"
 
 class Physics2DDirectSpaceStateSW : public Physics2DDirectSpaceState {
diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp
index da6174cd5c..f17411f11a 100644
--- a/servers/visual/visual_server_raster.cpp
+++ b/servers/visual/visual_server_raster.cpp
@@ -29,9 +29,9 @@
 /*************************************************************************/
 #include "visual_server_raster.h"
 #include "default_mouse_cursor.xpm"
-#include "project_settings.h"
 #include "io/marshalls.h"
 #include "os/os.h"
+#include "project_settings.h"
 #include "sort.h"
 #include "visual_server_canvas.h"
 #include "visual_server_global.h"
diff --git a/servers/visual/visual_server_scene.h b/servers/visual/visual_server_scene.h
index d13c24ae24..168dfddfd4 100644
--- a/servers/visual/visual_server_scene.h
+++ b/servers/visual/visual_server_scene.h
@@ -36,7 +36,6 @@
 #include "geometry.h"
 #include "octree.h"
 #include "os/semaphore.h"
-#include "os/semaphore.h"
 #include "os/thread.h"
 #include "self_list.h"
 
diff --git a/servers/visual/visual_server_wrap_mt.cpp b/servers/visual/visual_server_wrap_mt.cpp
index bdd41b0a57..525e3dc2f9 100644
--- a/servers/visual/visual_server_wrap_mt.cpp
+++ b/servers/visual/visual_server_wrap_mt.cpp
@@ -27,8 +27,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "visual_server_wrap_mt.h"
-#include "project_settings.h"
 #include "os/os.h"
+#include "project_settings.h"
 
 void VisualServerWrapMT::thread_exit() {