aboutsummaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde2017-12-06 21:36:34 +0100
committerRémi Verschelde2017-12-07 08:02:00 +0100
commit13c2ff932089db24841bb971b645141218bd8586 (patch)
tree1fc056e9e5531b9d039ecfcf19602cdce33222d2 /main
parenta8ceb7e3f213216e4fb103a6a8687d007632f788 (diff)
downloadgodot-13c2ff932089db24841bb971b645141218bd8586.tar.gz
godot-13c2ff932089db24841bb971b645141218bd8586.tar.zst
godot-13c2ff932089db24841bb971b645141218bd8586.zip
Style: Apply new clang-format 5.0 style to all files
Diffstat (limited to 'main')
-rw-r--r--[-rwxr-xr-x]main/main.cpp1
-rw-r--r--main/tests/test_gdscript.cpp4
-rw-r--r--main/tests/test_gdscript.h2
-rw-r--r--main/tests/test_image.cpp2
-rw-r--r--main/tests/test_io.cpp4
-rw-r--r--main/tests/test_math.cpp2
-rw-r--r--main/tests/test_physics.cpp2
-rw-r--r--main/tests/test_physics_2d.cpp2
-rw-r--r--main/tests/test_render.cpp2
-rw-r--r--main/tests/test_shader_lang.cpp2
-rw-r--r--main/tests/test_string.cpp2
11 files changed, 12 insertions, 13 deletions
diff --git a/main/main.cpp b/main/main.cpp
index c9b84d2cd..b2f091e76 100755..100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -168,7 +168,6 @@ static String get_full_version_string() {
}
//#define DEBUG_INIT
-
#ifdef DEBUG_INIT
#define MAIN_PRINT(m_txt) print_line(m_txt)
#else
diff --git a/main/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp
index b41b5f645..f99fd5fd8 100644
--- a/main/tests/test_gdscript.cpp
+++ b/main/tests/test_gdscript.cpp
@@ -1057,7 +1057,7 @@ MainLoop *test(TestType p_type) {
return NULL;
}
-}
+} // namespace TestGDScript
#else
@@ -1067,6 +1067,6 @@ MainLoop *test(TestType p_type) {
return NULL;
}
-}
+} // namespace TestGDScript
#endif
diff --git a/main/tests/test_gdscript.h b/main/tests/test_gdscript.h
index f37b17591..cbbf7f3ef 100644
--- a/main/tests/test_gdscript.h
+++ b/main/tests/test_gdscript.h
@@ -42,6 +42,6 @@ enum TestType {
};
MainLoop *test(TestType p_type);
-}
+} // namespace TestGDScript
#endif // TEST_GDSCRIPT_H
diff --git a/main/tests/test_image.cpp b/main/tests/test_image.cpp
index b94d93b2b..0b7ba0edc 100644
--- a/main/tests/test_image.cpp
+++ b/main/tests/test_image.cpp
@@ -65,4 +65,4 @@ MainLoop *test() {
return memnew(TestMainLoop);
}
-}
+} // namespace TestImage
diff --git a/main/tests/test_io.cpp b/main/tests/test_io.cpp
index f96c5cfe3..1477df441 100644
--- a/main/tests/test_io.cpp
+++ b/main/tests/test_io.cpp
@@ -118,7 +118,7 @@ MainLoop *test() {
return memnew(TestMainLoop);
}
-}
+} // namespace TestIO
#else
@@ -128,5 +128,5 @@ MainLoop *test() {
return NULL;
}
-}
+} // namespace TestIO
#endif
diff --git a/main/tests/test_math.cpp b/main/tests/test_math.cpp
index 3ba8ef51b..7d88372ee 100644
--- a/main/tests/test_math.cpp
+++ b/main/tests/test_math.cpp
@@ -684,4 +684,4 @@ MainLoop *test() {
return NULL;
}
-}
+} // namespace TestMath
diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp
index 1c5047054..e374113b6 100644
--- a/main/tests/test_physics.cpp
+++ b/main/tests/test_physics.cpp
@@ -435,4 +435,4 @@ MainLoop *test() {
return memnew(TestPhysicsMainLoop);
}
-}
+} // namespace TestPhysics
diff --git a/main/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp
index 7d596fbda..41b789303 100644
--- a/main/tests/test_physics_2d.cpp
+++ b/main/tests/test_physics_2d.cpp
@@ -431,4 +431,4 @@ MainLoop *test() {
return memnew(TestPhysics2DMainLoop);
}
-}
+} // namespace TestPhysics2D
diff --git a/main/tests/test_render.cpp b/main/tests/test_render.cpp
index cbf1a5785..9860a4a44 100644
--- a/main/tests/test_render.cpp
+++ b/main/tests/test_render.cpp
@@ -241,4 +241,4 @@ MainLoop *test() {
return memnew(TestMainLoop);
}
-}
+} // namespace TestRender
diff --git a/main/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp
index ddb2ed5e7..679e54451 100644
--- a/main/tests/test_shader_lang.cpp
+++ b/main/tests/test_shader_lang.cpp
@@ -339,4 +339,4 @@ MainLoop *test() {
return NULL;
}
-}
+} // namespace TestShaderLang
diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp
index 88d7702ac..db57788ad 100644
--- a/main/tests/test_string.cpp
+++ b/main/tests/test_string.cpp
@@ -919,4 +919,4 @@ MainLoop *test() {
return NULL;
}
-}
+} // namespace TestString