diff --git a/core/SCsub b/core/SCsub index 50f981cac..4cd2c7832 100644 --- a/core/SCsub +++ b/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 diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index f83238bb8..99685850e 100644 --- a/core/bind/core_bind.cpp +++ b/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" diff --git a/core/bind/logger_bind.h b/core/bind/logger_bind.h index 0a00c36fc..1901d5134 100644 --- a/core/bind/logger_bind.h +++ b/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" diff --git a/core/containers/packed_data_container.h b/core/containers/packed_data_container.h index 1d5f52dff..a187e4779 100644 --- a/core/containers/packed_data_container.h +++ b/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); diff --git a/core/crypto/aes_context.h b/core/crypto/aes_context.h index a34f131e9..b89cf6889 100644 --- a/core/crypto/aes_context.h +++ b/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); diff --git a/core/crypto/crypto.h b/core/crypto/crypto.h index 246cb0cc8..3403d0bea 100644 --- a/core/crypto/crypto.h +++ b/core/crypto/crypto.h @@ -31,8 +31,8 @@ /*************************************************************************/ #include "core/crypto/hashing_context.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" diff --git a/core/crypto/crypto_core.h b/core/crypto/crypto_core.h index f33c27984..fe6fe54c6 100644 --- a/core/crypto/crypto_core.h +++ b/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: diff --git a/core/crypto/hashing_context.h b/core/crypto/hashing_context.h index cf6e08f4b..7f4d55a4d 100644 --- a/core/crypto/hashing_context.h +++ b/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); diff --git a/core/func_ref.h b/core/func_ref.h index ef2a77d49..f6581c5aa 100644 --- a/core/func_ref.h +++ b/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); diff --git a/core/global_constants.cpp b/core/global_constants.cpp index 3866cfabc..14dc12301 100644 --- a/core/global_constants.cpp +++ b/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" diff --git a/core/image.h b/core/image.h index ba4f7b3de..74dd9db51 100644 --- a/core/image.h +++ b/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 diff --git a/core/input_map.h b/core/input_map.h index c4726d357..41a66d6bd 100644 --- a/core/input_map.h +++ b/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 { diff --git a/core/io/config_file.h b/core/io/config_file.h index d4b49cff4..674dd5c1a 100644 --- a/core/io/config_file.h +++ b/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 { diff --git a/core/io/http_client.h b/core/io/http_client.h index 709cf9326..a487497eb 100644 --- a/core/io/http_client.h +++ b/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); diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index f7c130c5f..fcdfd8427 100644 --- a/core/io/marshalls.cpp +++ b/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 #include diff --git a/core/io/marshalls.h b/core/io/marshalls.h index 21f875d6d..f6695de2c 100644 --- a/core/io/marshalls.h +++ b/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" diff --git a/core/io/multiplayer_api.h b/core/io/multiplayer_api.h index 61018ba0b..b50e499d0 100644 --- a/core/io/multiplayer_api.h +++ b/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); diff --git a/core/io/net_socket.h b/core/io/net_socket.h index 84675b4aa..91912572a 100644 --- a/core/io/net_socket.h +++ b/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: diff --git a/core/io/packet_peer.h b/core/io/packet_peer.h index b7d336deb..fe0e1f736 100644 --- a/core/io/packet_peer.h +++ b/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 { diff --git a/core/io/pck_packer.h b/core/io/pck_packer.h index 0dc37cc11..12a52c30b 100644 --- a/core/io/pck_packer.h +++ b/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; diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h index 67da120cd..73d771306 100644 --- a/core/io/resource_loader.h +++ b/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); diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp index f569e4aa7..2c5e8522d 100644 --- a/core/io/resource_saver.cpp +++ b/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 ResourceSaver::saver[MAX_SAVERS]; diff --git a/core/io/resource_saver.h b/core/io/resource_saver.h index a4c8d4d9e..2da028701 100644 --- a/core/io/resource_saver.h +++ b/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); diff --git a/core/io/stream_peer.h b/core/io/stream_peer.h index a075ea6da..9b007cfaf 100644 --- a/core/io/stream_peer.h +++ b/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); diff --git a/core/io/xml_parser.h b/core/io/xml_parser.h index 3c857a8f4..da0be6ee2 100644 --- a/core/io/xml_parser.h +++ b/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" diff --git a/core/log/logger.h b/core/log/logger.h index 7ff881be7..3f7bf03f4 100644 --- a/core/log/logger.h +++ b/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" diff --git a/core/log/logger_backend.h b/core/log/logger_backend.h index 1b6de26c6..9ec856a56 100644 --- a/core/log/logger_backend.h +++ b/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); diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp index 6316a29a3..7794dee2d 100644 --- a/core/math/a_star.cpp +++ b/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 { diff --git a/core/math/a_star.h b/core/math/a_star.h index e318a8ac5..3303c57f2 100644 --- a/core/math/a_star.h +++ b/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 diff --git a/core/math/expression.cpp b/core/math/expression.cpp index 07e19d60e..b97ca7c0b 100644 --- a/core/math/expression.cpp +++ b/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] = { diff --git a/core/math/expression.h b/core/math/expression.h index b245b369f..bbc1c3e4d 100644 --- a/core/math/expression.h +++ b/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); diff --git a/core/math/geometry.h b/core/math/geometry.h index 56add205e..8f9ef26dc 100644 --- a/core/math/geometry.h +++ b/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" diff --git a/core/math/random_number_generator.h b/core/math/random_number_generator.h index 2e200f704..f208dc1a2 100644 --- a/core/math/random_number_generator.h +++ b/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); diff --git a/core/math/triangle_mesh.h b/core/math/triangle_mesh.h index 607aa3f61..1d19e1818 100644 --- a/core/math/triangle_mesh.h +++ b/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); diff --git a/core/object/SCsub b/core/object/SCsub new file mode 100644 index 000000000..75a683167 --- /dev/null +++ b/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") diff --git a/core/class_db.cpp b/core/object/class_db.cpp similarity index 100% rename from core/class_db.cpp rename to core/object/class_db.cpp diff --git a/core/class_db.h b/core/object/class_db.h similarity index 99% rename from core/class_db.h rename to core/object/class_db.h index 19a4b98f7..b08221426 100644 --- a/core/class_db.h +++ b/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.h" +#include "core/object/method_bind.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) diff --git a/core/make_binders.py b/core/object/make_binders.py similarity index 100% rename from core/make_binders.py rename to core/object/make_binders.py diff --git a/core/message_queue.cpp b/core/object/message_queue.cpp similarity index 99% rename from core/message_queue.cpp rename to core/object/message_queue.cpp index 7d7f9f2ab..e90bff3d8 100644 --- a/core/message_queue.cpp +++ b/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; diff --git a/core/message_queue.h b/core/object/message_queue.h similarity index 99% rename from core/message_queue.h rename to core/object/message_queue.h index f38ea1712..c91ab67a9 100644 --- a/core/message_queue.h +++ b/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 { diff --git a/core/method_bind.cpp b/core/object/method_bind.cpp similarity index 99% rename from core/method_bind.cpp rename to core/object/method_bind.cpp index 5869c72b3..c2c6bd94a 100644 --- a/core/method_bind.cpp +++ b/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" diff --git a/core/method_bind.h b/core/object/method_bind.h similarity index 99% rename from core/method_bind.h rename to core/object/method_bind.h index 546f4b091..71c57a4cb 100644 --- a/core/method_bind.h +++ b/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 diff --git a/core/object.cpp b/core/object/object.cpp similarity index 99% rename from core/object.cpp rename to core/object/object.cpp index f51fa5efc..100f7f7e1 100644 --- a/core/object.cpp +++ b/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/script_language.h" +#include "core/object/resource.h" +#include "core/object/script_language.h" #include "core/translation.h" #ifdef DEBUG_ENABLED diff --git a/core/object.h b/core/object/object.h similarity index 99% rename from core/object.h rename to core/object/object.h index 3b82f77d3..aec2319c7 100644 --- a/core/object.h +++ b/core/object/object.h @@ -859,6 +859,6 @@ public: }; //needed by macros -#include "core/class_db.h" +#include "core/object/class_db.h" #endif diff --git a/core/ref_ptr.cpp b/core/object/ref_ptr.cpp similarity index 98% rename from core/ref_ptr.cpp rename to core/object/ref_ptr.cpp index 30ff2c4c9..c8c6cf74d 100644 --- a/core/ref_ptr.cpp +++ b/core/object/ref_ptr.cpp @@ -30,8 +30,8 @@ #include "ref_ptr.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" void RefPtr::operator=(const RefPtr &p_other) { Ref *ref = reinterpret_cast *>(&data[0]); diff --git a/core/ref_ptr.h b/core/object/ref_ptr.h similarity index 100% rename from core/ref_ptr.h rename to core/object/ref_ptr.h diff --git a/core/reference.cpp b/core/object/reference.cpp similarity index 99% rename from core/reference.cpp rename to core/object/reference.cpp index 9efc65f12..4d900f115 100644 --- a/core/reference.cpp +++ b/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()) { diff --git a/core/reference.h b/core/object/reference.h similarity index 99% rename from core/reference.h rename to core/object/reference.h index f69a1e3ed..8031a5adf 100644 --- a/core/reference.h +++ b/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.h" -#include "core/ref_ptr.h" +#include "core/object/class_db.h" +#include "core/object/object.h" +#include "core/object/ref_ptr.h" #include "core/safe_refcount.h" class Reference : public Object { diff --git a/core/resource.cpp b/core/object/resource.cpp similarity index 99% rename from core/resource.cpp rename to core/object/resource.cpp index 408296026..af4d7002f 100644 --- a/core/resource.cpp +++ b/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 diff --git a/core/resource.h b/core/object/resource.h similarity index 97% rename from core/resource.h rename to core/object/resource.h index 156817a64..3add0cb8e 100644 --- a/core/resource.h +++ b/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.h" -#include "core/ref_ptr.h" -#include "core/reference.h" +#include "core/object/class_db.h" +#include "core/object/object.h" +#include "core/object/ref_ptr.h" +#include "core/object/reference.h" #include "core/safe_refcount.h" #include "core/containers/self_list.h" diff --git a/core/script_language.cpp b/core/object/script_language.cpp similarity index 100% rename from core/script_language.cpp rename to core/object/script_language.cpp diff --git a/core/script_language.h b/core/object/script_language.h similarity index 99% rename from core/script_language.h rename to core/object/script_language.h index c0702fd4d..bfd9947a5 100644 --- a/core/script_language.h +++ b/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; diff --git a/core/undo_redo.cpp b/core/object/undo_redo.cpp similarity index 99% rename from core/undo_redo.cpp rename to core/object/undo_redo.cpp index 0e16fb45e..969d17242 100644 --- a/core/undo_redo.cpp +++ b/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) { diff --git a/core/undo_redo.h b/core/object/undo_redo.h similarity index 99% rename from core/undo_redo.h rename to core/object/undo_redo.h index 2ca1b17fc..e2a0a7205 100644 --- a/core/undo_redo.h +++ b/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); diff --git a/core/os/input.h b/core/os/input.h index ddfdc4201..d25f2fb65 100644 --- a/core/os/input.h +++ b/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" diff --git a/core/os/input_event.h b/core/os/input_event.h index f7c88c58d..1da6d43ff 100644 --- a/core/os/input_event.h +++ b/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" diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp index 00e59e3b3..55b56b296 100644 --- a/core/os/main_loop.cpp +++ b/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); diff --git a/core/os/main_loop.h b/core/os/main_loop.h index 5685bbdaf..09a1da5c1 100644 --- a/core/os/main_loop.h +++ b/core/os/main_loop.h @@ -31,8 +31,8 @@ /*************************************************************************/ #include "core/os/input_event.h" -#include "core/reference.h" -#include "core/script_language.h" +#include "core/object/reference.h" +#include "core/object/script_language.h" class MainLoop : public Object { GDCLASS(MainLoop, Object); diff --git a/core/os/thread.cpp b/core/os/thread.cpp index c077ec507..1bad739c8 100644 --- a/core/os/thread.cpp +++ b/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) diff --git a/core/os/time.h b/core/os/time.h index 05432d6cb..a9c886d96 100644 --- a/core/os/time.h +++ b/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 diff --git a/core/project_settings.h b/core/project_settings.h index 0fcee0d0f..3142afc1b 100644 --- a/core/project_settings.h +++ b/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" diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp index 27448e97a..124033331 100644 --- a/core/register_core_types.cpp +++ b/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" diff --git a/core/script_debugger_local.h b/core/script_debugger_local.h index 010c03d11..ab8667cee 100644 --- a/core/script_debugger_local.h +++ b/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; diff --git a/core/translation.h b/core/translation.h index 06143f823..e85d0e10f 100644 --- a/core/translation.h +++ b/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); diff --git a/core/variant/array.cpp b/core/variant/array.cpp index 086873d0f..539363b37 100644 --- a/core/variant/array.cpp +++ b/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" diff --git a/core/variant/variant.cpp b/core/variant/variant.cpp index a9ef0a9a8..2ddb63df4 100644 --- a/core/variant/variant.cpp +++ b/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" diff --git a/core/variant/variant.h b/core/variant/variant.h index 201edf9c3..87d86758f 100644 --- a/core/variant/variant.h +++ b/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" diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index 50e42cd04..840a079b8 100644 --- a/core/variant/variant_call.cpp +++ b/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); diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp index b8bc15d36..2e5e67f3f 100644 --- a/core/variant/variant_op.cpp +++ b/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) \ diff --git a/core/variant/variant_parser.h b/core/variant/variant_parser.h index b220a4b8b..76ae68d82 100644 --- a/core/variant/variant_parser.h +++ b/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 { diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp index 317fed8df..ceb701733 100644 --- a/editor/animation_bezier_editor.cpp +++ b/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" diff --git a/editor/animation_bezier_editor.h b/editor/animation_bezier_editor.h index 88349d3e8..6e275e2c7 100644 --- a/editor/animation_bezier_editor.h +++ b/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/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/containers/set.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index e0dc71340..502f5faf0 100644 --- a/editor/animation_track_editor.cpp +++ b/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/script_language.h" +#include "core/object/resource.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" diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h index 591be6fe8..c148bf025 100644 --- a/editor/animation_track_editor.h +++ b/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" diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index dca7a534f..30b7eb2cd 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/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" diff --git a/editor/animation_track_editor_plugins.h b/editor/animation_track_editor_plugins.h index a67791c6d..4189d00b8 100644 --- a/editor/animation_track_editor_plugins.h +++ b/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" diff --git a/editor/array_property_edit.cpp b/editor/array_property_edit.cpp index 0c74edc9a..84ecc1997 100644 --- a/editor/array_property_edit.cpp +++ b/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 diff --git a/editor/array_property_edit.h b/editor/array_property_edit.h index 680dacd93..bb6605ace 100644 --- a/editor/array_property_edit.h +++ b/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" diff --git a/editor/audio_stream_preview.cpp b/editor/audio_stream_preview.cpp index 0edb07e2f..4fa3cacd5 100644 --- a/editor/audio_stream_preview.cpp +++ b/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" diff --git a/editor/audio_stream_preview.h b/editor/audio_stream_preview.h index 9b87c168a..d57cd1afc 100644 --- a/editor/audio_stream_preview.h +++ b/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; diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 0a4429b15..5e8858793 100644 --- a/editor/code_editor.cpp +++ b/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/script_language.h" +#include "core/object/resource.h" +#include "core/object/script_language.h" #include "core/string_builder.h" #include "core/typedefs.h" #include "core/containers/vector.h" diff --git a/editor/code_editor.h b/editor/code_editor.h index 813094a6e..51c00bb10 100644 --- a/editor/code_editor.h +++ b/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/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index f63513a5b..527f62b43 100644 --- a/editor/connections_dialog.cpp +++ b/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/reference.h" -#include "core/script_language.h" +#include "core/object/ref_ptr.h" +#include "core/object/reference.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" diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h index fa30da9e7..337a6927d 100644 --- a/editor/connections_dialog.h +++ b/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" diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 8ce183dc4..f43221bb6 100644 --- a/editor/create_dialog.cpp +++ b/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" diff --git a/editor/create_dialog.h b/editor/create_dialog.h index 5846fc7df..eed139b94 100644 --- a/editor/create_dialog.h +++ b/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/reference.h" -#include "core/resource.h" +#include "core/object/object.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/containers/set.h" #include "core/string_name.h" #include "core/ustring.h" diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index 3d79debe5..3a6f9a909 100644 --- a/editor/dependency_editor.cpp +++ b/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/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/string_name.h" #include "core/typedefs.h" #include "core/variant/variant.h" diff --git a/editor/dependency_editor.h b/editor/dependency_editor.h index 2ebe65920..4626f6aa0 100644 --- a/editor/dependency_editor.h +++ b/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" diff --git a/editor/dictionary_property_edit.cpp b/editor/dictionary_property_edit.cpp index 787dc7664..fb3cd820c 100644 --- a/editor/dictionary_property_edit.cpp +++ b/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() { diff --git a/editor/dictionary_property_edit.h b/editor/dictionary_property_edit.h index 25930160a..eb7ee1609 100644 --- a/editor/dictionary_property_edit.h +++ b/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" diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index a0dd1b2b9..a68354f7a 100644 --- a/editor/doc/doc_data.cpp +++ b/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.h" +#include "core/object/method_bind.h" +#include "core/object/object.h" #include "core/os/file_access.h" #include "core/os/memory.h" #include "core/pair.h" diff --git a/editor/doc/doc_data.h b/editor/doc/doc_data.h index 4b79f4296..fb67ad210 100644 --- a/editor/doc/doc_data.h +++ b/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" diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index f16bb96de..8055ffe3e 100644 --- a/editor/editor_about.cpp +++ b/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" diff --git a/editor/editor_about.h b/editor/editor_about.h index 865ed5058..65d17be78 100644 --- a/editor/editor_about.h +++ b/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; diff --git a/editor/editor_atlas_packer.h b/editor/editor_atlas_packer.h index 213bb9f19..c66b82925 100644 --- a/editor/editor_atlas_packer.h +++ b/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; diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 6ea07fa52..af7286809 100644 --- a/editor/editor_audio_buses.cpp +++ b/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" diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h index f4264ec3a..386361b98 100644 --- a/editor/editor_audio_buses.h +++ b/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/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/typedefs.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index df48d2a5e..61f1dcea9 100644 --- a/editor/editor_autoload_settings.cpp +++ b/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/resource.h" -#include "core/script_language.h" +#include "core/object/reference.h" +#include "core/object/resource.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" diff --git a/editor/editor_autoload_settings.h b/editor/editor_autoload_settings.h index 7d344edef..d96d7eb97 100644 --- a/editor/editor_autoload_settings.h +++ b/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" diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index c99fb2b7b..66d694277 100644 --- a/editor/editor_data.cpp +++ b/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" diff --git a/editor/editor_data.h b/editor/editor_data.h index c415533cc..15176ec40 100644 --- a/editor/editor_data.h +++ b/editor/editor_data.h @@ -30,22 +30,22 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/object.h" +#include "core/object/object.h" #include "editor/plugins/script_editor_plugin.h" #include "scene/resources/texture.h" #include "core/containers/list.h" #include "core/pair.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.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" #include "core/object_id.h" -#include "core/reference.h" -#include "core/script_language.h" +#include "core/object/reference.h" +#include "core/object/script_language.h" #include "core/containers/set.h" #include "core/string_name.h" #include "core/typedefs.h" diff --git a/editor/editor_dir_dialog.cpp b/editor/editor_dir_dialog.cpp index fc1f78ee1..a3a7179d7 100644 --- a/editor/editor_dir_dialog.cpp +++ b/editor/editor_dir_dialog.cpp @@ -37,7 +37,7 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/line_edit.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/math/vector2.h" diff --git a/editor/editor_dir_dialog.h b/editor/editor_dir_dialog.h index e94dcaa53..ab9495ef5 100644 --- a/editor/editor_dir_dialog.h +++ b/editor/editor_dir_dialog.h @@ -33,7 +33,7 @@ #include "scene/gui/dialogs.h" #include "core/os/dir_access.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/set.h" #include "core/ustring.h" diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index 56e970bcb..ef5742d5e 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -30,7 +30,7 @@ #include "editor_export.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/crypto/crypto_core.h" #include "core/error_macros.h" #include "core/io/config_file.h" @@ -42,7 +42,7 @@ #include "core/os/memory.h" #include "core/os/os.h" #include "core/project_settings.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/version.h" #include "core/version_generated.gen.h" #include "editor/editor_file_system.h" diff --git a/editor/editor_export.h b/editor/editor_export.h index d7acdf3d4..6f9a2ddbc 100644 --- a/editor/editor_export.h +++ b/editor/editor_export.h @@ -30,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "scene/main/node.h" #include "scene/main/timer.h" @@ -40,7 +40,7 @@ #include "core/error_list.h" #include "core/containers/list.h" #include "core/containers/map.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/os/dir_access.h" #include "core/containers/pool_vector.h" #include "core/containers/set.h" diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index ca9c65544..9515210c9 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -30,7 +30,7 @@ #include "editor_file_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_list.h" diff --git a/editor/editor_file_dialog.h b/editor/editor_file_dialog.h index 082bb183f..64727f86f 100644 --- a/editor/editor_file_dialog.h +++ b/editor/editor_file_dialog.h @@ -37,9 +37,9 @@ #include "scene/gui/item_list.h" #include "core/os/dir_access.h" -#include "core/method_bind.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/method_bind.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index e5a76a08c..62f773945 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -41,16 +41,16 @@ #include "editor_resource_preview.h" #include "editor_settings.h" #include "core/variant/array.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/variant/dictionary.h" #include "core/error_macros.h" #include "core/io/config_file.h" #include "core/os/dir_access.h" #include "core/os/memory.h" #include "core/print_string.h" -#include "core/reference.h" -#include "core/resource.h" -#include "core/script_language.h" +#include "core/object/reference.h" +#include "core/object/resource.h" +#include "core/object/script_language.h" #include "core/typedefs.h" #include "core/variant/variant.h" #include "editor/editor_data.h" diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h index 010ca447b..113f2d403 100644 --- a/editor/editor_file_system.h +++ b/editor/editor_file_system.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/main/node.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/os/dir_access.h" #include "core/os/thread.h" diff --git a/editor/editor_folding.cpp b/editor/editor_folding.cpp index 3180bf2ac..466a50587 100644 --- a/editor/editor_folding.cpp +++ b/editor/editor_folding.cpp @@ -39,8 +39,8 @@ #include "core/io/config_file.h" #include "core/containers/list.h" #include "core/node_path.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/variant/variant.h" #include "scene/main/node.h" diff --git a/editor/editor_folding.h b/editor/editor_folding.h index b5d37a412..ab42df855 100644 --- a/editor/editor_folding.h +++ b/editor/editor_folding.h @@ -33,7 +33,7 @@ #include "scene/main/node.h" #include "core/containers/pool_vector.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/set.h" #include "core/ustring.h" diff --git a/editor/editor_fonts.h b/editor/editor_fonts.h index d2e236d46..590023280 100644 --- a/editor/editor_fonts.h +++ b/editor/editor_fonts.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/resources/theme.h" -#include "core/reference.h" +#include "core/object/reference.h" class Theme; diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 7721e44b5..30aba6162 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -39,7 +39,7 @@ #include "editor_scale.h" #include "editor_settings.h" #include "scene/gui/texture_button.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/io/resource_loader.h" #include "core/containers/list.h" #include "core/math/math_defs.h" diff --git a/editor/editor_help.h b/editor/editor_help.h index dd37aa9d8..c51b747be 100644 --- a/editor/editor_help.h +++ b/editor/editor_help.h @@ -39,8 +39,8 @@ #include "core/math/color.h" #include "core/error_list.h" #include "core/containers/map.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp index 0f40349af..ee577d996 100644 --- a/editor/editor_help_search.cpp +++ b/editor/editor_help_search.cpp @@ -33,7 +33,7 @@ #include "core/os/keyboard.h" #include "editor_node.h" #include "editor_scale.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/math/rect2.h" #include "core/math/vector2.h" diff --git a/editor/editor_help_search.h b/editor/editor_help_search.h index e61da7e60..98805cb4a 100644 --- a/editor/editor_help_search.h +++ b/editor/editor_help_search.h @@ -30,12 +30,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/dialogs.h" #include "core/math/color.h" #include "core/containers/map.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" #include "core/containers/vector.h" #include "core/containers/ordered_hash_map.h" diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 22e44e9b1..efd1ba4e5 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -31,7 +31,7 @@ #include "editor_inspector.h" #include "core/variant/array.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/variant/dictionary.h" #include "core/error_macros.h" #include "core/containers/hash_map.h" @@ -42,9 +42,9 @@ #include "core/os/keyboard.h" #include "core/os/memory.h" #include "core/os/os.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 "editor/doc/doc_data.h" #include "editor/editor_data.h" #include "editor/editor_help.h" diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index 96396508a..af9bcc00c 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.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/scroll_container.h" #include "scene/gui/container.h" #include "scene/gui/control.h" @@ -40,10 +40,10 @@ #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/object_id.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/set.h" #include "core/string_name.h" #include "core/ustring.h" diff --git a/editor/editor_layouts_dialog.cpp b/editor/editor_layouts_dialog.cpp index 6029e1d16..f74dfefe2 100644 --- a/editor/editor_layouts_dialog.cpp +++ b/editor/editor_layouts_dialog.cpp @@ -30,7 +30,7 @@ #include "editor_layouts_dialog.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/io/config_file.h" #include "core/os/keyboard.h" #include "editor/editor_settings.h" diff --git a/editor/editor_layouts_dialog.h b/editor/editor_layouts_dialog.h index b2f74cc3b..ff0d5a40e 100644 --- a/editor/editor_layouts_dialog.h +++ b/editor/editor_layouts_dialog.h @@ -32,7 +32,7 @@ #include "scene/gui/dialogs.h" -#include "core/reference.h" +#include "core/object/reference.h" class LineEdit; class ItemList; diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 15cca2f43..16838ef13 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -30,14 +30,14 @@ #include "editor_log.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/keyboard.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/reference.h" -#include "core/undo_redo.h" +#include "core/object/reference.h" +#include "core/object/undo_redo.h" #include "core/version.h" #include "editor/editor_settings.h" #include "editor_node.h" diff --git a/editor/editor_log.h b/editor/editor_log.h index a23469772..cc679ca22 100644 --- a/editor/editor_log.h +++ b/editor/editor_log.h @@ -34,7 +34,7 @@ #include "core/os/thread.h" #include "core/error_macros.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class Button; diff --git a/editor/editor_network_profiler.cpp b/editor/editor_network_profiler.cpp index 736fd843b..0065232a6 100644 --- a/editor/editor_network_profiler.cpp +++ b/editor/editor_network_profiler.cpp @@ -33,7 +33,7 @@ #include "editor_scale.h" #include "scene/gui/line_edit.h" #include "scene/main/timer.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" diff --git a/editor/editor_network_profiler.h b/editor/editor_network_profiler.h index c0255946b..08f438107 100644 --- a/editor/editor_network_profiler.h +++ b/editor/editor_network_profiler.h @@ -34,7 +34,7 @@ #include "core/io/multiplayer_api.h" #include "core/containers/map.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/object_id.h" class Button; diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 2ec1d9c7b..6e4b42af1 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -33,7 +33,7 @@ #include #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" @@ -57,9 +57,9 @@ #include "core/containers/pool_vector.h" #include "core/print_string.h" #include "core/project_settings.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/translation.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/version.h" #include "core/version_generated.gen.h" #include "editor/animation_track_editor.h" diff --git a/editor/editor_node.h b/editor/editor_node.h index 99fa14fbb..e69084f5e 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.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 "scene/main/node.h" #include "editor/editor_folding.h" @@ -51,8 +51,8 @@ #include "core/os/os.h" #include "core/os/thread.h" #include "core/print_string.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/safe_refcount.h" #include "core/containers/set.h" #include "core/string_name.h" diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp index 1f50e389b..9ab73d3e9 100644 --- a/editor/editor_path.cpp +++ b/editor/editor_path.cpp @@ -32,14 +32,14 @@ #include "editor_node.h" #include "editor_scale.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/rect2.h" #include "core/math/vector2.h" #include "core/os/memory.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 03a667fab..f3226b98e 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -42,7 +42,7 @@ #include "scene/3d/camera.h" #include "scene/gui/popup_menu.h" #include "servers/visual_server.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/image.h" #include "core/io/resource_importer.h" @@ -53,10 +53,10 @@ #include "core/math/vector3.h" #include "core/os/input_event.h" #include "core/containers/pool_vector.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/rid.h" #include "core/rid_handle.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/typedefs.h" #include "editor/editor_autoload_settings.h" #include "editor/editor_data.h" diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h index e43239c06..751019eb9 100644 --- a/editor/editor_plugin.h +++ b/editor/editor_plugin.h @@ -42,11 +42,11 @@ #include "core/error_macros.h" #include "core/io/config_file.h" #include "core/containers/list.h" -#include "core/method_bind.h" -#include "core/object.h" +#include "core/object/method_bind.h" +#include "core/object/object.h" #include "core/os/memory.h" -#include "core/reference.h" -#include "core/undo_redo.h" +#include "core/object/reference.h" +#include "core/object/undo_redo.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/editor_plugin_settings.cpp b/editor/editor_plugin_settings.cpp index e6e98c7cb..b9274a6f5 100644 --- a/editor/editor_plugin_settings.cpp +++ b/editor/editor_plugin_settings.cpp @@ -30,7 +30,7 @@ #include "editor_plugin_settings.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" @@ -38,7 +38,7 @@ #include "core/os/file_access.h" #include "core/os/main_loop.h" #include "core/os/memory.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/variant/variant.h" #include "editor/plugin_config_dialog.h" #include "editor_node.h" diff --git a/editor/editor_plugin_settings.h b/editor/editor_plugin_settings.h index 9c815b7f9..e0eaa479b 100644 --- a/editor/editor_plugin_settings.h +++ b/editor/editor_plugin_settings.h @@ -32,7 +32,7 @@ #include "scene/gui/box_container.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/editor_profiler.cpp b/editor/editor_profiler.cpp index ff1e66222..e9c29d2f3 100644 --- a/editor/editor_profiler.cpp +++ b/editor/editor_profiler.cpp @@ -33,7 +33,7 @@ #include "editor_scale.h" #include "editor_settings.h" #include "scene/main/timer.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/image.h" #include "core/math/math_funcs.h" diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h index 02e10f568..17568f523 100644 --- a/editor/editor_profiler.h +++ b/editor/editor_profiler.h @@ -34,9 +34,9 @@ #include "core/math/color.h" #include "core/containers/map.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/set.h" #include "core/string_name.h" #include "core/typedefs.h" diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 62cf795e0..e09cfe5f6 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -31,7 +31,7 @@ #include "editor_properties.h" #include "core/variant/array.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/variant/dictionary.h" #include "core/error_macros.h" #include "core/math/aabb.h" @@ -45,13 +45,13 @@ #include "core/math/transform.h" #include "core/math/transform_2d.h" #include "core/math/vector3.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/object_id.h" #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/project_settings.h" #include "core/rid.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/typedefs.h" #include "editor/create_dialog.h" #include "editor/editor_data.h" diff --git a/editor/editor_properties.h b/editor/editor_properties.h index 990c13104..899c17022 100644 --- a/editor/editor_properties.h +++ b/editor/editor_properties.h @@ -37,9 +37,9 @@ #include "core/math/vector3.h" #include "core/math/vector4.h" #include "core/node_path.h" -#include "core/object.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/object.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp index 207c8a1f5..e1c70e774 100644 --- a/editor/editor_properties_array_dict.cpp +++ b/editor/editor_properties_array_dict.cpp @@ -30,7 +30,7 @@ #include "editor_properties_array_dict.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/error_macros.h" #include "core/io/marshalls.h" @@ -40,7 +40,7 @@ #include "core/os/input.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/typedefs.h" #include "core/containers/vector.h" #include "editor/editor_file_system.h" diff --git a/editor/editor_properties_array_dict.h b/editor/editor_properties_array_dict.h index 031a8a280..2a07d9031 100644 --- a/editor/editor_properties_array_dict.h +++ b/editor/editor_properties_array_dict.h @@ -31,11 +31,11 @@ /*************************************************************************/ #include "editor/editor_inspector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/variant/dictionary.h" #include "core/math/vector2.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/object_id.h" #include "core/string_name.h" #include "core/ustring.h" diff --git a/editor/editor_property_name_processor.h b/editor/editor_property_name_processor.h index ab0bf62ee..d6bba8195 100644 --- a/editor/editor_property_name_processor.h +++ b/editor/editor_property_name_processor.h @@ -33,7 +33,7 @@ #include "scene/main/node.h" #include "core/containers/map.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class EditorPropertyNameProcessor : public Node { diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index 57ae0a6c7..071e62a17 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -36,7 +36,7 @@ #include "editor_settings.h" #include "filesystem_dock.h" #include "scene/main/viewport.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,8 +47,8 @@ #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/pair.h" -#include "core/ref_ptr.h" -#include "core/script_language.h" +#include "core/object/ref_ptr.h" +#include "core/object/script_language.h" #include "core/string_name.h" #include "core/typedefs.h" #include "editor/editor_data.h" diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h index ceb4db8bf..58d1a7eb5 100644 --- a/editor/editor_resource_picker.h +++ b/editor/editor_resource_picker.h @@ -35,10 +35,10 @@ #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/object_id.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/containers/set.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 549a8d596..6b26146d7 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -30,11 +30,11 @@ #include "editor_resource_preview.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/os/file_access.h" #include "core/project_settings.h" #include "editor_node.h" @@ -46,7 +46,7 @@ #include "core/os/memory.h" #include "core/os/os.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/typedefs.h" #include "scene/gui/control.h" #include "servers/visual_server.h" diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h index 7f357a8ad..68ef57a5e 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/main/node.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/os/semaphore.h" #include "core/os/thread.h" @@ -39,10 +39,10 @@ #include "core/containers/list.h" #include "core/containers/map.h" #include "core/math/vector2.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/object_id.h" #include "core/os/mutex.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp index 10c90bd04..a602beff6 100644 --- a/editor/editor_run_native.cpp +++ b/editor/editor_run_native.cpp @@ -30,11 +30,11 @@ #include "editor_run_native.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/image.h" #include "core/os/memory.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/typedefs.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/editor_run_native.h b/editor/editor_run_native.h index 6b97e3253..1798934d1 100644 --- a/editor/editor_run_native.h +++ b/editor/editor_run_native.h @@ -33,7 +33,7 @@ #include "scene/gui/box_container.h" #include "core/containers/map.h" -#include "core/object.h" +#include "core/object/object.h" class MenuButton; class RichTextLabel; diff --git a/editor/editor_run_script.cpp b/editor/editor_run_script.cpp index e81a98b71..a9d670731 100644 --- a/editor/editor_run_script.cpp +++ b/editor/editor_run_script.cpp @@ -31,9 +31,9 @@ #include "editor_run_script.h" #include "editor_node.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "editor/editor_plugin.h" diff --git a/editor/editor_run_script.h b/editor/editor_run_script.h index 017eeb51e..76ec2ef67 100644 --- a/editor/editor_run_script.h +++ b/editor/editor_run_script.h @@ -30,9 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/reference.h" +#include "core/object/reference.h" -#include "core/object.h" +#include "core/object/object.h" class EditorNode; class EditorInterface; diff --git a/editor/editor_sectioned_inspector.cpp b/editor/editor_sectioned_inspector.cpp index 51c8ef2a7..033b3fbb6 100644 --- a/editor/editor_sectioned_inspector.cpp +++ b/editor/editor_sectioned_inspector.cpp @@ -32,7 +32,7 @@ #include "editor_property_name_processor.h" #include "editor_scale.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/containers/list.h" #include "core/math/vector2.h" #include "core/os/memory.h" diff --git a/editor/editor_sectioned_inspector.h b/editor/editor_sectioned_inspector.h index 0ff9ccd06..a011b6125 100644 --- a/editor/editor_sectioned_inspector.h +++ b/editor/editor_sectioned_inspector.h @@ -33,7 +33,7 @@ #include "scene/gui/split_container.h" #include "core/containers/map.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/object_id.h" #include "core/ustring.h" diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 2c657c7b8..9702701a6 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -31,7 +31,7 @@ #include "editor_settings.h" #include "core/variant/array.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_list.h" diff --git a/editor/editor_settings.h b/editor/editor_settings.h index 9ecd7605d..e1d8dcd48 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -30,18 +30,18 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/gui/shortcut.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/io/config_file.h" #include "core/os/thread_safe.h" #include "core/translation.h" #include "core/containers/hash_map.h" #include "core/containers/list.h" #include "core/containers/map.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp index a00e832b4..9ab4dd3de 100644 --- a/editor/editor_spin_slider.cpp +++ b/editor/editor_spin_slider.cpp @@ -35,7 +35,7 @@ #include "core/os/keyboard.h" #include "editor_scale.h" #include "core/variant/array.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/math/math_defs.h" diff --git a/editor/editor_spin_slider.h b/editor/editor_spin_slider.h index beab5579a..baa74fd4a 100644 --- a/editor/editor_spin_slider.h +++ b/editor/editor_spin_slider.h @@ -34,8 +34,8 @@ #include "core/math/color.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" class InputEvent; diff --git a/editor/editor_sub_scene.cpp b/editor/editor_sub_scene.cpp index ff6b90d54..f8fa8e301 100644 --- a/editor/editor_sub_scene.cpp +++ b/editor/editor_sub_scene.cpp @@ -32,11 +32,11 @@ #include "editor/editor_node.h" #include "scene/resources/packed_scene.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/io/resource_loader.h" #include "core/os/memory.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/string_name.h" #include "core/variant/variant.h" #include "editor/editor_file_dialog.h" diff --git a/editor/editor_sub_scene.h b/editor/editor_sub_scene.h index 7813b99a7..319057c9b 100644 --- a/editor/editor_sub_scene.h +++ b/editor/editor_sub_scene.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 EditorFileDialog; diff --git a/editor/editor_themes.h b/editor/editor_themes.h index 75d6b38c5..088cc7fb2 100644 --- a/editor/editor_themes.h +++ b/editor/editor_themes.h @@ -32,7 +32,7 @@ #include "scene/resources/texture.h" #include "scene/resources/theme.h" -#include "core/reference.h" +#include "core/object/reference.h" class ImageTexture; diff --git a/editor/editor_translation.cpp b/editor/editor_translation.cpp index d1d154055..beaa63690 100644 --- a/editor/editor_translation.cpp +++ b/editor/editor_translation.cpp @@ -37,7 +37,7 @@ #include "editor/editor_translations.gen.h" #include "core/error_macros.h" #include "core/os/memory.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/translation.h" Vector get_editor_locales() { diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index 9576b7101..06006b341 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -31,7 +31,7 @@ #include "export_template_manager.h" #include "core/variant/array.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/variant/dictionary.h" #include "core/error_macros.h" #include "core/io/http_client.h" diff --git a/editor/export_template_manager.h b/editor/export_template_manager.h index 9610a7f97..d9bff08b0 100644 --- a/editor/export_template_manager.h +++ b/editor/export_template_manager.h @@ -33,7 +33,7 @@ #include "scene/gui/dialogs.h" #include "core/error_list.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/fileserver/editor_file_server.h b/editor/fileserver/editor_file_server.h index 1c1ef0d86..185c91ff0 100644 --- a/editor/fileserver/editor_file_server.h +++ b/editor/fileserver/editor_file_server.h @@ -33,7 +33,7 @@ #include "core/io/file_access_network.h" #include "core/io/packet_peer.h" #include "core/io/tcp_server.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/os/thread.h" class EditorFileServer : public Object { diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index f8472f03e..6ae166291 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -45,7 +45,7 @@ #include "scene/main/viewport.h" #include "scene/resources/packed_scene.h" #include "core/variant/array.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_list.h" @@ -55,7 +55,7 @@ #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/print_string.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/typedefs.h" #include "editor/create_dialog.h" #include "editor/dependency_editor.h" diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 1b52c1518..dd5650af0 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -39,8 +39,8 @@ #include "core/containers/list.h" #include "core/containers/map.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/containers/set.h" #include "core/string_name.h" #include "core/ustring.h" diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp index 1e91de17d..1c48daaf0 100644 --- a/editor/find_in_files.cpp +++ b/editor/find_in_files.cpp @@ -45,7 +45,7 @@ #include "scene/gui/progress_bar.h" #include "scene/gui/tree.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_list.h" #include "core/error_macros.h" @@ -56,7 +56,7 @@ #include "core/os/memory.h" #include "core/containers/pool_vector.h" #include "core/print_string.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/typedefs.h" #include "scene/2d/canvas_item.h" #include "scene/resources/font.h" diff --git a/editor/find_in_files.h b/editor/find_in_files.h index 3aed4ca1b..bdc2f474b 100644 --- a/editor/find_in_files.h +++ b/editor/find_in_files.h @@ -36,7 +36,7 @@ #include "core/containers/hash_map.h" #include "core/containers/map.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/set.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp index 3cec60032..190e6a8aa 100644 --- a/editor/groups_editor.cpp +++ b/editor/groups_editor.cpp @@ -36,15 +36,15 @@ #include "scene/gui/box_container.h" #include "scene/gui/label.h" #include "scene/resources/packed_scene.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/containers/list.h" #include "core/math/vector2.h" #include "core/node_path.h" #include "core/os/memory.h" #include "core/os/os.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/string_name.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/scene_tree_dock.h" #include "scene/gui/button.h" diff --git a/editor/groups_editor.h b/editor/groups_editor.h index 922f7c581..d7b22cb4b 100644 --- a/editor/groups_editor.h +++ b/editor/groups_editor.h @@ -33,7 +33,7 @@ #include "scene/gui/box_container.h" #include "scene/gui/dialogs.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class Button; diff --git a/editor/import/editor_import_plugin.cpp b/editor/import/editor_import_plugin.cpp index 2e259d91e..bd90b26f4 100644 --- a/editor/import/editor_import_plugin.cpp +++ b/editor/import/editor_import_plugin.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "editor_import_plugin.h" -#include "core/script_language.h" +#include "core/object/script_language.h" EditorImportPlugin::EditorImportPlugin() { } diff --git a/editor/import_defaults_editor.cpp b/editor/import_defaults_editor.cpp index 77a487e6e..1213c5649 100644 --- a/editor/import_defaults_editor.cpp +++ b/editor/import_defaults_editor.cpp @@ -30,14 +30,14 @@ #include "import_defaults_editor.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/variant/dictionary.h" #include "core/io/resource_importer.h" #include "core/containers/list.h" #include "core/containers/map.h" #include "core/os/memory.h" #include "core/project_settings.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/string_name.h" #include "core/typedefs.h" #include "core/ustring.h" diff --git a/editor/import_defaults_editor.h b/editor/import_defaults_editor.h index 500446a63..ccf415898 100644 --- a/editor/import_defaults_editor.h +++ b/editor/import_defaults_editor.h @@ -32,7 +32,7 @@ #include "scene/gui/box_container.h" -#include "core/object.h" +#include "core/object/object.h" class ImportDefaultsEditorSettings; diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index 7503e260d..6cc91fa1a 100644 --- a/editor/import_dock.cpp +++ b/editor/import_dock.cpp @@ -34,7 +34,7 @@ #include "editor_node.h" #include "editor_resource_preview.h" #include "editor_scale.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" diff --git a/editor/import_dock.h b/editor/import_dock.h index 8d30a23c5..feb51585b 100644 --- a/editor/import_dock.h +++ b/editor/import_dock.h @@ -35,8 +35,8 @@ #include "core/io/config_file.h" #include "core/containers/list.h" #include "core/containers/map.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index 7c09641a2..b707c7c26 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -30,18 +30,18 @@ #include "inspector_dock.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/io/resource_loader.h" #include "core/containers/list.h" #include "core/containers/map.h" -#include "core/method_bind.h" +#include "core/object/method_bind.h" #include "core/object_id.h" #include "core/os/memory.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_track_editor.h" #include "editor/create_dialog.h" #include "editor/editor_data.h" diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h index 0745bbb49..7fe00aec2 100644 --- a/editor/inspector_dock.h +++ b/editor/inspector_dock.h @@ -32,9 +32,9 @@ #include "scene/gui/box_container.h" -#include "core/object.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/object.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/multi_node_edit.cpp b/editor/multi_node_edit.cpp index b689dc9b2..e2422c158 100644 --- a/editor/multi_node_edit.cpp +++ b/editor/multi_node_edit.cpp @@ -34,7 +34,7 @@ #include "editor_node.h" #include "core/error_macros.h" #include "core/containers/hash_map.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "editor/editor_inspector.h" #include "scene/main/node.h" diff --git a/editor/multi_node_edit.h b/editor/multi_node_edit.h index e623a9279..6103da641 100644 --- a/editor/multi_node_edit.h +++ b/editor/multi_node_edit.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/string_name.h" #include "core/ustring.h" diff --git a/editor/node_dock.cpp b/editor/node_dock.cpp index 94c03ab24..d7302e935 100644 --- a/editor/node_dock.cpp +++ b/editor/node_dock.cpp @@ -32,7 +32,7 @@ #include "editor_node.h" #include "editor_scale.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/vector2.h" #include "core/os/memory.h" #include "core/ustring.h" diff --git a/editor/pane_drag.cpp b/editor/pane_drag.cpp index db51f29ff..8f35cc475 100644 --- a/editor/pane_drag.cpp +++ b/editor/pane_drag.cpp @@ -30,7 +30,7 @@ #include "pane_drag.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/os/input_event.h" #include "core/variant/variant.h" #include "scene/2d/canvas_item.h" diff --git a/editor/pane_drag.h b/editor/pane_drag.h index f0f00d491..227aed7d1 100644 --- a/editor/pane_drag.h +++ b/editor/pane_drag.h @@ -33,8 +33,8 @@ #include "scene/gui/control.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" class InputEvent; diff --git a/editor/plugin_config_dialog.cpp b/editor/plugin_config_dialog.cpp index 06457167a..fbb89674b 100644 --- a/editor/plugin_config_dialog.cpp +++ b/editor/plugin_config_dialog.cpp @@ -37,14 +37,14 @@ #include "editor/project_settings_editor.h" #include "scene/gui/grid_container.h" #include "modules/modules_enabled.gen.h" // For gdscript. -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/io/resource_saver.h" #include "core/math/vector2.h" #include "core/os/memory.h" -#include "core/reference.h" -#include "core/script_language.h" +#include "core/object/reference.h" +#include "core/object/script_language.h" #include "core/variant/variant.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp index d0ce66321..c02351455 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/plugins/abstract_polygon_2d_editor.cpp @@ -33,7 +33,7 @@ #include "canvas_item_editor_plugin.h" #include "core/os/keyboard.h" #include "editor/editor_scale.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/error_macros.h" #include "core/math/geometry.h" @@ -44,7 +44,7 @@ #include "core/os/memory.h" #include "core/containers/pool_vector.h" #include "core/typedefs.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" #include "scene/2d/node_2d.h" diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h index 0b781b227..11f9954ad 100644 --- a/editor/plugins/abstract_polygon_2d_editor.h +++ b/editor/plugins/abstract_polygon_2d_editor.h @@ -31,8 +31,8 @@ /*************************************************************************/ #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp index 80768a777..94bc905ef 100644 --- a/editor/plugins/animation_blend_space_1d_editor.cpp +++ b/editor/plugins/animation_blend_space_1d_editor.cpp @@ -33,7 +33,7 @@ #include "core/os/keyboard.h" #include "editor/editor_scale.h" #include "scene/animation/animation_blend_tree.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/error_macros.h" #include "core/io/resource_loader.h" @@ -43,7 +43,7 @@ #include "core/math/transform_2d.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/plugins/animation_blend_space_1d_editor.h index eecc8c7fc..ca261aacf 100644 --- a/editor/plugins/animation_blend_space_1d_editor.h +++ b/editor/plugins/animation_blend_space_1d_editor.h @@ -33,8 +33,8 @@ #include "editor/plugins/animation_tree_editor_plugin.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp index 926c7755f..2189a8416 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/plugins/animation_blend_space_2d_editor.cpp @@ -37,7 +37,7 @@ #include "editor/editor_scale.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.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" @@ -47,7 +47,7 @@ #include "core/math/transform_2d.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" diff --git a/editor/plugins/animation_blend_space_2d_editor.h b/editor/plugins/animation_blend_space_2d_editor.h index 4d4bd7b07..d28541485 100644 --- a/editor/plugins/animation_blend_space_2d_editor.h +++ b/editor/plugins/animation_blend_space_2d_editor.h @@ -33,8 +33,8 @@ #include "editor/plugins/animation_tree_editor_plugin.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index 0a9c01009..097b515a5 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "animation_blend_tree_editor_plugin.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/hash_map.h" @@ -41,7 +41,7 @@ #include "core/os/memory.h" #include "core/containers/set.h" #include "core/typedefs.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "editor/editor_file_dialog.h" #include "editor/editor_inspector.h" #include "editor/editor_node.h" diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h index db63fcc4a..29c4365af 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.h +++ b/editor/plugins/animation_blend_tree_editor_plugin.h @@ -35,9 +35,9 @@ #include "core/variant/array.h" #include "core/containers/map.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" -#include "core/script_language.h" +#include "core/object/object.h" +#include "core/object/reference.h" +#include "core/object/script_language.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 69327ad85..82f7cd1a0 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -44,7 +44,7 @@ #include "scene/main/viewport.h" #include "servers/visual_server.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_list.h" #include "core/error_macros.h" @@ -54,11 +54,11 @@ #include "core/math/rect2.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/rid_handle.h" #include "core/string_name.h" #include "core/typedefs.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_data.h" #include "editor/editor_file_dialog.h" diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h index f235f3a10..ffe8dc3ef 100644 --- a/editor/plugins/animation_player_editor_plugin.h +++ b/editor/plugins/animation_player_editor_plugin.h @@ -35,8 +35,8 @@ #include "core/variant/dictionary.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/rid.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp index 9c8b80798..1f7e6022d 100644 --- a/editor/plugins/animation_state_machine_editor.cpp +++ b/editor/plugins/animation_state_machine_editor.cpp @@ -35,7 +35,7 @@ #include "editor/editor_scale.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.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" @@ -45,7 +45,7 @@ #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/typedefs.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" diff --git a/editor/plugins/animation_state_machine_editor.h b/editor/plugins/animation_state_machine_editor.h index 4ab7da9f0..6a15aa3bf 100644 --- a/editor/plugins/animation_state_machine_editor.h +++ b/editor/plugins/animation_state_machine_editor.h @@ -35,8 +35,8 @@ #include "core/math/rect2.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp index 3ada9309d..a2129902d 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/plugins/animation_tree_editor_plugin.cpp @@ -38,7 +38,7 @@ #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" #include "scene/scene_string_names.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/vector2.h" diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h index 4c6a34654..98e1393ad 100644 --- a/editor/plugins/animation_tree_editor_plugin.h +++ b/editor/plugins/animation_tree_editor_plugin.h @@ -33,9 +33,9 @@ #include "editor/editor_plugin.h" #include "scene/gui/box_container.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/containers/vector.h" diff --git a/editor/plugins/audio_stream_editor_plugin.cpp b/editor/plugins/audio_stream_editor_plugin.cpp index c5b5acc5f..59776af4b 100644 --- a/editor/plugins/audio_stream_editor_plugin.cpp +++ b/editor/plugins/audio_stream_editor_plugin.cpp @@ -34,7 +34,7 @@ #include "editor/audio_stream_preview.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/math/math_funcs.h" #include "core/math/rect2.h" diff --git a/editor/plugins/audio_stream_editor_plugin.h b/editor/plugins/audio_stream_editor_plugin.h index 2a83f6760..bd2866134 100644 --- a/editor/plugins/audio_stream_editor_plugin.h +++ b/editor/plugins/audio_stream_editor_plugin.h @@ -34,9 +34,9 @@ #include "scene/gui/color_rect.h" #include "core/math/math_defs.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" class AudioStream; diff --git a/editor/plugins/camera_editor_plugin.cpp b/editor/plugins/camera_editor_plugin.cpp index 75f58a9c5..acf3fd496 100644 --- a/editor/plugins/camera_editor_plugin.cpp +++ b/editor/plugins/camera_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "camera_editor_plugin.h" #include "spatial_editor_plugin.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/math_defs.h" #include "core/os/memory.h" #include "scene/3d/camera.h" diff --git a/editor/plugins/camera_editor_plugin.h b/editor/plugins/camera_editor_plugin.h index 3c2d9e005..fbe1f8f53 100644 --- a/editor/plugins/camera_editor_plugin.h +++ b/editor/plugins/camera_editor_plugin.h @@ -33,7 +33,7 @@ #include "scene/gui/control.h" #include "editor/editor_plugin.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class Button; diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 5f61bdf62..95c950a9d 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -52,7 +52,7 @@ #include "scene/resources/dynamic_font.h" #include "scene/resources/packed_scene.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_list.h" @@ -64,10 +64,10 @@ #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/rid.h" #include "core/string_name.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "editor/animation_track_editor.h" #include "editor/editor_data.h" #include "editor/scene_tree_dock.h" diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 77d0c9758..15330be41 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -41,9 +41,9 @@ #include "core/math/rect2.h" #include "core/math/transform_2d.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/typedefs.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/plugins/collision_polygon_2d_editor_plugin.h b/editor/plugins/collision_polygon_2d_editor_plugin.h index 41b6aa6c0..5205deb28 100644 --- a/editor/plugins/collision_polygon_2d_editor_plugin.h +++ b/editor/plugins/collision_polygon_2d_editor_plugin.h @@ -32,7 +32,7 @@ #include "editor/plugins/abstract_polygon_2d_editor.h" #include "scene/2d/collision_polygon_2d.h" -#include "core/object.h" +#include "core/object/object.h" class CollisionPolygon2D; class EditorNode; diff --git a/editor/plugins/collision_polygon_editor_plugin.cpp b/editor/plugins/collision_polygon_editor_plugin.cpp index b956b2c85..db471c43b 100644 --- a/editor/plugins/collision_polygon_editor_plugin.cpp +++ b/editor/plugins/collision_polygon_editor_plugin.cpp @@ -36,7 +36,7 @@ #include "scene/3d/camera.h" #include "spatial_editor_plugin.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/math/aabb.h" @@ -50,7 +50,7 @@ #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_node.h" #include "scene/3d/immediate_geometry.h" diff --git a/editor/plugins/collision_polygon_editor_plugin.h b/editor/plugins/collision_polygon_editor_plugin.h index af77d2e0a..3c206620c 100644 --- a/editor/plugins/collision_polygon_editor_plugin.h +++ b/editor/plugins/collision_polygon_editor_plugin.h @@ -34,8 +34,8 @@ #include "scene/gui/box_container.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp index 2477b2a9f..8d0b5b329 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.cpp +++ b/editor/plugins/collision_shape_2d_editor_plugin.cpp @@ -38,14 +38,14 @@ #include "scene/resources/line_shape_2d.h" #include "scene/resources/rectangle_shape_2d.h" #include "scene/resources/segment_shape_2d.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/math_defs.h" #include "core/math/math_funcs.h" #include "core/os/input.h" #include "core/os/input_event.h" #include "core/os/keyboard.h" #include "core/os/memory.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "editor/editor_node.h" #include "scene/2d/collision_shape_2d.h" #include "scene/main/node.h" diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h index 46872d5c4..a497d74fe 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.h +++ b/editor/plugins/collision_shape_2d_editor_plugin.h @@ -35,8 +35,8 @@ #include "core/math/transform_2d.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.cpp b/editor/plugins/cpu_particles_2d_editor_plugin.cpp index c5d735028..cb4d4d9cf 100644 --- a/editor/plugins/cpu_particles_2d_editor_plugin.cpp +++ b/editor/plugins/cpu_particles_2d_editor_plugin.cpp @@ -33,7 +33,7 @@ #include "core/io/image_loader.h" #include "scene/2d/cpu_particles_2d.h" #include "scene/gui/separator.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" @@ -42,7 +42,7 @@ #include "core/math/vector2.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/variant/variant.h" #include "core/containers/vector.h" #include "editor/editor_file_dialog.h" diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.h b/editor/plugins/cpu_particles_2d_editor_plugin.h index 10f4c7366..047cb35e0 100644 --- a/editor/plugins/cpu_particles_2d_editor_plugin.h +++ b/editor/plugins/cpu_particles_2d_editor_plugin.h @@ -32,7 +32,7 @@ #include "editor/editor_plugin.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class CPUParticles2D; diff --git a/editor/plugins/cpu_particles_editor_plugin.cpp b/editor/plugins/cpu_particles_editor_plugin.cpp index f2d3e886c..b81ec9b53 100644 --- a/editor/plugins/cpu_particles_editor_plugin.cpp +++ b/editor/plugins/cpu_particles_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "cpu_particles_editor_plugin.h" #include "editor/plugins/spatial_editor_plugin.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/vector3.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 2a78f5daf..1e4c1d72d 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -34,7 +34,7 @@ #include "core/os/input.h" #include "core/os/keyboard.h" #include "editor/editor_scale.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/error_macros.h" #include "core/image.h" @@ -43,10 +43,10 @@ #include "core/math/rect2.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/string_name.h" #include "core/typedefs.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" diff --git a/editor/plugins/curve_editor_plugin.h b/editor/plugins/curve_editor_plugin.h index 2654f55bb..829b3dbbd 100644 --- a/editor/plugins/curve_editor_plugin.h +++ b/editor/plugins/curve_editor_plugin.h @@ -37,7 +37,7 @@ #include "core/math/transform_2d.h" #include "core/math/vector2.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "editor/editor_inspector.h" #include "scene/gui/control.h" diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index 86c873151..ce7fba760 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -40,7 +40,7 @@ #include "servers/audio/audio_stream.h" #include "core/project_settings.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_list.h" #include "core/error_macros.h" @@ -57,7 +57,7 @@ #include "core/os/memory.h" #include "core/containers/pool_vector.h" #include "core/rid_handle.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/containers/set.h" #include "core/typedefs.h" #include "core/containers/vector.h" diff --git a/editor/plugins/editor_preview_plugins.h b/editor/plugins/editor_preview_plugins.h index 33e7f507b..7074a54ac 100644 --- a/editor/plugins/editor_preview_plugins.h +++ b/editor/plugins/editor_preview_plugins.h @@ -34,9 +34,9 @@ #include "core/safe_refcount.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/object.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/rid.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp index 4050831c2..3f903ba94 100644 --- a/editor/plugins/gradient_editor_plugin.cpp +++ b/editor/plugins/gradient_editor_plugin.cpp @@ -31,9 +31,9 @@ #include "gradient_editor_plugin.h" #include "editor/editor_scale.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/os/memory.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/containers/vector.h" #include "editor/editor_node.h" #include "scene/resources/gradient.h" diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/plugins/gradient_editor_plugin.h index 392d953f6..a25446547 100644 --- a/editor/plugins/gradient_editor_plugin.h +++ b/editor/plugins/gradient_editor_plugin.h @@ -35,8 +35,8 @@ #include "scene/gui/gradient_edit.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" class Gradient; diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.h b/editor/plugins/gradient_texture_2d_editor_plugin.h index d7547c84d..cf47214a2 100644 --- a/editor/plugins/gradient_texture_2d_editor_plugin.h +++ b/editor/plugins/gradient_texture_2d_editor_plugin.h @@ -36,7 +36,7 @@ #include "scene/gui/control.h" #include "editor/editor_inspector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/resources/texture.h" class Button; diff --git a/editor/plugins/item_list_editor_plugin.cpp b/editor/plugins/item_list_editor_plugin.cpp index c8db30e10..449da89ff 100644 --- a/editor/plugins/item_list_editor_plugin.cpp +++ b/editor/plugins/item_list_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "item_list_editor_plugin.h" #include "editor/editor_scale.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/vector2.h" #include "core/os/memory.h" #include "editor/editor_inspector.h" diff --git a/editor/plugins/item_list_editor_plugin.h b/editor/plugins/item_list_editor_plugin.h index 79d1b5a2c..a71698cc6 100644 --- a/editor/plugins/item_list_editor_plugin.h +++ b/editor/plugins/item_list_editor_plugin.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 "scene/gui/box_container.h" #include "editor/editor_plugin.h" @@ -39,7 +39,7 @@ #include "scene/gui/popup_menu.h" #include "core/containers/list.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/plugins/light_occluder_2d_editor_plugin.cpp b/editor/plugins/light_occluder_2d_editor_plugin.cpp index 131390e4b..f1ff120e1 100644 --- a/editor/plugins/light_occluder_2d_editor_plugin.cpp +++ b/editor/plugins/light_occluder_2d_editor_plugin.cpp @@ -33,7 +33,7 @@ #include "core/math/vector2.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/ustring.h" #include "core/containers/vector.h" #include "scene/2d/light_occluder_2d.h" diff --git a/editor/plugins/light_occluder_2d_editor_plugin.h b/editor/plugins/light_occluder_2d_editor_plugin.h index 9211d705a..7fc166de0 100644 --- a/editor/plugins/light_occluder_2d_editor_plugin.h +++ b/editor/plugins/light_occluder_2d_editor_plugin.h @@ -32,8 +32,8 @@ #include "editor/plugins/abstract_polygon_2d_editor.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/variant/variant.h" class EditorNode; diff --git a/editor/plugins/line_2d_editor_plugin.cpp b/editor/plugins/line_2d_editor_plugin.cpp index fd3bb81bb..1578966c2 100644 --- a/editor/plugins/line_2d_editor_plugin.cpp +++ b/editor/plugins/line_2d_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "line_2d_editor_plugin.h" #include "core/os/memory.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/ustring.h" #include "scene/2d/line_2d.h" #include "scene/2d/node_2d.h" diff --git a/editor/plugins/line_2d_editor_plugin.h b/editor/plugins/line_2d_editor_plugin.h index 96ea38111..1f60049ad 100644 --- a/editor/plugins/line_2d_editor_plugin.h +++ b/editor/plugins/line_2d_editor_plugin.h @@ -32,7 +32,7 @@ #include "editor/plugins/abstract_polygon_2d_editor.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/variant/variant.h" class EditorNode; diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index 59af69496..29f44e1dd 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -38,7 +38,7 @@ #include "scene/resources/particles_material.h" #include "scene/resources/sky.h" #include "scene/resources/world.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" @@ -49,7 +49,7 @@ #include "core/math/vector2.h" #include "core/math/vector3.h" #include "core/os/memory.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/variant/variant.h" #include "editor/editor_settings.h" #include "scene/2d/canvas_item.h" diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index e116e3ba1..9808b2533 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/plugins/material_editor_plugin.h @@ -38,8 +38,8 @@ #include "scene/resources/primitive_meshes.h" #include "scene/resources/material.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "scene/resources/environment.h" diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp index bb27b9621..4f6b128c3 100644 --- a/editor/plugins/mesh_editor_plugin.cpp +++ b/editor/plugins/mesh_editor_plugin.cpp @@ -35,7 +35,7 @@ #include "scene/main/viewport.h" #include "scene/resources/world.h" #include "scene/resources/mesh.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/math/aabb.h" #include "core/math/basis.h" diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h index b2cf3d510..cdb061329 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/plugins/mesh_editor_plugin.h @@ -34,8 +34,8 @@ #include "editor/editor_inspector.h" #include "scene/gui/viewport_container.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "scene/resources/material.h" diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp index 12dbe72f0..8a445554b 100644 --- a/editor/plugins/mesh_instance_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_editor_plugin.cpp @@ -38,7 +38,7 @@ #include "scene/resources/navigation_mesh.h" #include "spatial_editor_plugin.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,9 +46,9 @@ #include "core/math/rect2.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/set.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_data.h" #include "editor/editor_node.h" diff --git a/editor/plugins/mesh_instance_editor_plugin.h b/editor/plugins/mesh_instance_editor_plugin.h index 55333b73f..5efb5b533 100644 --- a/editor/plugins/mesh_instance_editor_plugin.h +++ b/editor/plugins/mesh_instance_editor_plugin.h @@ -34,7 +34,7 @@ #include "editor/editor_plugin.h" #include "core/math/vector2.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp index d414aebc8..4d4afc342 100644 --- a/editor/plugins/multimesh_editor_plugin.cpp +++ b/editor/plugins/multimesh_editor_plugin.cpp @@ -34,7 +34,7 @@ #include "scene/gui/box_container.h" #include "scene/resources/multimesh.h" #include "spatial_editor_plugin.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/containers/map.h" #include "core/math/basis.h" @@ -47,7 +47,7 @@ #include "core/math/vector3.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/typedefs.h" #include "editor/editor_node.h" #include "editor/scene_tree_editor.h" diff --git a/editor/plugins/multimesh_editor_plugin.h b/editor/plugins/multimesh_editor_plugin.h index 5953d4b0a..12748a403 100644 --- a/editor/plugins/multimesh_editor_plugin.h +++ b/editor/plugins/multimesh_editor_plugin.h @@ -34,7 +34,7 @@ #include "editor/editor_plugin.h" #include "core/node_path.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class AcceptDialog; diff --git a/editor/plugins/navigation_polygon_editor_plugin.cpp b/editor/plugins/navigation_polygon_editor_plugin.cpp index 568d762f5..ed764f38f 100644 --- a/editor/plugins/navigation_polygon_editor_plugin.cpp +++ b/editor/plugins/navigation_polygon_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "core/math/vector2.h" #include "core/os/memory.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/ustring.h" #include "core/containers/vector.h" #include "scene/2d/navigation_polygon.h" diff --git a/editor/plugins/navigation_polygon_editor_plugin.h b/editor/plugins/navigation_polygon_editor_plugin.h index d285dc854..62be87ced 100644 --- a/editor/plugins/navigation_polygon_editor_plugin.h +++ b/editor/plugins/navigation_polygon_editor_plugin.h @@ -32,8 +32,8 @@ #include "editor/plugins/abstract_polygon_2d_editor.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/variant/variant.h" class EditorNode; diff --git a/editor/plugins/particles_editor_plugin.cpp b/editor/plugins/particles_editor_plugin.cpp index f5bcbfdab..7f6fe72f9 100644 --- a/editor/plugins/particles_editor_plugin.cpp +++ b/editor/plugins/particles_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "particles_editor_plugin.h" #include "core/io/resource_loader.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/containers/list.h" #include "core/containers/map.h" diff --git a/editor/plugins/particles_editor_plugin.h b/editor/plugins/particles_editor_plugin.h index 98201f1fe..084d10c36 100644 --- a/editor/plugins/particles_editor_plugin.h +++ b/editor/plugins/particles_editor_plugin.h @@ -35,7 +35,7 @@ #include "core/math/face3.h" #include "core/node_path.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/pool_vector.h" diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp index 4dcdead06..ea0c12e09 100644 --- a/editor/plugins/path_2d_editor_plugin.cpp +++ b/editor/plugins/path_2d_editor_plugin.cpp @@ -34,7 +34,7 @@ #include "core/os/keyboard.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/math/math_defs.h" #include "core/math/math_funcs.h" @@ -42,7 +42,7 @@ #include "core/math/transform_2d.h" #include "core/os/input_event.h" #include "core/os/memory.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_node.h" #include "scene/2d/path_2d.h" diff --git a/editor/plugins/path_2d_editor_plugin.h b/editor/plugins/path_2d_editor_plugin.h index ac187e4da..10d1598dd 100644 --- a/editor/plugins/path_2d_editor_plugin.h +++ b/editor/plugins/path_2d_editor_plugin.h @@ -34,8 +34,8 @@ #include "editor/editor_plugin.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" diff --git a/editor/plugins/path_editor_plugin.cpp b/editor/plugins/path_editor_plugin.cpp index 5fbbb8669..b31e4a141 100644 --- a/editor/plugins/path_editor_plugin.cpp +++ b/editor/plugins/path_editor_plugin.cpp @@ -30,7 +30,7 @@ #include "path_editor_plugin.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/math/basis.h" #include "core/math/geometry.h" @@ -41,7 +41,7 @@ #include "core/os/keyboard.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/containers/vector.h" #include "editor/editor_node.h" #include "editor/editor_settings.h" diff --git a/editor/plugins/path_editor_plugin.h b/editor/plugins/path_editor_plugin.h index 687f8f24d..96bb14d7a 100644 --- a/editor/plugins/path_editor_plugin.h +++ b/editor/plugins/path_editor_plugin.h @@ -36,8 +36,8 @@ #include "core/math/vector2.h" #include "core/math/vector3.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/plugins/physical_bone_plugin.cpp b/editor/plugins/physical_bone_plugin.cpp index 974b719ff..804956048 100644 --- a/editor/plugins/physical_bone_plugin.cpp +++ b/editor/plugins/physical_bone_plugin.cpp @@ -32,7 +32,7 @@ #include "editor/plugins/spatial_editor_plugin.h" #include "scene/3d/physics_body.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/os/memory.h" #include "scene/gui/box_container.h" diff --git a/editor/plugins/physical_bone_plugin.h b/editor/plugins/physical_bone_plugin.h index 60424aacc..67cbdfa97 100644 --- a/editor/plugins/physical_bone_plugin.h +++ b/editor/plugins/physical_bone_plugin.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/ustring.h" #include "editor/editor_plugin.h" diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index 1f562f89b..739973970 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -37,7 +37,7 @@ #include "editor/editor_settings.h" #include "scene/2d/skeleton_2d.h" #include "scene/gui/panel.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/geometry.h" #include "core/math/math_defs.h" #include "core/math/math_funcs.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/ustring.h" #include "core/variant/variant.h" #include "scene/2d/canvas_item.h" diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h index 10d9132d7..072f3c7b7 100644 --- a/editor/plugins/polygon_2d_editor_plugin.h +++ b/editor/plugins/polygon_2d_editor_plugin.h @@ -35,9 +35,9 @@ #include "core/variant/array.h" #include "core/math/color.h" #include "core/math/vector2.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" class AcceptDialog; diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp index f81b45e5e..2498eb4f7 100644 --- a/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/editor/plugins/resource_preloader_editor_plugin.cpp @@ -33,14 +33,14 @@ #include "core/io/resource_loader.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/variant/dictionary.h" #include "core/error_macros.h" #include "core/containers/list.h" #include "core/os/memory.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/string_name.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/containers/vector.h" #include "editor/editor_file_dialog.h" #include "editor/editor_node.h" diff --git a/editor/plugins/resource_preloader_editor_plugin.h b/editor/plugins/resource_preloader_editor_plugin.h index c42280ca3..d5694bbf8 100644 --- a/editor/plugins/resource_preloader_editor_plugin.h +++ b/editor/plugins/resource_preloader_editor_plugin.h @@ -35,8 +35,8 @@ #include "scene/main/resource_preloader.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/plugins/room_manager_editor_plugin.cpp b/editor/plugins/room_manager_editor_plugin.cpp index dcef8055f..f20912cec 100644 --- a/editor/plugins/room_manager_editor_plugin.cpp +++ b/editor/plugins/room_manager_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "editor/spatial_editor_gizmos.h" #include "scene/resources/occluder_shape.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/engine.h" #include "core/containers/local_vector.h" #include "core/math/math_defs.h" @@ -40,9 +40,9 @@ #include "core/math/vector3.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/string_name.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "editor/editor_node.h" #include "editor/plugins/spatial_editor_plugin.h" #include "scene/3d/occluder.h" diff --git a/editor/plugins/room_manager_editor_plugin.h b/editor/plugins/room_manager_editor_plugin.h index acbd1cb6c..a069530ae 100644 --- a/editor/plugins/room_manager_editor_plugin.h +++ b/editor/plugins/room_manager_editor_plugin.h @@ -33,7 +33,7 @@ #include "editor/editor_plugin.h" #include "scene/resources/material.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class EditorNode; diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp index c1024f457..d7d33cee9 100644 --- a/editor/plugins/root_motion_editor_plugin.cpp +++ b/editor/plugins/root_motion_editor_plugin.cpp @@ -33,12 +33,12 @@ #include "editor/editor_node.h" #include "scene/3d/skeleton.h" #include "scene/main/viewport.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/containers/list.h" #include "core/containers/map.h" #include "core/os/memory.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/set.h" #include "core/string_name.h" #include "core/typedefs.h" diff --git a/editor/plugins/root_motion_editor_plugin.h b/editor/plugins/root_motion_editor_plugin.h index e46c0f1ca..26e595eab 100644 --- a/editor/plugins/root_motion_editor_plugin.h +++ b/editor/plugins/root_motion_editor_plugin.h @@ -33,7 +33,7 @@ #include "editor/editor_inspector.h" #include "core/node_path.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 94b866b18..cf0dfccab 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -49,7 +49,7 @@ #include "scene/scene_string_names.h" #include "script_text_editor.h" #include "text_editor.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" @@ -63,7 +63,7 @@ #include "core/os/memory.h" #include "core/pair.h" #include "core/string_name.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/version_generated.gen.h" #include "editor/editor_data.h" #include "editor/editor_file_dialog.h" diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index 210ddcdb5..f84757cca 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -37,14 +37,14 @@ #include "scene/resources/text_file.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/variant/array.h" #include "core/error_list.h" #include "core/containers/list.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/object.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/containers/set.h" #include "core/typedefs.h" #include "core/ustring.h" diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 0d3383507..7145b7406 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -31,7 +31,7 @@ #include "script_text_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/error_list.h" #include "core/error_macros.h" @@ -46,7 +46,7 @@ #include "core/os/keyboard.h" #include "core/os/memory.h" #include "core/project_settings.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" diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h index b3daec7b9..c9754d6d8 100644 --- a/editor/plugins/script_text_editor.h +++ b/editor/plugins/script_text_editor.h @@ -33,15 +33,15 @@ #include "scene/gui/dialogs.h" #include "script_editor_plugin.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "core/math/color.h" #include "core/containers/list.h" #include "core/containers/map.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/resource.h" +#include "core/object/object.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "editor/code_editor.h" diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index b030c17da..cff1b2a4a 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "shader_editor_plugin.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_list.h" #include "core/error_macros.h" diff --git a/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h index 765646d7e..87b089ebf 100644 --- a/editor/plugins/shader_editor_plugin.h +++ b/editor/plugins/shader_editor_plugin.h @@ -38,8 +38,8 @@ #include "core/containers/list.h" #include "core/math/vector2.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" class Button; diff --git a/editor/plugins/skeleton_2d_editor_plugin.cpp b/editor/plugins/skeleton_2d_editor_plugin.cpp index 0ed813544..17e696001 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.cpp +++ b/editor/plugins/skeleton_2d_editor_plugin.cpp @@ -31,9 +31,9 @@ #include "skeleton_2d_editor_plugin.h" #include "canvas_item_editor_plugin.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/os/memory.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "editor/editor_node.h" #include "scene/2d/skeleton_2d.h" #include "scene/gui/dialogs.h" diff --git a/editor/plugins/skeleton_2d_editor_plugin.h b/editor/plugins/skeleton_2d_editor_plugin.h index 9b74f3791..9cf1a19a1 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.h +++ b/editor/plugins/skeleton_2d_editor_plugin.h @@ -33,7 +33,7 @@ #include "editor/editor_plugin.h" #include "scene/gui/control.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class AcceptDialog; diff --git a/editor/plugins/skeleton_ik_editor_plugin.cpp b/editor/plugins/skeleton_ik_editor_plugin.cpp index b4f15b1ce..1274aa8b6 100644 --- a/editor/plugins/skeleton_ik_editor_plugin.cpp +++ b/editor/plugins/skeleton_ik_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "scene/3d/skeleton.h" #include "scene/animation/skeleton_ik.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/os/memory.h" #include "editor/editor_node.h" #include "scene/gui/button.h" diff --git a/editor/plugins/skeleton_ik_editor_plugin.h b/editor/plugins/skeleton_ik_editor_plugin.h index 1269ac9d6..e42e8e9e1 100644 --- a/editor/plugins/skeleton_ik_editor_plugin.h +++ b/editor/plugins/skeleton_ik_editor_plugin.h @@ -32,7 +32,7 @@ #include "editor/editor_plugin.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class SkeletonIK; diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 1ac7df2c6..566558d05 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "spatial_editor_plugin.h" #include "core/variant/array.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/engine.h" #include "core/io/resource_loader.h" #include "core/containers/map.h" @@ -50,10 +50,10 @@ #include "core/containers/pool_vector.h" #include "core/project_settings.h" #include "core/rid_handle.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/containers/set.h" #include "core/string_name.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "editor/animation_track_editor.h" #include "editor/editor_data.h" #include "editor/editor_node.h" diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 1d87e7ddb..18f51bf40 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -49,10 +49,10 @@ #include "core/math/transform.h" #include "core/math/vector2.h" #include "core/math/vector3.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/object_id.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/rid.h" #include "core/typedefs.h" #include "core/ustring.h" diff --git a/editor/plugins/sprite_editor_plugin.cpp b/editor/plugins/sprite_editor_plugin.cpp index 53343df89..eacf57451 100644 --- a/editor/plugins/sprite_editor_plugin.cpp +++ b/editor/plugins/sprite_editor_plugin.cpp @@ -41,7 +41,7 @@ #include "thirdparty/misc/clipper.hpp" #include "scene/resources/mesh.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/image.h" @@ -49,8 +49,8 @@ #include "core/math/rect2.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" -#include "core/undo_redo.h" +#include "core/object/reference.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_node.h" #include "editor/scene_tree_dock.h" diff --git a/editor/plugins/sprite_editor_plugin.h b/editor/plugins/sprite_editor_plugin.h index 243f29844..ca8c617b6 100644 --- a/editor/plugins/sprite_editor_plugin.h +++ b/editor/plugins/sprite_editor_plugin.h @@ -34,7 +34,7 @@ #include "editor/editor_plugin.h" #include "core/math/vector2.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index d1a44dd6c..5cffbb975 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -30,7 +30,7 @@ #include "sprite_frames_editor_plugin.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,9 +44,9 @@ #include "core/os/keyboard.h" #include "core/os/memory.h" #include "core/containers/pool_vector.h" -#include "core/resource.h" +#include "core/object/resource.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 "editor/editor_file_system.h" diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h index f39c9782f..0ede20f99 100644 --- a/editor/plugins/sprite_frames_editor_plugin.h +++ b/editor/plugins/sprite_frames_editor_plugin.h @@ -34,9 +34,9 @@ #include "scene/gui/split_container.h" #include "core/math/vector2.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/set.h" #include "core/string_name.h" #include "core/ustring.h" diff --git a/editor/plugins/style_box_editor_plugin.cpp b/editor/plugins/style_box_editor_plugin.cpp index ac6a9afc6..bffd6a4eb 100644 --- a/editor/plugins/style_box_editor_plugin.cpp +++ b/editor/plugins/style_box_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "style_box_editor_plugin.h" #include "editor/editor_scale.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/rect2.h" #include "core/math/vector2.h" #include "core/os/memory.h" diff --git a/editor/plugins/style_box_editor_plugin.h b/editor/plugins/style_box_editor_plugin.h index c219e0a5a..7b174d27f 100644 --- a/editor/plugins/style_box_editor_plugin.h +++ b/editor/plugins/style_box_editor_plugin.h @@ -34,8 +34,8 @@ #include "editor/editor_plugin.h" #include "editor/editor_inspector.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/plugins/text_editor.cpp b/editor/plugins/text_editor.cpp index 6fc76de77..4bb757a7a 100644 --- a/editor/plugins/text_editor.cpp +++ b/editor/plugins/text_editor.cpp @@ -33,7 +33,7 @@ #include "core/os/keyboard.h" #include "editor/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/error_macros.h" #include "core/math/transform_2d.h" diff --git a/editor/plugins/text_editor.h b/editor/plugins/text_editor.h index 0418a7fd2..b3ad606b7 100644 --- a/editor/plugins/text_editor.h +++ b/editor/plugins/text_editor.h @@ -35,9 +35,9 @@ #include "core/math/color.h" #include "core/containers/list.h" #include "core/containers/map.h" -#include "core/object.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/object.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/plugins/texture_editor_plugin.cpp b/editor/plugins/texture_editor_plugin.cpp index c48131361..9b9b0eb1d 100644 --- a/editor/plugins/texture_editor_plugin.cpp +++ b/editor/plugins/texture_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "editor/editor_scale.h" #include "scene/resources/dynamic_font.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/image.h" #include "core/math/vector2.h" diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h index 44703cb53..8783a9a5b 100644 --- a/editor/plugins/texture_editor_plugin.h +++ b/editor/plugins/texture_editor_plugin.h @@ -35,8 +35,8 @@ #include "editor/editor_plugin.h" #include "scene/resources/texture.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" class EditorNode; diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 2428da2ea..1cc55d969 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -35,7 +35,7 @@ #include "core/os/keyboard.h" #include "editor/editor_scale.h" #include "scene/gui/panel.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/error_macros.h" #include "core/math/math_defs.h" @@ -46,7 +46,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/variant/variant.h" #include "editor/editor_node.h" #include "scene/2d/canvas_item.h" diff --git a/editor/plugins/texture_region_editor_plugin.h b/editor/plugins/texture_region_editor_plugin.h index 8006b5975..802d3112d 100644 --- a/editor/plugins/texture_region_editor_plugin.h +++ b/editor/plugins/texture_region_editor_plugin.h @@ -41,8 +41,8 @@ #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/object/object.h" +#include "core/object/reference.h" #include "core/rid.h" #include "core/ustring.h" diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index f01e98c6a..4a364c960 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "theme_editor_plugin.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/io/resource_loader.h" diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h index 0bcce9e7b..946d3b8a1 100644 --- a/editor/plugins/theme_editor_plugin.h +++ b/editor/plugins/theme_editor_plugin.h @@ -40,10 +40,10 @@ #include "core/containers/list.h" #include "core/containers/map.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/ordered_hash_map.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/plugins/theme_editor_preview.cpp b/editor/plugins/theme_editor_preview.cpp index a60250b37..b9898932a 100644 --- a/editor/plugins/theme_editor_preview.cpp +++ b/editor/plugins/theme_editor_preview.cpp @@ -33,7 +33,7 @@ #include "core/project_settings.h" #include "scene/resources/packed_scene.h" #include "editor/editor_scale.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/io/resource_loader.h" #include "core/math/math_defs.h" #include "core/math/rect2.h" diff --git a/editor/plugins/theme_editor_preview.h b/editor/plugins/theme_editor_preview.h index fb4b34b69..c3e9a6841 100644 --- a/editor/plugins/theme_editor_preview.h +++ b/editor/plugins/theme_editor_preview.h @@ -33,8 +33,8 @@ #include "scene/gui/box_container.h" #include "core/math/color.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "scene/resources/theme.h" diff --git a/editor/plugins/viewport_preview_editor_plugin.cpp b/editor/plugins/viewport_preview_editor_plugin.cpp index ecfde9b57..4ce5f2b67 100644 --- a/editor/plugins/viewport_preview_editor_plugin.cpp +++ b/editor/plugins/viewport_preview_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "viewport_preview_editor_plugin.h" #include "core/os/memory.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "editor/editor_inspector.h" #include "scene/gui/texture_rect.h" #include "scene/main/viewport.h" diff --git a/editor/plugins/viewport_preview_editor_plugin.h b/editor/plugins/viewport_preview_editor_plugin.h index 3986f7164..23ed674b7 100644 --- a/editor/plugins/viewport_preview_editor_plugin.h +++ b/editor/plugins/viewport_preview_editor_plugin.h @@ -33,7 +33,7 @@ #include "editor/editor_plugin.h" #include "editor/plugins/texture_editor_plugin.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class EditorNode; diff --git a/editor/progress_dialog.cpp b/editor/progress_dialog.cpp index dc4427086..a0bc1dae9 100644 --- a/editor/progress_dialog.cpp +++ b/editor/progress_dialog.cpp @@ -30,17 +30,17 @@ #include "progress_dialog.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/os/os.h" #include "editor_scale.h" #include "main/main.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/math/math_defs.h" #include "core/math/rect2.h" #include "core/math/vector2.h" #include "core/os/memory.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/typedefs.h" #include "scene/2d/canvas_item.h" #include "scene/gui/button.h" diff --git a/editor/project_export.cpp b/editor/project_export.cpp index 998b0c877..499f04c60 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -30,7 +30,7 @@ #include "project_export.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" diff --git a/editor/project_export.h b/editor/project_export.h index fdfc42d29..c1570e4c5 100644 --- a/editor/project_export.h +++ b/editor/project_export.h @@ -35,7 +35,7 @@ #include "core/math/vector2.h" #include "core/os/dir_access.h" #include "core/os/thread.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 2a7eb0995..ff2c2afb3 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -30,7 +30,7 @@ #include "project_manager.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/engine.h" #include "core/error_list.h" diff --git a/editor/project_manager.h b/editor/project_manager.h index 5b739d091..74a0afade 100644 --- a/editor/project_manager.h +++ b/editor/project_manager.h @@ -34,8 +34,8 @@ #include "scene/gui/control.h" #include "core/containers/list.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 95c7458c4..d69603989 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -39,7 +39,7 @@ #include "editor/editor_scale.h" #include "scene/gui/tab_container.h" #include "core/variant/array.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_list.h" @@ -53,7 +53,7 @@ #include "core/containers/pool_vector.h" #include "core/containers/set.h" #include "core/typedefs.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "editor/editor_autoload_settings.h" #include "editor/editor_data.h" #include "editor/editor_file_dialog.h" diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h index cce9ce95a..045555851 100644 --- a/editor/project_settings_editor.h +++ b/editor/project_settings_editor.h @@ -34,7 +34,7 @@ #include "core/math/vector2.h" #include "core/os/input_event.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index a47d88b56..68678ebee 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -31,7 +31,7 @@ #include "property_editor.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_list.h" #include "core/error_macros.h" @@ -55,10 +55,10 @@ #include "core/os/memory.h" #include "core/pair.h" #include "core/project_settings.h" -#include "core/ref_ptr.h" -#include "core/resource.h" +#include "core/object/ref_ptr.h" +#include "core/object/resource.h" #include "core/rid.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" diff --git a/editor/property_editor.h b/editor/property_editor.h index 1dcec2b0d..e724fb61e 100644 --- a/editor/property_editor.h +++ b/editor/property_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/popup.h" #include "core/containers/list.h" diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index 9bcd997d8..4b0c05264 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -30,16 +30,16 @@ #include "property_selector.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" #include "core/containers/map.h" -#include "core/method_bind.h" +#include "core/object/method_bind.h" #include "core/os/input_event.h" #include "core/os/keyboard.h" #include "core/os/memory.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/string_name.h" #include "core/typedefs.h" #include "editor/doc/doc_data.h" diff --git a/editor/property_selector.h b/editor/property_selector.h index 212efb0e2..e8c88398d 100644 --- a/editor/property_selector.h +++ b/editor/property_selector.h @@ -33,7 +33,7 @@ #include "scene/gui/dialogs.h" #include "core/object_id.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/editor/quick_open.cpp b/editor/quick_open.cpp index e0b6fd88e..3dcb4cd4e 100644 --- a/editor/quick_open.cpp +++ b/editor/quick_open.cpp @@ -34,7 +34,7 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/line_edit.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/pair.h" diff --git a/editor/quick_open.h b/editor/quick_open.h index 100b25398..1597d8d36 100644 --- a/editor/quick_open.h +++ b/editor/quick_open.h @@ -33,7 +33,7 @@ #include "scene/gui/dialogs.h" #include "core/pair.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/string_name.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp index b69223d61..8ddd4e17c 100644 --- a/editor/rename_dialog.cpp +++ b/editor/rename_dialog.cpp @@ -32,13 +32,13 @@ #include "modules/modules_enabled.gen.h" // For regex. #include "core/variant/array.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/reference.h" +#include "core/object/reference.h" #include "core/string_name.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_data.h" #include "editor/scene_tree_editor.h" diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h index 958a7d922..944d9ea65 100644 --- a/editor/rename_dialog.h +++ b/editor/rename_dialog.h @@ -37,7 +37,7 @@ #include "core/error_macros.h" #include "core/containers/list.h" #include "core/node_path.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/pair.h" #include "core/ustring.h" diff --git a/editor/reparent_dialog.cpp b/editor/reparent_dialog.cpp index 051311b86..41ba9ce8b 100644 --- a/editor/reparent_dialog.cpp +++ b/editor/reparent_dialog.cpp @@ -31,7 +31,7 @@ #include "reparent_dialog.h" #include "scene/gui/box_container.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/os/memory.h" #include "core/ustring.h" #include "core/variant/variant.h" diff --git a/editor/run_settings_dialog.cpp b/editor/run_settings_dialog.cpp index aad7d7dda..ce62052c5 100644 --- a/editor/run_settings_dialog.cpp +++ b/editor/run_settings_dialog.cpp @@ -31,7 +31,7 @@ #include "run_settings_dialog.h" #include "scene/gui/option_button.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/vector2.h" #include "core/os/memory.h" #include "scene/gui/box_container.h" diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 8efb6b69b..a1e75f03b 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -31,7 +31,7 @@ #include "scene_tree_dock.h" #include "core/variant/array.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" @@ -45,11 +45,11 @@ #include "core/os/memory.h" #include "core/os/os.h" #include "core/project_settings.h" -#include "core/ref_ptr.h" -#include "core/script_language.h" +#include "core/object/ref_ptr.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/variant/variant.h" #include "editor/animation_track_editor.h" #include "editor/create_dialog.h" diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h index 4a5f03dcd..1dcce841d 100644 --- a/editor/scene_tree_dock.h +++ b/editor/scene_tree_dock.h @@ -37,8 +37,8 @@ #include "core/containers/map.h" #include "core/node_path.h" #include "core/object_id.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/containers/set.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index 3e8bf62ab..710c25711 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -31,20 +31,20 @@ #include "scene_tree_editor.h" #include "core/variant/array.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" #include "core/containers/hashfuncs.h" #include "core/math/math_defs.h" #include "core/math/transform_2d.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/os/memory.h" -#include "core/ref_ptr.h" -#include "core/reference.h" -#include "core/resource.h" -#include "core/script_language.h" -#include "core/undo_redo.h" +#include "core/object/ref_ptr.h" +#include "core/object/reference.h" +#include "core/object/resource.h" +#include "core/object/script_language.h" +#include "core/object/undo_redo.h" #include "editor/editor_data.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 446326b91..bfed78583 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -30,7 +30,7 @@ #include "script_create_dialog.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/math/color.h" #include "core/error_list.h" #include "core/io/resource_loader.h" @@ -40,9 +40,9 @@ #include "core/os/dir_access.h" #include "core/os/memory.h" #include "core/project_settings.h" -#include "core/reference.h" -#include "core/resource.h" -#include "core/script_language.h" +#include "core/object/reference.h" +#include "core/object/resource.h" +#include "core/object/script_language.h" #include "core/string_builder.h" #include "core/typedefs.h" #include "core/variant/variant.h" diff --git a/editor/script_create_dialog.h b/editor/script_create_dialog.h index c14d05459..b3c6ccae5 100644 --- a/editor/script_create_dialog.h +++ b/editor/script_create_dialog.h @@ -33,7 +33,7 @@ #include "scene/gui/dialogs.h" #include "core/containers/map.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index f98b1f13d..5fadf1a9f 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -30,7 +30,7 @@ #include "script_editor_debugger.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_list.h" @@ -51,10 +51,10 @@ #include "core/os/memory.h" #include "core/os/os.h" #include "core/print_string.h" -#include "core/ref_ptr.h" -#include "core/script_language.h" +#include "core/object/ref_ptr.h" +#include "core/object/script_language.h" #include "core/typedefs.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/ustring.h" #include "core/version.h" #include "editor/editor_data.h" diff --git a/editor/script_editor_debugger.h b/editor/script_editor_debugger.h index 328c6b2df..d82419c97 100644 --- a/editor/script_editor_debugger.h +++ b/editor/script_editor_debugger.h @@ -38,10 +38,10 @@ #include "core/containers/map.h" #include "core/math/vector2.h" #include "core/node_path.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/object_id.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/reference.h" +#include "core/object/resource.h" #include "core/containers/set.h" #include "core/string_name.h" #include "core/ustring.h" diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index 9163e122a..c58b84adc 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -37,7 +37,7 @@ #include "editor_scale.h" #include "editor_settings.h" #include "script_editor_debugger.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" @@ -48,7 +48,7 @@ #include "core/os/input_event.h" #include "core/os/memory.h" #include "core/typedefs.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "editor/editor_inspector.h" #include "editor/editor_sectioned_inspector.h" diff --git a/editor/settings_config_dialog.h b/editor/settings_config_dialog.h index 2b0a89b7d..2b32a0df2 100644 --- a/editor/settings_config_dialog.h +++ b/editor/settings_config_dialog.h @@ -32,8 +32,8 @@ #include "scene/gui/dialogs.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/ustring.h" class Control; diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index 6bfb5c7f3..123371e9e 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -31,7 +31,7 @@ #include "spatial_editor_gizmos.h" #include "core/variant/array.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/containers/list.h" @@ -49,9 +49,9 @@ #include "core/os/memory.h" #include "core/containers/pool_vector.h" #include "core/rid.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 "editor/editor_node.h" #include "editor/editor_settings.h" #include "scene/3d/audio_stream_player_3d.h" diff --git a/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h index effd0b631..c7b2940db 100644 --- a/editor/spatial_editor_gizmos.h +++ b/editor/spatial_editor_gizmos.h @@ -37,10 +37,10 @@ #include "core/math/math_defs.h" #include "core/math/vector2.h" #include "core/math/vector3.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/ordered_hash_map.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/main/main.cpp b/main/main.cpp index 265e0ada7..8d926a35b 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -38,14 +38,14 @@ #include "core/io/image_loader.h" #include "core/io/ip.h" #include "core/io/resource_loader.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/os/dir_access.h" #include "core/os/os.h" #include "core/os/time.h" #include "core/project_settings.h" #include "core/register_core_types.h" #include "core/script_debugger_local.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/translation.h" #include "core/version.h" #include "drivers/register_driver_types.h" diff --git a/main/performance.cpp b/main/performance.cpp index b44aa882c..468b9ebcf 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -30,7 +30,7 @@ #include "performance.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/os/os.h" #include "scene/main/node.h" #include "scene/main/scene_tree.h" diff --git a/main/performance.h b/main/performance.h index 4613b134b..0717ad742 100644 --- a/main/performance.h +++ b/main/performance.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/object.h" +#include "core/object/object.h" #define PERF_WARN_OFFLINE_FUNCTION #define PERF_WARN_PROCESS_SYNC diff --git a/modules/broken_seals_module/biome_terrarin_generator.h b/modules/broken_seals_module/biome_terrarin_generator.h index c083d0d51..65f0de034 100644 --- a/modules/broken_seals_module/biome_terrarin_generator.h +++ b/modules/broken_seals_module/biome_terrarin_generator.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #ifdef VOXELMAN_PRESENT class VoxelChunk; diff --git a/modules/cscript/cscript.h b/modules/cscript/cscript.h index 947f3f1ec..bba825abd 100644 --- a/modules/cscript/cscript.h +++ b/modules/cscript/cscript.h @@ -32,7 +32,7 @@ #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "cscript_function.h" class CScriptNativeClass : public Reference { diff --git a/modules/cscript/cscript_function.h b/modules/cscript/cscript_function.h index 4f6124191..15382e075 100644 --- a/modules/cscript/cscript_function.h +++ b/modules/cscript/cscript_function.h @@ -32,8 +32,8 @@ #include "core/os/thread.h" #include "core/pair.h" -#include "core/reference.h" -#include "core/script_language.h" +#include "core/object/reference.h" +#include "core/object/script_language.h" #include "core/containers/self_list.h" #include "core/string_name.h" #include "core/variant/variant.h" diff --git a/modules/cscript/cscript_functions.cpp b/modules/cscript/cscript_functions.cpp index fa580819b..006745c51 100644 --- a/modules/cscript/cscript_functions.cpp +++ b/modules/cscript/cscript_functions.cpp @@ -30,13 +30,13 @@ #include "cscript_functions.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/func_ref.h" #include "core/io/json.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" #include "cscript.h" diff --git a/modules/cscript/cscript_parser.cpp b/modules/cscript/cscript_parser.cpp index 0ad4db17f..9b8174b99 100644 --- a/modules/cscript/cscript_parser.cpp +++ b/modules/cscript/cscript_parser.cpp @@ -36,8 +36,8 @@ #include "core/os/file_access.h" #include "core/print_string.h" #include "core/project_settings.h" -#include "core/reference.h" -#include "core/script_language.h" +#include "core/object/reference.h" +#include "core/object/script_language.h" #include "cscript.h" template diff --git a/modules/cscript/cscript_parser.h b/modules/cscript/cscript_parser.h index b38561005..f7f74c9a5 100644 --- a/modules/cscript/cscript_parser.h +++ b/modules/cscript/cscript_parser.h @@ -31,8 +31,8 @@ /*************************************************************************/ #include "core/containers/map.h" -#include "core/object.h" -#include "core/script_language.h" +#include "core/object/object.h" +#include "core/object/script_language.h" #include "cscript_functions.h" #include "cscript_tokenizer.h" diff --git a/modules/database/database.h b/modules/database/database.h index d6f3e0fc1..2d133c92e 100644 --- a/modules/database/database.h +++ b/modules/database/database.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "core/reference.h" +#include "core/object/reference.h" class DatabaseConnection; diff --git a/modules/database/database_connection.h b/modules/database/database_connection.h index 026aeac56..76faaf21b 100644 --- a/modules/database/database_connection.h +++ b/modules/database/database_connection.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "core/reference.h" +#include "core/object/reference.h" class QueryBuilder; class TableBuilder; diff --git a/modules/database/database_manager.cpp b/modules/database/database_manager.cpp index 64bd54ea9..f2f89316f 100644 --- a/modules/database/database_manager.cpp +++ b/modules/database/database_manager.cpp @@ -1,6 +1,6 @@ #include "database_manager.h" -#include "core/object.h" +#include "core/object/object.h" #include "database.h" Ref DatabaseManager::get_ddb() { diff --git a/modules/database/database_manager.h b/modules/database/database_manager.h index 7804164ee..109978adc 100644 --- a/modules/database/database_manager.h +++ b/modules/database/database_manager.h @@ -1,11 +1,11 @@ #ifndef DATABASE_MANAGER_H #define DATABASE_MANAGER_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" -#include "core/object.h" +#include "core/object/object.h" class Database; diff --git a/modules/database/query_builder.h b/modules/database/query_builder.h index 2cef27936..153cdb755 100644 --- a/modules/database/query_builder.h +++ b/modules/database/query_builder.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "core/reference.h" +#include "core/object/reference.h" class QueryResult; diff --git a/modules/database/query_result.h b/modules/database/query_result.h index 884b669ae..acf61c9d5 100644 --- a/modules/database/query_result.h +++ b/modules/database/query_result.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "core/reference.h" +#include "core/object/reference.h" class QueryResult : public Reference { GDCLASS(QueryResult, Reference); diff --git a/modules/database/table_builder.h b/modules/database/table_builder.h index 7e52bb3a2..03addfbde 100644 --- a/modules/database/table_builder.h +++ b/modules/database/table_builder.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "core/reference.h" +#include "core/object/reference.h" class QueryResult; diff --git a/modules/entity_spell_system/data/atlases/character_atlas.h b/modules/entity_spell_system/data/atlases/character_atlas.h index b93b2f529..85003c987 100644 --- a/modules/entity_spell_system/data/atlases/character_atlas.h +++ b/modules/entity_spell_system/data/atlases/character_atlas.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class CharacterAtlas : public Resource { GDCLASS(CharacterAtlas, Resource); diff --git a/modules/entity_spell_system/data/atlases/character_atlas_entry.h b/modules/entity_spell_system/data/atlases/character_atlas_entry.h index 8d5d37412..51a3fc530 100644 --- a/modules/entity_spell_system/data/atlases/character_atlas_entry.h +++ b/modules/entity_spell_system/data/atlases/character_atlas_entry.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class CharacterAtlasEntry : public Resource { GDCLASS(CharacterAtlasEntry, Resource); diff --git a/modules/entity_spell_system/data/auras/aura_group.h b/modules/entity_spell_system/data/auras/aura_group.h index 7c6f4583b..0e02df87b 100644 --- a/modules/entity_spell_system/data/auras/aura_group.h +++ b/modules/entity_spell_system/data/auras/aura_group.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class AuraGroup : public Resource { GDCLASS(AuraGroup, Resource); diff --git a/modules/entity_spell_system/data/items/craft_recipe.h b/modules/entity_spell_system/data/items/craft_recipe.h index 6fd792129..809fbc2f3 100644 --- a/modules/entity_spell_system/data/items/craft_recipe.h +++ b/modules/entity_spell_system/data/items/craft_recipe.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/data/items/craft_recipe_helper.h b/modules/entity_spell_system/data/items/craft_recipe_helper.h index 33a481cf5..d64a7546d 100644 --- a/modules/entity_spell_system/data/items/craft_recipe_helper.h +++ b/modules/entity_spell_system/data/items/craft_recipe_helper.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "item_template.h" diff --git a/modules/entity_spell_system/data/items/equipment_data.h b/modules/entity_spell_system/data/items/equipment_data.h index 84373cf1a..f59f09bd0 100644 --- a/modules/entity_spell_system/data/items/equipment_data.h +++ b/modules/entity_spell_system/data/items/equipment_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class ItemInstance; class ItemTemplate; diff --git a/modules/entity_spell_system/data/items/item_instance.h b/modules/entity_spell_system/data/items/item_instance.h index 876d8cf27..83aa1f526 100644 --- a/modules/entity_spell_system/data/items/item_instance.h +++ b/modules/entity_spell_system/data/items/item_instance.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "../../item_enums.h" diff --git a/modules/entity_spell_system/data/items/item_template.h b/modules/entity_spell_system/data/items/item_template.h index 6a9ba5b65..58744d981 100644 --- a/modules/entity_spell_system/data/items/item_template.h +++ b/modules/entity_spell_system/data/items/item_template.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "scene/resources/texture.h" diff --git a/modules/entity_spell_system/data/items/model_visual.h b/modules/entity_spell_system/data/items/model_visual.h index b5f345e00..edeb8743e 100644 --- a/modules/entity_spell_system/data/items/model_visual.h +++ b/modules/entity_spell_system/data/items/model_visual.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "../../item_enums.h" #include "model_visual_entry.h" diff --git a/modules/entity_spell_system/data/items/model_visual_entry.h b/modules/entity_spell_system/data/items/model_visual_entry.h index 25600b07a..cb45eacd8 100644 --- a/modules/entity_spell_system/data/items/model_visual_entry.h +++ b/modules/entity_spell_system/data/items/model_visual_entry.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "scene/resources/texture.h" diff --git a/modules/entity_spell_system/data/species/entity_species_data.h b/modules/entity_spell_system/data/species/entity_species_data.h index 9c2d9fe83..165fdb329 100644 --- a/modules/entity_spell_system/data/species/entity_species_data.h +++ b/modules/entity_spell_system/data/species/entity_species_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/data/species/species_instance.h b/modules/entity_spell_system/data/species/species_instance.h index 963ad0b8a..7001d59c6 100644 --- a/modules/entity_spell_system/data/species/species_instance.h +++ b/modules/entity_spell_system/data/species/species_instance.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "../items/model_visual_entry.h" diff --git a/modules/entity_spell_system/data/species/species_model_data.h b/modules/entity_spell_system/data/species/species_model_data.h index a59c52bcd..81bd8578b 100644 --- a/modules/entity_spell_system/data/species/species_model_data.h +++ b/modules/entity_spell_system/data/species/species_model_data.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/data/spells/spell.h b/modules/entity_spell_system/data/spells/spell.h index fa1f02277..1fa072e27 100644 --- a/modules/entity_spell_system/data/spells/spell.h +++ b/modules/entity_spell_system/data/spells/spell.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/resources/texture.h" diff --git a/modules/entity_spell_system/data/spells/spell_cooldown_manipulation_data.h b/modules/entity_spell_system/data/spells/spell_cooldown_manipulation_data.h index ff64f83e8..6e7238719 100644 --- a/modules/entity_spell_system/data/spells/spell_cooldown_manipulation_data.h +++ b/modules/entity_spell_system/data/spells/spell_cooldown_manipulation_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class SpellCooldownManipulationData : public Reference { GDCLASS(SpellCooldownManipulationData, Reference); diff --git a/modules/entity_spell_system/data/spells/spell_effect_visual.h b/modules/entity_spell_system/data/spells/spell_effect_visual.h index f2fe703a1..5149f01ba 100644 --- a/modules/entity_spell_system/data/spells/spell_effect_visual.h +++ b/modules/entity_spell_system/data/spells/spell_effect_visual.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class SpellEffectVisual : public Resource { GDCLASS(SpellEffectVisual, Resource); diff --git a/modules/entity_spell_system/database/ess_resource_db.h b/modules/entity_spell_system/database/ess_resource_db.h index 600112dc1..9bbc54834 100644 --- a/modules/entity_spell_system/database/ess_resource_db.h +++ b/modules/entity_spell_system/database/ess_resource_db.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/bind/core_bind.h" #include "core/containers/hash_map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h b/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h index 6662aa480..df33f674a 100644 --- a/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h +++ b/modules/entity_spell_system/drag_and_drop/es_drag_and_drop.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/entities/ai/entity_ai.h b/modules/entity_spell_system/entities/ai/entity_ai.h index 7cc9dc004..9472f6418 100644 --- a/modules/entity_spell_system/entities/ai/entity_ai.h +++ b/modules/entity_spell_system/entities/ai/entity_ai.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/entities/auras/aura_data.h b/modules/entity_spell_system/entities/auras/aura_data.h index 82acf7155..55317237c 100644 --- a/modules/entity_spell_system/entities/auras/aura_data.h +++ b/modules/entity_spell_system/entities/auras/aura_data.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/variant/dictionary.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "../../spell_enums.h" diff --git a/modules/entity_spell_system/entities/data/character_spec.h b/modules/entity_spell_system/entities/data/character_spec.h index 870a2b19b..2c3d8489e 100644 --- a/modules/entity_spell_system/entities/data/character_spec.h +++ b/modules/entity_spell_system/entities/data/character_spec.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/entities/data/entity_class_data.h b/modules/entity_spell_system/entities/data/entity_class_data.h index a4536b83b..e89f1e754 100644 --- a/modules/entity_spell_system/entities/data/entity_class_data.h +++ b/modules/entity_spell_system/entities/data/entity_class_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/entities/data/entity_data.h b/modules/entity_spell_system/entities/data/entity_data.h index cb3cd2653..8caaf818d 100644 --- a/modules/entity_spell_system/entities/data/entity_data.h +++ b/modules/entity_spell_system/entities/data/entity_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/entities/data/entity_data_container.h b/modules/entity_spell_system/entities/data/entity_data_container.h index 6fe8c677d..678fb259d 100644 --- a/modules/entity_spell_system/entities/data/entity_data_container.h +++ b/modules/entity_spell_system/entities/data/entity_data_container.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/dictionary.h" -#include "core/resource.h" +#include "core/object/resource.h" class EntityDataContainer : public Resource { GDCLASS(EntityDataContainer, Resource); diff --git a/modules/entity_spell_system/entities/data/item_container_data.h b/modules/entity_spell_system/entities/data/item_container_data.h index 0d4ed720b..8ad96a273 100644 --- a/modules/entity_spell_system/entities/data/item_container_data.h +++ b/modules/entity_spell_system/entities/data/item_container_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "item_container_data_entry.h" diff --git a/modules/entity_spell_system/entities/data/item_container_data_entry.h b/modules/entity_spell_system/entities/data/item_container_data_entry.h index e5d162249..01858c926 100644 --- a/modules/entity_spell_system/entities/data/item_container_data_entry.h +++ b/modules/entity_spell_system/entities/data/item_container_data_entry.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class ItemTemplate; diff --git a/modules/entity_spell_system/entities/data/vendor_item_data.h b/modules/entity_spell_system/entities/data/vendor_item_data.h index c09e60447..73a29ee59 100644 --- a/modules/entity_spell_system/entities/data/vendor_item_data.h +++ b/modules/entity_spell_system/entities/data/vendor_item_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "vendor_item_data_entry.h" diff --git a/modules/entity_spell_system/entities/data/vendor_item_data_entry.h b/modules/entity_spell_system/entities/data/vendor_item_data_entry.h index d84dd3e24..da68787da 100644 --- a/modules/entity_spell_system/entities/data/vendor_item_data_entry.h +++ b/modules/entity_spell_system/entities/data/vendor_item_data_entry.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class ItemTemplate; class Spell; diff --git a/modules/entity_spell_system/entities/entity.cpp b/modules/entity_spell_system/entities/entity.cpp index c5ca6e273..b006e959a 100644 --- a/modules/entity_spell_system/entities/entity.cpp +++ b/modules/entity_spell_system/entities/entity.cpp @@ -43,7 +43,7 @@ SOFTWARE. #include "./skills/entity_skill.h" #include "scene/2d/node_2d.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "../defines.h" diff --git a/modules/entity_spell_system/entities/entity.h b/modules/entity_spell_system/entities/entity.h index ce6bc7daf..5260b4f14 100644 --- a/modules/entity_spell_system/entities/entity.h +++ b/modules/entity_spell_system/entities/entity.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/entities/resources/entity_resource.h b/modules/entity_spell_system/entities/resources/entity_resource.h index 910846852..a42dd5eea 100644 --- a/modules/entity_spell_system/entities/resources/entity_resource.h +++ b/modules/entity_spell_system/entities/resources/entity_resource.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "../../defines.h" diff --git a/modules/entity_spell_system/entities/resources/entity_resource_cost_data.h b/modules/entity_spell_system/entities/resources/entity_resource_cost_data.h index 1a12e6493..6a7431837 100644 --- a/modules/entity_spell_system/entities/resources/entity_resource_cost_data.h +++ b/modules/entity_spell_system/entities/resources/entity_resource_cost_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "entity_resource.h" #include "entity_resource_cost_data.h" diff --git a/modules/entity_spell_system/entities/resources/entity_resource_cost_data_health.h b/modules/entity_spell_system/entities/resources/entity_resource_cost_data_health.h index 97b0276db..077688c08 100644 --- a/modules/entity_spell_system/entities/resources/entity_resource_cost_data_health.h +++ b/modules/entity_spell_system/entities/resources/entity_resource_cost_data_health.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "entity_resource.h" #include "entity_resource_cost_data.h" diff --git a/modules/entity_spell_system/entities/resources/entity_resource_cost_data_resource.h b/modules/entity_spell_system/entities/resources/entity_resource_cost_data_resource.h index ff47cb086..0f2ea55d4 100644 --- a/modules/entity_spell_system/entities/resources/entity_resource_cost_data_resource.h +++ b/modules/entity_spell_system/entities/resources/entity_resource_cost_data_resource.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "entity_resource.h" #include "entity_resource_cost_data.h" diff --git a/modules/entity_spell_system/entities/skills/entity_skill.h b/modules/entity_spell_system/entities/skills/entity_skill.h index d255e7405..c5c6819fb 100644 --- a/modules/entity_spell_system/entities/skills/entity_skill.h +++ b/modules/entity_spell_system/entities/skills/entity_skill.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "entity_skill_data.h" diff --git a/modules/entity_spell_system/entities/skills/entity_skill_data.h b/modules/entity_spell_system/entities/skills/entity_skill_data.h index 070092f71..222c7e349 100644 --- a/modules/entity_spell_system/entities/skills/entity_skill_data.h +++ b/modules/entity_spell_system/entities/skills/entity_skill_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" class EntitySkillData : public Resource { diff --git a/modules/entity_spell_system/entities/stats/complex_level_stat_data.h b/modules/entity_spell_system/entities/stats/complex_level_stat_data.h index 7026dc983..07d982673 100644 --- a/modules/entity_spell_system/entities/stats/complex_level_stat_data.h +++ b/modules/entity_spell_system/entities/stats/complex_level_stat_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "../../entity_enums.h" #include "level_stat_data.h" diff --git a/modules/entity_spell_system/entities/stats/level_stat_data.h b/modules/entity_spell_system/entities/stats/level_stat_data.h index 29aac5054..514fac4c3 100644 --- a/modules/entity_spell_system/entities/stats/level_stat_data.h +++ b/modules/entity_spell_system/entities/stats/level_stat_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class LevelStatData : public Resource { GDCLASS(LevelStatData, Resource); diff --git a/modules/entity_spell_system/entities/stats/stat_data.h b/modules/entity_spell_system/entities/stats/stat_data.h index 4271b20cc..4922b6301 100644 --- a/modules/entity_spell_system/entities/stats/stat_data.h +++ b/modules/entity_spell_system/entities/stats/stat_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/resources/curve.h" diff --git a/modules/entity_spell_system/entity_enums.h b/modules/entity_spell_system/entity_enums.h index 8a801890e..c593399c0 100644 --- a/modules/entity_spell_system/entity_enums.h +++ b/modules/entity_spell_system/entity_enums.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class EntityEnums : public Object { diff --git a/modules/entity_spell_system/formations/ai_formation.h b/modules/entity_spell_system/formations/ai_formation.h index 94a806ab1..747d58fee 100644 --- a/modules/entity_spell_system/formations/ai_formation.h +++ b/modules/entity_spell_system/formations/ai_formation.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/infos/aura_infos.h b/modules/entity_spell_system/infos/aura_infos.h index 370108556..1690e55a2 100644 --- a/modules/entity_spell_system/infos/aura_infos.h +++ b/modules/entity_spell_system/infos/aura_infos.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "../entities/entity.h" diff --git a/modules/entity_spell_system/infos/spell_cast_info.h b/modules/entity_spell_system/infos/spell_cast_info.h index 3284349ad..920b568ae 100644 --- a/modules/entity_spell_system/infos/spell_cast_info.h +++ b/modules/entity_spell_system/infos/spell_cast_info.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class Spell; class Entity; diff --git a/modules/entity_spell_system/inventory/bag.h b/modules/entity_spell_system/inventory/bag.h index 51be95f22..be4ccc856 100644 --- a/modules/entity_spell_system/inventory/bag.h +++ b/modules/entity_spell_system/inventory/bag.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "../item_enums.h" diff --git a/modules/entity_spell_system/inventory/grid_bag.h b/modules/entity_spell_system/inventory/grid_bag.h index e24d88db7..db6289512 100644 --- a/modules/entity_spell_system/inventory/grid_bag.h +++ b/modules/entity_spell_system/inventory/grid_bag.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "../item_enums.h" diff --git a/modules/entity_spell_system/inventory/inventory.h b/modules/entity_spell_system/inventory/inventory.h index 6c6308454..b801ee19e 100644 --- a/modules/entity_spell_system/inventory/inventory.h +++ b/modules/entity_spell_system/inventory/inventory.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "../item_enums.h" diff --git a/modules/entity_spell_system/inventory/normal_bag.h b/modules/entity_spell_system/inventory/normal_bag.h index 6ce84d46a..501ab4d80 100644 --- a/modules/entity_spell_system/inventory/normal_bag.h +++ b/modules/entity_spell_system/inventory/normal_bag.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "../item_enums.h" diff --git a/modules/entity_spell_system/item_enums.h b/modules/entity_spell_system/item_enums.h index 162480dfb..b2182859c 100644 --- a/modules/entity_spell_system/item_enums.h +++ b/modules/entity_spell_system/item_enums.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class ItemEnums : public Object { diff --git a/modules/entity_spell_system/material_cache/ess_material_cache.h b/modules/entity_spell_system/material_cache/ess_material_cache.h index d69f95f07..ac9f5f727 100644 --- a/modules/entity_spell_system/material_cache/ess_material_cache.h +++ b/modules/entity_spell_system/material_cache/ess_material_cache.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h b/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h index e48a8c13a..bb81b880a 100644 --- a/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h +++ b/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h @@ -25,7 +25,7 @@ SOFTWARE. #include "ess_material_cache.h" #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/entity_spell_system/pipelines/spell_damage_info.h b/modules/entity_spell_system/pipelines/spell_damage_info.h index 8dc4e3a3b..ed95b80cb 100644 --- a/modules/entity_spell_system/pipelines/spell_damage_info.h +++ b/modules/entity_spell_system/pipelines/spell_damage_info.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "../spell_enums.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/pipelines/spell_heal_info.h b/modules/entity_spell_system/pipelines/spell_heal_info.h index a3c62b23b..e1f1ad317 100644 --- a/modules/entity_spell_system/pipelines/spell_heal_info.h +++ b/modules/entity_spell_system/pipelines/spell_heal_info.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "../spell_enums.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/profiles/actionbar/action_bar_button_entry.h b/modules/entity_spell_system/profiles/actionbar/action_bar_button_entry.h index 1b23eef29..78a2cb439 100644 --- a/modules/entity_spell_system/profiles/actionbar/action_bar_button_entry.h +++ b/modules/entity_spell_system/profiles/actionbar/action_bar_button_entry.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/dictionary.h" -#include "core/reference.h" +#include "core/object/reference.h" class ActionBarEntry; diff --git a/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h b/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h index ea8e4d346..b0fb34210 100644 --- a/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h +++ b/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/variant/dictionary.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "action_bar_button_entry.h" diff --git a/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h b/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h index c220508f7..1ed3ef5e0 100644 --- a/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h +++ b/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/variant/dictionary.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/profiles/class_profile.h b/modules/entity_spell_system/profiles/class_profile.h index 9153470ca..b90377b18 100644 --- a/modules/entity_spell_system/profiles/class_profile.h +++ b/modules/entity_spell_system/profiles/class_profile.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/dictionary.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "actionbar/action_bar_profile.h" diff --git a/modules/entity_spell_system/profiles/input/input_profile.h b/modules/entity_spell_system/profiles/input/input_profile.h index e99ea4666..39ec73232 100644 --- a/modules/entity_spell_system/profiles/input/input_profile.h +++ b/modules/entity_spell_system/profiles/input/input_profile.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" class ClassProfile; diff --git a/modules/entity_spell_system/profiles/input/input_profile_modifier.h b/modules/entity_spell_system/profiles/input/input_profile_modifier.h index 05fa23fa9..38cf319d1 100644 --- a/modules/entity_spell_system/profiles/input/input_profile_modifier.h +++ b/modules/entity_spell_system/profiles/input/input_profile_modifier.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h b/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h index 04ac674dd..f58c6e248 100644 --- a/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h +++ b/modules/entity_spell_system/profiles/input/input_profile_modifier_entry.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" class InputProfileModifierEntry : public Reference { diff --git a/modules/entity_spell_system/profiles/player_profile.h b/modules/entity_spell_system/profiles/player_profile.h index 0783f9fcd..20c36807e 100644 --- a/modules/entity_spell_system/profiles/player_profile.h +++ b/modules/entity_spell_system/profiles/player_profile.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/variant/dictionary.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "class_profile.h" diff --git a/modules/entity_spell_system/singletons/ess.h b/modules/entity_spell_system/singletons/ess.h index 7eccfb5e6..9a15b36e1 100644 --- a/modules/entity_spell_system/singletons/ess.h +++ b/modules/entity_spell_system/singletons/ess.h @@ -24,8 +24,8 @@ SOFTWARE. #include "core/bind/core_bind.h" #include "core/engine.h" -#include "core/object.h" -#include "core/resource.h" +#include "core/object/object.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "scene/main/node.h" diff --git a/modules/entity_spell_system/singletons/profile_manager.h b/modules/entity_spell_system/singletons/profile_manager.h index 18aa6a149..66d7adc8b 100644 --- a/modules/entity_spell_system/singletons/profile_manager.h +++ b/modules/entity_spell_system/singletons/profile_manager.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/vector.h" #include "../profiles/player_profile.h" diff --git a/modules/entity_spell_system/skeleton/entity_skeleton_data.h b/modules/entity_spell_system/skeleton/entity_skeleton_data.h index 521d48fc3..898a9d46e 100644 --- a/modules/entity_spell_system/skeleton/entity_skeleton_data.h +++ b/modules/entity_spell_system/skeleton/entity_skeleton_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" class CharacterSkeletonVisualEntry; diff --git a/modules/entity_spell_system/skeleton/skeleton_model_entry.h b/modules/entity_spell_system/skeleton/skeleton_model_entry.h index 1da20bb4d..f7aa7df2a 100644 --- a/modules/entity_spell_system/skeleton/skeleton_model_entry.h +++ b/modules/entity_spell_system/skeleton/skeleton_model_entry.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "../data/items/model_visual_entry.h" diff --git a/modules/entity_spell_system/spell_enums.h b/modules/entity_spell_system/spell_enums.h index eaf922746..77a62d7c2 100644 --- a/modules/entity_spell_system/spell_enums.h +++ b/modules/entity_spell_system/spell_enums.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/object.h" +#include "core/object/object.h" class SpellEnums : public Object { GDCLASS(SpellEnums, Object); diff --git a/modules/entity_spell_system/utility/entity_create_info.h b/modules/entity_spell_system/utility/entity_create_info.h index 0a2b3ab49..b80ec99a8 100644 --- a/modules/entity_spell_system/utility/entity_create_info.h +++ b/modules/entity_spell_system/utility/entity_create_info.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "../entity_enums.h" diff --git a/modules/fastnoise/fastnoise_noise_params.h b/modules/fastnoise/fastnoise_noise_params.h index 94b31938f..6c06a5f01 100644 --- a/modules/fastnoise/fastnoise_noise_params.h +++ b/modules/fastnoise/fastnoise_noise_params.h @@ -1,7 +1,7 @@ #ifndef FASTNOISE_NOISE_PARAMS_H #define FASTNOISE_NOISE_PARAMS_H -#include "core/resource.h" +#include "core/object/resource.h" #include "noise.h" diff --git a/modules/fastnoise/noise.h b/modules/fastnoise/noise.h index 5ffa0b16b..0ffd0db61 100644 --- a/modules/fastnoise/noise.h +++ b/modules/fastnoise/noise.h @@ -1,7 +1,7 @@ #ifndef FASTNOISE_NOISE_H #define FASTNOISE_NOISE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "lib/FastNoise.h" diff --git a/modules/fastnoise/register_types.cpp b/modules/fastnoise/register_types.cpp index a80faabb2..750ea6f48 100644 --- a/modules/fastnoise/register_types.cpp +++ b/modules/fastnoise/register_types.cpp @@ -1,6 +1,6 @@ #include "register_types.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "fastnoise_noise_params.h" #include "noise.h" diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h index da153ff5d..99cb616f2 100644 --- a/modules/gdscript/gdscript.h +++ b/modules/gdscript/gdscript.h @@ -32,7 +32,7 @@ #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "gdscript_function.h" class GDScriptNativeClass : public Reference { diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h index 33ba0c4a3..819cde4d7 100644 --- a/modules/gdscript/gdscript_function.h +++ b/modules/gdscript/gdscript_function.h @@ -32,8 +32,8 @@ #include "core/os/thread.h" #include "core/pair.h" -#include "core/reference.h" -#include "core/script_language.h" +#include "core/object/reference.h" +#include "core/object/script_language.h" #include "core/containers/self_list.h" #include "core/string_name.h" #include "core/variant/variant.h" diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp index c6f3f8d9f..da750c8a8 100644 --- a/modules/gdscript/gdscript_functions.cpp +++ b/modules/gdscript/gdscript_functions.cpp @@ -30,13 +30,13 @@ #include "gdscript_functions.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/func_ref.h" #include "core/io/json.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" #include "gdscript.h" diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index c83fb91a2..7bec88628 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -36,8 +36,8 @@ #include "core/os/file_access.h" #include "core/print_string.h" #include "core/project_settings.h" -#include "core/reference.h" -#include "core/script_language.h" +#include "core/object/reference.h" +#include "core/object/script_language.h" #include "gdscript.h" template diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index 33e257e49..1d8905ff8 100644 --- a/modules/gdscript/gdscript_parser.h +++ b/modules/gdscript/gdscript_parser.h @@ -31,8 +31,8 @@ /*************************************************************************/ #include "core/containers/map.h" -#include "core/object.h" -#include "core/script_language.h" +#include "core/object/object.h" +#include "core/object/script_language.h" #include "gdscript_functions.h" #include "gdscript_tokenizer.h" diff --git a/modules/gltf/gltf_accessor.h b/modules/gltf/gltf_accessor.h index 6e6a6007b..8f75a5c9d 100644 --- a/modules/gltf/gltf_accessor.h +++ b/modules/gltf/gltf_accessor.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "gltf_document.h" diff --git a/modules/gltf/gltf_animation.h b/modules/gltf/gltf_animation.h index ee292fec1..bf3b3f67e 100644 --- a/modules/gltf/gltf_animation.h +++ b/modules/gltf/gltf_animation.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 GLTFAnimation : public Resource { GDCLASS(GLTFAnimation, Resource); diff --git a/modules/gltf/gltf_buffer_view.h b/modules/gltf/gltf_buffer_view.h index e148a65c0..e76d7264b 100644 --- a/modules/gltf/gltf_buffer_view.h +++ b/modules/gltf/gltf_buffer_view.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "gltf_document.h" diff --git a/modules/gltf/gltf_camera.h b/modules/gltf/gltf_camera.h index 207dff64e..02d28f294 100644 --- a/modules/gltf/gltf_camera.h +++ b/modules/gltf/gltf_camera.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 GLTFCamera : public Resource { GDCLASS(GLTFCamera, Resource); diff --git a/modules/gltf/gltf_light.h b/modules/gltf/gltf_light.h index 5076917ed..ac0593660 100644 --- a/modules/gltf/gltf_light.h +++ b/modules/gltf/gltf_light.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 GLTFLight : public Resource { GDCLASS(GLTFLight, Resource) diff --git a/modules/gltf/gltf_mesh.h b/modules/gltf/gltf_mesh.h index 780855b2c..8b35e3c76 100644 --- a/modules/gltf/gltf_mesh.h +++ b/modules/gltf/gltf_mesh.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/resources/mesh.h" class GLTFMesh : public Resource { diff --git a/modules/gltf/gltf_node.h b/modules/gltf/gltf_node.h index 41f6a74c1..737ccf4f0 100644 --- a/modules/gltf/gltf_node.h +++ b/modules/gltf/gltf_node.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "gltf_document.h" diff --git a/modules/gltf/gltf_skeleton.h b/modules/gltf/gltf_skeleton.h index 364731480..309942cc1 100644 --- a/modules/gltf/gltf_skeleton.h +++ b/modules/gltf/gltf_skeleton.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "gltf_document.h" diff --git a/modules/gltf/gltf_skin.h b/modules/gltf/gltf_skin.h index 26c17f729..f5a6e441a 100644 --- a/modules/gltf/gltf_skin.h +++ b/modules/gltf/gltf_skin.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "gltf_document.h" diff --git a/modules/gltf/gltf_spec_gloss.h b/modules/gltf/gltf_spec_gloss.h index 3a69f431c..952553540 100644 --- a/modules/gltf/gltf_spec_gloss.h +++ b/modules/gltf/gltf_spec_gloss.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/image.h" -#include "core/resource.h" +#include "core/object/resource.h" class GLTFSpecGloss : public Resource { GDCLASS(GLTFSpecGloss, Resource); diff --git a/modules/gltf/gltf_state.h b/modules/gltf/gltf_state.h index 4f5a33aab..fd4411c82 100644 --- a/modules/gltf/gltf_state.h +++ b/modules/gltf/gltf_state.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/containers/map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "scene/animation/animation_player.h" #include "scene/resources/texture.h" diff --git a/modules/gltf/gltf_texture.h b/modules/gltf/gltf_texture.h index 08998ba32..886777c1b 100644 --- a/modules/gltf/gltf_texture.h +++ b/modules/gltf/gltf_texture.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "gltf_document.h" diff --git a/modules/material_maker/algos/mm_algos.h b/modules/material_maker/algos/mm_algos.h index 3c833a0fd..152ddff62 100644 --- a/modules/material_maker/algos/mm_algos.h +++ b/modules/material_maker/algos/mm_algos.h @@ -7,7 +7,7 @@ #include "core/containers/pool_vector.h" #include "core/variant/variant.h" -#include "core/reference.h" +#include "core/object/reference.h" class MMAlgos : public Reference { GDCLASS(MMAlgos, Reference); diff --git a/modules/material_maker/algos/mm_algos_bind.cpp b/modules/material_maker/algos/mm_algos_bind.cpp index 449ec9fd1..77b66c106 100644 --- a/modules/material_maker/algos/mm_algos_bind.cpp +++ b/modules/material_maker/algos/mm_algos_bind.cpp @@ -1,7 +1,7 @@ #include "mm_algos_bind.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "mm_algos.h" Vector3 _MMAlgos::clampv3(const Vector3 &v, const Vector3 &mi, const Vector3 &ma) { diff --git a/modules/material_maker/algos/mm_algos_bind.h b/modules/material_maker/algos/mm_algos_bind.h index cfa5df9ad..584759a58 100644 --- a/modules/material_maker/algos/mm_algos_bind.h +++ b/modules/material_maker/algos/mm_algos_bind.h @@ -7,7 +7,7 @@ #include "core/containers/pool_vector.h" #include "core/variant/variant.h" -#include "core/object.h" +#include "core/object/object.h" class _MMAlgos : public Object { GDCLASS(_MMAlgos, Object); diff --git a/modules/material_maker/editor/mat_maker_gd_editor.cpp b/modules/material_maker/editor/mat_maker_gd_editor.cpp index 6fa362ce8..f961137e7 100644 --- a/modules/material_maker/editor/mat_maker_gd_editor.cpp +++ b/modules/material_maker/editor/mat_maker_gd_editor.cpp @@ -4,7 +4,7 @@ #include "../algos/mm_algos.h" #include "core/io/resource_loader.h" -#include "core/undo_redo.h" +#include "core/object/undo_redo.h" #include "modules/material_maker/editor/mm_create_name_popup.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" diff --git a/modules/material_maker/editor/mat_maker_gd_editor.h b/modules/material_maker/editor/mat_maker_gd_editor.h index 3171d68eb..ce95e36b3 100644 --- a/modules/material_maker/editor/mat_maker_gd_editor.h +++ b/modules/material_maker/editor/mat_maker_gd_editor.h @@ -3,8 +3,8 @@ #include "core/math/vector2.h" #include "core/node_path.h" -#include "core/reference.h" -#include "core/undo_redo.h" +#include "core/object/reference.h" +#include "core/object/undo_redo.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/material_maker/editor/mm_create_name_popup.h b/modules/material_maker/editor/mm_create_name_popup.h index 3f4b586a9..a28ca5852 100644 --- a/modules/material_maker/editor/mm_create_name_popup.h +++ b/modules/material_maker/editor/mm_create_name_popup.h @@ -3,8 +3,8 @@ #include "core/math/vector2.h" #include "core/node_path.h" -#include "core/reference.h" -#include "core/undo_redo.h" +#include "core/object/reference.h" +#include "core/object/undo_redo.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/material_maker/editor/mm_graph_node.h b/modules/material_maker/editor/mm_graph_node.h index c59da8d3e..188490351 100644 --- a/modules/material_maker/editor/mm_graph_node.h +++ b/modules/material_maker/editor/mm_graph_node.h @@ -2,8 +2,8 @@ #define MM_GRAPH_NODE_H #include "core/math/vector2.h" -#include "core/reference.h" -#include "core/undo_redo.h" +#include "core/object/reference.h" +#include "core/object/undo_redo.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/material_maker/editor/widgets/curve_edit/curve_dialog.h b/modules/material_maker/editor/widgets/curve_edit/curve_dialog.h index 8a49836b5..b62671efe 100644 --- a/modules/material_maker/editor/widgets/curve_edit/curve_dialog.h +++ b/modules/material_maker/editor/widgets/curve_edit/curve_dialog.h @@ -1,7 +1,7 @@ #ifndef CURVE_DIALOG_H #define CURVE_DIALOG_H -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/dialogs.h" diff --git a/modules/material_maker/editor/widgets/curve_edit/curve_editor.cpp b/modules/material_maker/editor/widgets/curve_edit/curve_editor.cpp index 83eba3607..d34689006 100644 --- a/modules/material_maker/editor/widgets/curve_edit/curve_editor.cpp +++ b/modules/material_maker/editor/widgets/curve_edit/curve_editor.cpp @@ -3,7 +3,7 @@ #include "../../../nodes/bases/curve_base.h" #include "control_point.h" -#include "core/object.h" +#include "core/object/object.h" #include "slope_point.h" void MMCurveEditor::set_curve(const Ref &c) { diff --git a/modules/material_maker/editor/widgets/curve_edit/curve_view.h b/modules/material_maker/editor/widgets/curve_edit/curve_view.h index f3d6b410b..9f7192cb5 100644 --- a/modules/material_maker/editor/widgets/curve_edit/curve_view.h +++ b/modules/material_maker/editor/widgets/curve_edit/curve_view.h @@ -1,7 +1,7 @@ #ifndef CURVE_VIEW_H #define CURVE_VIEW_H -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/control.h" diff --git a/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h b/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h index b44482765..711ac22cf 100644 --- a/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h +++ b/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h @@ -3,8 +3,8 @@ #include "core/math/color.h" #include "core/os/input_event.h" -#include "core/reference.h" -#include "core/undo_redo.h" +#include "core/object/reference.h" +#include "core/object/undo_redo.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/material_maker/editor/widgets/gradient_editor/gradient_popup.cpp b/modules/material_maker/editor/widgets/gradient_editor/gradient_popup.cpp index ff7e9b6e1..c752566a2 100644 --- a/modules/material_maker/editor/widgets/gradient_editor/gradient_popup.cpp +++ b/modules/material_maker/editor/widgets/gradient_editor/gradient_popup.cpp @@ -1,7 +1,7 @@ #include "gradient_popup.h" -#include "core/object.h" +#include "core/object/object.h" #include "gradient_editor.h" #include "../../../nodes/bases/gradient_base.h" diff --git a/modules/material_maker/editor/widgets/gradient_editor/gradient_popup.h b/modules/material_maker/editor/widgets/gradient_editor/gradient_popup.h index d1709168b..bfbbaae77 100644 --- a/modules/material_maker/editor/widgets/gradient_editor/gradient_popup.h +++ b/modules/material_maker/editor/widgets/gradient_editor/gradient_popup.h @@ -1,7 +1,7 @@ #ifndef GRADIENT_POPUP_H #define GRADIENT_POPUP_H -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/popup.h" diff --git a/modules/material_maker/editor/widgets/polygon_edit/polygon_dialog.h b/modules/material_maker/editor/widgets/polygon_edit/polygon_dialog.h index 8a9a6f753..d84b4a20b 100644 --- a/modules/material_maker/editor/widgets/polygon_edit/polygon_dialog.h +++ b/modules/material_maker/editor/widgets/polygon_edit/polygon_dialog.h @@ -1,7 +1,7 @@ #ifndef POLYGON_DIALOG_H #define POLYGON_DIALOG_H -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/dialogs.h" diff --git a/modules/material_maker/editor/widgets/polygon_edit/polygon_edit.h b/modules/material_maker/editor/widgets/polygon_edit/polygon_edit.h index f4e573f65..c0ce1a490 100644 --- a/modules/material_maker/editor/widgets/polygon_edit/polygon_edit.h +++ b/modules/material_maker/editor/widgets/polygon_edit/polygon_edit.h @@ -1,7 +1,7 @@ #ifndef POLYGON_EDIT_H #define POLYGON_EDIT_H -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/button.h" diff --git a/modules/material_maker/editor/widgets/polygon_edit/polygon_editor.h b/modules/material_maker/editor/widgets/polygon_edit/polygon_editor.h index 4b9111be2..baf005635 100644 --- a/modules/material_maker/editor/widgets/polygon_edit/polygon_editor.h +++ b/modules/material_maker/editor/widgets/polygon_edit/polygon_editor.h @@ -2,7 +2,7 @@ #define POLYGON_EDITOR_H #include "core/os/input_event.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "polygon_view.h" diff --git a/modules/material_maker/editor/widgets/polygon_edit/polygon_view.h b/modules/material_maker/editor/widgets/polygon_edit/polygon_view.h index d9caab93a..7a1b83714 100644 --- a/modules/material_maker/editor/widgets/polygon_edit/polygon_view.h +++ b/modules/material_maker/editor/widgets/polygon_edit/polygon_view.h @@ -1,7 +1,7 @@ #ifndef POLYGON_VIEW_H #define POLYGON_VIEW_H -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/control.h" diff --git a/modules/material_maker/nodes/mm_material.h b/modules/material_maker/nodes/mm_material.h index bf4c9a545..9b8a25c87 100644 --- a/modules/material_maker/nodes/mm_material.h +++ b/modules/material_maker/nodes/mm_material.h @@ -4,11 +4,11 @@ #include "core/image.h" #include "core/math/vector2.h" #include "core/math/vector3.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/variant/variant.h" #include "core/containers/vector.h" -#include "core/resource.h" +#include "core/object/resource.h" class MMNode; class ThreadPoolExecuteJob; diff --git a/modules/material_maker/nodes/mm_node.cpp b/modules/material_maker/nodes/mm_node.cpp index 663f4730c..50c11599b 100644 --- a/modules/material_maker/nodes/mm_node.cpp +++ b/modules/material_maker/nodes/mm_node.cpp @@ -2,7 +2,7 @@ #include "mm_node.h" #include "../editor/mm_graph_node.h" -#include "core/object.h" +#include "core/object/object.h" #include "mm_material.h" #include "mm_node_universal_property.h" #include "scene/main/node.h" diff --git a/modules/material_maker/nodes/mm_node.h b/modules/material_maker/nodes/mm_node.h index 719921649..2a325e6ac 100644 --- a/modules/material_maker/nodes/mm_node.h +++ b/modules/material_maker/nodes/mm_node.h @@ -6,7 +6,7 @@ #include "core/math/vector3.h" #include "core/variant/variant.h" -#include "core/resource.h" +#include "core/object/resource.h" class Node; class MMMaterial; diff --git a/modules/material_maker/nodes/mm_node_universal_property.h b/modules/material_maker/nodes/mm_node_universal_property.h index 675c63ef9..907d9c04f 100644 --- a/modules/material_maker/nodes/mm_node_universal_property.h +++ b/modules/material_maker/nodes/mm_node_universal_property.h @@ -4,10 +4,10 @@ #include "core/image.h" #include "core/math/vector2.h" #include "core/math/vector3.h" -#include "core/method_bind.h" +#include "core/object/method_bind.h" #include "core/variant/variant.h" -#include "core/resource.h" +#include "core/object/resource.h" class MMNode; diff --git a/modules/mbedtls/crypto_mbedtls.h b/modules/mbedtls/crypto_mbedtls.h index ed0d695fc..39fdc31bf 100644 --- a/modules/mbedtls/crypto_mbedtls.h +++ b/modules/mbedtls/crypto_mbedtls.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/crypto/crypto.h" -#include "core/resource.h" +#include "core/object/resource.h" #include #include diff --git a/modules/mbedtls/ssl_context_mbedtls.h b/modules/mbedtls/ssl_context_mbedtls.h index 15750eac0..c67c80439 100644 --- a/modules/mbedtls/ssl_context_mbedtls.h +++ b/modules/mbedtls/ssl_context_mbedtls.h @@ -34,7 +34,7 @@ #include "core/os/file_access.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include #include diff --git a/modules/mesh_data_resource/editor/mdi_gizmo.h b/modules/mesh_data_resource/editor/mdi_gizmo.h index 8010b5ab5..c3d9dfd76 100644 --- a/modules/mesh_data_resource/editor/mdi_gizmo.h +++ b/modules/mesh_data_resource/editor/mdi_gizmo.h @@ -29,7 +29,7 @@ SOFTWARE. #include "core/math/transform.h" #include "core/math/vector3.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/variant/variant.h" class Camera; diff --git a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_decompose.h b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_decompose.h index 0e5ccd761..dc1caf54b 100644 --- a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_decompose.h +++ b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_decompose.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_outline.h b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_outline.h index 9eb1553ab..1ca45f813 100644 --- a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_outline.h +++ b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_outline.h @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/variant/array.h" #include "core/containers/pool_vector.h" diff --git a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h index fdf63e157..3d5038f15 100644 --- a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h +++ b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h @@ -26,7 +26,7 @@ SOFTWARE. #include "core/ustring.h" #include "core/containers/pool_vector.h" #include "core/math/vector3.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/variant/array.h" class MeshDataResource; diff --git a/modules/mesh_data_resource/editor/uv_editor/mdr_ed_uv_previewer.h b/modules/mesh_data_resource/editor/uv_editor/mdr_ed_uv_previewer.h index 4f0c3e055..c699b758d 100644 --- a/modules/mesh_data_resource/editor/uv_editor/mdr_ed_uv_previewer.h +++ b/modules/mesh_data_resource/editor/uv_editor/mdr_ed_uv_previewer.h @@ -25,7 +25,7 @@ SOFTWARE. #include "scene/gui/control.h" -#include "core/reference.h" +#include "core/object/reference.h" class MeshDataResource; class MeshDataInstance; diff --git a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_editor.h b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_editor.h index 92fc1fb08..1c2afb118 100644 --- a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_editor.h +++ b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_editor.h @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/panel_container.h" class EditorPlugin; diff --git a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view.h b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view.h index 0e54fbd3a..84b82904f 100644 --- a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view.h +++ b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/math/rect2.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/control.h" class MeshDataResource; diff --git a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h index 64a12c7c1..0dac277ae 100644 --- a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h +++ b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h @@ -26,7 +26,7 @@ SOFTWARE. #include "core/math/color.h" #include "core/math/rect2.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/margin_container.h" diff --git a/modules/mesh_data_resource/mesh_data_resource.h b/modules/mesh_data_resource/mesh_data_resource.h index 51fc06cbe..2f1fae5bf 100644 --- a/modules/mesh_data_resource/mesh_data_resource.h +++ b/modules/mesh_data_resource/mesh_data_resource.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/containers/pool_vector.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/variant/variant.h" #include "scene/resources/mesh.h" diff --git a/modules/mesh_data_resource/mesh_data_resource_collection.h b/modules/mesh_data_resource/mesh_data_resource_collection.h index f84b40983..7879ceda9 100644 --- a/modules/mesh_data_resource/mesh_data_resource_collection.h +++ b/modules/mesh_data_resource/mesh_data_resource_collection.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "mesh_data_resource.h" diff --git a/modules/mesh_utils/fast_quadratic_mesh_simplifier.h b/modules/mesh_utils/fast_quadratic_mesh_simplifier.h index 0a36aeefc..a21807b29 100644 --- a/modules/mesh_utils/fast_quadratic_mesh_simplifier.h +++ b/modules/mesh_utils/fast_quadratic_mesh_simplifier.h @@ -26,7 +26,7 @@ SOFTWARE. */ #include "core/variant/array.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "simplify.h" diff --git a/modules/mesh_utils/mesh_merger.h b/modules/mesh_utils/mesh_merger.h index bd8e05d9a..5def0c499 100644 --- a/modules/mesh_utils/mesh_merger.h +++ b/modules/mesh_utils/mesh_merger.h @@ -25,7 +25,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "defines.h" diff --git a/modules/mesh_utils/mesh_utils.h b/modules/mesh_utils/mesh_utils.h index c4cb6ec52..6fffa4f5c 100644 --- a/modules/mesh_utils/mesh_utils.h +++ b/modules/mesh_utils/mesh_utils.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/variant.h" -#include "core/object.h" +#include "core/object/object.h" #include "scene/resources/texture.h" diff --git a/modules/navigation/rvo_agent.h b/modules/navigation/rvo_agent.h index 7fd580cf2..c16c326ed 100644 --- a/modules/navigation/rvo_agent.h +++ b/modules/navigation/rvo_agent.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 "nav_rid.h" #include diff --git a/modules/network_synchronizer/data_buffer.h b/modules/network_synchronizer/data_buffer.h index 347b9ad18..4424b2a48 100644 --- a/modules/network_synchronizer/data_buffer.h +++ b/modules/network_synchronizer/data_buffer.h @@ -35,7 +35,7 @@ @author AndreaCatania */ -#include "core/class_db.h" +#include "core/object/class_db.h" #include "bit_array.h" diff --git a/modules/network_synchronizer/interpolator.h b/modules/network_synchronizer/interpolator.h index 42d74256f..11db83c1c 100644 --- a/modules/network_synchronizer/interpolator.h +++ b/modules/network_synchronizer/interpolator.h @@ -35,7 +35,7 @@ @author AndreaCatania */ -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/containers/vector.h" class Interpolator : public Object { diff --git a/modules/network_synchronizer/scene_diff.h b/modules/network_synchronizer/scene_diff.h index 091c8563f..1b45811b3 100644 --- a/modules/network_synchronizer/scene_diff.h +++ b/modules/network_synchronizer/scene_diff.h @@ -35,7 +35,7 @@ @author AndreaCatania */ -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/containers/local_vector.h" #include "net_utilities.h" diff --git a/modules/network_synchronizer/scene_synchronizer.cpp b/modules/network_synchronizer/scene_synchronizer.cpp index 40a98ccd8..3ea34a0cb 100644 --- a/modules/network_synchronizer/scene_synchronizer.cpp +++ b/modules/network_synchronizer/scene_synchronizer.cpp @@ -36,7 +36,7 @@ #include "networked_controller.h" #include "core/engine.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "scene_diff.h" #include "scene/main/viewport.h" diff --git a/modules/opensimplex/noise_texture.h b/modules/opensimplex/noise_texture.h index 4f735f9cd..c59b813f3 100644 --- a/modules/opensimplex/noise_texture.h +++ b/modules/opensimplex/noise_texture.h @@ -33,7 +33,7 @@ #include "open_simplex_noise.h" #include "core/image.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "editor/editor_node.h" #include "editor/editor_plugin.h" #include "editor/property_editor.h" diff --git a/modules/opensimplex/open_simplex_noise.h b/modules/opensimplex/open_simplex_noise.h index b109d386e..fe4d58dbe 100644 --- a/modules/opensimplex/open_simplex_noise.h +++ b/modules/opensimplex/open_simplex_noise.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/image.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/resources/texture.h" #include "thirdparty/misc/open-simplex-noise.h" diff --git a/modules/paint/actions/paint_action.cpp b/modules/paint/actions/paint_action.cpp index 9c9fecc91..42a794959 100644 --- a/modules/paint/actions/paint_action.cpp +++ b/modules/paint/actions/paint_action.cpp @@ -26,7 +26,7 @@ SOFTWARE. #include "../paint_canvas.h" #include "../paint_canvas_layer.h" -#include "core/object.h" +#include "core/object/object.h" Dictionary PaintAction::get_action_data_undo() { return action_data_undo; diff --git a/modules/paint/actions/paint_action.h b/modules/paint/actions/paint_action.h index 6ff06f1eb..5b0e5540a 100644 --- a/modules/paint/actions/paint_action.h +++ b/modules/paint/actions/paint_action.h @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/variant/array.h" #include "core/variant/dictionary.h" diff --git a/modules/paint/paint_canvas.h b/modules/paint/paint_canvas.h index 471738126..9493546ba 100644 --- a/modules/paint/paint_canvas.h +++ b/modules/paint/paint_canvas.h @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/gui/margin_container.h" #include "core/containers/vector.h" diff --git a/modules/paint/paint_canvas_background.h b/modules/paint/paint_canvas_background.h index 933bf50d6..5d145fe44 100644 --- a/modules/paint/paint_canvas_background.h +++ b/modules/paint/paint_canvas_background.h @@ -27,7 +27,7 @@ SOFTWARE. #include "scene/gui/texture_rect.h" -#include "core/reference.h" +#include "core/object/reference.h" class ShaderMaterial; class Shader; diff --git a/modules/paint/paint_canvas_layer.h b/modules/paint/paint_canvas_layer.h index 91c5afdf7..a32fe54ee 100644 --- a/modules/paint/paint_canvas_layer.h +++ b/modules/paint/paint_canvas_layer.h @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/image.h" #include "scene/resources/texture.h" diff --git a/modules/paint/paint_editor_plugin.h b/modules/paint/paint_editor_plugin.h index 581c74459..4730ea065 100644 --- a/modules/paint/paint_editor_plugin.h +++ b/modules/paint/paint_editor_plugin.h @@ -24,7 +24,7 @@ SOFTWARE. */ #include "editor/editor_plugin.h" -#include "core/reference.h" +#include "core/object/reference.h" class PaintWindow; class Texture; diff --git a/modules/paint/paint_utilities.h b/modules/paint/paint_utilities.h index 19ff745ce..da3b5700f 100644 --- a/modules/paint/paint_utilities.h +++ b/modules/paint/paint_utilities.h @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/pool_vector.h" #include "core/variant/variant.h" diff --git a/modules/paint/paint_window.h b/modules/paint/paint_window.h index 70f512cf9..58198abc0 100644 --- a/modules/paint/paint_window.h +++ b/modules/paint/paint_window.h @@ -30,7 +30,7 @@ SOFTWARE. #include "bush_prefabs.h" #include "core/containers/hash_map.h" #include "core/os/keyboard.h" -#include "core/reference.h" +#include "core/object/reference.h" class PaintAction; class PaintCanvasLayer; diff --git a/modules/plugin_refresher/plugin_refresher.h b/modules/plugin_refresher/plugin_refresher.h index 4872417ac..9847085b6 100644 --- a/modules/plugin_refresher/plugin_refresher.h +++ b/modules/plugin_refresher/plugin_refresher.h @@ -1,7 +1,7 @@ #ifndef PLUGIN_REFRESHER_H #define PLUGIN_REFRESHER_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/plugin_refresher/plugin_refresher_editor_plugin.h b/modules/plugin_refresher/plugin_refresher_editor_plugin.h index 12bb60ad3..4c1c879c5 100644 --- a/modules/plugin_refresher/plugin_refresher_editor_plugin.h +++ b/modules/plugin_refresher/plugin_refresher_editor_plugin.h @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "editor/editor_plugin.h" class CheckBox; diff --git a/modules/props/clutter/ground_clutter.h b/modules/props/clutter/ground_clutter.h index bdda660e8..8a77c6479 100644 --- a/modules/props/clutter/ground_clutter.h +++ b/modules/props/clutter/ground_clutter.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #ifdef TEXTURE_PACKER_PRESENT #include "../../texture_packer/texture_packer.h" diff --git a/modules/props/jobs/prop_mesher_job_step.h b/modules/props/jobs/prop_mesher_job_step.h index 06b30b56f..5642a194a 100644 --- a/modules/props/jobs/prop_mesher_job_step.h +++ b/modules/props/jobs/prop_mesher_job_step.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #ifdef MESH_UTILS_PRESENT #include "../../mesh_utils/fast_quadratic_mesh_simplifier.h" diff --git a/modules/props/jobs/prop_texture_job.h b/modules/props/jobs/prop_texture_job.h index ff3e77c69..834ed73b5 100644 --- a/modules/props/jobs/prop_texture_job.h +++ b/modules/props/jobs/prop_texture_job.h @@ -28,7 +28,7 @@ SOFTWARE. #include "../../thread_pool/thread_pool_job.h" #endif -#include "core/reference.h" +#include "core/object/reference.h" #if TEXTURE_PACKER_PRESENT class TexturePacker; diff --git a/modules/props/lights/prop_light.h b/modules/props/lights/prop_light.h index 6eaf3747a..b4cd82185 100644 --- a/modules/props/lights/prop_light.h +++ b/modules/props/lights/prop_light.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" class PropLight : public Reference { diff --git a/modules/props/material_cache/prop_material_cache.h b/modules/props/material_cache/prop_material_cache.h index e14cae78b..3c9a583c3 100644 --- a/modules/props/material_cache/prop_material_cache.h +++ b/modules/props/material_cache/prop_material_cache.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/props/material_cache/prop_material_cache_pcm.h b/modules/props/material_cache/prop_material_cache_pcm.h index bed7e2523..92b63f603 100644 --- a/modules/props/material_cache/prop_material_cache_pcm.h +++ b/modules/props/material_cache/prop_material_cache_pcm.h @@ -25,7 +25,7 @@ SOFTWARE. #include "prop_material_cache.h" #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/props/prop_instance_job.h b/modules/props/prop_instance_job.h index 0a9b65a9d..b705020ac 100644 --- a/modules/props/prop_instance_job.h +++ b/modules/props/prop_instance_job.h @@ -27,7 +27,7 @@ SOFTWARE. #if THREAD_POOL_PRESENT #include "../thread_pool/thread_pool_job.h" #else -#include "core/reference.h" +#include "core/object/reference.h" #endif class PropData; diff --git a/modules/props/prop_mesher.h b/modules/props/prop_mesher.h index b4d055a17..3ce5dd243 100644 --- a/modules/props/prop_mesher.h +++ b/modules/props/prop_mesher.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/math/color.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "scene/3d/mesh_instance.h" diff --git a/modules/props/props/prop_data.h b/modules/props/props/prop_data.h index 7aa2cb95f..a199d6c2f 100644 --- a/modules/props/props/prop_data.h +++ b/modules/props/props/prop_data.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/transform.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/props/props/prop_data_entry.h b/modules/props/props/prop_data_entry.h index 02df003f1..1e347e89b 100644 --- a/modules/props/props/prop_data_entry.h +++ b/modules/props/props/prop_data_entry.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/transform.h" -#include "core/resource.h" +#include "core/object/resource.h" class PropData; class PropMesher; diff --git a/modules/props/singleton/prop_cache.h b/modules/props/singleton/prop_cache.h index 9d7332df7..34c42e7f5 100644 --- a/modules/props/singleton/prop_cache.h +++ b/modules/props/singleton/prop_cache.h @@ -25,8 +25,8 @@ SOFTWARE. #include "core/bind/core_bind.h" #include "core/math/color.h" #include "core/containers/hash_map.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "scene/resources/material.h" diff --git a/modules/props/singleton/prop_utils.h b/modules/props/singleton/prop_utils.h index 0b90eb983..d96412372 100644 --- a/modules/props/singleton/prop_utils.h +++ b/modules/props/singleton/prop_utils.h @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "scene/3d/spatial.h" diff --git a/modules/props/tiled_wall/tiled_wall_data.h b/modules/props/tiled_wall/tiled_wall_data.h index 623b3fdec..1562b57f3 100644 --- a/modules/props/tiled_wall/tiled_wall_data.h +++ b/modules/props/tiled_wall/tiled_wall_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/props_2d/clutter/ground_clutter_2d.h b/modules/props_2d/clutter/ground_clutter_2d.h index c7c6d9f50..1523db71b 100644 --- a/modules/props_2d/clutter/ground_clutter_2d.h +++ b/modules/props_2d/clutter/ground_clutter_2d.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #ifdef TEXTURE_PACKER_PRESENT #include "../../texture_packer/texture_packer.h" diff --git a/modules/props_2d/jobs/prop_2d_texture_job.h b/modules/props_2d/jobs/prop_2d_texture_job.h index fab3486f7..5f5f7608c 100644 --- a/modules/props_2d/jobs/prop_2d_texture_job.h +++ b/modules/props_2d/jobs/prop_2d_texture_job.h @@ -28,7 +28,7 @@ SOFTWARE. #include "../../thread_pool/thread_pool_job.h" #endif -#include "core/reference.h" +#include "core/object/reference.h" #if TEXTURE_PACKER_PRESENT class TexturePacker; diff --git a/modules/props_2d/lights/prop_2d_light.h b/modules/props_2d/lights/prop_2d_light.h index 7fe040941..23b3a4e0f 100644 --- a/modules/props_2d/lights/prop_2d_light.h +++ b/modules/props_2d/lights/prop_2d_light.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" class Prop2DLight : public Reference { diff --git a/modules/props_2d/material_cache/prop_2d_material_cache.h b/modules/props_2d/material_cache/prop_2d_material_cache.h index 3cbbbc91d..05b0fa7e5 100644 --- a/modules/props_2d/material_cache/prop_2d_material_cache.h +++ b/modules/props_2d/material_cache/prop_2d_material_cache.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h b/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h index 0bb00805d..6f7a7356f 100644 --- a/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h +++ b/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h @@ -25,7 +25,7 @@ SOFTWARE. #include "prop_2d_material_cache.h" #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/props_2d/prop_2d_instance_job.h b/modules/props_2d/prop_2d_instance_job.h index f07d1deec..fcf8acf83 100644 --- a/modules/props_2d/prop_2d_instance_job.h +++ b/modules/props_2d/prop_2d_instance_job.h @@ -28,7 +28,7 @@ SOFTWARE. #include "../thread_pool/thread_pool_job.h" #else -#include "core/reference.h" +#include "core/object/reference.h" #endif diff --git a/modules/props_2d/prop_2d_mesher.h b/modules/props_2d/prop_2d_mesher.h index 5884d67bb..c2192e314 100644 --- a/modules/props_2d/prop_2d_mesher.h +++ b/modules/props_2d/prop_2d_mesher.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/math/color.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "scene/3d/mesh_instance.h" diff --git a/modules/props_2d/props/prop_2d_data.h b/modules/props_2d/props/prop_2d_data.h index e38cb9047..bacb2ac00 100644 --- a/modules/props_2d/props/prop_2d_data.h +++ b/modules/props_2d/props/prop_2d_data.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/transform.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/props_2d/props/prop_2d_data_entry.h b/modules/props_2d/props/prop_2d_data_entry.h index 66409f6ca..ba23ca4f5 100644 --- a/modules/props_2d/props/prop_2d_data_entry.h +++ b/modules/props_2d/props/prop_2d_data_entry.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/math/transform.h" #include "core/math/transform_2d.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/resources/material.h" diff --git a/modules/props_2d/singleton/prop_2d_cache.h b/modules/props_2d/singleton/prop_2d_cache.h index 4a63a8938..c86b76c5b 100644 --- a/modules/props_2d/singleton/prop_2d_cache.h +++ b/modules/props_2d/singleton/prop_2d_cache.h @@ -25,8 +25,8 @@ SOFTWARE. #include "core/bind/core_bind.h" #include "core/math/color.h" #include "core/containers/hash_map.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "scene/resources/material.h" diff --git a/modules/props_2d/singleton/prop_2d_utils.h b/modules/props_2d/singleton/prop_2d_utils.h index 2cfb0af90..dd855a8af 100644 --- a/modules/props_2d/singleton/prop_2d_utils.h +++ b/modules/props_2d/singleton/prop_2d_utils.h @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "scene/3d/spatial.h" diff --git a/modules/props_2d/tiled_wall/tiled_wall_2d_data.h b/modules/props_2d/tiled_wall/tiled_wall_2d_data.h index a3af994de..2bea63b2f 100644 --- a/modules/props_2d/tiled_wall/tiled_wall_2d_data.h +++ b/modules/props_2d/tiled_wall/tiled_wall_2d_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/pvr/image_compress_pvrtc.cpp b/modules/pvr/image_compress_pvrtc.cpp index cb0e6babb..e5765a2b1 100644 --- a/modules/pvr/image_compress_pvrtc.cpp +++ b/modules/pvr/image_compress_pvrtc.cpp @@ -31,7 +31,7 @@ #include "image_compress_pvrtc.h" #include "core/image.h" -#include "core/reference.h" +#include "core/object/reference.h" #include #include diff --git a/modules/regex/regex.h b/modules/regex/regex.h index 94c2d58a1..8ac3bdc1b 100644 --- a/modules/regex/regex.h +++ b/modules/regex/regex.h @@ -33,7 +33,7 @@ #include "core/variant/array.h" #include "core/variant/dictionary.h" #include "core/containers/map.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/regex/register_types.cpp b/modules/regex/register_types.cpp index 592ee0bec..9a0183432 100644 --- a/modules/regex/register_types.cpp +++ b/modules/regex/register_types.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "register_types.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "regex.h" void register_regex_types() { diff --git a/modules/rtile_map/tile_map.cpp b/modules/rtile_map/tile_map.cpp index 576ee9c1f..8a106e322 100644 --- a/modules/rtile_map/tile_map.cpp +++ b/modules/rtile_map/tile_map.cpp @@ -31,7 +31,7 @@ #include "tile_map.h" #include "core/io/marshalls.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "core/os/os.h" #include "scene/2d/area_2d.h" #include "scene/2d/collision_object_2d.h" diff --git a/modules/rtile_map/tile_set.h b/modules/rtile_map/tile_set.h index 50d53d6fa..fd30f3328 100644 --- a/modules/rtile_map/tile_set.h +++ b/modules/rtile_map/tile_set.h @@ -33,7 +33,7 @@ #include "../fastnoise/fastnoise_noise_params.h" #include "../fastnoise/noise.h" #include "core/variant/array.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/2d/light_occluder_2d.h" #include "scene/2d/navigation_polygon.h" #include "scene/resources/convex_polygon_shape_2d.h" diff --git a/modules/terraman/areas/terrain_world_area.h b/modules/terraman/areas/terrain_world_area.h index 3ad04464d..909538458 100644 --- a/modules/terraman/areas/terrain_world_area.h +++ b/modules/terraman/areas/terrain_world_area.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/math/aabb.h" diff --git a/modules/terraman/data/terrain_light.h b/modules/terraman/data/terrain_light.h index a6b45f67c..1ecf8002f 100644 --- a/modules/terraman/data/terrain_light.h +++ b/modules/terraman/data/terrain_light.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" class TerrainLight : public Reference { diff --git a/modules/terraman/level_generator/terrain_level_generator.h b/modules/terraman/level_generator/terrain_level_generator.h index ac3a60e86..c55b8976d 100644 --- a/modules/terraman/level_generator/terrain_level_generator.h +++ b/modules/terraman/level_generator/terrain_level_generator.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class TerrainChunk; diff --git a/modules/terraman/library/terrain_library.h b/modules/terraman/library/terrain_library.h index 84fe499cd..1fbfd5751 100644 --- a/modules/terraman/library/terrain_library.h +++ b/modules/terraman/library/terrain_library.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/math/rect2.h" #include "scene/resources/material.h" diff --git a/modules/terraman/library/terrain_library_merger.h b/modules/terraman/library/terrain_library_merger.h index 2d66c6bdd..41c28e5b1 100644 --- a/modules/terraman/library/terrain_library_merger.h +++ b/modules/terraman/library/terrain_library_merger.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/containers/map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "terrain_library.h" diff --git a/modules/terraman/library/terrain_library_merger_pcm.cpp b/modules/terraman/library/terrain_library_merger_pcm.cpp index 515cff731..7d8758523 100644 --- a/modules/terraman/library/terrain_library_merger_pcm.cpp +++ b/modules/terraman/library/terrain_library_merger_pcm.cpp @@ -39,7 +39,7 @@ SOFTWARE. #include "../defines.h" #include "../world/default/terrain_chunk_default.h" #include "core/containers/hashfuncs.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "terrain_material_cache_pcm.h" bool TerrainLibraryMergerPCM::_supports_caching() { diff --git a/modules/terraman/library/terrain_library_merger_pcm.h b/modules/terraman/library/terrain_library_merger_pcm.h index fff8b9587..3d8b1daf7 100644 --- a/modules/terraman/library/terrain_library_merger_pcm.h +++ b/modules/terraman/library/terrain_library_merger_pcm.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/containers/map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "terrain_library.h" diff --git a/modules/terraman/library/terrain_library_simple.h b/modules/terraman/library/terrain_library_simple.h index 3726e1294..05da4e969 100644 --- a/modules/terraman/library/terrain_library_simple.h +++ b/modules/terraman/library/terrain_library_simple.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "terrain_library.h" diff --git a/modules/terraman/library/terrain_material_cache.h b/modules/terraman/library/terrain_material_cache.h index 1c9c6951e..19df2a82a 100644 --- a/modules/terraman/library/terrain_material_cache.h +++ b/modules/terraman/library/terrain_material_cache.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/terraman/library/terrain_material_cache_pcm.h b/modules/terraman/library/terrain_material_cache_pcm.h index 972a0648c..e0b95c4a9 100644 --- a/modules/terraman/library/terrain_material_cache_pcm.h +++ b/modules/terraman/library/terrain_material_cache_pcm.h @@ -25,7 +25,7 @@ SOFTWARE. #include "terrain_material_cache.h" #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/terraman/library/terrain_surface.h b/modules/terraman/library/terrain_surface.h index 4538a5cb8..980912050 100644 --- a/modules/terraman/library/terrain_surface.h +++ b/modules/terraman/library/terrain_surface.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/terraman/meshers/terrain_mesher.h b/modules/terraman/meshers/terrain_mesher.h index 53bcbed1f..256061b82 100644 --- a/modules/terraman/meshers/terrain_mesher.h +++ b/modules/terraman/meshers/terrain_mesher.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "../defines.h" diff --git a/modules/terraman/world/jobs/terrain_job.h b/modules/terraman/world/jobs/terrain_job.h index 441071173..ddf8dfcd3 100644 --- a/modules/terraman/world/jobs/terrain_job.h +++ b/modules/terraman/world/jobs/terrain_job.h @@ -27,7 +27,7 @@ SOFTWARE. #if THREAD_POOL_PRESENT #include "../../../thread_pool/thread_pool_job.h" #else -#include "core/reference.h" +#include "core/object/reference.h" #endif #include "../../defines.h" diff --git a/modules/terraman/world/jobs/terrain_mesher_job_step.h b/modules/terraman/world/jobs/terrain_mesher_job_step.h index 0f59bff1d..45152b708 100644 --- a/modules/terraman/world/jobs/terrain_mesher_job_step.h +++ b/modules/terraman/world/jobs/terrain_mesher_job_step.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #ifdef MESH_UTILS_PRESENT #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h" diff --git a/modules/terraman/world/terrain_chunk.cpp b/modules/terraman/world/terrain_chunk.cpp index 43eb798ed..84710eac8 100644 --- a/modules/terraman/world/terrain_chunk.cpp +++ b/modules/terraman/world/terrain_chunk.cpp @@ -28,7 +28,7 @@ SOFTWARE. #include "../defines.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "jobs/terrain_job.h" #include "servers/physics_server.h" #include "terrain_structure.h" diff --git a/modules/terraman/world/terrain_chunk.h b/modules/terraman/world/terrain_chunk.h index 286277b4b..37700d73f 100644 --- a/modules/terraman/world/terrain_chunk.h +++ b/modules/terraman/world/terrain_chunk.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/engine.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "../defines.h" diff --git a/modules/terraman/world/terrain_environment_data.h b/modules/terraman/world/terrain_environment_data.h index 3ed76bfc0..7e2c6807e 100644 --- a/modules/terraman/world/terrain_environment_data.h +++ b/modules/terraman/world/terrain_environment_data.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "../defines.h" diff --git a/modules/terraman/world/terrain_structure.h b/modules/terraman/world/terrain_structure.h index ecea42473..5725727b0 100644 --- a/modules/terraman/world/terrain_structure.h +++ b/modules/terraman/world/terrain_structure.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/containers/hash_map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "../defines.h" diff --git a/modules/terraman/world/terrain_world.cpp b/modules/terraman/world/terrain_world.cpp index 1307183fe..3eaf2ff11 100644 --- a/modules/terraman/world/terrain_world.cpp +++ b/modules/terraman/world/terrain_world.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "terrain_world.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "terrain_chunk.h" #include "terrain_structure.h" diff --git a/modules/terraman_2d/areas/terrain_2d_world_area.h b/modules/terraman_2d/areas/terrain_2d_world_area.h index caf1d262a..c0dece401 100644 --- a/modules/terraman_2d/areas/terrain_2d_world_area.h +++ b/modules/terraman_2d/areas/terrain_2d_world_area.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/math/aabb.h" diff --git a/modules/terraman_2d/data/terrain_2d_light.h b/modules/terraman_2d/data/terrain_2d_light.h index 1666a8a7e..9f9dd61da 100644 --- a/modules/terraman_2d/data/terrain_2d_light.h +++ b/modules/terraman_2d/data/terrain_2d_light.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" class Terrain2DLight : public Reference { diff --git a/modules/terraman_2d/level_generator/terrain_2d_level_generator.h b/modules/terraman_2d/level_generator/terrain_2d_level_generator.h index 48a526141..98b394246 100644 --- a/modules/terraman_2d/level_generator/terrain_2d_level_generator.h +++ b/modules/terraman_2d/level_generator/terrain_2d_level_generator.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class Terrain2DChunk; diff --git a/modules/terraman_2d/library/terrain_2d_library.h b/modules/terraman_2d/library/terrain_2d_library.h index ef4e92503..2c3b33519 100644 --- a/modules/terraman_2d/library/terrain_2d_library.h +++ b/modules/terraman_2d/library/terrain_2d_library.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/math/rect2.h" #include "scene/resources/material.h" diff --git a/modules/terraman_2d/library/terrain_2d_library_merger.h b/modules/terraman_2d/library/terrain_2d_library_merger.h index f497634e8..5f122192a 100644 --- a/modules/terraman_2d/library/terrain_2d_library_merger.h +++ b/modules/terraman_2d/library/terrain_2d_library_merger.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/containers/map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "terrain_2d_library.h" diff --git a/modules/terraman_2d/library/terrain_2d_library_merger_pcm.cpp b/modules/terraman_2d/library/terrain_2d_library_merger_pcm.cpp index c04faabc0..5ad1ec6fa 100644 --- a/modules/terraman_2d/library/terrain_2d_library_merger_pcm.cpp +++ b/modules/terraman_2d/library/terrain_2d_library_merger_pcm.cpp @@ -39,7 +39,7 @@ SOFTWARE. #include "../defines.h" #include "../world/default/terrain_2d_chunk_default.h" #include "core/containers/hashfuncs.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "terrain_2d_material_cache_pcm.h" bool Terrain2DLibraryMergerPCM::_supports_caching() { diff --git a/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h b/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h index 063c923e5..58f012b54 100644 --- a/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h +++ b/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/containers/map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "terrain_2d_library.h" diff --git a/modules/terraman_2d/library/terrain_2d_library_simple.h b/modules/terraman_2d/library/terrain_2d_library_simple.h index b8219f29d..615e0e3f4 100644 --- a/modules/terraman_2d/library/terrain_2d_library_simple.h +++ b/modules/terraman_2d/library/terrain_2d_library_simple.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "terrain_2d_library.h" diff --git a/modules/terraman_2d/library/terrain_2d_material_cache.h b/modules/terraman_2d/library/terrain_2d_material_cache.h index ba913e582..2f5989525 100644 --- a/modules/terraman_2d/library/terrain_2d_material_cache.h +++ b/modules/terraman_2d/library/terrain_2d_material_cache.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h b/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h index 88a6bb5a8..1d8e82f4e 100644 --- a/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h +++ b/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h @@ -25,7 +25,7 @@ SOFTWARE. #include "terrain_2d_material_cache.h" #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/terraman_2d/library/terrain_2d_surface.h b/modules/terraman_2d/library/terrain_2d_surface.h index 2c266f392..f03d17381 100644 --- a/modules/terraman_2d/library/terrain_2d_surface.h +++ b/modules/terraman_2d/library/terrain_2d_surface.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/terraman_2d/meshers/terrain_2d_mesher.h b/modules/terraman_2d/meshers/terrain_2d_mesher.h index 3bf88e7bc..884d9cff2 100644 --- a/modules/terraman_2d/meshers/terrain_2d_mesher.h +++ b/modules/terraman_2d/meshers/terrain_2d_mesher.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "../defines.h" diff --git a/modules/terraman_2d/world/jobs/terrain_2d_job.h b/modules/terraman_2d/world/jobs/terrain_2d_job.h index b9be949fe..d2f96ed0a 100644 --- a/modules/terraman_2d/world/jobs/terrain_2d_job.h +++ b/modules/terraman_2d/world/jobs/terrain_2d_job.h @@ -27,7 +27,7 @@ SOFTWARE. #if THREAD_POOL_PRESENT #include "../../../thread_pool/thread_pool_job.h" #else -#include "core/reference.h" +#include "core/object/reference.h" #endif #include "../../defines.h" diff --git a/modules/terraman_2d/world/terrain_2d_chunk.cpp b/modules/terraman_2d/world/terrain_2d_chunk.cpp index 01b7c4380..84362d199 100644 --- a/modules/terraman_2d/world/terrain_2d_chunk.cpp +++ b/modules/terraman_2d/world/terrain_2d_chunk.cpp @@ -28,7 +28,7 @@ SOFTWARE. #include "../defines.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "jobs/terrain_2d_job.h" #include "terrain_2d_structure.h" diff --git a/modules/terraman_2d/world/terrain_2d_chunk.h b/modules/terraman_2d/world/terrain_2d_chunk.h index a126135d2..936979334 100644 --- a/modules/terraman_2d/world/terrain_2d_chunk.h +++ b/modules/terraman_2d/world/terrain_2d_chunk.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/engine.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "../defines.h" diff --git a/modules/terraman_2d/world/terrain_2d_environment_data.h b/modules/terraman_2d/world/terrain_2d_environment_data.h index 8c83f2992..17c44d048 100644 --- a/modules/terraman_2d/world/terrain_2d_environment_data.h +++ b/modules/terraman_2d/world/terrain_2d_environment_data.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "../defines.h" diff --git a/modules/terraman_2d/world/terrain_2d_structure.h b/modules/terraman_2d/world/terrain_2d_structure.h index 03430b46b..d8f1e2eb6 100644 --- a/modules/terraman_2d/world/terrain_2d_structure.h +++ b/modules/terraman_2d/world/terrain_2d_structure.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/containers/hash_map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "../defines.h" diff --git a/modules/terraman_2d/world/terrain_2d_world.cpp b/modules/terraman_2d/world/terrain_2d_world.cpp index b174e81ec..2930c06aa 100644 --- a/modules/terraman_2d/world/terrain_2d_world.cpp +++ b/modules/terraman_2d/world/terrain_2d_world.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "terrain_2d_world.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "terrain_2d_chunk.h" #include "terrain_2d_structure.h" diff --git a/modules/text_editor/text_editor_plugin.h b/modules/text_editor/text_editor_plugin.h index 91a706b23..76a0fcb8f 100644 --- a/modules/text_editor/text_editor_plugin.h +++ b/modules/text_editor/text_editor_plugin.h @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "editor/editor_plugin.h" class TextFileEditor; diff --git a/modules/text_editor/text_editor_settings.h b/modules/text_editor/text_editor_settings.h index 08d1cbd24..5f6bf25cb 100644 --- a/modules/text_editor/text_editor_settings.h +++ b/modules/text_editor/text_editor_settings.h @@ -1,7 +1,7 @@ #ifndef TEXT_EDITOR_SETTINGS_H #define TEXT_EDITOR_SETTINGS_H -#include "core/reference.h" +#include "core/object/reference.h" class ItemList; diff --git a/modules/text_editor/text_editor_vanilla_editor.cpp b/modules/text_editor/text_editor_vanilla_editor.cpp index 7d5306afb..5b7d56570 100644 --- a/modules/text_editor/text_editor_vanilla_editor.cpp +++ b/modules/text_editor/text_editor_vanilla_editor.cpp @@ -2,7 +2,7 @@ #include "text_editor_vanilla_editor.h" #include "core/math/color.h" -#include "core/object.h" +#include "core/object/object.h" #include "text_editor_settings.h" #include "scene/gui/box_container.h" diff --git a/modules/text_editor/text_editor_vanilla_editor.h b/modules/text_editor/text_editor_vanilla_editor.h index cc1375a1b..7a12a2bf7 100644 --- a/modules/text_editor/text_editor_vanilla_editor.h +++ b/modules/text_editor/text_editor_vanilla_editor.h @@ -2,7 +2,7 @@ #define TEXT_EDITOR_VANILLA_EDITOR_H #include "core/os/os.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "scene/gui/box_container.h" diff --git a/modules/text_editor/text_file_editor.h b/modules/text_editor/text_file_editor.h index 8f65e8468..f514349f7 100644 --- a/modules/text_editor/text_file_editor.h +++ b/modules/text_editor/text_file_editor.h @@ -1,7 +1,7 @@ #ifndef TEXT_FILE_EDITOR_H #define TEXT_FILE_EDITOR_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" diff --git a/modules/texture_packer/layers/texture_layer_merger.h b/modules/texture_packer/layers/texture_layer_merger.h index 552c4a6e6..876088ed3 100644 --- a/modules/texture_packer/layers/texture_layer_merger.h +++ b/modules/texture_packer/layers/texture_layer_merger.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/image.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/texture_packer/texture_packer.h b/modules/texture_packer/texture_packer.h index bc2cfd305..64db281e1 100644 --- a/modules/texture_packer/texture_packer.h +++ b/modules/texture_packer/texture_packer.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/math/color.h" #include "core/image.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/thread_pool/thread_pool.h b/modules/thread_pool/thread_pool.h index 95847f5e0..9c649e6e6 100644 --- a/modules/thread_pool/thread_pool.h +++ b/modules/thread_pool/thread_pool.h @@ -25,7 +25,7 @@ SOFTWARE. */ -#include "core/object.h" +#include "core/object/object.h" #include "core/containers/vector.h" #include "core/os/semaphore.h" diff --git a/modules/thread_pool/thread_pool_job.h b/modules/thread_pool/thread_pool_job.h index 8b96e7dba..ecacaa397 100644 --- a/modules/thread_pool/thread_pool_job.h +++ b/modules/thread_pool/thread_pool_job.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" class ThreadPoolJob : public Reference { GDCLASS(ThreadPoolJob, Reference); diff --git a/modules/upnp/upnp.h b/modules/upnp/upnp.h index ab4334372..89246d4f1 100644 --- a/modules/upnp/upnp.h +++ b/modules/upnp/upnp.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 "upnp_device.h" diff --git a/modules/upnp/upnp_device.h b/modules/upnp/upnp_device.h index 570ac8253..8ee438a89 100644 --- a/modules/upnp/upnp_device.h +++ b/modules/upnp/upnp_device.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 UPNPDevice : public Reference { GDCLASS(UPNPDevice, Reference); diff --git a/modules/users/managers/user_manager.h b/modules/users/managers/user_manager.h index e873c69f7..e824c59dc 100644 --- a/modules/users/managers/user_manager.h +++ b/modules/users/managers/user_manager.h @@ -1,7 +1,7 @@ #ifndef USER_MANAGER_H #define USER_MANAGER_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/managers/user_manager_db.h b/modules/users/managers/user_manager_db.h index 48107375a..355723369 100644 --- a/modules/users/managers/user_manager_db.h +++ b/modules/users/managers/user_manager_db.h @@ -2,7 +2,7 @@ #define USER_MANAGER_DB_H #include "core/os/rw_lock.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/managers/user_manager_file.h b/modules/users/managers/user_manager_file.h index dd114eda3..d390ef933 100644 --- a/modules/users/managers/user_manager_file.h +++ b/modules/users/managers/user_manager_file.h @@ -2,7 +2,7 @@ #define USER_MANAGER_FILE_H #include "core/os/rw_lock.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/managers/user_manager_static.h b/modules/users/managers/user_manager_static.h index adff4a1df..d1de94a22 100644 --- a/modules/users/managers/user_manager_static.h +++ b/modules/users/managers/user_manager_static.h @@ -2,7 +2,7 @@ #define USER_MANAGER_STATIC_H #include "core/os/rw_lock.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/singleton/user_db.h b/modules/users/singleton/user_db.h index c30e3c4bd..763c11ea6 100644 --- a/modules/users/singleton/user_db.h +++ b/modules/users/singleton/user_db.h @@ -2,11 +2,11 @@ #define USER_DB_H #include "core/os/rw_lock.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" -#include "core/object.h" +#include "core/object/object.h" class UserManager; class User; diff --git a/modules/users/users/user.cpp b/modules/users/users/user.cpp index d33be7aff..64caacf84 100644 --- a/modules/users/users/user.cpp +++ b/modules/users/users/user.cpp @@ -1,5 +1,5 @@ #include "user.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/io/json.h" #include "user_module.h" diff --git a/modules/users/users/user.h b/modules/users/users/user.h index 23116da6f..4acf54bb9 100644 --- a/modules/users/users/user.h +++ b/modules/users/users/user.h @@ -4,7 +4,7 @@ #include "core/os/rw_lock.h" #include "core/ustring.h" -#include "core/resource.h" +#include "core/object/resource.h" class UserModule; diff --git a/modules/users/users/user_module.cpp b/modules/users/users/user_module.cpp index 733ab1b83..d3d58dab8 100644 --- a/modules/users/users/user_module.cpp +++ b/modules/users/users/user_module.cpp @@ -1,7 +1,7 @@ #include "user_module.h" -#include "core/class_db.h" +#include "core/object/class_db.h" -#include "core/object.h" +#include "core/object/object.h" #include "user.h" int UserModule::get_module_index() const { diff --git a/modules/users/users/user_module.h b/modules/users/users/user_module.h index 9f99b4c6d..c30954418 100644 --- a/modules/users/users/user_module.h +++ b/modules/users/users/user_module.h @@ -4,7 +4,7 @@ #include "core/os/rw_lock.h" #include "core/ustring.h" -#include "core/resource.h" +#include "core/object/resource.h" class User; diff --git a/modules/users/web/middleware/user_session_setup_web_server_middleware.h b/modules/users/web/middleware/user_session_setup_web_server_middleware.h index 06d4e1ad4..88d10d05f 100644 --- a/modules/users/web/middleware/user_session_setup_web_server_middleware.h +++ b/modules/users/web/middleware/user_session_setup_web_server_middleware.h @@ -1,7 +1,7 @@ #ifndef USER_SESSION_SETUP_WEB_SERVER_MIDDLEWARE_H #define USER_SESSION_SETUP_WEB_SERVER_MIDDLEWARE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "modules/web/http/web_server_middleware.h" diff --git a/modules/users/web/web_nodes/user_controller.h b/modules/users/web/web_nodes/user_controller.h index 9551b3a88..54c9429ce 100644 --- a/modules/users/web/web_nodes/user_controller.h +++ b/modules/users/web/web_nodes/user_controller.h @@ -1,7 +1,7 @@ #ifndef USER_CONTROLLER_H #define USER_CONTROLLER_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/web/web_nodes/user_delete_web_page.h b/modules/users/web/web_nodes/user_delete_web_page.h index 5e582eac6..5ebe8c7ae 100644 --- a/modules/users/web/web_nodes/user_delete_web_page.h +++ b/modules/users/web/web_nodes/user_delete_web_page.h @@ -1,7 +1,7 @@ #ifndef USER_DELETE_WEB_PAGE_H #define USER_DELETE_WEB_PAGE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/web/web_nodes/user_login_web_page.h b/modules/users/web/web_nodes/user_login_web_page.h index ceb1707af..d9b3c9072 100644 --- a/modules/users/web/web_nodes/user_login_web_page.h +++ b/modules/users/web/web_nodes/user_login_web_page.h @@ -1,7 +1,7 @@ #ifndef USER_LOGIN_REQUEST_WEB_PAGE_H #define USER_LOGIN_REQUEST_WEB_PAGE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/web/web_nodes/user_logout_web_page.h b/modules/users/web/web_nodes/user_logout_web_page.h index b1aa06da6..41f027e09 100644 --- a/modules/users/web/web_nodes/user_logout_web_page.h +++ b/modules/users/web/web_nodes/user_logout_web_page.h @@ -1,7 +1,7 @@ #ifndef USER_LOGOUT_WEB_PAGE_H #define USER_LOGOUT_WEB_PAGE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/web/web_nodes/user_password_reset_web_page.h b/modules/users/web/web_nodes/user_password_reset_web_page.h index edeae738a..5801e4828 100644 --- a/modules/users/web/web_nodes/user_password_reset_web_page.h +++ b/modules/users/web/web_nodes/user_password_reset_web_page.h @@ -1,7 +1,7 @@ #ifndef USER_PASSWORD_RESET_WEB_PAGE_H #define USER_PASSWORD_RESET_WEB_PAGE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/web/web_nodes/user_register_web_page.h b/modules/users/web/web_nodes/user_register_web_page.h index 0bf4ccf9b..be277916a 100644 --- a/modules/users/web/web_nodes/user_register_web_page.h +++ b/modules/users/web/web_nodes/user_register_web_page.h @@ -1,7 +1,7 @@ #ifndef USER_REGISTER_WEB_PAGE_H #define USER_REGISTER_WEB_PAGE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/web/web_nodes/user_settings_web_page.h b/modules/users/web/web_nodes/user_settings_web_page.h index d2a5c1c0b..2f79c6a99 100644 --- a/modules/users/web/web_nodes/user_settings_web_page.h +++ b/modules/users/web/web_nodes/user_settings_web_page.h @@ -1,7 +1,7 @@ #ifndef USER_SETTINGS_WEB_PAGE_H #define USER_SETTINGS_WEB_PAGE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/web/web_nodes/user_stats_web_page.h b/modules/users/web/web_nodes/user_stats_web_page.h index c4f6930a8..4b180b55a 100644 --- a/modules/users/web/web_nodes/user_stats_web_page.h +++ b/modules/users/web/web_nodes/user_stats_web_page.h @@ -1,7 +1,7 @@ #ifndef USER_STATS_WEB_PAGE_H #define USER_STATS_WEB_PAGE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/users/web/web_nodes/user_web_page.cpp b/modules/users/web/web_nodes/user_web_page.cpp index b90dd55ca..55f65ca93 100644 --- a/modules/users/web/web_nodes/user_web_page.cpp +++ b/modules/users/web/web_nodes/user_web_page.cpp @@ -1,5 +1,5 @@ #include "user_web_page.h" -#include "core/object.h" +#include "core/object/object.h" #include "../../users/user.h" #include "modules/web/http/web_server_request.h" diff --git a/modules/users/web/web_nodes/user_web_page.h b/modules/users/web/web_nodes/user_web_page.h index f95239ecc..609fc43a0 100644 --- a/modules/users/web/web_nodes/user_web_page.h +++ b/modules/users/web/web_nodes/user_web_page.h @@ -1,7 +1,7 @@ #ifndef USER_WEB_PAGE_H #define USER_WEB_PAGE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/voxelman/areas/world_area.h b/modules/voxelman/areas/world_area.h index 88cc52c01..3b4bc7d23 100644 --- a/modules/voxelman/areas/world_area.h +++ b/modules/voxelman/areas/world_area.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/math/aabb.h" diff --git a/modules/voxelman/data/voxel_light.h b/modules/voxelman/data/voxel_light.h index 05ab59e60..4f876ee72 100644 --- a/modules/voxelman/data/voxel_light.h +++ b/modules/voxelman/data/voxel_light.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" class VoxelLight : public Reference { diff --git a/modules/voxelman/level_generator/voxel_level_generator.h b/modules/voxelman/level_generator/voxel_level_generator.h index db309082d..752430ede 100644 --- a/modules/voxelman/level_generator/voxel_level_generator.h +++ b/modules/voxelman/level_generator/voxel_level_generator.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" class VoxelChunk; diff --git a/modules/voxelman/library/voxel_library.h b/modules/voxelman/library/voxel_library.h index bbaed9980..7a759770e 100644 --- a/modules/voxelman/library/voxel_library.h +++ b/modules/voxelman/library/voxel_library.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/math/rect2.h" #include "scene/resources/material.h" diff --git a/modules/voxelman/library/voxel_library_merger.h b/modules/voxelman/library/voxel_library_merger.h index 9e467d2b0..6249764a5 100644 --- a/modules/voxelman/library/voxel_library_merger.h +++ b/modules/voxelman/library/voxel_library_merger.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/containers/map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "voxel_library.h" diff --git a/modules/voxelman/library/voxel_library_merger_pcm.h b/modules/voxelman/library/voxel_library_merger_pcm.h index aee6ae2ae..e7c2f3ed3 100644 --- a/modules/voxelman/library/voxel_library_merger_pcm.h +++ b/modules/voxelman/library/voxel_library_merger_pcm.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/containers/map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "voxel_library.h" diff --git a/modules/voxelman/library/voxel_library_simple.h b/modules/voxelman/library/voxel_library_simple.h index bcd8be416..265aeaa61 100644 --- a/modules/voxelman/library/voxel_library_simple.h +++ b/modules/voxelman/library/voxel_library_simple.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/resource.h" +#include "core/object/resource.h" #include "voxel_library.h" diff --git a/modules/voxelman/library/voxel_material_cache.h b/modules/voxelman/library/voxel_material_cache.h index be1859f37..cea69423d 100644 --- a/modules/voxelman/library/voxel_material_cache.h +++ b/modules/voxelman/library/voxel_material_cache.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/voxelman/library/voxel_material_cache_pcm.h b/modules/voxelman/library/voxel_material_cache_pcm.h index 19457cd1a..55e949f7c 100644 --- a/modules/voxelman/library/voxel_material_cache_pcm.h +++ b/modules/voxelman/library/voxel_material_cache_pcm.h @@ -25,7 +25,7 @@ SOFTWARE. #include "voxel_material_cache.h" #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/voxelman/library/voxel_surface.h b/modules/voxelman/library/voxel_surface.h index ab7e6169d..92a4543c1 100644 --- a/modules/voxelman/library/voxel_surface.h +++ b/modules/voxelman/library/voxel_surface.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" #include "core/math/rect2.h" diff --git a/modules/voxelman/meshers/cubic/voxel_cube_points.h b/modules/voxelman/meshers/cubic/voxel_cube_points.h index 932d79cfa..6760f8de0 100644 --- a/modules/voxelman/meshers/cubic/voxel_cube_points.h +++ b/modules/voxelman/meshers/cubic/voxel_cube_points.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" class VoxelChunk; diff --git a/modules/voxelman/meshers/marching_cubes/marching_cubes_cell_data.h b/modules/voxelman/meshers/marching_cubes/marching_cubes_cell_data.h index 2161dd2f1..7088f7202 100644 --- a/modules/voxelman/meshers/marching_cubes/marching_cubes_cell_data.h +++ b/modules/voxelman/meshers/marching_cubes/marching_cubes_cell_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "marching_cubes_tables.h" diff --git a/modules/voxelman/meshers/marching_cubes/voxel_mesher_marching_cubes.h b/modules/voxelman/meshers/marching_cubes/voxel_mesher_marching_cubes.h index ed28b2050..010e4f926 100644 --- a/modules/voxelman/meshers/marching_cubes/voxel_mesher_marching_cubes.h +++ b/modules/voxelman/meshers/marching_cubes/voxel_mesher_marching_cubes.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #include "../default/voxel_mesher_default.h" #include "marching_cubes_cell_data.h" diff --git a/modules/voxelman/meshers/voxel_mesher.h b/modules/voxelman/meshers/voxel_mesher.h index e2df23828..94674d4a0 100644 --- a/modules/voxelman/meshers/voxel_mesher.h +++ b/modules/voxelman/meshers/voxel_mesher.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/vector.h" #include "../defines.h" diff --git a/modules/voxelman/world/environment_data.h b/modules/voxelman/world/environment_data.h index 034fe3e9f..5ca31d1bd 100644 --- a/modules/voxelman/world/environment_data.h +++ b/modules/voxelman/world/environment_data.h @@ -23,13 +23,13 @@ SOFTWARE. */ #include "core/math/color.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "../defines.h" #include "scene/3d/light.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/3d/world_environment.h" #include "scene/main/node.h" diff --git a/modules/voxelman/world/jobs/voxel_job.h b/modules/voxelman/world/jobs/voxel_job.h index 2733f5f55..60bdcb5af 100644 --- a/modules/voxelman/world/jobs/voxel_job.h +++ b/modules/voxelman/world/jobs/voxel_job.h @@ -27,7 +27,7 @@ SOFTWARE. #if THREAD_POOL_PRESENT #include "../../../thread_pool/thread_pool_job.h" #else -#include "core/reference.h" +#include "core/object/reference.h" #endif #include "../../defines.h" diff --git a/modules/voxelman/world/jobs/voxel_mesher_job_step.h b/modules/voxelman/world/jobs/voxel_mesher_job_step.h index 28350d444..a6e8ab9c5 100644 --- a/modules/voxelman/world/jobs/voxel_mesher_job_step.h +++ b/modules/voxelman/world/jobs/voxel_mesher_job_step.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/reference.h" +#include "core/object/reference.h" #ifdef MESH_UTILS_PRESENT #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h" diff --git a/modules/voxelman/world/voxel_chunk.h b/modules/voxelman/world/voxel_chunk.h index 0f7fe8710..f71234ad5 100644 --- a/modules/voxelman/world/voxel_chunk.h +++ b/modules/voxelman/world/voxel_chunk.h @@ -24,7 +24,7 @@ SOFTWARE. #include "core/variant/array.h" #include "core/engine.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/ustring.h" #include "../defines.h" diff --git a/modules/voxelman/world/voxel_structure.h b/modules/voxelman/world/voxel_structure.h index f199d04f7..5bf55d0e8 100644 --- a/modules/voxelman/world/voxel_structure.h +++ b/modules/voxelman/world/voxel_structure.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/containers/hash_map.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "../defines.h" diff --git a/modules/web/file_cache.h b/modules/web/file_cache.h index f487c99c3..759a03b25 100644 --- a/modules/web/file_cache.h +++ b/modules/web/file_cache.h @@ -8,7 +8,7 @@ #include "core/ustring.h" #include "core/containers/vector.h" -#include "core/reference.h" +#include "core/object/reference.h" class FileCache : public Reference { GDCLASS(FileCache, Reference); diff --git a/modules/web/html/bbcode_parser.h b/modules/web/html/bbcode_parser.h index 2faad3638..3cb814989 100644 --- a/modules/web/html/bbcode_parser.h +++ b/modules/web/html/bbcode_parser.h @@ -4,7 +4,7 @@ #include "core/ustring.h" #include "core/containers/vector.h" -#include "core/reference.h" +#include "core/object/reference.h" class BBCodeParserAttribute : public Reference { GDCLASS(BBCodeParserAttribute, Reference); diff --git a/modules/web/html/form_validator.h b/modules/web/html/form_validator.h index 1f1628d01..20b131a29 100644 --- a/modules/web/html/form_validator.h +++ b/modules/web/html/form_validator.h @@ -4,7 +4,7 @@ #include "core/ustring.h" #include "core/containers/vector.h" -#include "core/resource.h" +#include "core/object/resource.h" class Request; class FormField; diff --git a/modules/web/html/html_builder.h b/modules/web/html/html_builder.h index 63ceb56f8..66de69d1e 100644 --- a/modules/web/html/html_builder.h +++ b/modules/web/html/html_builder.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "core/reference.h" +#include "core/object/reference.h" class Request; class HTMLBuilder; diff --git a/modules/web/html/html_builder_bind.cpp b/modules/web/html/html_builder_bind.cpp index 52b438b72..4e961e73b 100644 --- a/modules/web/html/html_builder_bind.cpp +++ b/modules/web/html/html_builder_bind.cpp @@ -2,7 +2,7 @@ #include "core/print_string.h" #include "core/ustring.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "../http/web_server_request.h" diff --git a/modules/web/html/html_builder_bind.h b/modules/web/html/html_builder_bind.h index a86a5f702..679bed5f6 100644 --- a/modules/web/html/html_builder_bind.h +++ b/modules/web/html/html_builder_bind.h @@ -1,10 +1,10 @@ #ifndef HTML_BUILDER_BIND_H #define HTML_BUILDER_BIND_H -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" -#include "core/reference.h" +#include "core/object/reference.h" class _HTMLBuilder; class WebServerRequest; diff --git a/modules/web/html/html_parser.cpp b/modules/web/html/html_parser.cpp index 0a2c021c0..d10394519 100644 --- a/modules/web/html/html_parser.cpp +++ b/modules/web/html/html_parser.cpp @@ -1,6 +1,6 @@ #include "html_parser.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/log/logger.h" diff --git a/modules/web/html/html_parser.h b/modules/web/html/html_parser.h index 1f48c93f3..38c1f0233 100644 --- a/modules/web/html/html_parser.h +++ b/modules/web/html/html_parser.h @@ -5,7 +5,7 @@ #include "core/variant/variant.h" #include "core/containers/vector.h" -#include "core/reference.h" +#include "core/object/reference.h" class HTMLParserAttribute : public Reference { GDCLASS(HTMLParserAttribute, Reference); diff --git a/modules/web/html/markdown_renderer.cpp b/modules/web/html/markdown_renderer.cpp index e94d51fbc..12a164cd4 100644 --- a/modules/web/html/markdown_renderer.cpp +++ b/modules/web/html/markdown_renderer.cpp @@ -1,11 +1,11 @@ #include "markdown_renderer.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/error_macros.h" #include "core/log/logger.h" #include "./libs/hoedown/html.h" -#include "core/object.h" +#include "core/object/object.h" MarkdownRenderer::RenderType MarkdownRenderer::get_render_type() { return _render_type; diff --git a/modules/web/html/markdown_renderer.h b/modules/web/html/markdown_renderer.h index 0c1f6e7fa..9a4e2a821 100644 --- a/modules/web/html/markdown_renderer.h +++ b/modules/web/html/markdown_renderer.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "core/reference.h" +#include "core/object/reference.h" class MarkdownRenderer : public Reference { GDCLASS(MarkdownRenderer, Reference); diff --git a/modules/web/html/paginator.h b/modules/web/html/paginator.h index f3161bd94..c91c419c8 100644 --- a/modules/web/html/paginator.h +++ b/modules/web/html/paginator.h @@ -4,7 +4,7 @@ #include "core/ustring.h" #include "core/containers/vector.h" -#include "core/reference.h" +#include "core/object/reference.h" class HTMLPaginator : public Reference { GDCLASS(HTMLPaginator, Reference); diff --git a/modules/web/http/http_server_enums.h b/modules/web/http/http_server_enums.h index 5ef414f04..c03fa2d16 100644 --- a/modules/web/http/http_server_enums.h +++ b/modules/web/http/http_server_enums.h @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/object.h" +#include "core/object/object.h" #include "core/ustring.h" class HTTPServerEnums : public Object { diff --git a/modules/web/http/http_session.h b/modules/web/http/http_session.h index 8fbbc5495..9b3c06044 100644 --- a/modules/web/http/http_session.h +++ b/modules/web/http/http_session.h @@ -3,7 +3,7 @@ #include "core/containers/hash_map.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/os/mutex.h" #include "core/ustring.h" diff --git a/modules/web/http/http_session_manager.h b/modules/web/http/http_session_manager.h index fe96a474e..9da37bdea 100644 --- a/modules/web/http/http_session_manager.h +++ b/modules/web/http/http_session_manager.h @@ -6,7 +6,7 @@ #include "core/ustring.h" #include "core/containers/vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/main/node.h" #include "web_server_middleware.h" diff --git a/modules/web/http/web_node.cpp b/modules/web/http/web_node.cpp index 766fb1ce0..81a20c731 100644 --- a/modules/web/http/web_node.cpp +++ b/modules/web/http/web_node.cpp @@ -3,7 +3,7 @@ #include "core/error_macros.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/print_string.h" #include "http_server_enums.h" #include "modules/database/database_connection.h" diff --git a/modules/web/http/web_node.h b/modules/web/http/web_node.h index 0b187fde4..a09b4b47f 100644 --- a/modules/web/http/web_node.h +++ b/modules/web/http/web_node.h @@ -4,7 +4,7 @@ #include "../../modules_enabled.gen.h" #include "core/containers/hash_map.h" #include "core/os/rw_lock.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/variant/variant.h" #include "scene/main/node.h" diff --git a/modules/web/http/web_permission.h b/modules/web/http/web_permission.h index cacfcbe90..609bcf0d1 100644 --- a/modules/web/http/web_permission.h +++ b/modules/web/http/web_permission.h @@ -4,7 +4,7 @@ #include "core/ustring.h" #include "core/variant/variant.h" -#include "core/reference.h" +#include "core/object/reference.h" class WebServerRequest; diff --git a/modules/web/http/web_root.cpp b/modules/web/http/web_root.cpp index 7dc4e204b..a6d30a7b9 100644 --- a/modules/web/http/web_root.cpp +++ b/modules/web/http/web_root.cpp @@ -1,6 +1,6 @@ #include "web_root.h" -#include "core/object.h" +#include "core/object/object.h" #include "modules/web/http/http_server_enums.h" #include "web_server_request.h" diff --git a/modules/web/http/web_server.cpp b/modules/web/http/web_server.cpp index 725a725ec..7f22d8092 100644 --- a/modules/web/http/web_server.cpp +++ b/modules/web/http/web_server.cpp @@ -1,6 +1,6 @@ #include "web_server.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "web_node.h" #include "web_server_request.h" diff --git a/modules/web/http/web_server_cookie.cpp b/modules/web/http/web_server_cookie.cpp index e62dabd61..1a7d5eea7 100644 --- a/modules/web/http/web_server_cookie.cpp +++ b/modules/web/http/web_server_cookie.cpp @@ -1,7 +1,7 @@ #include "web_server_cookie.h" -#include "core/class_db.h" -#include "core/object.h" +#include "core/object/class_db.h" +#include "core/object/object.h" String WebServerCookie::get_domain() { return _domain; diff --git a/modules/web/http/web_server_cookie.h b/modules/web/http/web_server_cookie.h index 36a83fef0..a248f313a 100644 --- a/modules/web/http/web_server_cookie.h +++ b/modules/web/http/web_server_cookie.h @@ -4,7 +4,7 @@ #include "core/os/os.h" #include "core/ustring.h" -#include "core/reference.h" +#include "core/object/reference.h" class WebServerCookie : public Reference { GDCLASS(WebServerCookie, Reference); diff --git a/modules/web/http/web_server_middleware.h b/modules/web/http/web_server_middleware.h index 596ae0732..d9a119f57 100644 --- a/modules/web/http/web_server_middleware.h +++ b/modules/web/http/web_server_middleware.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "core/resource.h" +#include "core/object/resource.h" class WebServerRequest; diff --git a/modules/web/http/web_server_request.cpp b/modules/web/http/web_server_request.cpp index 560150249..c00ddbcf8 100644 --- a/modules/web/http/web_server_request.cpp +++ b/modules/web/http/web_server_request.cpp @@ -1,6 +1,6 @@ #include "web_server_request.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/variant/variant.h" #include "web_server.h" #include "web_server_cookie.h" diff --git a/modules/web/http/web_server_request.h b/modules/web/http/web_server_request.h index beac051f2..a2c3a4331 100644 --- a/modules/web/http/web_server_request.h +++ b/modules/web/http/web_server_request.h @@ -5,8 +5,8 @@ #include "core/ustring.h" #include "core/containers/vector.h" -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" #include "http_server_enums.h" diff --git a/modules/web/http_server_simple/http_parser.h b/modules/web/http_server_simple/http_parser.h index a39ddf545..dd882a326 100644 --- a/modules/web/http_server_simple/http_parser.h +++ b/modules/web/http_server_simple/http_parser.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "core/reference.h" +#include "core/object/reference.h" class SimpleWebServerRequest; struct http_parser; diff --git a/modules/web/http_server_simple/http_writer.h b/modules/web/http_server_simple/http_writer.h index f56f33898..713309aef 100644 --- a/modules/web/http_server_simple/http_writer.h +++ b/modules/web/http_server_simple/http_writer.h @@ -1,7 +1,7 @@ #ifndef HTTP_WRITER_H #define HTTP_WRITER_H -#include "core/reference.h" +#include "core/object/reference.h" class HTTPWriter : public Reference { GDCLASS(HTTPWriter, Reference); diff --git a/modules/web/http_server_simple/simple_web_server_request.cpp b/modules/web/http_server_simple/simple_web_server_request.cpp index b8481b4fb..ce4cf7179 100644 --- a/modules/web/http_server_simple/simple_web_server_request.cpp +++ b/modules/web/http_server_simple/simple_web_server_request.cpp @@ -2,7 +2,7 @@ #include "../http/web_server.h" #include "../http/web_server_cookie.h" -#include "core/object.h" +#include "core/object/object.h" #include "../http/http_session.h" diff --git a/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h index 2c61ec36f..a839a8172 100644 --- a/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h +++ b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h @@ -1,7 +1,7 @@ #ifndef FOLDER_SERVE_WEB_PAGE_H #define FOLDER_SERVE_WEB_PAGE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "../../http/web_node.h" diff --git a/modules/web/nodes/paged_article/paged_article_web_page.h b/modules/web/nodes/paged_article/paged_article_web_page.h index 5f47f51a6..2dc781dfe 100644 --- a/modules/web/nodes/paged_article/paged_article_web_page.h +++ b/modules/web/nodes/paged_article/paged_article_web_page.h @@ -1,7 +1,7 @@ #ifndef PAGED_ARTICLE_WEB_PAGE_H #define PAGED_ARTICLE_WEB_PAGE_H -#include "core/reference.h" +#include "core/object/reference.h" #include "core/ustring.h" #include "core/containers/vector.h" diff --git a/modules/websocket/emws_server.h b/modules/websocket/emws_server.h index 9f7ad6305..c892cd8bb 100644 --- a/modules/websocket/emws_server.h +++ b/modules/websocket/emws_server.h @@ -32,7 +32,7 @@ #ifdef JAVASCRIPT_ENABLED -#include "core/reference.h" +#include "core/object/reference.h" #include "emws_peer.h" #include "websocket_server.h" diff --git a/modules/websocket/websocket_server.h b/modules/websocket/websocket_server.h index cb8989492..943772343 100644 --- a/modules/websocket/websocket_server.h +++ b/modules/websocket/websocket_server.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/crypto/crypto.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "websocket_multiplayer_peer.h" #include "websocket_peer.h" diff --git a/modules/wfc/image_indexer.h b/modules/wfc/image_indexer.h index 7a57d46a4..3d34487e8 100644 --- a/modules/wfc/image_indexer.h +++ b/modules/wfc/image_indexer.h @@ -2,7 +2,7 @@ #define IMAGE_INDEXER_H #include "core/image.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/variant/variant.h" #include "core/containers/oa_hash_map.h" diff --git a/modules/wfc/wave_form_collapse.h b/modules/wfc/wave_form_collapse.h index b144c5af3..2ce01b276 100644 --- a/modules/wfc/wave_form_collapse.h +++ b/modules/wfc/wave_form_collapse.h @@ -8,7 +8,7 @@ #include "array_3d.h" #include "core/containers/vector.h" -#include "core/reference.h" +#include "core/object/reference.h" class WaveFormCollapse : public Reference { GDCLASS(WaveFormCollapse, Reference); diff --git a/platform/android/api/java_class_wrapper.h b/platform/android/api/java_class_wrapper.h index 4621282a7..2b1bdb038 100644 --- a/platform/android/api/java_class_wrapper.h +++ b/platform/android/api/java_class_wrapper.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/reference.h" +#include "core/object/reference.h" #ifdef ANDROID_ENABLED #include diff --git a/platform/iphone/ios.h b/platform/iphone/ios.h index 9430d3376..fc42f1dae 100644 --- a/platform/iphone/ios.h +++ b/platform/iphone/ios.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/object.h" +#include "core/object/object.h" #import class iOS : public Object { diff --git a/platform/javascript/api/javascript_singleton.h b/platform/javascript/api/javascript_singleton.h index a537617f3..77fe1cfab 100644 --- a/platform/javascript/api/javascript_singleton.h +++ b/platform/javascript/api/javascript_singleton.h @@ -30,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/object.h" -#include "core/reference.h" +#include "core/object/object.h" +#include "core/object/reference.h" class JavaScriptObject : public Reference { private: diff --git a/platform/osx/export/codesign.h b/platform/osx/export/codesign.h index 2f6c139b1..f85e12fc0 100644 --- a/platform/osx/export/codesign.h +++ b/platform/osx/export/codesign.h @@ -45,7 +45,7 @@ #include "core/crypto/crypto_core.h" #include "core/os/dir_access.h" #include "core/os/file_access.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "modules/modules_enabled.gen.h" // For regex. #ifdef MODULE_REGEX_ENABLED #include "modules/regex/regex.h" diff --git a/platform/osx/export/lipo.h b/platform/osx/export/lipo.h index 2d679300a..276867c6f 100644 --- a/platform/osx/export/lipo.h +++ b/platform/osx/export/lipo.h @@ -34,7 +34,7 @@ #define LIPO_H #include "core/os/file_access.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "modules/modules_enabled.gen.h" // For regex. #include "macho.h" diff --git a/platform/osx/export/macho.h b/platform/osx/export/macho.h index 9887d7f84..38a9f53e4 100644 --- a/platform/osx/export/macho.h +++ b/platform/osx/export/macho.h @@ -36,7 +36,7 @@ #include "core/crypto/crypto.h" #include "core/crypto/crypto_core.h" #include "core/os/file_access.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "modules/modules_enabled.gen.h" // For regex. #ifdef MODULE_REGEX_ENABLED diff --git a/scene/2d/audio_stream_player_2d.h b/scene/2d/audio_stream_player_2d.h index 16b16d6af..df67b5e2d 100644 --- a/scene/2d/audio_stream_player_2d.h +++ b/scene/2d/audio_stream_player_2d.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/math/audio_frame.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/safe_refcount.h" #include "scene/2d/node_2d.h" diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index f209e6d3c..bf5660a1f 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -29,8 +29,8 @@ /*************************************************************************/ #include "canvas_item.h" -#include "core/message_queue.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/message_queue.h" +#include "core/object/method_bind_ext.gen.inc" #include "core/os/input.h" #include "core/version.h" #include "scene/main/canvas_layer.h" diff --git a/scene/2d/collision_shape_2d.h b/scene/2d/collision_shape_2d.h index c04bcca83..626327ec1 100644 --- a/scene/2d/collision_shape_2d.h +++ b/scene/2d/collision_shape_2d.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/2d/node_2d.h" class Shape2D; diff --git a/scene/2d/navigation_polygon.h b/scene/2d/navigation_polygon.h index 08d59c23c..80ddb3742 100644 --- a/scene/2d/navigation_polygon.h +++ b/scene/2d/navigation_polygon.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/2d/node_2d.h" class NavigationMesh; diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index d062ccfa8..e9534d3ca 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -30,7 +30,7 @@ #include "node_2d.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "scene/gui/control.h" #include "scene/main/viewport.h" #include "servers/visual_server.h" diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 97e34588c..804f57fec 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -34,8 +34,8 @@ #include "core/engine.h" #include "core/containers/list.h" #include "core/math/math_funcs.h" -#include "core/method_bind_ext.gen.inc" -#include "core/object.h" +#include "core/object/method_bind_ext.gen.inc" +#include "core/object/object.h" #include "core/project_settings.h" #include "core/rid.h" #include "scene/resources/physics_material.h" diff --git a/scene/2d/sprite.h b/scene/2d/sprite.h index 478b25326..4727bdc72 100644 --- a/scene/2d/sprite.h +++ b/scene/2d/sprite.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/2d/node_2d.h" class Sprite : public Node2D { diff --git a/scene/2d/touch_screen_button.h b/scene/2d/touch_screen_button.h index e25685c40..4b64383ce 100644 --- a/scene/2d/touch_screen_button.h +++ b/scene/2d/touch_screen_button.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/2d/node_2d.h" class Texture; diff --git a/scene/3d/camera.h b/scene/3d/camera.h index cd1fe4b58..7254c707f 100644 --- a/scene/3d/camera.h +++ b/scene/3d/camera.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/3d/spatial.h" class SpatialVelocityTracker; diff --git a/scene/3d/collision_object.h b/scene/3d/collision_object.h index 933dee652..1a1dc3826 100644 --- a/scene/3d/collision_object.h +++ b/scene/3d/collision_object.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/3d/spatial.h" #include "scene/resources/shape.h" diff --git a/scene/3d/collision_polygon.h b/scene/3d/collision_polygon.h index d15181812..a3e326149 100644 --- a/scene/3d/collision_polygon.h +++ b/scene/3d/collision_polygon.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/3d/spatial.h" class CollisionObject; diff --git a/scene/3d/collision_shape.h b/scene/3d/collision_shape.h index d306a88ed..1f2b9e942 100644 --- a/scene/3d/collision_shape.h +++ b/scene/3d/collision_shape.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/3d/spatial.h" class CollisionObject; diff --git a/scene/3d/cpu_particles.h b/scene/3d/cpu_particles.h index 9e185736a..870a6afa0 100644 --- a/scene/3d/cpu_particles.h +++ b/scene/3d/cpu_particles.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/rid.h" #include "core/safe_refcount.h" #include "scene/3d/visual_instance.h" diff --git a/scene/3d/mesh_instance.h b/scene/3d/mesh_instance.h index 8bf6abb6c..d52f745a9 100644 --- a/scene/3d/mesh_instance.h +++ b/scene/3d/mesh_instance.h @@ -33,7 +33,7 @@ #include "scene/3d/visual_instance.h" #include "core/containers/local_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" class Mesh; class Skin; diff --git a/scene/3d/multimesh_instance.h b/scene/3d/multimesh_instance.h index cb0052e43..05740dfe1 100644 --- a/scene/3d/multimesh_instance.h +++ b/scene/3d/multimesh_instance.h @@ -32,7 +32,7 @@ #include "scene/3d/visual_instance.h" -#include "core/reference.h" +#include "core/object/reference.h" class MultiMesh; diff --git a/scene/3d/occluder.h b/scene/3d/occluder.h index a29825541..b8d03f799 100644 --- a/scene/3d/occluder.h +++ b/scene/3d/occluder.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/3d/spatial.h" class OccluderShape; diff --git a/scene/3d/path.h b/scene/3d/path.h index 507d97992..c057cb7a1 100644 --- a/scene/3d/path.h +++ b/scene/3d/path.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/3d/spatial.h" class Curve3D; diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index ae212fd6b..2f13f2b75 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -33,8 +33,8 @@ #include "core/core_string_names.h" #include "core/engine.h" #include "core/containers/list.h" -#include "core/method_bind_ext.gen.inc" -#include "core/object.h" +#include "core/object/method_bind_ext.gen.inc" +#include "core/object/object.h" #include "core/project_settings.h" #include "core/rid.h" #include "scene/resources/physics_material.h" diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index 5bc0a7a6e..5e6b6cb00 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.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/containers/vset.h" #include "scene/3d/collision_object.h" #include "servers/physics_server.h" diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp index b9028221a..8a001d586 100644 --- a/scene/3d/skeleton.cpp +++ b/scene/3d/skeleton.cpp @@ -30,7 +30,7 @@ #include "skeleton.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/engine.h" #include "core/project_settings.h" diff --git a/scene/3d/skeleton.h b/scene/3d/skeleton.h index cac67186e..d1b5fef59 100644 --- a/scene/3d/skeleton.h +++ b/scene/3d/skeleton.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/rid.h" #include "scene/3d/spatial.h" diff --git a/scene/3d/soft_body.cpp b/scene/3d/soft_body.cpp index 85eedee11..e4dceccf7 100644 --- a/scene/3d/soft_body.cpp +++ b/scene/3d/soft_body.cpp @@ -30,7 +30,7 @@ #include "soft_body.h" #include "core/containers/list.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/os/os.h" #include "core/rid.h" #include "scene/3d/collision_object.h" diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp index f1e9b1c8e..b7324a731 100644 --- a/scene/3d/spatial.cpp +++ b/scene/3d/spatial.cpp @@ -32,7 +32,7 @@ #include "core/engine.h" #include "core/math/transform_interpolator.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "scene/main/scene_tree.h" #include "scene/main/viewport.h" #include "scene/resources/world.h" diff --git a/scene/3d/spring_arm.h b/scene/3d/spring_arm.h index 06cb38e4b..75c129240 100644 --- a/scene/3d/spring_arm.h +++ b/scene/3d/spring_arm.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/3d/spatial.h" class Shape; diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h index 267355429..12bc68113 100644 --- a/scene/3d/sprite_3d.h +++ b/scene/3d/sprite_3d.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/3d/visual_instance.h" #include "scene/resources/material.h" diff --git a/scene/3d/visual_instance.h b/scene/3d/visual_instance.h index 1b71af7ac..9f88a9ef9 100644 --- a/scene/3d/visual_instance.h +++ b/scene/3d/visual_instance.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/math/face3.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/rid.h" #include "scene/3d/cull_instance.h" #include "servers/visual_server.h" diff --git a/scene/3d/world_environment.h b/scene/3d/world_environment.h index ecb4b173f..506d31288 100644 --- a/scene/3d/world_environment.h +++ b/scene/3d/world_environment.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/main/node.h" class Environment; diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index bebc10d5f..71e4ed771 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -31,7 +31,7 @@ #include "animation_player.h" #include "core/engine.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "scene/2d/node_2d.h" #include "scene/3d/skeleton.h" #include "scene/3d/spatial.h" diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h index 5564705b0..54e00187b 100644 --- a/scene/animation/animation_player.h +++ b/scene/animation/animation_player.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/main/node.h" class Resource; diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index c04dac777..fc7875400 100644 --- a/scene/animation/animation_tree.cpp +++ b/scene/animation/animation_tree.cpp @@ -33,7 +33,7 @@ #include "animation_blend_tree.h" #include "animation_player.h" #include "core/engine.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "scene/3d/skeleton.h" #include "scene/3d/spatial.h" #include "scene/scene_string_names.h" diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h index e9d9c1a13..5c6b0de6f 100644 --- a/scene/animation/animation_tree.h +++ b/scene/animation/animation_tree.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/main/node.h" #include "scene/resources/animation.h" diff --git a/scene/animation/scene_tree_tween.cpp b/scene/animation/scene_tree_tween.cpp index dd4796a4b..a1c25b1c6 100644 --- a/scene/animation/scene_tree_tween.cpp +++ b/scene/animation/scene_tree_tween.cpp @@ -30,7 +30,7 @@ #include "scene_tree_tween.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "scene/animation/tween.h" #include "scene/main/node.h" #include "scene/scene_string_names.h" diff --git a/scene/animation/scene_tree_tween.h b/scene/animation/scene_tree_tween.h index cf57d7b65..d259560aa 100644 --- a/scene/animation/scene_tree_tween.h +++ b/scene/animation/scene_tree_tween.h @@ -31,7 +31,7 @@ #ifndef SCENE_TREE_TWEEN_H #define SCENE_TREE_TWEEN_H -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/animation/tween.h" class SceneTreeTween; diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index b7bdf1b3e..964ab4f24 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -30,7 +30,7 @@ #include "tween.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "scene/animation/easing_equations.h" Tween::interpolater Tween::interpolaters[Tween::TRANS_COUNT][Tween::EASE_COUNT] = { diff --git a/scene/debugger/script_debugger_remote.h b/scene/debugger/script_debugger_remote.h index 09e2fe11a..fa7e84cde 100644 --- a/scene/debugger/script_debugger_remote.h +++ b/scene/debugger/script_debugger_remote.h @@ -34,7 +34,7 @@ #include "core/io/stream_peer_tcp.h" #include "core/containers/list.h" #include "core/os/os.h" -#include "core/script_language.h" +#include "core/object/script_language.h" class SceneTree; diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index 5aa8878e7..a91726392 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "container.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "scene/scene_string_names.h" void Container::_child_minsize_changed() { diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 971f64877..5ffe94180 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -30,7 +30,7 @@ #include "control.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/print_string.h" diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp index 2af00a7d3..6fa9c201f 100644 --- a/scene/gui/graph_node.cpp +++ b/scene/gui/graph_node.cpp @@ -30,7 +30,7 @@ #include "graph_node.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" struct _MinSizeCache { int min_size; diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 24b6751a8..3f476a6cc 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -30,7 +30,7 @@ #include "line_edit.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/os/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" diff --git a/scene/gui/rich_text_effect.cpp b/scene/gui/rich_text_effect.cpp index 0273b8905..629cbff9f 100644 --- a/scene/gui/rich_text_effect.cpp +++ b/scene/gui/rich_text_effect.cpp @@ -30,7 +30,7 @@ #include "rich_text_effect.h" -#include "core/script_language.h" +#include "core/object/script_language.h" void RichTextEffect::_bind_methods() { BIND_VMETHOD(MethodInfo(Variant::BOOL, "_process_custom_fx", PropertyInfo(Variant::OBJECT, "char_fx", PROPERTY_HINT_RESOURCE_TYPE, "CharFXTransform"))); diff --git a/scene/gui/rich_text_effect.h b/scene/gui/rich_text_effect.h index 0eb2ed12e..ee63cba52 100644 --- a/scene/gui/rich_text_effect.h +++ b/scene/gui/rich_text_effect.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 RichTextEffect : public Resource { GDCLASS(RichTextEffect, Resource); diff --git a/scene/gui/shortcut.h b/scene/gui/shortcut.h index c0f08b291..5c1be0ffd 100644 --- a/scene/gui/shortcut.h +++ b/scene/gui/shortcut.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 InputEvent; diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index b3fe909cd..0c0de382e 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -30,7 +30,7 @@ #include "tab_container.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "scene/gui/box_container.h" #include "scene/gui/label.h" #include "scene/gui/popup.h" diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp index 66e131a6c..8e56190c0 100644 --- a/scene/gui/tabs.cpp +++ b/scene/gui/tabs.cpp @@ -30,7 +30,7 @@ #include "tabs.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "scene/gui/box_container.h" #include "scene/gui/label.h" #include "scene/gui/texture_rect.h" diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 8a31113e0..5aab1bda3 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -30,12 +30,12 @@ #include "text_edit.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/os/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/project_settings.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "label.h" #include "scene/gui/popup_menu.h" #include "scene/gui/scroll_bar.h" diff --git a/scene/gui/texture_button.h b/scene/gui/texture_button.h index b5962040d..e8f2933de 100644 --- a/scene/gui/texture_button.h +++ b/scene/gui/texture_button.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/base_button.h" class BitMap; diff --git a/scene/gui/tree.h b/scene/gui/tree.h index 6f3b966ac..f4f7171ed 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.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 "scene/gui/control.h" class Tree; diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 07025038d..dd5f254b0 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -32,7 +32,7 @@ #include "core/core_string_names.h" #include "core/io/resource_loader.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/print_string.h" #include "instance_placeholder.h" #include "scene/animation/scene_tree_tween.h" @@ -40,9 +40,9 @@ #include "scene/scene_string_names.h" #include "viewport.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/project_settings.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/scene/main/node.h b/scene/main/node.h index f82e604d7..a33e87587 100644 --- a/scene/main/node.h +++ b/scene/main/node.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/containers/map.h" #include "core/node_path.h" diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 2ccf4a31c..8f331b0ac 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -32,7 +32,7 @@ #include "core/io/marshalls.h" #include "core/io/resource_loader.h" -#include "core/message_queue.h" +#include "core/object/message_queue.h" #include "core/os/dir_access.h" #include "core/os/keyboard.h" #include "core/os/os.h" diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index a990df312..79742f9a8 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -30,7 +30,7 @@ #include "register_scene_types.h" -#include "core/class_db.h" +#include "core/object/class_db.h" #include "core/os/os.h" #include "core/project_settings.h" #include "scene/2d/animated_sprite.h" diff --git a/scene/resources/animation.h b/scene/resources/animation.h index d46ff7771..f014129ef 100644 --- a/scene/resources/animation.h +++ b/scene/resources/animation.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #define ANIM_MIN_LENGTH 0.001 diff --git a/scene/resources/bit_map.h b/scene/resources/bit_map.h index bb1ee2580..eda7a8ff0 100644 --- a/scene/resources/bit_map.h +++ b/scene/resources/bit_map.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/image.h" -#include "core/resource.h" +#include "core/object/resource.h" class BitMap : public Resource { GDCLASS(BitMap, Resource); diff --git a/scene/resources/curve.h b/scene/resources/curve.h index 02334fc1e..ec537680d 100644 --- a/scene/resources/curve.h +++ b/scene/resources/curve.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" // y(x) curve class Curve : public Resource { diff --git a/scene/resources/environment.h b/scene/resources/environment.h index 4a1b5bab0..cf57c8518 100644 --- a/scene/resources/environment.h +++ b/scene/resources/environment.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 Sky; class Texture; diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp index 392841cec..264864bfb 100644 --- a/scene/resources/font.cpp +++ b/scene/resources/font.cpp @@ -30,7 +30,7 @@ #include "font.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "core/os/file_access.h" #include "scene/resources/texture.h" diff --git a/scene/resources/font.h b/scene/resources/font.h index 89905b477..7dc68b268 100644 --- a/scene/resources/font.h +++ b/scene/resources/font.h @@ -32,7 +32,7 @@ #include "core/io/resource_loader.h" #include "core/containers/map.h" -#include "core/resource.h" +#include "core/object/resource.h" class Texture; diff --git a/scene/resources/gradient.h b/scene/resources/gradient.h index ab9ca143d..a274f88ae 100644 --- a/scene/resources/gradient.h +++ b/scene/resources/gradient.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 Gradient : public Resource { GDCLASS(Gradient, Resource); diff --git a/scene/resources/importer_mesh.cpp b/scene/resources/importer_mesh.cpp index 83954f450..4ddb526c5 100644 --- a/scene/resources/importer_mesh.cpp +++ b/scene/resources/importer_mesh.cpp @@ -32,7 +32,7 @@ #include "core/math/random_pcg.h" #include "scene/resources/surface_tool.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include diff --git a/scene/resources/importer_mesh.h b/scene/resources/importer_mesh.h index 834df048e..66ce17121 100644 --- a/scene/resources/importer_mesh.h +++ b/scene/resources/importer_mesh.h @@ -31,7 +31,7 @@ #ifndef IMPORTER_MESH_H #define IMPORTER_MESH_H -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/local_vector.h" #include "scene/resources/concave_polygon_shape.h" #include "scene/resources/convex_polygon_shape.h" diff --git a/scene/resources/material.h b/scene/resources/material.h index 72a074ac1..822ddc70a 100644 --- a/scene/resources/material.h +++ b/scene/resources/material.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/self_list.h" #include "scene/resources/shader.h" #include "servers/visual_server.h" diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index cbd11d59b..aa48f6ee0 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -32,7 +32,7 @@ #include "core/math/face3.h" #include "core/math/triangle_mesh.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/resources/material.h" #include "scene/resources/shape.h" diff --git a/scene/resources/occluder_shape.h b/scene/resources/occluder_shape.h index b443cf40e..f6b5d50d3 100644 --- a/scene/resources/occluder_shape.h +++ b/scene/resources/occluder_shape.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/math/plane.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "core/containers/vector.h" class OccluderShape : public Resource { diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h index 5586813ac..3f864f297 100644 --- a/scene/resources/packed_scene.h +++ b/scene/resources/packed_scene.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/main/node.h" class SceneState : public Reference { diff --git a/scene/resources/physics_material.h b/scene/resources/physics_material.h index 81726b71a..3626b6a5b 100644 --- a/scene/resources/physics_material.h +++ b/scene/resources/physics_material.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "servers/physics_server.h" class PhysicsMaterial : public Resource { diff --git a/scene/resources/polygon_path_finder.h b/scene/resources/polygon_path_finder.h index cf1585f9c..788cce820 100644 --- a/scene/resources/polygon_path_finder.h +++ b/scene/resources/polygon_path_finder.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 PolygonPathFinder : public Resource { GDCLASS(PolygonPathFinder, Resource); diff --git a/scene/resources/shader.h b/scene/resources/shader.h index 022df3a15..64956299c 100644 --- a/scene/resources/shader.h +++ b/scene/resources/shader.h @@ -32,7 +32,7 @@ #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/resources/texture.h" class Shader : public Resource { diff --git a/scene/resources/shape.h b/scene/resources/shape.h index d1fe80fc2..8f6b93fe7 100644 --- a/scene/resources/shape.h +++ b/scene/resources/shape.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 ArrayMesh; class Shape : public Resource { diff --git a/scene/resources/shape_2d.h b/scene/resources/shape_2d.h index 2f5ade41f..fef3945ef 100644 --- a/scene/resources/shape_2d.h +++ b/scene/resources/shape_2d.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 Shape2D : public Resource { GDCLASS(Shape2D, Resource); diff --git a/scene/resources/skeleton_modification_3d.h b/scene/resources/skeleton_modification_3d.h index 4483a7e8a..84b920f59 100644 --- a/scene/resources/skeleton_modification_3d.h +++ b/scene/resources/skeleton_modification_3d.h @@ -31,7 +31,7 @@ #ifndef SKELETON_MODIFICATION_3D_H #define SKELETON_MODIFICATION_3D_H -#include "core/reference.h" +#include "core/object/reference.h" #include "scene/3d/skeleton.h" class SkeletonModificationStack3D; diff --git a/scene/resources/skin.h b/scene/resources/skin.h index d8fca6e29..5e5d45f8e 100644 --- a/scene/resources/skin.h +++ b/scene/resources/skin.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 Skin : public Resource { GDCLASS(Skin, Resource) diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index b706bb36c..13501deeb 100644 --- a/scene/resources/style_box.h +++ b/scene/resources/style_box.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/resources/texture.h" #include "servers/visual_server.h" diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index 650eb4f8d..4c80e6938 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -30,7 +30,7 @@ #include "surface_tool.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #define _VERTEX_SNAP 0.0001 #define EQ_VERTEX_DIST 0.00001 diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index f6a6ff678..d5f5fb471 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -33,7 +33,7 @@ #include "core/core_string_names.h" #include "core/io/image_loader.h" #include "core/math/geometry.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "core/os/os.h" #include "mesh.h" #include "scene/resources/bit_map.h" diff --git a/scene/resources/texture.h b/scene/resources/texture.h index 24a03ea09..9cdac06ca 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -35,7 +35,7 @@ #include "core/os/mutex.h" #include "core/os/rw_lock.h" #include "core/os/thread_safe.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/resources/curve.h" #include "scene/resources/gradient.h" #include "servers/visual_server.h" diff --git a/scene/resources/theme.h b/scene/resources/theme.h index edbd95114..8b126f8c9 100644 --- a/scene/resources/theme.h +++ b/scene/resources/theme.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/io/resource_loader.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/resources/font.h" #include "scene/resources/shader.h" #include "scene/resources/style_box.h" diff --git a/scene/resources/world.h b/scene/resources/world.h index 54da04c99..28aaf916d 100644 --- a/scene/resources/world.h +++ b/scene/resources/world.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/resource.h" +#include "core/object/resource.h" #include "scene/resources/environment.h" #include "servers/physics_server.h" #include "servers/visual_server.h" diff --git a/scene/resources/world_2d.h b/scene/resources/world_2d.h index cbeaf27d8..b3e70d9ab 100644 --- a/scene/resources/world_2d.h +++ b/scene/resources/world_2d.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/project_settings.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "servers/physics_2d_server.h" class VisibilityNotifier2D; diff --git a/servers/audio/audio_effect.h b/servers/audio/audio_effect.h index 7d8a35099..e269ec922 100644 --- a/servers/audio/audio_effect.h +++ b/servers/audio/audio_effect.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/math/audio_frame.h" -#include "core/resource.h" +#include "core/object/resource.h" class AudioEffectInstance : public Reference { GDCLASS(AudioEffectInstance, Reference); diff --git a/servers/audio/audio_stream.h b/servers/audio/audio_stream.h index 4c8d6ad1e..9e23f3f08 100644 --- a/servers/audio/audio_stream.h +++ b/servers/audio/audio_stream.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/image.h" -#include "core/resource.h" +#include "core/object/resource.h" #include "servers/audio/audio_filter_sw.h" #include "servers/audio_server.h" diff --git a/servers/audio/effects/audio_effect_capture.h b/servers/audio/effects/audio_effect_capture.h index 4ffb36a39..50fcaeef6 100644 --- a/servers/audio/effects/audio_effect_capture.h +++ b/servers/audio/effects/audio_effect_capture.h @@ -33,7 +33,7 @@ #include "core/engine.h" #include "core/math/audio_frame.h" #include "core/containers/pool_vector.h" -#include "core/reference.h" +#include "core/object/reference.h" #include "core/containers/ring_buffer.h" #include "servers/audio/audio_effect.h" #include "servers/audio_server.h" diff --git a/servers/audio_server.h b/servers/audio_server.h index 1ce2a0978..78a9e2c0a 100644 --- a/servers/audio_server.h +++ b/servers/audio_server.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/math/audio_frame.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/os/os.h" #include "core/variant/variant.h" #include "servers/audio/audio_effect.h" diff --git a/servers/navigation_2d_server.h b/servers/navigation_2d_server.h index 87d293fe6..2ccd95926 100644 --- a/servers/navigation_2d_server.h +++ b/servers/navigation_2d_server.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/rid.h" #include "scene/2d/navigation_polygon.h" diff --git a/servers/navigation_server.h b/servers/navigation_server.h index 3042a8807..0e92fe283 100644 --- a/servers/navigation_server.h +++ b/servers/navigation_server.h @@ -30,10 +30,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/object.h" +#include "core/object/object.h" #include "core/rid.h" -#include "core/reference.h" +#include "core/object/reference.h" class NavigationMesh; diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp index ed90e8d27..d214c98b0 100644 --- a/servers/physics/physics_server_sw.cpp +++ b/servers/physics/physics_server_sw.cpp @@ -35,7 +35,7 @@ #include "broad_phase_octree.h" #include "core/os/os.h" #include "core/project_settings.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "joints/cone_twist_joint_sw.h" #include "joints/generic_6dof_joint_sw.h" #include "joints/hinge_joint_sw.h" diff --git a/servers/physics_2d/physics_2d_server_sw.cpp b/servers/physics_2d/physics_2d_server_sw.cpp index 7c2fb1339..476f78e8b 100644 --- a/servers/physics_2d/physics_2d_server_sw.cpp +++ b/servers/physics_2d/physics_2d_server_sw.cpp @@ -35,7 +35,7 @@ #include "collision_solver_2d_sw.h" #include "core/os/os.h" #include "core/project_settings.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #define FLUSH_QUERY_CHECK(m_object) \ ERR_FAIL_COND_MSG(m_object->get_space() && flushing_queries, "Can't change this state while flushing queries. Use call_deferred() or set_deferred() to change monitoring state instead."); diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index 121bfe2a9..95c991283 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -30,7 +30,7 @@ #include "physics_2d_server.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "core/print_string.h" #include "core/project_settings.h" diff --git a/servers/physics_2d_server.h b/servers/physics_2d_server.h index 37ee4dcc2..c6b3d1f12 100644 --- a/servers/physics_2d_server.h +++ b/servers/physics_2d_server.h @@ -30,9 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/object.h" -#include "core/reference.h" -#include "core/resource.h" +#include "core/object/object.h" +#include "core/object/reference.h" +#include "core/object/resource.h" class Physics2DDirectSpaceState; diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp index 37f09d6f6..88e542fa2 100644 --- a/servers/physics_server.cpp +++ b/servers/physics_server.cpp @@ -30,7 +30,7 @@ #include "physics_server.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "core/print_string.h" #include "core/project_settings.h" diff --git a/servers/physics_server.h b/servers/physics_server.h index 783a5140d..f5772b8a9 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -30,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/object.h" -#include "core/resource.h" +#include "core/object/object.h" +#include "core/object/resource.h" class PhysicsDirectSpaceState; diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h index ea8748c58..69b5ab241 100644 --- a/servers/visual/shader_language.h +++ b/servers/visual/shader_language.h @@ -33,7 +33,7 @@ #include "core/containers/list.h" #include "core/containers/map.h" #include "core/containers/ordered_hash_map.h" -#include "core/script_language.h" +#include "core/object/script_language.h" #include "core/string_name.h" #include "core/typedefs.h" #include "core/ustring.h" diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index 1855db7f3..db5ab1036 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -31,7 +31,7 @@ #include "visual_server.h" #include "core/engine.h" -#include "core/method_bind_ext.gen.inc" +#include "core/object/method_bind_ext.gen.inc" #include "core/project_settings.h" #ifdef TOOLS_ENABLED diff --git a/servers/visual_server.h b/servers/visual_server.h index b6ead4c77..c3c8b69fe 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -34,7 +34,7 @@ #include "core/math/bsp_tree.h" #include "core/math/geometry.h" #include "core/math/transform_2d.h" -#include "core/object.h" +#include "core/object/object.h" #include "core/rid.h" #include "core/variant/variant.h" diff --git a/servers/visual_server_callbacks.cpp b/servers/visual_server_callbacks.cpp index 31c77f678..ad362d034 100644 --- a/servers/visual_server_callbacks.cpp +++ b/servers/visual_server_callbacks.cpp @@ -30,7 +30,7 @@ #include "visual_server_callbacks.h" -#include "core/object.h" +#include "core/object/object.h" void VisualServerCallbacks::lock() { mutex.lock();