summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-07-23 13:16:48 +0200
committerGitHub <noreply@github.com>2017-07-23 13:16:48 +0200
commit38c471bef6ec5b9236ccf3331d982e379d7be4a8 (patch)
tree7c92b7e1ab05989b9567d88b9a84062b912f96c3 /modules
parent21497bd501ff1a6f8029475a1cdf99162c6ca369 (diff)
parentc7c65ca6bac04925353db9b3bee4b0cd0b634ac6 (diff)
Merge pull request #9765 from Noshyaar/pr-clang
Clang-formatting *.cpp and *.h (some files excluded)
Diffstat (limited to 'modules')
-rw-r--r--modules/gdscript/gd_editor.cpp2
-rw-r--r--modules/gdscript/gd_script.cpp2
-rw-r--r--modules/openssl/stream_peer_openssl.h2
-rw-r--r--modules/theora/video_stream_theora.cpp2
-rw-r--r--modules/visual_script/visual_script.cpp2
-rw-r--r--modules/visual_script/visual_script_func_nodes.cpp2
-rw-r--r--modules/webm/video_stream_webm.cpp2
7 files changed, 7 insertions, 7 deletions
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"