Moved Variant related classes under a variant folder in core.

core/SCsub

@@ -190,6 +190,7 @@ env.CommandNoCache(
 SConscript("os/SCsub")
 SConscript("math/SCsub")
 SConscript("containers/SCsub")
+SConscript("variant/SCsub")
 SConscript("crypto/SCsub")
 SConscript("io/SCsub")
 SConscript("log/SCsub")

core/global_constants.cpp

@@ -33,7 +33,7 @@
 #include "core/object.h"
 #include "core/os/input_event.h"
 #include "core/os/keyboard.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 struct _GlobalConstant {
 #ifdef DEBUG_METHODS_ENABLED

core/io/config_file.cpp

@@ -32,7 +32,7 @@
 
 #include "core/io/file_access_encrypted.h"
 #include "core/os/keyboard.h"
-#include "core/variant_parser.h"
+#include "core/variant/variant_parser.h"
 
 PoolStringArray ConfigFile::_get_sections() const {
 	List<String> s;

core/io/config_file.h

@@ -33,7 +33,7 @@
 #include "core/containers/ordered_hash_map.h"
 #include "core/os/file_access.h"
 #include "core/reference.h"
-#include "core/variant_parser.h"
+#include "core/variant/variant_parser.h"
 
 class ConfigFile : public Reference {
 	GDCLASS(ConfigFile, Reference);

core/io/file_access_encrypted.cpp

@@ -32,7 +32,7 @@
 
 #include "core/crypto/crypto_core.h"
 #include "core/print_string.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 #include <stdio.h>
 

core/io/json.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 class JSON {
 	enum TokenType {

core/io/marshalls.h

@@ -32,7 +32,7 @@
 
 #include "core/reference.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 /**
  * Miscellaneous helpers for marshalling data types, and encoding

core/io/resource_importer.cpp

@@ -32,7 +32,7 @@
 
 #include "core/os/os.h"
 #include "core/project_settings.h"
-#include "core/variant_parser.h"
+#include "core/variant/variant_parser.h"
 
 bool ResourceFormatImporter::SortImporterByName::operator()(const Ref<ResourceImporter> &p_a, const Ref<ResourceImporter> &p_b) const {
 	return p_a->get_importer_name() < p_b->get_importer_name();

core/io/resource_loader.cpp

@@ -37,7 +37,7 @@
 #include "core/print_string.h"
 #include "core/project_settings.h"
 #include "core/translation.h"
-#include "core/variant_parser.h"
+#include "core/variant/variant_parser.h"
 
 Ref<ResourceFormatLoader> ResourceLoader::loader[ResourceLoader::MAX_LOADERS];
 

core/log/logger_backend.h

@@ -2,7 +2,7 @@
 #define LOGGER_BACKEND_H
 
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 #include "core/reference.h"
 

core/math/aabb.cpp

@@ -30,7 +30,7 @@
 
 #include "aabb.h"
 
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/print_string.h"
 
 real_t AABB::get_volume() const {

core/math/bsp_tree.h

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

core/math/expression.cpp

@@ -36,7 +36,7 @@
 #include "core/math/math_funcs.h"
 #include "core/os/os.h"
 #include "core/reference.h"
-#include "core/variant_parser.h"
+#include "core/variant/variant_parser.h"
 
 const char *Expression::func_name[Expression::FUNC_MAX] = {
 	"sin",

core/math/math_fieldwise.h

@@ -32,7 +32,7 @@
 
 #ifdef TOOLS_ENABLED
 
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const String &p_field);
 

core/math/octree_definition.inc

@@ -39,7 +39,7 @@
 #include "core/math/vector3.h"
 #include "core/os/os.h"
 #include "core/print_string.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 typedef uint32_t OctreeElementID;
 

core/math/plane.cpp

@@ -31,7 +31,7 @@
 #include "plane.h"
 
 #include "core/math/math_funcs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 void Plane::set_normal(const Vector3 &p_normal) {
 	normal = p_normal;

core/math/projection.cpp

@@ -30,14 +30,14 @@
 
 #include "projection.h"
 
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/math/aabb.h"
 #include "core/math/math_funcs.h"
 #include "core/math/plane.h"
 #include "core/math/rect2.h"
 #include "core/math/transform.h"
 #include "core/print_string.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 float Projection::determinant() const {
 	return matrix[0][3] * matrix[1][2] * matrix[2][1] * matrix[3][0] - matrix[0][2] * matrix[1][3] * matrix[2][1] * matrix[3][0] -

core/method_bind.h

@@ -31,9 +31,9 @@
 /*************************************************************************/
 
 #include "core/containers/list.h"
-#include "core/method_ptrcall.h"
+#include "core/variant/method_ptrcall.h"
 #include "core/object.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 #include <stdio.h>
 
@@ -41,7 +41,7 @@
 #define DEBUG_METHODS_ENABLED
 #endif
 
-#include "core/type_info.h"
+#include "core/variant/type_info.h"
 
 enum MethodFlags {
 

core/object.h

@@ -37,7 +37,7 @@
 #include "core/os/rw_lock.h"
 #include "core/safe_refcount.h"
 #include "core/containers/set.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vmap.h"
 
 #include <atomic>

core/os/midi_driver.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 /**
  * Multi-Platform abstraction for accessing to MIDI.

core/project_settings.cpp

@@ -39,7 +39,7 @@
 #include "core/os/file_access.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/variant_parser.h"
+#include "core/variant/variant_parser.h"
 
 #include <zlib.h>
 

core/ustring.cpp

@@ -41,7 +41,7 @@
 #include "core/print_string.h"
 #include "core/translation.h"
 #include "core/ucaps.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/version_generated.gen.h"
 
 #include <wchar.h>

core/ustring.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/char_utils.h"
 #include "core/containers/cowdata.h"
 #include "core/typedefs.h"

core/variant/SCsub

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

core/variant/array.cpp

@@ -32,7 +32,7 @@
 
 #include "core/containers/hashfuncs.h"
 #include "core/object.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 class ArrayPrivate {

core/variant/dictionary.cpp

@@ -32,7 +32,7 @@
 
 #include "core/containers/ordered_hash_map.h"
 #include "core/safe_refcount.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 struct DictionaryPrivate {
 	SafeRefCount refcount;

core/variant/dictionary.h

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

core/variant/method_ptrcall.h

@@ -32,7 +32,7 @@
 
 #include "core/math/transform_2d.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 #ifdef PTRCALL_ENABLED
 

core/variant/variant.cpp

@@ -36,7 +36,7 @@
 #include "core/object_rc.h"
 #include "core/print_string.h"
 #include "core/resource.h"
-#include "core/variant_parser.h"
+#include "core/variant/variant_parser.h"
 #include "scene/gui/control.h"
 #include "scene/main/node.h"
 

core/variant/variant.h

@@ -30,9 +30,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/math/color.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/io/ip_address.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"

core/variant/variant_parser.h

@@ -32,7 +32,7 @@
 
 #include "core/os/file_access.h"
 #include "core/resource.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 class VariantParser {
 public:

drivers/gles2/shader_gles2.h

@@ -42,7 +42,7 @@
 #include "core/containers/map.h"
 #include "core/math/projection.h"
 #include "core/pair.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "servers/visual/shader_language.h"
 
 #include <stdio.h>

editor/animation_bezier_editor.cpp

@@ -32,7 +32,7 @@
 
 #include "editor/editor_node.h"
 #include "editor_scale.h"
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"

editor/animation_bezier_editor.h

@@ -39,7 +39,7 @@
 #include "core/reference.h"
 #include "core/containers/set.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 #include "scene/resources/animation.h"

editor/animation_track_editor.cpp

@@ -31,7 +31,7 @@
 #include "animation_track_editor.h"
 
 #include "animation_track_editor_plugins.h"
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/engine.h"

editor/animation_track_editor.h

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

editor/animation_track_editor_plugins.cpp

@@ -39,7 +39,7 @@
 #include "servers/audio/audio_stream.h"
 #include "core/class_db.h"
 #include "core/math/color.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"

editor/animation_track_editor_plugins.h

@@ -38,7 +38,7 @@
 #include "core/object_id.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 #include "scene/resources/texture.h"
 

editor/array_property_edit.cpp

@@ -32,7 +32,7 @@
 
 #include "core/io/marshalls.h"
 #include "editor_node.h"
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"

editor/array_property_edit.h

@@ -38,7 +38,7 @@
 #include "core/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 class Node;
 

editor/audio_stream_preview.cpp

@@ -37,7 +37,7 @@
 #include "core/os/memory.h"
 #include "core/os/thread.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "servers/audio_server.h"
 
 /////////////////////

editor/code_editor.cpp

@@ -30,9 +30,9 @@
 
 #include "code_editor.h"
 
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"
 #include "core/os/input.h"

editor/code_editor.h

@@ -38,7 +38,7 @@
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 class Button;
 class CheckBox;

editor/connections_dialog.cpp

@@ -32,7 +32,7 @@
 
 #include "core/class_db.h"
 #include "core/math/color.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/aabb.h"
@@ -49,7 +49,7 @@
 #include "core/script_language.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "editor/doc/doc_data.h"
 #include "editor/editor_help.h"
 #include "editor/editor_inspector.h"

editor/create_dialog.cpp

@@ -38,7 +38,7 @@
 #include "editor_settings.h"
 #include "scene/gui/box_container.h"
 #include "core/math/color.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/os/file_access.h"

editor/create_dialog.h

@@ -41,7 +41,7 @@
 #include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 class Button;

editor/dependency_editor.cpp

@@ -49,7 +49,7 @@
 #include "core/resource.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_settings.h"

editor/dictionary_property_edit.cpp

@@ -31,9 +31,9 @@
 #include "dictionary_property_edit.h"
 
 #include "editor_node.h"
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/undo_redo.h"
 #include "scene/main/node.h"
 

editor/dictionary_property_edit.h

@@ -38,7 +38,7 @@
 #include "core/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 class Node;
 

editor/doc/doc_data.cpp

@@ -52,7 +52,7 @@
 #include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 static String _get_indent(const String &p_text) {
 	String indent;

editor/doc/doc_data.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/containers/map.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/reference.h"
 #include "core/error_list.h"
 #include "core/ustring.h"

editor/editor_about.cpp

@@ -40,7 +40,7 @@
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/reference.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "editor/editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"

editor/editor_audio_buses.cpp

@@ -40,7 +40,7 @@
 #include "servers/audio_server.h"
 #include "core/project_settings.h"
 #include "core/class_db.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"

editor/editor_audio_buses.h

@@ -44,7 +44,7 @@
 #include "core/reference.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "scene/resources/texture.h"
 
 class EditorAudioBuses;

editor/editor_autoload_settings.cpp

@@ -39,7 +39,7 @@
 #include "scene/resources/packed_scene.h"
 #include "core/class_db.h"
 #include "core/math/color.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/map.h"

editor/editor_autoload_settings.h

@@ -36,7 +36,7 @@
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 class Button;
 class Control;

editor/editor_data.h

@@ -38,8 +38,8 @@
 #include "core/containers/list.h"
 #include "core/pair.h"
 #include "core/undo_redo.h"
-#include "core/array.h"
-#include "core/dictionary.h"
+#include "core/variant/array.h"
+#include "core/variant/dictionary.h"
 #include "core/containers/hash_map.h"
 #include "core/containers/map.h"
 #include "core/node_path.h"
@@ -50,7 +50,7 @@
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 class ConfigFile;

editor/editor_dir_dialog.cpp

@@ -43,7 +43,7 @@
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/memory.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "scene/2d/canvas_item.h"
 #include "scene/gui/tree.h"
 #include "scene/main/node.h"

editor/editor_export.h

@@ -47,7 +47,7 @@
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 class FileAccess;

editor/editor_file_dialog.cpp

@@ -32,7 +32,7 @@
 
 #include "core/class_db.h"
 #include "core/math/color.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/containers/list.h"

editor/editor_file_dialog.h

@@ -41,7 +41,7 @@
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 class DependencyRemoveDialog;

editor/editor_file_system.cpp

@@ -36,13 +36,13 @@
 #include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
-#include "core/variant_parser.h"
+#include "core/variant/variant_parser.h"
 #include "editor_node.h"
 #include "editor_resource_preview.h"
 #include "editor_settings.h"
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/os/dir_access.h"
@@ -52,7 +52,7 @@
 #include "core/resource.h"
 #include "core/script_language.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "editor/editor_data.h"
 
 EditorFileSystem *EditorFileSystem::singleton = nullptr;

editor/editor_folding.cpp

@@ -33,7 +33,7 @@
 #include "core/os/file_access.h"
 #include "editor_inspector.h"
 #include "editor_settings.h"
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/io/config_file.h"
@@ -41,7 +41,7 @@
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/reference.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "scene/main/node.h"
 
 PoolVector<String> EditorFolding::_get_unfolds(const Object *p_object) {

editor/editor_fonts.cpp

@@ -37,7 +37,7 @@
 #include "scene/resources/dynamic_font.h"
 #include "core/os/memory.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "scene/resources/font.h"
 #include "scene/resources/theme.h"
 

editor/editor_help.cpp

@@ -52,7 +52,7 @@
 #include "core/pair.h"
 #include "core/containers/set.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "scene/2d/canvas_item.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"

editor/editor_help_search.cpp

@@ -41,7 +41,7 @@
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "editor/editor_help.h"
 #include "editor/editor_settings.h"
 #include "scene/gui/box_container.h"

editor/editor_inspector.cpp

@@ -30,9 +30,9 @@
 
 #include "editor_inspector.h"
 
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_macros.h"
 #include "core/containers/hash_map.h"
 #include "core/math/math_defs.h"

editor/editor_inspector.h

@@ -47,7 +47,7 @@
 #include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 #include "scene/resources/texture.h"

editor/editor_layouts_dialog.cpp

@@ -43,7 +43,7 @@
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 #include "scene/gui/control.h"
 

editor/editor_network_profiler.cpp

@@ -39,7 +39,7 @@
 #include "core/os/memory.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"

editor/editor_node.cpp

@@ -32,7 +32,7 @@
 
 #include <stdlib.h>
 
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/engine.h"

editor/editor_node.h

@@ -41,7 +41,7 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/split_container.h"
 
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_list.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
@@ -58,7 +58,7 @@
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 #include "editor/editor_data.h"
 #include "scene/gui/control.h"

editor/editor_path.cpp

@@ -42,7 +42,7 @@
 #include "core/resource.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "editor/editor_data.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"

editor/editor_plugin.h

@@ -36,8 +36,8 @@
 
 #include "scene/resources/texture.h"
 
-#include "core/array.h"
-#include "core/dictionary.h"
+#include "core/variant/array.h"
+#include "core/variant/dictionary.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/io/config_file.h"
@@ -48,7 +48,7 @@
 #include "core/reference.h"
 #include "core/undo_redo.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 class EditorNode;

editor/editor_plugin_settings.cpp

@@ -39,7 +39,7 @@
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
 #include "core/reference.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "editor/plugin_config_dialog.h"
 #include "editor_node.h"
 #include "editor_scale.h"

editor/editor_profiler.cpp

@@ -40,7 +40,7 @@
 #include "core/math/vector2.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"

editor/editor_properties.cpp

@@ -30,9 +30,9 @@
 
 #include "editor_properties.h"
 
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_macros.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"

editor/editor_properties.h

@@ -42,7 +42,7 @@
 #include "core/resource.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 class AcceptDialog;

editor/editor_properties_array_dict.h

@@ -33,13 +33,13 @@
 #include "editor/editor_inspector.h"
 #include "core/reference.h"
 
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/object_id.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 class Button;
 class Control;

editor/editor_resource_picker.cpp

@@ -38,7 +38,7 @@
 #include "scene/main/viewport.h"
 #include "core/class_db.h"
 #include "core/math/color.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/map.h"

editor/editor_resource_picker.h

@@ -41,7 +41,7 @@
 #include "core/resource.h"
 #include "core/containers/set.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 class Button;

editor/editor_resource_preview.h

@@ -45,7 +45,7 @@
 #include "core/resource.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 #include "scene/resources/texture.h"

editor/editor_run.cpp

@@ -40,7 +40,7 @@
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 EditorRun::Status EditorRun::get_status() const {

editor/editor_run_native.cpp

@@ -37,7 +37,7 @@
 #include "core/reference.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "editor_export.h"
 #include "editor_node.h"
 #include "editor_scale.h"

editor/editor_run_script.cpp

@@ -35,7 +35,7 @@
 #include "core/error_macros.h"
 #include "core/script_language.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "editor/editor_plugin.h"
 
 class Node;

editor/editor_sectioned_inspector.cpp

@@ -38,7 +38,7 @@
 #include "core/os/memory.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 #include "editor/editor_inspector.h"
 #include "scene/gui/box_container.h"

editor/editor_settings.cpp

@@ -30,10 +30,10 @@
 
 #include "editor_settings.h"
 
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
 #include "core/math/color.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/io/certs_compressed.gen.h"

editor/editor_settings.h

@@ -44,7 +44,7 @@
 #include "core/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 class EditorPlugin;

editor/editor_spin_slider.cpp

@@ -34,7 +34,7 @@
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
 #include "editor_scale.h"
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
@@ -46,7 +46,7 @@
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "scene/2d/canvas_item.h"
 #include "scene/gui/control.h"
 #include "scene/gui/line_edit.h"

editor/editor_sub_scene.cpp

@@ -38,7 +38,7 @@
 #include "core/os/memory.h"
 #include "core/reference.h"
 #include "core/string_name.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "editor/editor_file_dialog.h"
 #include "scene/2d/canvas_item.h"
 #include "scene/gui/box_container.h"

editor/editor_themes.cpp

@@ -40,7 +40,7 @@
 #include "editor_settings.h"
 #include "modules/modules_enabled.gen.h" // For svg.
 #include "core/math/color.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/image.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
@@ -50,7 +50,7 @@
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "scene/resources/font.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"

editor/export_template_manager.cpp

@@ -30,9 +30,9 @@
 
 #include "export_template_manager.h"
 
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_macros.h"
 #include "core/io/http_client.h"
 #include "core/io/json.h"

editor/export_template_manager.h

@@ -35,7 +35,7 @@
 #include "core/error_list.h"
 #include "core/object.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 class ExportTemplateVersion;
 class HBoxContainer;

editor/filesystem_dock.cpp

@@ -44,10 +44,10 @@
 #include "import_dock.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/packed_scene.h"
-#include "core/array.h"
+#include "core/variant/array.h"
 #include "core/class_db.h"
 #include "core/math/color.h"
-#include "core/dictionary.h"
+#include "core/variant/dictionary.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/io/config_file.h"

editor/filesystem_dock.h

@@ -44,7 +44,7 @@
 #include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "core/containers/vector.h"
 
 class EditorNode;