Moved Object related classes under core/object.

core/SCsub

@@ -3,7 +3,6 @@
 Import("env")
 
 import core_builders
-import make_binders
 from platform_methods import run_in_subprocess
 
 env.core_sources = []
@@ -165,13 +164,6 @@ env.CommandNoCache(
     run_in_subprocess(core_builders.make_certs_header),
 )
 
-# Make binders
-env.CommandNoCache(
-    ["method_bind.gen.inc", "method_bind_ext.gen.inc", "method_bind_free_func.gen.inc"],
-    "make_binders.py",
-    run_in_subprocess(make_binders.run),
-)
-
 # Authors
 env.Depends("#core/authors.gen.h", "../AUTHORS.md")
 env.CommandNoCache("#core/authors.gen.h", "../AUTHORS.md", run_in_subprocess(core_builders.make_authors_header))
@@ -194,6 +186,7 @@ SConscript("variant/SCsub")
 SConscript("crypto/SCsub")
 SConscript("io/SCsub")
 SConscript("log/SCsub")
+SConscript("object/SCsub")
 SConscript("bind/SCsub")
 
 # Build it all as a library

core/bind/core_bind.cpp

@@ -36,7 +36,7 @@
 #include "core/io/json.h"
 #include "core/io/marshalls.h"
 #include "core/math/geometry.h"
-#include "core/method_bind_ext.gen.inc"
+#include "core/object/method_bind_ext.gen.inc"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"

core/bind/logger_bind.h

@@ -3,7 +3,7 @@
 #define PLOGGER_BIND_H
 
 #include "core/log/logger_backend.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
 

core/containers/packed_data_container.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/resource.h"
+#include "core/object/resource.h"
 
 class PackedDataContainer : public Resource {
 	GDCLASS(PackedDataContainer, Resource);

core/crypto/aes_context.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/crypto/crypto_core.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class AESContext : public Reference {
 	GDCLASS(AESContext, Reference);

core/crypto/crypto.h

@@ -31,8 +31,8 @@
 /*************************************************************************/
 
 #include "core/crypto/hashing_context.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
 
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"

core/crypto/crypto_core.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class CryptoCore {
 public:

core/crypto/hashing_context.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class HashingContext : public Reference {
 	GDCLASS(HashingContext, Reference);

core/func_ref.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class FuncRef : public Reference {
 	GDCLASS(FuncRef, Reference);

core/global_constants.cpp

@@ -30,7 +30,7 @@
 
 #include "global_constants.h"
 
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/os/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/variant/variant.h"

core/image.h

@@ -33,7 +33,7 @@
 #include "core/math/color.h"
 #include "core/math/rect2.h"
 #include "core/containers/pool_vector.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
 
 /**
  *	@author Juan Linietsky <reduzio@gmail.com>

core/input_map.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/os/input_event.h"
 
 class InputMap : public Object {

core/io/config_file.h

@@ -32,7 +32,7 @@
 
 #include "core/containers/ordered_hash_map.h"
 #include "core/os/file_access.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/variant/variant_parser.h"
 
 class ConfigFile : public Reference {

core/io/http_client.h

@@ -33,7 +33,7 @@
 #include "core/io/ip.h"
 #include "core/io/stream_peer.h"
 #include "core/io/stream_peer_tcp.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class HTTPClient : public Reference {
 	GDCLASS(HTTPClient, Reference);

core/io/marshalls.cpp

@@ -32,7 +32,7 @@
 
 #include "core/os/keyboard.h"
 #include "core/print_string.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 #include <limits.h>
 #include <stdio.h>

core/io/marshalls.h

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

core/io/multiplayer_api.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/io/networked_multiplayer_peer.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class MultiplayerAPI : public Reference {
 	GDCLASS(MultiplayerAPI, Reference);

core/io/net_socket.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/io/ip.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class NetSocket : public Reference {
 protected:

core/io/packet_peer.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/io/stream_peer.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/containers/ring_buffer.h"
 
 class PacketPeer : public Reference {

core/io/pck_packer.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class FileAccess;
 

core/io/resource_loader.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/thread.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
 
 class ResourceInteractiveLoader : public Reference {
 	GDCLASS(ResourceInteractiveLoader, Reference);

core/io/resource_saver.cpp

@@ -32,7 +32,7 @@
 #include "core/io/resource_loader.h"
 #include "core/os/file_access.h"
 #include "core/project_settings.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 
 Ref<ResourceFormatSaver> ResourceSaver::saver[MAX_SAVERS];
 

core/io/resource_saver.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/resource.h"
+#include "core/object/resource.h"
 
 class ResourceFormatSaver : public Reference {
 	GDCLASS(ResourceFormatSaver, Reference);

core/io/stream_peer.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class StreamPeer : public Reference {
 	GDCLASS(StreamPeer, Reference);

core/io/xml_parser.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/file_access.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/ustring.h"
 #include "core/containers/vector.h"
 

core/log/logger.h

@@ -2,7 +2,7 @@
 #ifndef PLOGGER_H
 #define PLOGGER_H
 
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
 #include "logger_backend.h"

core/log/logger_backend.h

@@ -4,7 +4,7 @@
 #include "core/ustring.h"
 #include "core/variant/variant.h"
 
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class LoggerBackend : public Reference {
 	GDCLASS(LoggerBackend, Reference);

core/math/a_star.cpp

@@ -31,7 +31,7 @@
 #include "a_star.h"
 
 #include "core/math/geometry.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 #include "scene/scene_string_names.h"
 
 int AStar::get_available_point_id() const {

core/math/a_star.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/containers/oa_hash_map.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 /**
 	A* pathfinding algorithm

core/math/expression.cpp

@@ -30,12 +30,12 @@
 
 #include "expression.h"
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/func_ref.h"
 #include "core/io/marshalls.h"
 #include "core/math/math_funcs.h"
 #include "core/os/os.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/variant/variant_parser.h"
 
 const char *Expression::func_name[Expression::FUNC_MAX] = {

core/math/expression.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class Expression : public Reference {
 	GDCLASS(Expression, Reference);

core/math/geometry.h

@@ -36,7 +36,7 @@
 #include "core/math/triangulate.h"
 #include "core/math/vector3.h"
 #include "core/math/vector2i.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/containers/pool_vector.h"
 #include "core/print_string.h"
 #include "core/containers/vector.h"

core/math/random_number_generator.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/math/random_pcg.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class RandomNumberGenerator : public Reference {
 	GDCLASS(RandomNumberGenerator, Reference);

core/math/triangle_mesh.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/math/face3.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class TriangleMesh : public Reference {
 	GDCLASS(TriangleMesh, Reference);

core/object/SCsub

@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+
+import make_binders
+from platform_methods import run_in_subprocess
+
+Import("env")
+
+env_object = env.Clone()
+
+# Make binders
+env_object.CommandNoCache(
+    ["method_bind.gen.inc", "method_bind_ext.gen.inc", "method_bind_free_func.gen.inc"],
+    "make_binders.py",
+    run_in_subprocess(make_binders.run),
+)
+
+
+env_object.add_source_files(env.core_sources, "*.cpp")

core/object/class_db.h

@@ -30,12 +30,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/method_bind.h"
+#include "core/object/method_bind.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/print_string.h"
 
 /**	To bind more then 6 parameters include this:
- *  #include "core/method_bind_ext.gen.inc"
+ *  #include "core/object/method_bind_ext.gen.inc"
  */
 
 #define DEFVAL(m_defval) (m_defval)

core/object/message_queue.cpp

@@ -31,7 +31,7 @@
 #include "message_queue.h"
 
 #include "core/project_settings.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 
 MessageQueue *MessageQueue::singleton = nullptr;
 

core/object/message_queue.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/os/thread_safe.h"
 
 class MessageQueue {

core/object/method_bind.cpp

@@ -30,7 +30,7 @@
 
 // object.h needs to be the first include *before* method_bind.h
 // FIXME: Find out why and fix potential cyclical dependencies.
-#include "core/object.h"
+#include "core/object/object.h"
 
 #include "method_bind.h"
 

core/object/method_bind.h

@@ -32,7 +32,7 @@
 
 #include "core/containers/list.h"
 #include "core/variant/method_ptrcall.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/variant/variant.h"
 
 #include <stdio.h>

core/object/object.cpp

@@ -30,14 +30,14 @@
 
 #include "object.h"
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/core_string_names.h"
-#include "core/message_queue.h"
+#include "core/object/message_queue.h"
 #include "core/object_rc.h"
 #include "core/os/os.h"
 #include "core/print_string.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 #include "core/translation.h"
 
 #ifdef DEBUG_ENABLED

core/object/object.h

@@ -859,6 +859,6 @@ public:
 };
 
 //needed by macros
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 
 #endif

core/object/ref_ptr.cpp

@@ -30,8 +30,8 @@
 
 #include "ref_ptr.h"
 
-#include "core/reference.h"
+#include "core/object/reference.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
 
 void RefPtr::operator=(const RefPtr &p_other) {
 	Ref<Reference> *ref = reinterpret_cast<Ref<Reference> *>(&data[0]);

core/object/reference.cpp

@@ -30,7 +30,7 @@
 
 #include "reference.h"
 
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 
 bool Reference::init_ref() {
 	if (reference()) {

core/object/reference.h

@@ -30,9 +30,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
-#include "core/object.h"
+#include "core/object/object.h"
-#include "core/ref_ptr.h"
+#include "core/object/ref_ptr.h"
 #include "core/safe_refcount.h"
 
 class Reference : public Object {

core/object/resource.cpp

@@ -34,7 +34,7 @@
 #include "core/io/resource_loader.h"
 #include "core/os/file_access.h"
 #include "core/os/os.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 #include "scene/main/node.h" //only so casting works
 
 #include <stdio.h>

core/object/resource.h

@@ -30,10 +30,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
-#include "core/object.h"
+#include "core/object/object.h"
-#include "core/ref_ptr.h"
+#include "core/object/ref_ptr.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/safe_refcount.h"
 #include "core/containers/self_list.h"
 

core/object/script_language.h

@@ -33,7 +33,7 @@
 #include "core/io/multiplayer_api.h"
 #include "core/containers/map.h"
 #include "core/pair.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
 
 class ScriptLanguage;
 

core/object/undo_redo.cpp

@@ -31,7 +31,7 @@
 #include "undo_redo.h"
 
 #include "core/os/os.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
 
 void UndoRedo::Operation::delete_reference() {
 	if (type != Operation::TYPE_REFERENCE) {

core/object/undo_redo.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class UndoRedo : public Object {
 	GDCLASS(UndoRedo, Object);

core/os/input.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/math/vector2i.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/os/main_loop.h"
 #include "core/os/thread_safe.h"
 

core/os/input_event.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/math/transform_2d.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
 

core/os/main_loop.cpp

@@ -30,7 +30,7 @@
 
 #include "main_loop.h"
 
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 
 void MainLoop::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("input_event", "event"), &MainLoop::input_event);

core/os/main_loop.h

@@ -31,8 +31,8 @@
 /*************************************************************************/
 
 #include "core/os/input_event.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 
 class MainLoop : public Object {
 	GDCLASS(MainLoop, Object);

core/os/thread.cpp

@@ -32,7 +32,7 @@
 
 #include "thread.h"
 
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 
 #if !defined(NO_THREADS)
 

core/os/time.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 
 // This Time class conforms with as many of the ISO 8601 standards as possible.
 // * As per ISO 8601:2004 4.3.2.1, all dates follow the Proleptic Gregorian

core/project_settings.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/os/thread_safe.h"
 #include "core/containers/set.h"
 

core/register_core_types.cpp

@@ -31,7 +31,7 @@
 #include "register_core_types.h"
 
 #include "core/bind/core_bind.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/compressed_translation.h"
 #include "core/core_string_names.h"
 #include "core/crypto/aes_context.h"
@@ -72,7 +72,7 @@
 #include "core/path_remap.h"
 #include "core/project_settings.h"
 #include "core/translation.h"
-#include "core/undo_redo.h"
+#include "core/object/undo_redo.h"
 
 #include "core/bind/logger_bind.h"
 #include "core/log/logger_backend.h"

core/script_debugger_local.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/containers/list.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 
 class ScriptDebuggerLocal : public ScriptDebugger {
 	bool profiling;

core/translation.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/resource.h"
+#include "core/object/resource.h"
 
 class Translation : public Resource {
 	GDCLASS(Translation, Resource);

core/variant/array.cpp

@@ -31,7 +31,7 @@
 #include "array.h"
 
 #include "core/containers/hashfuncs.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/variant/variant.h"
 #include "core/containers/vector.h"
 

core/variant/variant.cpp

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

core/variant/variant.h

@@ -49,7 +49,7 @@
 #include "core/node_path.h"
 #include "core/object_id.h"
 #include "core/containers/pool_vector.h"
-#include "core/ref_ptr.h"
+#include "core/object/ref_ptr.h"
 #include "core/rid.h"
 #include "core/ustring.h"
 

core/variant/variant_call.cpp

@@ -34,10 +34,10 @@
 #include "core/core_string_names.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/compression.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/object_rc.h"
 #include "core/os/os.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 
 typedef void (*VariantFunc)(Variant &r_ret, Variant &p_self, const Variant **p_args);
 typedef void (*VariantConstructFunc)(Variant &r_ret, const Variant **p_args);

core/variant/variant_op.cpp

@@ -31,9 +31,9 @@
 #include "variant.h"
 
 #include "core/core_string_names.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/object_rc.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 
 #define CASE_TYPE_ALL(PREFIX, OP) \
 	CASE_TYPE(PREFIX, OP, INT)    \

core/variant/variant_parser.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/file_access.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
 #include "core/variant/variant.h"
 
 class VariantParser {

editor/animation_bezier_editor.cpp

@@ -33,7 +33,7 @@
 #include "editor/editor_node.h"
 #include "editor_scale.h"
 #include "core/variant/array.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"
 #include "core/containers/list.h"
@@ -46,7 +46,7 @@
 #include "core/pair.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
-#include "core/undo_redo.h"
+#include "core/object/undo_redo.h"
 #include "editor/animation_track_editor.h"
 #include "editor/editor_settings.h"
 #include "scene/2d/canvas_item.h"

editor/animation_bezier_editor.h

@@ -35,8 +35,8 @@
 #include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
-#include "core/object.h"
+#include "core/object/object.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/containers/set.h"
 #include "core/ustring.h"
 #include "core/variant/variant.h"

editor/animation_track_editor.cpp

@@ -32,7 +32,7 @@
 
 #include "animation_track_editor_plugins.h"
 #include "core/variant/array.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/engine.h"
 #include "core/error_macros.h"
@@ -47,12 +47,12 @@
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/pair.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 #include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
-#include "core/undo_redo.h"
+#include "core/object/undo_redo.h"
 #include "editor/animation_bezier_editor.h"
 #include "editor/editor_data.h"
 #include "editor/editor_inspector.h"

editor/animation_track_editor.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
 #include "scene/gui/range.h"
@@ -43,7 +43,7 @@
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/node_path.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/ustring.h"
 #include "core/variant/variant.h"
 #include "core/containers/vector.h"

editor/animation_track_editor_plugins.cpp

@@ -37,7 +37,7 @@
 #include "scene/3d/sprite_3d.h"
 #include "scene/animation/animation_player.h"
 #include "servers/audio/audio_stream.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
 #include "core/io/resource_loader.h"
@@ -48,7 +48,7 @@
 #include "core/os/memory.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
-#include "core/undo_redo.h"
+#include "core/object/undo_redo.h"
 #include "core/containers/vector.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/font.h"

editor/animation_track_editor_plugins.h

@@ -34,9 +34,9 @@
 
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/object_id.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/ustring.h"
 #include "core/variant/variant.h"
 

editor/array_property_edit.cpp

@@ -33,9 +33,9 @@
 #include "core/io/marshalls.h"
 #include "editor_node.h"
 #include "core/variant/array.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/typedefs.h"
-#include "core/undo_redo.h"
+#include "core/object/undo_redo.h"
 #include "scene/main/node.h"
 
 #define ITEMS_PER_PAGE 100

editor/array_property_edit.h

@@ -33,9 +33,9 @@
 #include "scene/main/node.h"
 
 #include "core/containers/list.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/object_id.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant/variant.h"

editor/audio_stream_preview.cpp

@@ -30,7 +30,7 @@
 
 #include "audio_stream_preview.h"
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/audio_frame.h"

editor/audio_stream_preview.h

@@ -37,9 +37,9 @@
 #include "servers/audio/audio_stream.h"
 
 #include "core/containers/map.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/object_id.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/containers/vector.h"
 
 class Thread;

editor/code_editor.cpp

@@ -31,7 +31,7 @@
 #include "code_editor.h"
 
 #include "core/variant/array.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"
@@ -39,8 +39,8 @@
 #include "core/os/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 #include "core/string_builder.h"
 #include "core/typedefs.h"
 #include "core/containers/vector.h"

editor/code_editor.h

@@ -35,8 +35,8 @@
 
 #include "core/containers/list.h"
 #include "core/math/math_defs.h"
-#include "core/object.h"
+#include "core/object/object.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/ustring.h"
 #include "core/variant/variant.h"
 

editor/connections_dialog.cpp

@@ -30,7 +30,7 @@
 
 #include "connections_dialog.h"
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
 #include "core/error_macros.h"
@@ -44,11 +44,11 @@
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/os/memory.h"
-#include "core/ref_ptr.h"
+#include "core/object/ref_ptr.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 #include "core/typedefs.h"
-#include "core/undo_redo.h"
+#include "core/object/undo_redo.h"
 #include "core/variant/variant.h"
 #include "editor/doc/doc_data.h"
 #include "editor/editor_help.h"

editor/connections_dialog.h

@@ -38,10 +38,10 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/box_container.h"
 
-#include "core/undo_redo.h"
+#include "core/object/undo_redo.h"
 #include "core/containers/map.h"
 #include "core/node_path.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/containers/vector.h"

editor/create_dialog.cpp

@@ -30,7 +30,7 @@
 
 #include "create_dialog.h"
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor_help.h"
 #include "editor_node.h"
@@ -44,7 +44,7 @@
 #include "core/os/file_access.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 #include "core/typedefs.h"
 #include "editor/doc/doc_data.h"
 #include "editor/editor_data.h"

editor/create_dialog.h

@@ -35,9 +35,9 @@
 #include "core/containers/hash_map.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
-#include "core/object.h"
+#include "core/object/object.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
 #include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/ustring.h"

editor/dependency_editor.cpp

@@ -36,7 +36,7 @@
 #include "editor_scale.h"
 #include "scene/gui/margin_container.h"
 #include "core/project_settings.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
@@ -45,8 +45,8 @@
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/print_string.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/variant/variant.h"

editor/dependency_editor.h

@@ -35,7 +35,7 @@
 #include "core/containers/hash_map.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/ustring.h"
 #include "core/containers/vector.h"
 

editor/dictionary_property_edit.cpp

@@ -32,9 +32,9 @@
 
 #include "editor_node.h"
 #include "core/variant/array.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/undo_redo.h"
+#include "core/object/undo_redo.h"
 #include "scene/main/node.h"
 
 void DictionaryPropertyEdit::_notif_change() {

editor/dictionary_property_edit.h

@@ -33,9 +33,9 @@
 #include "scene/main/node.h"
 
 #include "core/containers/list.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/object_id.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant/variant.h"

editor/doc/doc_data.cpp

@@ -35,16 +35,16 @@
 #include "core/io/compression.h"
 #include "core/os/dir_access.h"
 #include "core/project_settings.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 #include "core/translation.h"
 #include "core/version.h"
 #include "scene/resources/theme.h"
 #include "core/io/xml_parser.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/error_macros.h"
 #include "core/containers/list.h"
-#include "core/method_bind.h"
+#include "core/object/method_bind.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
 #include "core/pair.h"

editor/doc/doc_data.h

@@ -32,7 +32,7 @@
 
 #include "core/containers/map.h"
 #include "core/variant/variant.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/error_list.h"
 #include "core/ustring.h"
 #include "core/containers/vector.h"

editor/editor_about.cpp

@@ -34,12 +34,12 @@
 #include "core/donors.gen.h"
 #include "core/license.gen.h"
 #include "core/version.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/variant/variant.h"
 #include "editor/editor_scale.h"
 #include "scene/gui/box_container.h"

editor/editor_about.h

@@ -33,7 +33,7 @@
 #include "scene/gui/dialogs.h"
 
 #include "core/containers/list.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/ustring.h"
 
 class LinkButton;

editor/editor_atlas_packer.h

@@ -33,7 +33,7 @@
 #include "core/math/vector2.h"
 #include "core/containers/vector.h"
 #include "scene/resources/bit_map.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 
 class BitMap;
 

editor/editor_audio_buses.cpp

@@ -39,7 +39,7 @@
 #include "scene/resources/font.h"
 #include "servers/audio_server.h"
 #include "core/project_settings.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
@@ -50,7 +50,7 @@
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
 #include "core/string_name.h"
-#include "core/undo_redo.h"
+#include "core/object/undo_redo.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_settings.h"
 #include "scene/2d/canvas_item.h"

editor/editor_audio_buses.h

@@ -40,8 +40,8 @@
 #include "core/math/color.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
-#include "core/object.h"
+#include "core/object/object.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
 #include "core/variant/variant.h"

editor/editor_autoload_settings.cpp

@@ -37,7 +37,7 @@
 #include "project_settings_editor.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/packed_scene.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
 #include "core/error_macros.h"
@@ -47,12 +47,12 @@
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
-#include "core/reference.h"
+#include "core/object/reference.h"
-#include "core/resource.h"
+#include "core/object/resource.h"
-#include "core/script_language.h"
+#include "core/object/script_language.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
-#include "core/undo_redo.h"
+#include "core/object/undo_redo.h"
 #include "core/containers/vector.h"
 #include "editor/editor_file_dialog.h"
 #include "scene/gui/button.h"

editor/editor_autoload_settings.h

@@ -34,7 +34,7 @@
 
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "core/ustring.h"
 #include "core/variant/variant.h"
 

editor/editor_data.cpp

@@ -30,7 +30,7 @@
 
 #include "editor_data.h"
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/io/config_file.h"