Moved the error macros.

core/SCsub

@@ -184,6 +184,7 @@ SConscript("math/SCsub")
 SConscript("string/SCsub")
 SConscript("containers/SCsub")
 SConscript("variant/SCsub")
+SConscript("error/SCsub")
 SConscript("crypto/SCsub")
 SConscript("io/SCsub")
 SConscript("log/SCsub")

core/bitfield_dynamic.h

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

core/containers/cowdata.h

@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/safe_refcount.h"
 

core/containers/hash_map.h

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

core/containers/list.h

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

core/containers/local_vector.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
 #include "core/containers/sort_array.h"

core/containers/map.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 
 // based on the very nice implementation of rb-trees by:

core/containers/rb_map.h

@@ -31,7 +31,7 @@
 #ifndef RB_MAP_H
 #define RB_MAP_H
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/pair.h"
 

core/containers/self_list.h

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

core/containers/sort_array.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/typedefs.h"
 
 #define ERR_BAD_COMPARE(cond)                                         \

core/containers/vector.h

@@ -37,7 +37,7 @@
  */
 
 #include "core/containers/cowdata.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/containers/sort_array.h"
 

core/error/SCsub

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

core/error/error_macros.cpp

@@ -32,7 +32,7 @@
 
 #include "core/io/logger.h"
 #include "core/string/ustring.h"
-#include "os/os.h"
+#include "core/os/os.h"
 
 static ErrorHandlerList *error_handler_list = nullptr;
 

core/image.cpp

@@ -30,7 +30,7 @@
 
 #include "image.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hash_map.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"

core/math/bsp_tree.cpp

@@ -30,7 +30,7 @@
 
 #include "bsp_tree.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/string/print_string.h"
 
 void BSP_Tree::from_aabb(const AABB &p_aabb) {

core/math/convex_hull.cpp

@@ -58,7 +58,7 @@ subject to the following restrictions:
 
 #include "convex_hull.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/aabb.h"
 #include "core/math/math_defs.h"
 #include "core/os/memory.h"

core/math/math_funcs.cpp

@@ -30,7 +30,7 @@
 
 #include "math_funcs.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 RandomPCG Math::default_rand(RandomPCG::DEFAULT_SEED, RandomPCG::DEFAULT_INC);
 

core/math/vector2.h

@@ -33,7 +33,7 @@
 
 #include "core/math/math_funcs.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 class String;
 

core/math/vector2i.h

@@ -32,7 +32,7 @@
 /*************************************************************************/
 
 #include "core/math/math_funcs.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 #include "vector2.h"
 

core/math/vector3i.h

@@ -31,7 +31,7 @@
 #ifndef VECTOR3I_H
 #define VECTOR3I_H
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
 
 class String;

core/math/vector4i.h

@@ -31,7 +31,7 @@
 #ifndef VECTOR4I_H
 #define VECTOR4I_H
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
 
 class String;

core/os/memory.cpp

@@ -30,7 +30,7 @@
 
 #include "memory.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/safe_refcount.h"
 
 #include <stdio.h>

core/os/memory.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/safe_refcount.h"
 
 #include <stddef.h>

core/os/mutex.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/typedefs.h"
 
 #if !defined(NO_THREADS)

core/os/rw_lock.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 
 #if !defined(NO_THREADS)
 

core/os/semaphore.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/typedefs.h"
 
 #if !defined(NO_THREADS)

core/pool_allocator.cpp

@@ -30,7 +30,7 @@
 
 #include "pool_allocator.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"

core/safe_refcount.cpp

@@ -32,7 +32,7 @@
 
 #include "safe_refcount.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 // On C++14 we don't have std::atomic::is_always_lockfree, so this is the best we can do
 void check_lockless_atomics() {

core/typedefs.h

@@ -146,7 +146,7 @@ T *_nullptr() {
 
 #include "core/int_types.h"
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 
 /** Generic ABS function, for math uses please use Math::abs */
 

editor/animation_bezier_editor.cpp

@@ -35,7 +35,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"

editor/animation_track_editor.cpp

@@ -35,7 +35,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/engine.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/basis.h"
 #include "core/math/math_funcs.h"
 #include "core/math/quaternion.h"

editor/audio_stream_preview.cpp

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

editor/connections_dialog.cpp

@@ -33,7 +33,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"

editor/dependency_editor.cpp

@@ -38,8 +38,8 @@
 #include "core/project_settings.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/memory.h"

editor/doc/doc_data.cpp

@@ -41,7 +41,7 @@
 #include "scene/resources/theme.h"
 #include "core/io/xml_parser.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/object/method_bind.h"
 #include "core/object/object.h"

editor/doc/doc_data.h

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

editor/editor_audio_buses.cpp

@@ -41,8 +41,8 @@
 #include "core/project_settings.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"

editor/editor_autoload_settings.cpp

@@ -40,7 +40,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/map.h"
 #include "core/math/math_funcs.h"

editor/editor_data.cpp

@@ -31,8 +31,8 @@
 #include "editor_data.h"
 
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_loader.h"
 #include "core/os/file_access.h"

editor/editor_dir_dialog.cpp

@@ -38,8 +38,8 @@
 #include "scene/gui/button.h"
 #include "scene/gui/line_edit.h"
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/memory.h"

editor/editor_export.cpp

@@ -32,7 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "core/crypto/crypto_core.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/file_access_pack.h" // PACK_HEADER_MAGIC, PACK_FORMAT_VERSION
 #include "core/io/resource_loader.h"

editor/editor_export.h

@@ -37,7 +37,7 @@
 #include "scene/main/timer.h"
 #include "scene/resources/texture.h"
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/object/object.h"

editor/editor_file_dialog.cpp

@@ -33,8 +33,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"

editor/editor_file_system.cpp

@@ -43,7 +43,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/os/dir_access.h"
 #include "core/os/memory.h"

editor/editor_file_system.h

@@ -38,7 +38,7 @@
 #include "core/os/thread_safe.h"
 #include "core/safe_refcount.h"
 #include "core/containers/set.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/hash_map.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"

editor/editor_folding.cpp

@@ -34,8 +34,8 @@
 #include "editor_inspector.h"
 #include "editor_settings.h"
 #include "core/variant/array.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/containers/list.h"
 #include "core/string/node_path.h"

editor/editor_help.h

@@ -37,7 +37,7 @@
 #include "scene/gui/rich_text_label.h"
 
 #include "core/math/color.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/map.h"
 #include "core/object/object.h"
 #include "core/object/reference.h"

editor/editor_help_search.cpp

@@ -34,7 +34,7 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/os/input_event.h"

editor/editor_inspector.cpp

@@ -33,7 +33,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hash_map.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"

editor/editor_layouts_dialog.cpp

@@ -37,7 +37,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/line_edit.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/os/input_event.h"

editor/editor_log.h

@@ -33,7 +33,7 @@
 #include "scene/gui/box_container.h"
 
 #include "core/os/thread.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/object/object.h"
 #include "core/string/ustring.h"
 

editor/editor_node.cpp

@@ -36,7 +36,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/engine.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"

editor/editor_node.h

@@ -42,7 +42,7 @@
 #include "scene/gui/split_container.h"
 
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/math/rect2.h"

editor/editor_path.cpp

@@ -33,7 +33,7 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"

editor/editor_plugin.h

@@ -38,8 +38,8 @@
 
 #include "core/variant/array.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/containers/list.h"
 #include "core/object/method_bind.h"

editor/editor_plugin_settings.cpp

@@ -31,8 +31,8 @@
 #include "editor_plugin_settings.h"
 
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"

editor/editor_profiler.cpp

@@ -34,7 +34,7 @@
 #include "editor_settings.h"
 #include "scene/main/timer.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"

editor/editor_properties.cpp

@@ -33,7 +33,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
 #include "core/math/math_defs.h"

editor/editor_properties_array_dict.cpp

@@ -32,7 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"

editor/editor_property_name_processor.cpp

@@ -31,7 +31,7 @@
 #include "editor_property_name_processor.h"
 
 #include "editor_settings.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/typedefs.h"
 
 EditorPropertyNameProcessor *EditorPropertyNameProcessor::singleton = nullptr;

editor/editor_resource_picker.cpp

@@ -39,7 +39,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/map.h"
 #include "core/math/math_defs.h"

editor/editor_resource_preview.cpp

@@ -40,8 +40,8 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 
 #include "core/os/memory.h"

editor/editor_run.cpp

@@ -36,7 +36,7 @@
 #include "script_editor_debugger.h"
 #include "core/project_settings.h"
 #include "editor_settings.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"

editor/editor_run.h

@@ -32,7 +32,7 @@
 
 #include "core/os/os.h"
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/list.h"
 #include "core/string/ustring.h"
 

editor/editor_run_native.cpp

@@ -31,7 +31,7 @@
 #include "editor_run_native.h"
 
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/os/memory.h"
 #include "core/object/reference.h"

editor/editor_run_script.cpp

@@ -32,7 +32,7 @@
 
 #include "editor_node.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/object/script_language.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

editor/editor_settings.cpp

@@ -34,8 +34,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/certs_compressed.gen.h"
 #include "core/io/config_file.h"
 #include "core/io/ip.h"

editor/editor_spin_slider.cpp

@@ -36,8 +36,8 @@
 #include "editor_scale.h"
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"

editor/editor_sub_scene.cpp

@@ -33,7 +33,7 @@
 #include "editor/editor_node.h"
 #include "scene/resources/packed_scene.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/os/memory.h"
 #include "core/object/reference.h"

editor/editor_translation.cpp

@@ -35,7 +35,7 @@
 #include "core/io/translation_loader_po.h"
 #include "editor/doc_translations.gen.h"
 #include "editor/editor_translations.gen.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/object/reference.h"
 #include "core/string/translation.h"

editor/export_template_manager.cpp

@@ -33,7 +33,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/http_client.h"
 #include "core/io/json.h"
 #include "core/io/zip_io.h"

editor/export_template_manager.h

@@ -32,7 +32,7 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/object/object.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

editor/filesystem_dock.cpp

@@ -48,8 +48,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_saver.h"
 #include "core/os/input_event.h"

editor/find_in_files.cpp

@@ -47,8 +47,8 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_defs.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"

editor/import_dock.cpp

@@ -36,8 +36,8 @@
 #include "editor_scale.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_importer.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"

editor/inspector_dock.cpp

@@ -31,7 +31,7 @@
 #include "inspector_dock.h"
 
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"

editor/multi_node_edit.cpp

@@ -32,7 +32,7 @@
 
 #include "core/math/math_fieldwise.h"
 #include "editor_node.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hash_map.h"
 #include "core/object/undo_redo.h"
 #include "editor/editor_inspector.h"

editor/plugin_config_dialog.cpp

@@ -38,8 +38,8 @@
 #include "scene/gui/grid_container.h"
 #include "modules/modules_enabled.gen.h" // For gdscript.
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_saver.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"

editor/plugins/abstract_polygon_2d_editor.cpp

@@ -35,7 +35,7 @@
 #include "editor/editor_scale.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/geometry.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"

editor/plugins/animation_blend_space_1d_editor.cpp

@@ -35,7 +35,7 @@
 #include "scene/animation/animation_blend_tree.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"

editor/plugins/animation_blend_space_2d_editor.cpp

@@ -39,7 +39,7 @@
 #include "scene/animation/animation_player.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/geometry.h"
 #include "core/math/math_funcs.h"

editor/plugins/animation_blend_tree_editor_plugin.cpp

@@ -33,7 +33,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hash_map.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"

editor/plugins/animation_player_editor_plugin.cpp

@@ -46,8 +46,8 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"

editor/plugins/animation_state_machine_editor.cpp

@@ -37,7 +37,7 @@
 #include "scene/animation/animation_player.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/geometry.h"
 #include "core/math/math_defs.h"

editor/plugins/animation_tree_editor_plugin.cpp

@@ -39,7 +39,7 @@
 #include "scene/animation/animation_player.h"
 #include "scene/scene_string_names.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"

editor/plugins/canvas_item_editor_plugin.cpp

@@ -55,8 +55,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/engine.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/math/geometry.h"
 #include "core/math/math_funcs.h"

editor/plugins/collision_polygon_editor_plugin.cpp

@@ -38,7 +38,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
 #include "core/math/geometry.h"

editor/plugins/cpu_particles_2d_editor_plugin.cpp

@@ -35,8 +35,8 @@
 #include "scene/gui/separator.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"

editor/plugins/curve_editor_plugin.cpp

@@ -36,7 +36,7 @@
 #include "editor/editor_scale.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"

editor/plugins/editor_preview_plugins.cpp

@@ -42,8 +42,8 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/containers/list.h"
 #include "core/math/aabb.h"

editor/plugins/material_editor_plugin.cpp

@@ -40,7 +40,7 @@
 #include "scene/resources/world.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/basis.h"
 #include "core/math/math_funcs.h"

editor/plugins/mesh_instance_editor_plugin.cpp

@@ -40,7 +40,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"

editor/plugins/multimesh_editor_plugin.cpp

@@ -35,7 +35,7 @@
 #include "scene/resources/multimesh.h"
 #include "spatial_editor_plugin.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/map.h"
 #include "core/math/basis.h"
 #include "core/math/face3.h"

editor/plugins/particles_editor_plugin.cpp

@@ -32,7 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/math/aabb.h"

editor/plugins/physical_bone_plugin.cpp

@@ -33,7 +33,7 @@
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/physics_body.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"

editor/plugins/resource_preloader_editor_plugin.cpp

@@ -35,7 +35,7 @@
 #include "editor/editor_settings.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/os/memory.h"
 #include "core/object/resource.h"

editor/plugins/root_motion_editor_plugin.cpp

@@ -34,7 +34,7 @@
 #include "scene/3d/skeleton.h"
 #include "scene/main/viewport.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/os/memory.h"

editor/plugins/script_editor_plugin.cpp

@@ -52,7 +52,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_saver.h"
 #include "core/containers/map.h"