diff options
Diffstat (limited to 'main/tests')
| -rw-r--r-- | main/tests/test_gdscript.cpp | 6 | ||||
| -rw-r--r-- | main/tests/test_gdscript.h | 2 | ||||
| -rw-r--r-- | main/tests/test_gui.cpp | 6 | ||||
| -rw-r--r-- | main/tests/test_gui.h | 2 | ||||
| -rw-r--r-- | main/tests/test_image.cpp | 8 | ||||
| -rw-r--r-- | main/tests/test_image.h | 2 | ||||
| -rw-r--r-- | main/tests/test_io.cpp | 14 | ||||
| -rw-r--r-- | main/tests/test_io.h | 2 | ||||
| -rw-r--r-- | main/tests/test_main.cpp | 4 | ||||
| -rw-r--r-- | main/tests/test_main.h | 4 | ||||
| -rw-r--r-- | main/tests/test_math.cpp | 24 | ||||
| -rw-r--r-- | main/tests/test_math.h | 2 | ||||
| -rw-r--r-- | main/tests/test_oa_hash_map.h | 2 | ||||
| -rw-r--r-- | main/tests/test_ordered_hash_map.cpp | 10 | ||||
| -rw-r--r-- | main/tests/test_physics.cpp | 12 | ||||
| -rw-r--r-- | main/tests/test_physics.h | 2 | ||||
| -rw-r--r-- | main/tests/test_physics_2d.cpp | 8 | ||||
| -rw-r--r-- | main/tests/test_physics_2d.h | 2 | ||||
| -rw-r--r-- | main/tests/test_render.cpp | 12 | ||||
| -rw-r--r-- | main/tests/test_render.h | 2 | ||||
| -rw-r--r-- | main/tests/test_shader_lang.cpp | 8 | ||||
| -rw-r--r-- | main/tests/test_shader_lang.h | 2 | ||||
| -rw-r--r-- | main/tests/test_string.cpp | 6 | ||||
| -rw-r--r-- | main/tests/test_string.h | 4 | 
24 files changed, 73 insertions, 73 deletions
diff --git a/main/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp index 0a9d03c1b7..412e809732 100644 --- a/main/tests/test_gdscript.cpp +++ b/main/tests/test_gdscript.cpp @@ -30,9 +30,9 @@  #include "test_gdscript.h" -#include "os/file_access.h" -#include "os/main_loop.h" -#include "os/os.h" +#include "core/os/file_access.h" +#include "core/os/main_loop.h" +#include "core/os/os.h"  #ifdef GDSCRIPT_ENABLED diff --git a/main/tests/test_gdscript.h b/main/tests/test_gdscript.h index 91e0be1238..0a052c8db5 100644 --- a/main/tests/test_gdscript.h +++ b/main/tests/test_gdscript.h @@ -31,7 +31,7 @@  #ifndef TEST_GDSCRIPT_H  #define TEST_GDSCRIPT_H -#include "os/main_loop.h" +#include "core/os/main_loop.h"  namespace TestGDScript { diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp index 305b749717..9b08ac4937 100644 --- a/main/tests/test_gui.cpp +++ b/main/tests/test_gui.cpp @@ -32,9 +32,9 @@  #include "test_gui.h" -#include "io/image_loader.h" -#include "os/os.h" -#include "print_string.h" +#include "core/io/image_loader.h" +#include "core/os/os.h" +#include "core/print_string.h"  #include "scene/2d/sprite.h"  #include "scene/gui/button.h"  #include "scene/gui/control.h" diff --git a/main/tests/test_gui.h b/main/tests/test_gui.h index 3ed9dae522..25dfa3bc2b 100644 --- a/main/tests/test_gui.h +++ b/main/tests/test_gui.h @@ -31,7 +31,7 @@  #ifndef TEST_GUI_H  #define TEST_GUI_H -#include "os/main_loop.h" +#include "core/os/main_loop.h"  /**  	@author Juan Linietsky <reduzio@gmail.com> diff --git a/main/tests/test_image.cpp b/main/tests/test_image.cpp index cb87458a93..979e590ab8 100644 --- a/main/tests/test_image.cpp +++ b/main/tests/test_image.cpp @@ -30,10 +30,10 @@  #include "test_image.h" -#include "io/image_loader.h" -#include "math_funcs.h" -#include "os/main_loop.h" -#include "print_string.h" +#include "core/io/image_loader.h" +#include "core/math/math_funcs.h" +#include "core/os/main_loop.h" +#include "core/print_string.h"  namespace TestImage { diff --git a/main/tests/test_image.h b/main/tests/test_image.h index d45b4e4e15..381edf7ef9 100644 --- a/main/tests/test_image.h +++ b/main/tests/test_image.h @@ -35,7 +35,7 @@  	@author Juan Linietsky <reduzio@gmail.com>  */ -#include "os/main_loop.h" +#include "core/os/main_loop.h"  namespace TestImage { diff --git a/main/tests/test_io.cpp b/main/tests/test_io.cpp index 4f98955995..c1b4b8af9b 100644 --- a/main/tests/test_io.cpp +++ b/main/tests/test_io.cpp @@ -32,16 +32,16 @@  #ifdef MINIZIP_ENABLED +#include "core/io/resource_loader.h" +#include "core/io/resource_saver.h" +#include "core/os/dir_access.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" +#include "core/print_string.h"  #include "core/project_settings.h" -#include "io/resource_loader.h" -#include "io/resource_saver.h" -#include "os/dir_access.h" -#include "os/main_loop.h" -#include "os/os.h" -#include "print_string.h"  #include "scene/resources/texture.h" -#include "io/file_access_memory.h" +#include "core/io/file_access_memory.h"  namespace TestIO { diff --git a/main/tests/test_io.h b/main/tests/test_io.h index 76567829e7..ffebd05160 100644 --- a/main/tests/test_io.h +++ b/main/tests/test_io.h @@ -35,7 +35,7 @@  	@author Juan Linietsky <reduzio@gmail.com>  */ -#include "os/main_loop.h" +#include "core/os/main_loop.h"  namespace TestIO { diff --git a/main/tests/test_main.cpp b/main/tests/test_main.cpp index cbc1107acb..cd70b95a28 100644 --- a/main/tests/test_main.cpp +++ b/main/tests/test_main.cpp @@ -28,8 +28,8 @@  /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */  /*************************************************************************/ -#include "list.h" -#include "os/main_loop.h" +#include "core/list.h" +#include "core/os/main_loop.h"  #ifdef DEBUG_ENABLED diff --git a/main/tests/test_main.h b/main/tests/test_main.h index d319391070..55ab4daeb8 100644 --- a/main/tests/test_main.h +++ b/main/tests/test_main.h @@ -31,8 +31,8 @@  #ifndef TEST_MAIN_H  #define TEST_MAIN_H -#include "list.h" -#include "ustring.h" +#include "core/list.h" +#include "core/ustring.h"  const char **tests_get_names();  MainLoop *test_main(String p_test, const List<String> &p_args); diff --git a/main/tests/test_math.cpp b/main/tests/test_math.cpp index 1a72416d6a..a48fdbe4e3 100644 --- a/main/tests/test_math.cpp +++ b/main/tests/test_math.cpp @@ -30,22 +30,22 @@  #include "test_math.h" -#include "camera_matrix.h" -#include "math_funcs.h" -#include "matrix3.h" -#include "os/file_access.h" -#include "os/keyboard.h" -#include "os/os.h" -#include "print_string.h" +#include "core/math/camera_matrix.h" +#include "core/math/math_funcs.h" +#include "core/math/matrix3.h" +#include "core/math/transform.h" +#include "core/os/file_access.h" +#include "core/os/keyboard.h" +#include "core/os/os.h" +#include "core/print_string.h" +#include "core/ustring.h" +#include "core/variant.h" +#include "core/vmap.h"  #include "scene/main/node.h"  #include "scene/resources/texture.h"  #include "servers/visual/shader_language.h" -#include "transform.h" -#include "ustring.h" -#include "variant.h" -#include "vmap.h" -#include "method_ptrcall.h" +#include "core/method_ptrcall.h"  namespace TestMath { diff --git a/main/tests/test_math.h b/main/tests/test_math.h index 26a33aa164..2d0c6c461f 100644 --- a/main/tests/test_math.h +++ b/main/tests/test_math.h @@ -31,7 +31,7 @@  #ifndef TEST_MATH_H  #define TEST_MATH_H -#include "os/main_loop.h" +#include "core/os/main_loop.h"  namespace TestMath { diff --git a/main/tests/test_oa_hash_map.h b/main/tests/test_oa_hash_map.h index a63da537d8..677021f933 100644 --- a/main/tests/test_oa_hash_map.h +++ b/main/tests/test_oa_hash_map.h @@ -31,7 +31,7 @@  #ifndef TEST_OA_HASH_MAP_H  #define TEST_OA_HASH_MAP_H -#include "os/main_loop.h" +#include "core/os/main_loop.h"  namespace TestOAHashMap { diff --git a/main/tests/test_ordered_hash_map.cpp b/main/tests/test_ordered_hash_map.cpp index 668a8788ff..cad52ceedf 100644 --- a/main/tests/test_ordered_hash_map.cpp +++ b/main/tests/test_ordered_hash_map.cpp @@ -28,10 +28,10 @@  /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */  /*************************************************************************/ -#include "ordered_hash_map.h" -#include "os/os.h" -#include "pair.h" -#include "vector.h" +#include "core/ordered_hash_map.h" +#include "core/os/os.h" +#include "core/pair.h" +#include "core/vector.h"  namespace TestOrderedHashMap { @@ -168,4 +168,4 @@ MainLoop *test() {  	return NULL;  } -} // namespace TestOrderedHashMap
\ No newline at end of file +} // namespace TestOrderedHashMap diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp index 99c8fce70e..c869b268b0 100644 --- a/main/tests/test_physics.cpp +++ b/main/tests/test_physics.cpp @@ -30,12 +30,12 @@  #include "test_physics.h" -#include "map.h" -#include "math_funcs.h" -#include "os/main_loop.h" -#include "os/os.h" -#include "print_string.h" -#include "quick_hull.h" +#include "core/map.h" +#include "core/math/math_funcs.h" +#include "core/math/quick_hull.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" +#include "core/print_string.h"  #include "servers/physics_server.h"  #include "servers/visual_server.h" diff --git a/main/tests/test_physics.h b/main/tests/test_physics.h index 4d62f3a0cf..c260bf9fcc 100644 --- a/main/tests/test_physics.h +++ b/main/tests/test_physics.h @@ -35,7 +35,7 @@  	@author Juan Linietsky <reduzio@gmail.com>  */ -#include "os/main_loop.h" +#include "core/os/main_loop.h"  namespace TestPhysics { diff --git a/main/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp index 482a858650..8245ee276e 100644 --- a/main/tests/test_physics_2d.cpp +++ b/main/tests/test_physics_2d.cpp @@ -30,10 +30,10 @@  #include "test_physics_2d.h" -#include "map.h" -#include "os/main_loop.h" -#include "os/os.h" -#include "print_string.h" +#include "core/map.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" +#include "core/print_string.h"  #include "scene/resources/texture.h"  #include "servers/physics_2d_server.h"  #include "servers/visual_server.h" diff --git a/main/tests/test_physics_2d.h b/main/tests/test_physics_2d.h index 1031aa7f71..52669777c0 100644 --- a/main/tests/test_physics_2d.h +++ b/main/tests/test_physics_2d.h @@ -31,7 +31,7 @@  #ifndef TEST_PHYSICS_2D_H  #define TEST_PHYSICS_2D_H -#include "os/main_loop.h" +#include "core/os/main_loop.h"  namespace TestPhysics2D { diff --git a/main/tests/test_render.cpp b/main/tests/test_render.cpp index 9340e69bc5..ebf6d363be 100644 --- a/main/tests/test_render.cpp +++ b/main/tests/test_render.cpp @@ -30,12 +30,12 @@  #include "test_render.h" -#include "math_funcs.h" -#include "os/keyboard.h" -#include "os/main_loop.h" -#include "os/os.h" -#include "print_string.h" -#include "quick_hull.h" +#include "core/math/math_funcs.h" +#include "core/math/quick_hull.h" +#include "core/os/keyboard.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" +#include "core/print_string.h"  #include "servers/visual_server.h"  #define OBJECT_COUNT 50 diff --git a/main/tests/test_render.h b/main/tests/test_render.h index 9084b57067..717074021c 100644 --- a/main/tests/test_render.h +++ b/main/tests/test_render.h @@ -35,7 +35,7 @@  	@author Juan Linietsky <reduzio@gmail.com>  */ -#include "os/main_loop.h" +#include "core/os/main_loop.h"  namespace TestRender { diff --git a/main/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp index 7103b436e1..2cd39d0208 100644 --- a/main/tests/test_shader_lang.cpp +++ b/main/tests/test_shader_lang.cpp @@ -30,11 +30,11 @@  #include "test_shader_lang.h" -#include "os/file_access.h" -#include "os/main_loop.h" -#include "os/os.h" +#include "core/os/file_access.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" -#include "print_string.h" +#include "core/print_string.h"  #include "scene/gui/control.h"  #include "scene/gui/text_edit.h"  #include "servers/visual/shader_language.h" diff --git a/main/tests/test_shader_lang.h b/main/tests/test_shader_lang.h index 235bf10463..e99858fdc6 100644 --- a/main/tests/test_shader_lang.h +++ b/main/tests/test_shader_lang.h @@ -31,7 +31,7 @@  #ifndef TEST_SHADER_LANG_H  #define TEST_SHADER_LANG_H -#include "os/main_loop.h" +#include "core/os/main_loop.h"  namespace TestShaderLang { diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp index af948556c4..74157d63c9 100644 --- a/main/tests/test_string.cpp +++ b/main/tests/test_string.cpp @@ -28,11 +28,11 @@  /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */  /*************************************************************************/ -#include "ustring.h" +#include "core/ustring.h"  #include <wchar.h> -//#include "math_funcs.h" +//#include "core/math/math_funcs.h"  #include "core/io/ip_address.h" -#include "os/os.h" +#include "core/os/os.h"  #include <stdio.h>  #include "test_string.h" diff --git a/main/tests/test_string.h b/main/tests/test_string.h index 110e115309..e293e96604 100644 --- a/main/tests/test_string.h +++ b/main/tests/test_string.h @@ -31,8 +31,8 @@  #ifndef TEST_STRING_H  #define TEST_STRING_H -#include "os/main_loop.h" -#include "ustring.h" +#include "core/os/main_loop.h" +#include "core/ustring.h"  namespace TestString {  |