Moved Engine and projectSettings.

core/SCsub

@@ -38,7 +38,7 @@ if "SCRIPT_AES256_ENCRYPTION_KEY" in os.environ:
 
 # NOTE: It is safe to generate this file here, since this is still executed serially
 with open("script_encryption_key.gen.cpp", "w") as f:
-    f.write('#include "core/project_settings.h"\nuint8_t script_encryption_key[32]={' + txt + "};\n")
+    f.write('#include "core/config/project_settings.h"\nuint8_t script_encryption_key[32]={' + txt + "};\n")
 
 
 # Add required thirdparty code.
@@ -185,6 +185,7 @@ SConscript("string/SCsub")
 SConscript("containers/SCsub")
 SConscript("variant/SCsub")
 SConscript("error/SCsub")
+SConscript("config/SCsub")
 SConscript("crypto/SCsub")
 SConscript("io/SCsub")
 SConscript("log/SCsub")

core/bind/core_bind.cpp

@@ -39,7 +39,7 @@
 #include "core/object/method_bind_ext.gen.inc"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 /**
  *  Time constants borrowed from loc_time.h

core/command_queue_mt.cpp

@@ -31,7 +31,7 @@
 #include "command_queue_mt.h"
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 void CommandQueueMT::lock() {
 	mutex.lock();

core/config/SCsub

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

core/crypto/crypto.cpp

@@ -30,7 +30,7 @@
 
 #include "crypto.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/io/certs_compressed.gen.h"
 #include "core/io/compression.h"
 

core/input_map.cpp

@@ -32,7 +32,7 @@
 
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 InputMap *InputMap::singleton = nullptr;
 

core/io/compression.cpp

@@ -31,7 +31,7 @@
 #include "compression.h"
 
 #include "core/io/zip_io.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 #include "thirdparty/misc/fastlz.h"
 

core/io/dtls_server.cpp

@@ -30,7 +30,7 @@
 
 #include "dtls_server.h"
 #include "core/os/file_access.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 DTLSServer *(*DTLSServer::_create)() = nullptr;
 bool DTLSServer::available = false;

core/io/file_access_memory.cpp

@@ -32,7 +32,7 @@
 
 #include "core/containers/map.h"
 #include "core/os/dir_access.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 static Map<String, Vector<uint8_t>> *files = nullptr;
 

core/io/file_access_network.cpp

@@ -33,7 +33,7 @@
 #include "core/io/ip.h"
 #include "core/io/marshalls.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 //#define DEBUG_PRINT(m_p) print_line(m_p)
 //#define DEBUG_TIME(m_what) printf("MS: %s - %lli\n",m_what,OS::get_singleton()->get_ticks_usec());

core/io/logger.cpp

@@ -33,7 +33,7 @@
 #include "core/os/dir_access.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 // va_copy was defined in the C99, but not in C++ standards before C++11.
 // When you compile C++ without --std=c++<XX> option, compilers still define

core/io/packet_peer.cpp

@@ -31,7 +31,7 @@
 #include "packet_peer.h"
 
 #include "core/io/marshalls.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 /* helpers / binders */
 

core/io/packet_peer_dtls.cpp

@@ -30,7 +30,7 @@
 
 #include "packet_peer_dtls.h"
 #include "core/os/file_access.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 PacketPeerDTLS *(*PacketPeerDTLS::_create)() = nullptr;
 bool PacketPeerDTLS::available = false;

core/io/resource_format_binary.cpp

@@ -34,7 +34,7 @@
 #include "core/io/file_access_compressed.h"
 #include "core/io/marshalls.h"
 #include "core/os/dir_access.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/version.h"
 
 //#define print_bl(m_what) print_line(m_what)

core/io/resource_importer.cpp

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

core/io/resource_loader.cpp

@@ -34,7 +34,7 @@
 #include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/string/translation.h"
 #include "core/variant/variant_parser.h"
 

core/io/resource_saver.cpp

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

core/io/stream_peer_ssl.cpp

@@ -30,7 +30,7 @@
 
 #include "stream_peer_ssl.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 
 StreamPeerSSL *(*StreamPeerSSL::_create)() = nullptr;
 

core/io/stream_peer_tcp.cpp

@@ -30,7 +30,7 @@
 
 #include "stream_peer_tcp.h"
 
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 Error StreamPeerTCP::_poll_connection() {
 	ERR_FAIL_COND_V(status != STATUS_CONNECTING || !_sock.is_valid() || !_sock->is_open(), FAILED);

core/object/class_db.cpp

@@ -30,7 +30,7 @@
 
 #include "class_db.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/os/mutex.h"
 #include "core/version.h"
 

core/object/message_queue.cpp

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

core/object/script_language.cpp

@@ -31,7 +31,7 @@
 #include "script_language.h"
 
 #include "core/core_string_names.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES];
 int ScriptServer::_language_count = 0;

core/os/dir_access.cpp

@@ -33,7 +33,7 @@
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 String DirAccess::_get_root_path() const {
 	switch (_access_type) {

core/os/file_access.cpp

@@ -34,7 +34,7 @@
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 FileAccess::CreateFunc FileAccess::create_func[ACCESS_MAX] = { nullptr, nullptr };
 

core/os/input.cpp

@@ -32,7 +32,7 @@
 
 #include "core/input_map.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_settings.h"

core/os/os.cpp

@@ -34,7 +34,7 @@
 #include "core/os/file_access.h"
 #include "core/os/input.h"
 #include "core/os/midi_driver.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/version_generated.gen.h"
 #include "servers/audio_server.h"
 

core/os/os.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/image.h"
 #include "core/io/logger.h"
 #include "core/containers/list.h"

core/register_core_types.cpp

@@ -37,7 +37,7 @@
 #include "core/crypto/aes_context.h"
 #include "core/crypto/crypto.h"
 #include "core/crypto/hashing_context.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/func_ref.h"
 #include "core/input_map.h"
 #include "core/io/config_file.h"
@@ -69,7 +69,7 @@
 #include "core/os/main_loop.h"
 #include "core/os/time.h"
 #include "core/containers/packed_data_container.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/string/translation.h"
 #include "core/object/undo_redo.h"
 

core/string/translation.cpp

@@ -32,7 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 // ISO 639-1 language codes (and a couple of three-letter ISO 639-2 codes),
 // with the addition of glibc locales with their regional identifiers.

drivers/alsa/audio_driver_alsa.cpp

@@ -33,7 +33,7 @@
 #ifdef ALSA_ENABLED
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 #include <errno.h>
 

drivers/coreaudio/audio_driver_coreaudio.cpp

@@ -33,7 +33,7 @@
 #include "audio_driver_coreaudio.h"
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 #define kOutputBus 0
 #define kInputBus 1

drivers/gles2/rasterizer_canvas_base_gles2.cpp

@@ -31,7 +31,7 @@
 #include "rasterizer_canvas_base_gles2.h"
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "drivers/gles_common/rasterizer_asserts.h"
 #include "rasterizer_scene_gles2.h"
 #include "servers/visual/visual_server_raster.h"

drivers/gles2/rasterizer_canvas_gles2.cpp

@@ -31,7 +31,7 @@
 #include "rasterizer_canvas_gles2.h"
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "drivers/gles2/rasterizer_gles2.h"
 #include "drivers/gles_common/rasterizer_asserts.h"
 #include "rasterizer_scene_gles2.h"

drivers/gles2/rasterizer_gles2.cpp

@@ -31,7 +31,7 @@
 #include "rasterizer_gles2.h"
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 #define _EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242
 #define _EXT_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243

drivers/gles2/rasterizer_scene_gles2.cpp

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

drivers/gles2/rasterizer_storage_gles2.cpp

@@ -31,7 +31,7 @@
 #include "rasterizer_storage_gles2.h"
 
 #include "core/math/transform.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "rasterizer_canvas_gles2.h"
 #include "rasterizer_scene_gles2.h"
 #include "servers/visual/shader_language.h"

drivers/gles2/shader_compiler_gles2.cpp

@@ -31,7 +31,7 @@
 #include "shader_compiler_gles2.h"
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/string/string_buffer.h"
 #include "core/string/string_builder.h"
 

drivers/gles2/shader_gles2.cpp

@@ -32,7 +32,7 @@
 
 #include "core/os/memory.h"
 #include "core/string/print_string.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/string/string_builder.h"
 #include "rasterizer_gles2.h"
 #include "rasterizer_storage_gles2.h"

drivers/gles_common/rasterizer_canvas_batcher.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "rasterizer_array.h"
 #include "rasterizer_asserts.h"
 #include "rasterizer_storage_common.h"

drivers/pulseaudio/audio_driver_pulseaudio.cpp

@@ -33,7 +33,7 @@
 #ifdef PULSEAUDIO_ENABLED
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/version.h"
 
 #ifdef ALSAMIDI_ENABLED

drivers/unix/os_unix.cpp

@@ -32,7 +32,7 @@
 
 #ifdef UNIX_ENABLED
 
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "drivers/unix/dir_access_unix.h"
 #include "drivers/unix/file_access_unix.h"
 #include "drivers/unix/net_socket_posix.h"

drivers/wasapi/audio_driver_wasapi.cpp

@@ -33,7 +33,7 @@
 #include "audio_driver_wasapi.h"
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 #include <functiondiscoverykeys.h>
 

drivers/xaudio2/audio_driver_xaudio2.cpp

@@ -31,7 +31,7 @@
 #include "audio_driver_xaudio2.h"
 
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 const char *AudioDriverXAudio2::get_name() const {
 	return "XAudio2";

editor/animation_track_editor.cpp

@@ -34,7 +34,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/error/error_macros.h"
 #include "core/math/basis.h"
 #include "core/math/math_funcs.h"

editor/dependency_editor.cpp

@@ -35,7 +35,7 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "scene/gui/margin_container.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/error/error_list.h"

editor/doc/doc_data.cpp

@@ -30,11 +30,11 @@
 
 #include "doc_data.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/global_constants.h"
 #include "core/io/compression.h"
 #include "core/os/dir_access.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/script_language.h"
 #include "core/string/translation.h"
 #include "core/version.h"

editor/editor_audio_buses.cpp

@@ -38,7 +38,7 @@
 #include "filesystem_dock.h"
 #include "scene/resources/font.h"
 #include "servers/audio_server.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
 #include "core/error/error_list.h"

editor/editor_autoload_settings.cpp

@@ -31,7 +31,7 @@
 #include "editor_autoload_settings.h"
 
 #include "core/global_constants.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "project_settings_editor.h"

editor/editor_data.cpp

@@ -37,7 +37,7 @@
 #include "core/io/resource_loader.h"
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor/editor_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor_node.h"

editor/editor_export.cpp

@@ -41,7 +41,7 @@
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/script_language.h"
 #include "core/version.h"
 #include "core/version_generated.gen.h"

editor/editor_file_dialog.cpp

@@ -44,7 +44,7 @@
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/containers/pool_vector.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/typedefs.h"
 #include "dependency_editor.h"
 #include "editor_file_system.h"

editor/editor_file_system.cpp

@@ -35,7 +35,7 @@
 #include "core/io/resource_saver.h"
 #include "core/os/file_access.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/variant/variant_parser.h"
 #include "editor_node.h"
 #include "editor_resource_preview.h"

editor/editor_node.cpp

@@ -35,7 +35,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/io/config_file.h"
@@ -56,7 +56,7 @@
 #include "core/os/os.h"
 #include "core/containers/pool_vector.h"
 #include "core/string/print_string.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/script_language.h"
 #include "core/string/translation.h"
 #include "core/object/undo_redo.h"

editor/editor_properties.cpp

@@ -49,7 +49,7 @@
 #include "core/object_id.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/rid.h"
 #include "core/object/script_language.h"
 #include "core/typedefs.h"

editor/editor_resource_preview.cpp

@@ -36,7 +36,7 @@
 #include "core/io/resource_saver.h"
 #include "core/object/message_queue.h"
 #include "core/os/file_access.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "editor_settings.h"

editor/editor_run.cpp

@@ -34,7 +34,7 @@
 
 #include "plugins/script_editor_plugin.h"
 #include "script_editor_debugger.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor_settings.h"
 #include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"

editor/editor_settings.cpp

@@ -52,7 +52,7 @@
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/containers/set.h"
 #include "core/string/translation.h"
 #include "core/typedefs.h"

editor/filesystem_dock.cpp

@@ -36,7 +36,7 @@
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor_node.h"
 #include "editor_resource_preview.h"
 #include "editor_scale.h"

editor/find_in_files.cpp

@@ -32,7 +32,7 @@
 
 #include "core/os/dir_access.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "scene/gui/box_container.h"

editor/import/resource_importer_layered_texture.cpp

@@ -34,7 +34,7 @@
 
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "scene/resources/texture.h"

editor/import/resource_importer_texture.cpp

@@ -32,7 +32,7 @@
 
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "scene/resources/texture.h"

editor/import_defaults_editor.cpp

@@ -36,7 +36,7 @@
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/os/memory.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/reference.h"
 #include "core/string/string_name.h"
 #include "core/typedefs.h"

editor/import_dock.cpp

@@ -30,7 +30,7 @@
 
 #include "import_dock.h"
 
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor_node.h"
 #include "editor_resource_preview.h"
 #include "editor_scale.h"

editor/plugins/animation_player_editor_plugin.cpp

@@ -34,7 +34,7 @@
 #include "core/io/resource_saver.h"
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor/animation_track_editor.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"

editor/plugins/canvas_item_editor_plugin.cpp

@@ -32,7 +32,7 @@
 
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
@@ -54,7 +54,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"

editor/plugins/editor_preview_plugins.cpp

@@ -38,7 +38,7 @@
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
 #include "servers/audio/audio_stream.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"

editor/plugins/room_manager_editor_plugin.cpp

@@ -33,7 +33,7 @@
 #include "editor/spatial_editor_gizmos.h"
 #include "scene/resources/occluder_shape.h"
 #include "core/object/class_db.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/containers/local_vector.h"
 #include "core/math/math_defs.h"
 #include "core/math/transform.h"

editor/plugins/script_editor_plugin.cpp

@@ -35,7 +35,7 @@
 #include "core/os/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "editor/editor_node.h"
 #include "editor/editor_run_script.h"
 #include "editor/editor_scale.h"

editor/plugins/script_text_editor.cpp

@@ -45,7 +45,7 @@
 #include "core/os/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/script_language.h"
 #include "core/containers/set.h"
 #include "core/string/string_name.h"

editor/plugins/spatial_editor_plugin.cpp

@@ -32,7 +32,7 @@
 
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/map.h"
 #include "core/math/basis.h"
@@ -48,7 +48,7 @@
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/containers/pool_vector.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/rid_handle.h"
 #include "core/object/script_language.h"
 #include "core/containers/set.h"

editor/plugins/theme_editor_preview.cpp

@@ -30,7 +30,7 @@
 
 #include "theme_editor_preview.h"
 
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "scene/resources/packed_scene.h"
 #include "editor/editor_scale.h"
 #include "core/object/class_db.h"

editor/project_export.cpp

@@ -38,7 +38,7 @@
 #include "core/math/rect2.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/containers/set.h"
 #include "core/containers/vector.h"
 #include "editor/editor_export.h"

editor/project_manager.cpp

@@ -32,7 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
 #include "core/image.h"
@@ -51,7 +51,7 @@
 #include "core/os/os.h"
 #include "core/containers/pool_vector.h"
 #include "core/string/print_string.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/containers/set.h"
 #include "core/containers/sort_array.h"
 #include "core/string/translation.h"

editor/project_settings_editor.cpp

@@ -32,7 +32,7 @@
 
 #include "core/input_map.h"
 #include "core/os/keyboard.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/string/translation.h"
 #include "editor/editor_export.h"
 #include "editor/editor_node.h"

editor/property_editor.cpp

@@ -54,7 +54,7 @@
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
 #include "core/pair.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/ref_ptr.h"
 #include "core/object/resource.h"
 #include "core/rid.h"

editor/scene_tree_dock.cpp

@@ -44,7 +44,7 @@
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/ref_ptr.h"
 #include "core/object/script_language.h"
 #include "core/string/string_name.h"

editor/script_create_dialog.cpp

@@ -39,7 +39,7 @@
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/memory.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/reference.h"
 #include "core/object/resource.h"
 #include "core/object/script_language.h"

main/main.cpp

@@ -42,7 +42,7 @@
 #include "core/os/dir_access.h"
 #include "core/os/os.h"
 #include "core/os/time.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/register_core_types.h"
 #include "core/script_debugger_local.h"
 #include "core/object/script_language.h"

main/main_timer_sync.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 
 // define these to get more debugging logs for the delta smoothing
 //#define PANDEMONIUM_DEBUG_DELTA_SMOOTHER

modules/broken_seals_module/biome_terrarin_generator.cpp

@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "biome_terrarin_generator.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 
 #include "core/math/math_funcs.h"
 

modules/cscript/cscript.cpp

@@ -31,12 +31,12 @@
 #include "cscript.h"
 
 #include "core/core_string_names.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/global_constants.h"
 #include "core/io/file_access_encrypted.h"
 #include "core/os/file_access.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "cscript_compiler.h"
 
 ///////////////////////////

modules/cscript/cscript_editor.cpp

@@ -30,10 +30,10 @@
 
 #include "cscript.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/global_constants.h"
 #include "core/os/file_access.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "cscript_compiler.h"
 
 #ifdef TOOLS_ENABLED

modules/cscript/cscript_parser.cpp

@@ -31,11 +31,11 @@
 #include "cscript_parser.h"
 
 #include "core/core_string_names.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/io/resource_loader.h"
 #include "core/os/file_access.h"
 #include "core/string/print_string.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/reference.h"
 #include "core/object/script_language.h"
 #include "cscript.h"

modules/database/register_types.cpp

@@ -31,7 +31,7 @@ SOFTWARE.
 #include "query_result.h"
 #include "table_builder.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 
 DatabaseManager *_database_manager = nullptr;
 

modules/entity_spell_system/database/ess_resource_db_folders.h

@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/variant/array.h"
 #include "core/bind/core_bind.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/containers/hash_map.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

modules/entity_spell_system/database/ess_resource_db_map.h

@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "core/variant/array.h"
 #include "core/bind/core_bind.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/containers/hash_map.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

modules/entity_spell_system/profiles/input/input_profile.cpp

@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "input_profile.h"
 
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/string/ustring.h"
 
 #include "../class_profile.h"

modules/entity_spell_system/singletons/ess.cpp

@@ -26,7 +26,7 @@ SOFTWARE.
 #include "../material_cache/ess_material_cache.h"
 #include "../spawners/ess_entity_spawner.h"
 #include "../utility/entity_create_info.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 ESS *ESS::instance;
 

modules/entity_spell_system/singletons/ess.h

@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/bind/core_bind.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/object/object.h"
 #include "core/object/resource.h"
 #include "core/string/ustring.h"

modules/entity_spell_system/singletons/profile_manager.cpp

@@ -24,8 +24,8 @@ SOFTWARE.
 #include "core/io/json.h"
 #include "core/os/file_access.h"
 
-#include "core/engine.h"
-#include "core/project_settings.h"
+#include "core/config/engine.h"
+#include "core/config/project_settings.h"
 
 #include "../defines.h"
 

modules/gdscript/gdscript.cpp

@@ -31,12 +31,12 @@
 #include "gdscript.h"
 
 #include "core/core_string_names.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/global_constants.h"
 #include "core/io/file_access_encrypted.h"
 #include "core/os/file_access.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "gdscript_compiler.h"
 
 ///////////////////////////

modules/gdscript/gdscript_editor.cpp

@@ -30,10 +30,10 @@
 
 #include "gdscript.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/global_constants.h"
 #include "core/os/file_access.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "gdscript_compiler.h"
 
 #ifdef TOOLS_ENABLED

modules/gdscript/gdscript_parser.cpp

@@ -31,11 +31,11 @@
 #include "gdscript_parser.h"
 
 #include "core/core_string_names.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/io/resource_loader.h"
 #include "core/os/file_access.h"
 #include "core/string/print_string.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 #include "core/object/reference.h"
 #include "core/object/script_language.h"
 #include "gdscript.h"

modules/material_maker/register_types.cpp

@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "register_types.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 
 #include "algos/mm_algos.h"
 #include "algos/mm_algos_bind.h"

modules/mbedtls/crypto_mbedtls.cpp

@@ -32,10 +32,10 @@
 
 #include "core/os/file_access.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/io/certs_compressed.gen.h"
 #include "core/io/compression.h"
-#include "core/project_settings.h"
+#include "core/config/project_settings.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_settings.h"

modules/mesh_utils/register_types.cpp

@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "register_types.h"
 
-#include "core/engine.h"
+#include "core/config/engine.h"
 
 #include "fast_quadratic_mesh_simplifier.h"
 #include "mesh_merger.h"