From cfd84625f0dbd5590e94ecf851bd7b7db5c7665b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Tue, 24 Mar 2020 09:54:49 +0100
Subject: [PATCH] Move DocData and Collada out of their subfolders

Now that the unused DocDump was removed, the `editor/doc` subfolder is
redundant.

Similarly, there's no reason for Collada to have a subfolder for itself
when glTF or OBJ don't.
---
 editor/SCsub                             | 4 +---
 editor/collada/SCsub                     | 5 -----
 editor/doc/SCsub                         | 5 -----
 editor/{doc => }/doc_data.cpp            | 0
 editor/{doc => }/doc_data.h              | 0
 editor/editor_help.h                     | 2 +-
 editor/{collada => import}/collada.cpp   | 0
 editor/{collada => import}/collada.h     | 0
 editor/import/editor_import_collada.cpp  | 2 +-
 main/main.cpp                            | 4 ++--
 modules/gdscript/language_server/lsp.hpp | 2 +-
 modules/mono/editor/bindings_generator.h | 2 +-
 12 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 editor/collada/SCsub
 delete mode 100644 editor/doc/SCsub
 rename editor/{doc => }/doc_data.cpp (100%)
 rename editor/{doc => }/doc_data.h (100%)
 rename editor/{collada => import}/collada.cpp (100%)
 rename editor/{collada => import}/collada.h (100%)

diff --git a/editor/SCsub b/editor/SCsub
index e54383350e7..6e8679b770f 100644
--- a/editor/SCsub
+++ b/editor/SCsub
@@ -56,7 +56,7 @@ if env['tools']:
         except OSError:
             pass
 
-    _make_doc_data_class_path(os.path.join(env.Dir('#').abspath, "editor/doc"))
+    _make_doc_data_class_path(os.path.join(env.Dir('#').abspath, "editor"))
 
     docs = sorted(docs)
     env.Depends("#editor/doc_data_compressed.gen.h", docs)
@@ -85,8 +85,6 @@ if env['tools']:
 
     env.add_source_files(env.editor_sources, "*.cpp")
 
-    SConscript('collada/SCsub')
-    SConscript('doc/SCsub')
     SConscript('debugger/SCsub')
     SConscript('fileserver/SCsub')
     SConscript('icons/SCsub')
diff --git a/editor/collada/SCsub b/editor/collada/SCsub
deleted file mode 100644
index 2b1e889fb03..00000000000
--- a/editor/collada/SCsub
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-Import('env')
-
-env.add_source_files(env.editor_sources, "*.cpp")
diff --git a/editor/doc/SCsub b/editor/doc/SCsub
deleted file mode 100644
index 2b1e889fb03..00000000000
--- a/editor/doc/SCsub
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-Import('env')
-
-env.add_source_files(env.editor_sources, "*.cpp")
diff --git a/editor/doc/doc_data.cpp b/editor/doc_data.cpp
similarity index 100%
rename from editor/doc/doc_data.cpp
rename to editor/doc_data.cpp
diff --git a/editor/doc/doc_data.h b/editor/doc_data.h
similarity index 100%
rename from editor/doc/doc_data.h
rename to editor/doc_data.h
diff --git a/editor/editor_help.h b/editor/editor_help.h
index a690e10e7e0..0d3ecf9bd05 100644
--- a/editor/editor_help.h
+++ b/editor/editor_help.h
@@ -32,7 +32,7 @@
 #define EDITOR_HELP_H
 
 #include "editor/code_editor.h"
-#include "editor/doc/doc_data.h"
+#include "editor/doc_data.h"
 #include "editor/editor_plugin.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/menu_button.h"
diff --git a/editor/collada/collada.cpp b/editor/import/collada.cpp
similarity index 100%
rename from editor/collada/collada.cpp
rename to editor/import/collada.cpp
diff --git a/editor/collada/collada.h b/editor/import/collada.h
similarity index 100%
rename from editor/collada/collada.h
rename to editor/import/collada.h
diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp
index 3cc6e7a50cb..f7da8c27f94 100644
--- a/editor/import/editor_import_collada.cpp
+++ b/editor/import/editor_import_collada.cpp
@@ -31,8 +31,8 @@
 #include "editor_import_collada.h"
 
 #include "core/os/os.h"
-#include "editor/collada/collada.h"
 #include "editor/editor_node.h"
+#include "editor/import/collada.h"
 #include "scene/3d/camera.h"
 #include "scene/3d/light.h"
 #include "scene/3d/mesh_instance.h"
diff --git a/main/main.cpp b/main/main.cpp
index 887d423d528..0047d05771d 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -71,8 +71,8 @@
 #include "servers/register_server_types.h"
 
 #ifdef TOOLS_ENABLED
-#include "editor/doc/doc_data.h"
-#include "editor/doc/doc_data_class_path.gen.h"
+#include "editor/doc_data.h"
+#include "editor/doc_data_class_path.gen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "editor/progress_dialog.h"
diff --git a/modules/gdscript/language_server/lsp.hpp b/modules/gdscript/language_server/lsp.hpp
index a2dcc488207..914c9742e1f 100644
--- a/modules/gdscript/language_server/lsp.hpp
+++ b/modules/gdscript/language_server/lsp.hpp
@@ -33,7 +33,7 @@
 
 #include "core/class_db.h"
 #include "core/list.h"
-#include "editor/doc/doc_data.h"
+#include "editor/doc_data.h"
 
 namespace lsp {
 
diff --git a/modules/mono/editor/bindings_generator.h b/modules/mono/editor/bindings_generator.h
index b133923c256..bebe489d025 100644
--- a/modules/mono/editor/bindings_generator.h
+++ b/modules/mono/editor/bindings_generator.h
@@ -33,7 +33,7 @@
 
 #include "core/class_db.h"
 #include "core/string_builder.h"
-#include "editor/doc/doc_data.h"
+#include "editor/doc_data.h"
 #include "editor/editor_help.h"
 
 #if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)