Moved container related classes in core under a new containers directory.

core/SCsub

@@ -189,6 +189,7 @@ env.CommandNoCache(
 # Chain load SCsubs
 SConscript("os/SCsub")
 SConscript("math/SCsub")
+SConscript("containers/SCsub")
 SConscript("crypto/SCsub")
 SConscript("io/SCsub")
 SConscript("log/SCsub")

core/array.cpp

@@ -30,10 +30,10 @@
 
 #include "array.h"
 
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 #include "core/object.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class ArrayPrivate {
 public:

core/command_queue_mt.h

@@ -33,7 +33,7 @@
 #include "core/os/memory.h"
 #include "core/os/mutex.h"
 #include "core/os/semaphore.h"
-#include "core/simple_type.h"
+#include "core/containers/simple_type.h"
 #include "core/typedefs.h"
 
 #define COMMA(N) _COMMA_##N

core/containers/SCsub

@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+Import("env")
+
+env_containers = env.Clone()
+
+env_containers.add_source_files(env.core_sources, "*.cpp")

core/containers/hash_map.h

@@ -31,8 +31,8 @@
 /*************************************************************************/
 
 #include "core/error_macros.h"
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/os/memory.h"
 #include "core/ustring.h"

core/containers/hash_set.h

@@ -33,8 +33,8 @@
 
 #include "core/math/math_funcs.h"
 #include "core/os/memory.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 
 /**
  * Implementation of Set using a bidi indexed hash map.

core/containers/list.h

@@ -32,7 +32,7 @@
 
 #include "core/error_macros.h"
 #include "core/os/memory.h"
-#include "core/sort_array.h"
+#include "core/containers/sort_array.h"
 
 /**
  * Generic Templatized Linked List Implementation.

core/containers/local_vector.h

@@ -32,9 +32,9 @@
 
 #include "core/error_macros.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
-#include "core/sort_array.h"
+#include "core/containers/sort_array.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 template <class T, class U = uint32_t, bool force_trivial = false>
 class LocalVector {

core/containers/oa_hash_map.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 #include "core/math/math_funcs.h"
 #include "core/os/memory.h"
 

core/containers/ordered_hash_map.h

@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/pair.h"
 
 /**

core/containers/pooled_list.h

@@ -52,7 +52,7 @@
 // Compaction can be done but would rely on a more complex method
 // of preferentially giving out lower IDs in the freelist first.
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 
 template <class T, class U = uint32_t, bool force_trivial = false, bool zero_on_first_request = false>
 class PooledList {

core/containers/ring_buffer.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 template <typename T>
 class RingBuffer {

core/containers/threaded_callable_queue.h

@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
-#include "core/ordered_hash_map.h"
+#include "core/containers/ordered_hash_map.h"
 #include "core/os/mutex.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"

core/containers/vector.h

@@ -36,10 +36,10 @@
  * Vector container. Regular Vector Container. Use with care and for smaller arrays when possible. Use PoolVector for large arrays.
  */
 
-#include "core/cowdata.h"
+#include "core/containers/cowdata.h"
 #include "core/error_macros.h"
 #include "core/os/memory.h"
-#include "core/sort_array.h"
+#include "core/containers/sort_array.h"
 
 template <class T>
 class VectorWriteProxy {

core/containers/vmap.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/cowdata.h"
+#include "core/containers/cowdata.h"
 #include "core/typedefs.h"
 
 template <class T, class V>

core/containers/vset.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 template <class T>
 class VSet {

core/dictionary.cpp

@@ -30,7 +30,7 @@
 
 #include "dictionary.h"
 
-#include "core/ordered_hash_map.h"
+#include "core/containers/ordered_hash_map.h"
 #include "core/safe_refcount.h"
 #include "core/variant.h"
 

core/dictionary.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/array.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/ustring.h"
 
 class Variant;

core/engine.h

@@ -30,10 +30,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/main_loop.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Engine {
 public:

core/image.cpp

@@ -31,7 +31,7 @@
 #include "image.h"
 
 #include "core/error_macros.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"

core/image.h

@@ -32,7 +32,7 @@
 
 #include "core/math/color.h"
 #include "core/math/rect2.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/resource.h"
 
 /**

core/io/compression.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/typedefs.h"
 
 class Compression {

core/io/config_file.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/ordered_hash_map.h"
+#include "core/containers/ordered_hash_map.h"
 #include "core/os/file_access.h"
 #include "core/reference.h"
 #include "core/variant_parser.h"

core/io/file_access_memory.cpp

@@ -30,7 +30,7 @@
 
 #include "file_access_memory.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/os/dir_access.h"
 #include "core/project_settings.h"
 

core/io/file_access_pack.h

@@ -30,13 +30,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 #include "core/print_string.h"
-#include "core/set.h"
+#include "core/containers/set.h"
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 
 // Pandemonium's packed file magic header ("GDPC" in ASCII).
 #define PACK_HEADER_MAGIC 0x43504447

core/io/file_access_zip.h

@@ -33,7 +33,7 @@
 #ifdef MINIZIP_ENABLED
 
 #include "core/io/file_access_pack.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 
 #include "thirdparty/minizip/unzip.h"
 

core/io/image_loader.h

@@ -32,7 +32,7 @@
 
 #include "core/image.h"
 #include "core/io/resource_loader.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/file_access.h"
 #include "core/ustring.h"
 

core/io/ip.cpp

@@ -30,7 +30,7 @@
 
 #include "ip.h"
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 

core/io/logger.h

@@ -32,7 +32,7 @@
 
 #include "core/os/file_access.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include <stdarg.h>
 

core/io/packet_peer.h

@@ -32,7 +32,7 @@
 
 #include "core/io/stream_peer.h"
 #include "core/object.h"
-#include "core/ring_buffer.h"
+#include "core/containers/ring_buffer.h"
 
 class PacketPeer : public Reference {
 	GDCLASS(PacketPeer, Reference);

core/io/xml_parser.h

@@ -33,7 +33,7 @@
 #include "core/os/file_access.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 /*
   Based on irrXML (see their zlib license). Added mainly for compatibility with their Collada loader.

core/math/a_star.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/oa_hash_map.h"
+#include "core/containers/oa_hash_map.h"
 #include "core/reference.h"
 
 /**

core/math/bsp_tree.h

@@ -34,9 +34,9 @@
 #include "core/math/face3.h"
 #include "core/math/plane.h"
 #include "core/method_ptrcall.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class BSP_Tree {
 public:

core/math/bvh_tree.h

@@ -38,12 +38,12 @@
 // to a simpler tree.
 // Note that MAX_CHILDREN should be fixed at 2 for now.
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/aabb.h"
 #include "core/math/bvh_abb.h"
 #include "core/math/geometry.h"
 #include "core/math/vector3.h"
-#include "core/pooled_list.h"
+#include "core/containers/pooled_list.h"
 #include "core/print_string.h"
 #include <limits.h>
 

core/math/color.cpp

@@ -31,7 +31,7 @@
 #include "color.h"
 
 #include "core/math/color_names.inc"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/math_funcs.h"
 #include "core/print_string.h"
 

core/math/color_names.inc

@@ -1,5 +1,5 @@
 // Names from https://en.wikipedia.org/wiki/X11_color_names
-#include "core/map.h"
+#include "core/containers/map.h"
 
 static Map<String, Color> _named_colors;
 static void _populate_named_colors() {

core/math/convex_hull.cpp

@@ -62,7 +62,7 @@ subject to the following restrictions:
 #include "core/math/aabb.h"
 #include "core/math/math_defs.h"
 #include "core/os/memory.h"
-#include "core/paged_allocator.h"
+#include "core/containers/paged_allocator.h"
 
 #include <string.h>
 

core/math/convex_hull.h

@@ -44,10 +44,10 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/geometry.h"
 #include "core/math/vector3.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 /// Convex hull implementation based on Preparata and Hong
 /// See http://code.google.com/p/bullet/issues/detail?id=275

core/math/delaunay.h

@@ -32,7 +32,7 @@
 
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Delaunay2D {
 public:

core/math/disjoint_set.h

@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/map.h"
+#include "core/containers/map.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 /**
 	@author Marios Staikopoulos <marios@staik.net>

core/math/geometry.cpp

@@ -30,7 +30,7 @@
 
 #include "geometry.h"
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/print_string.h"
 
 #include "thirdparty/misc/clipper.hpp"

core/math/geometry.h

@@ -37,9 +37,9 @@
 #include "core/math/vector3.h"
 #include "core/math/vector2i.h"
 #include "core/object.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/print_string.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Geometry {
 public:

core/math/octree_definition.inc

@@ -31,9 +31,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/aabb.h"
 #include "core/math/geometry.h"
 #include "core/math/vector3.h"

core/math/projection.h

@@ -34,7 +34,7 @@
 #include "core/math/math_defs.h"
 #include "core/math/vector3.h"
 #include "core/math/vector4.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Array;
 struct AABB;

core/math/quick_hull.cpp

@@ -30,7 +30,7 @@
 
 #include "quick_hull.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 
 uint32_t QuickHull::debug_stop_after = 0xFFFFFFFF;
 bool QuickHull::_flag_warnings = true;

core/math/quick_hull.h

@@ -30,10 +30,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/aabb.h"
 #include "core/math/geometry.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 
 class QuickHull {
 public:

core/math/transform.h

@@ -34,7 +34,7 @@
 #include "core/math/basis.h"
 #include "core/math/plane.h"
 #include "core/math/vector3i.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 struct _NO_DISCARD_CLASS_ Transform {
 	Basis basis;

core/math/transform_2d.h

@@ -32,7 +32,7 @@
 
 #include "core/math/rect2.h" // also includes vector2, math_funcs, and ustring
 #include "core/math/rect2i.h" // also includes vector2i, math_funcs, and ustring
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 struct _NO_DISCARD_CLASS_ Transform2D {
 	// Warning #1: basis of Transform2D is stored differently from Basis. In terms of columns array, the basis matrix looks like "on paper":

core/math/triangle_mesh.cpp

@@ -30,7 +30,7 @@
 
 #include "triangle_mesh.h"
 
-#include "core/sort_array.h"
+#include "core/containers/sort_array.h"
 
 int TriangleMesh::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, int p_depth, int &max_depth, int &max_alloc) {
 	if (p_depth > max_depth) {

core/math/triangulate.h

@@ -32,7 +32,7 @@
 
 #include "core/math/vector2.h"
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 /*
 http://www.flipcode.com/archives/Efficient_Polygon_Triangulation.shtml

core/method_bind.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/method_ptrcall.h"
 #include "core/object.h"
 #include "core/variant.h"

core/object.h

@@ -30,15 +30,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
-#include "core/list.h"
+#include "core/containers/list.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object_id.h"
 #include "core/os/rw_lock.h"
 #include "core/safe_refcount.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/variant.h"
-#include "core/vmap.h"
+#include "core/containers/vmap.h"
 
 #include <atomic>
 

core/os/os.h

@@ -33,10 +33,10 @@
 #include "core/engine.h"
 #include "core/image.h"
 #include "core/io/logger.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/main_loop.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include <stdarg.h>
 #include <stdlib.h>

core/pair.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 #include "core/typedefs.h"
 
 template <class F, class S>

core/project_settings.h

@@ -32,7 +32,7 @@
 
 #include "core/object.h"
 #include "core/os/thread_safe.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 
 // Querying ProjectSettings is usually done at startup.
 // Additionally, in order to keep track of changes to ProjectSettings,

core/register_core_types.cpp

@@ -68,7 +68,7 @@
 #include "core/os/input.h"
 #include "core/os/main_loop.h"
 #include "core/os/time.h"
-#include "core/packed_data_container.h"
+#include "core/containers/packed_data_container.h"
 #include "core/path_remap.h"
 #include "core/project_settings.h"
 #include "core/translation.h"

core/resource.h

@@ -35,7 +35,7 @@
 #include "core/ref_ptr.h"
 #include "core/reference.h"
 #include "core/safe_refcount.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 
 #define RES_BASE_EXTENSION(m_ext)                                                                                   \
 public:                                                                                                             \

core/rid.h

@@ -30,11 +30,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/memory.h"
 #include "core/rid_handle.h"
 #include "core/safe_refcount.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/typedefs.h"
 
 #ifndef RID_HANDLES_ENABLED

core/rid_handle.h

@@ -30,9 +30,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/mutex.h"
-#include "core/pooled_list.h"
+#include "core/containers/pooled_list.h"
 #include "core/safe_refcount.h"
 #include "core/typedefs.h"
 

core/script_debugger_local.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/script_language.h"
 
 class ScriptDebuggerLocal : public ScriptDebugger {

core/script_language.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/io/multiplayer_api.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/pair.h"
 #include "core/resource.h"
 

core/string_builder.h

@@ -32,7 +32,7 @@
 
 #include "core/ustring.h"
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class StringBuilder {
 	uint32_t string_length;

core/ustring.h

@@ -32,9 +32,9 @@
 
 #include "core/array.h"
 #include "core/char_utils.h"
-#include "core/cowdata.h"
+#include "core/containers/cowdata.h"
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 /*************************************************************************/
 /*  CharProxy                                                            */

core/variant.h

@@ -48,7 +48,7 @@
 #include "core/math/vector4i.h"
 #include "core/node_path.h"
 #include "core/object_id.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/ref_ptr.h"
 #include "core/rid.h"
 #include "core/ustring.h"

drivers/alsamidi/midi_driver_alsamidi.h

@@ -35,7 +35,7 @@
 #include "core/os/midi_driver.h"
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../alsa/asound-so_wrap.h"
 #include <stdio.h>

drivers/coremidi/midi_driver_coremidi.h

@@ -33,7 +33,7 @@
 #ifdef COREMIDI_ENABLED
 
 #include "core/os/midi_driver.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include <CoreMIDI/CoreMIDI.h>
 #include <stdio.h>

drivers/dummy/rasterizer_dummy.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/math/projection.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "scene/resources/mesh.h"
 #include "servers/visual/rasterizer.h"
 #include "servers/visual_server.h"

drivers/gles2/rasterizer_scene_gles2.cpp

@@ -34,7 +34,7 @@
 #include "core/math/transform.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
-#include "core/vmap.h"
+#include "core/containers/vmap.h"
 #include "rasterizer_canvas_gles2.h"
 #include "servers/visual/visual_server_raster.h"
 

drivers/gles2/rasterizer_storage_gles2.h

@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "drivers/gles_common/rasterizer_asserts.h"
 #include "servers/visual/rasterizer.h"
 #include "servers/visual/shader_language.h"

drivers/gles2/shader_gles2.h

@@ -38,8 +38,8 @@
 #include GLES2_INCLUDE_H
 #endif
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/projection.h"
 #include "core/pair.h"
 #include "core/variant.h"

drivers/gles_common/rasterizer_array.h

@@ -37,7 +37,7 @@
  */
 
 #include "core/os/memory.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include <string.h>
 

drivers/png/png_driver_common.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/image.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 namespace PNGDriverCommon {
 

drivers/unix/dir_access_unix.cpp

@@ -32,7 +32,7 @@
 
 #if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED)
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/memory.h"
 #include "core/print_string.h"
 

drivers/winmidi/midi_driver_winmidi.h

@@ -33,7 +33,7 @@
 #ifdef WINMIDI_ENABLED
 
 #include "core/os/midi_driver.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include <stdio.h>
 #define WIN32_LEAN_AND_MEAN

editor/animation_bezier_editor.cpp

@@ -36,7 +36,7 @@
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/transform_2d.h"

editor/animation_bezier_editor.h

@@ -32,15 +32,15 @@
 
 #include "scene/gui/control.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/animation.h"
 #include "scene/resources/texture.h"

editor/animation_track_editor.cpp

@@ -49,7 +49,7 @@
 #include "core/pair.h"
 #include "core/resource.h"
 #include "core/script_language.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"

editor/animation_track_editor.h

@@ -38,15 +38,15 @@
 #include "scene/gui/slider.h"
 
 #include "core/dictionary.h"
-#include "core/list.h"
+#include "core/containers/list.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/texture.h"
 

editor/animation_track_editor_plugins.cpp

@@ -41,7 +41,7 @@
 #include "core/math/color.h"
 #include "core/dictionary.h"
 #include "core/io/resource_loader.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/node_path.h"
 #include "core/os/input_event.h"
@@ -49,7 +49,7 @@
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/font.h"
 #include "servers/visual_server.h"

editor/array_property_edit.h

@@ -32,7 +32,7 @@
 
 #include "scene/main/node.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/object.h"
 #include "core/object_id.h"
 #include "core/reference.h"

editor/audio_stream_preview.cpp

@@ -32,7 +32,7 @@
 
 #include "core/class_db.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/audio_frame.h"
 #include "core/os/memory.h"
 #include "core/os/thread.h"

editor/audio_stream_preview.h

@@ -36,11 +36,11 @@
 #include "scene/main/node.h"
 #include "servers/audio/audio_stream.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/object_id.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Thread;
 

editor/code_editor.cpp

@@ -43,7 +43,7 @@
 #include "core/script_language.h"
 #include "core/string_builder.h"
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_scale.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor_node.h"

editor/code_editor.h

@@ -33,7 +33,7 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/box_container.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/object.h"
 #include "core/reference.h"

editor/connections_dialog.cpp

@@ -34,7 +34,7 @@
 #include "core/math/color.h"
 #include "core/dictionary.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
 #include "core/math/plane.h"

editor/connections_dialog.h

@@ -39,12 +39,12 @@
 #include "scene/gui/box_container.h"
 
 #include "core/undo_redo.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class PopupMenu;
 class ConnectDialogBinds;