Move files to subdirectories (#6599)

* Move files around
minetest · Nov 8, 2017 · 20a85d7 · 20a85d7
1 parent fc9747e
commit 20a85d7
Show file tree

Hide file tree

Showing 118 changed files with 236 additions and 221 deletions.
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
@@ -114,7 +114,7 @@ LOCAL_C_INCLUDES := \
 LOCAL_SRC_FILES := \
 		jni/src/ban.cpp                           \
 		jni/src/camera.cpp                        \
-		jni/src/cavegen.cpp                       \
+		jni/src/mapgen/cavegen.cpp                \
 		jni/src/chat.cpp                          \
 		jni/src/client.cpp                        \
 		jni/src/clientenvironment.cpp             \
@@ -132,13 +132,13 @@ LOCAL_SRC_FILES := \
 		jni/src/content_sao.cpp                   \
 		jni/src/convert_json.cpp                  \
 		jni/src/craftdef.cpp                      \
-		jni/src/database-dummy.cpp                \
-		jni/src/database-files.cpp                \
-		jni/src/database-sqlite3.cpp              \
-		jni/src/database.cpp                      \
+		jni/src/database/database-dummy.cpp       \
+		jni/src/database/database-files.cpp       \
+		jni/src/database/database-sqlite3.cpp     \
+		jni/src/database/database.cpp             \
 		jni/src/debug.cpp                         \
 		jni/src/defaultsettings.cpp               \
-		jni/src/dungeongen.cpp                    \
+		jni/src/mapgen/dungeongen.cpp             \
 		jni/src/emerge.cpp                        \
 		jni/src/environment.cpp                   \
 		jni/src/face_position_cache.cpp           \
@@ -148,20 +148,20 @@ LOCAL_SRC_FILES := \
 		jni/src/game.cpp                          \
 		jni/src/genericobject.cpp                 \
 		jni/src/gettext.cpp                       \
-		jni/src/guiChatConsole.cpp                \
-		jni/src/guiEditBoxWithScrollbar.cpp       \
-		jni/src/guiEngine.cpp                     \
-		jni/src/guiPathSelectMenu.cpp             \
-		jni/src/guiFormSpecMenu.cpp               \
-		jni/src/guiKeyChangeMenu.cpp              \
-		jni/src/guiPasswordChange.cpp             \
-		jni/src/guiTable.cpp                      \
+		jni/src/gui/guiChatConsole.cpp            \
+		jni/src/gui/guiEditBoxWithScrollbar.cpp   \
+		jni/src/gui/guiEngine.cpp                 \
+		jni/src/gui/guiPathSelectMenu.cpp         \
+		jni/src/gui/guiFormSpecMenu.cpp           \
+		jni/src/gui/guiKeyChangeMenu.cpp          \
+		jni/src/gui/guiPasswordChange.cpp         \
+		jni/src/gui/guiTable.cpp                  \
 		jni/src/guiscalingfilter.cpp              \
-		jni/src/guiVolumeChange.cpp               \
+		jni/src/gui/guiVolumeChange.cpp           \
 		jni/src/httpfetch.cpp                     \
 		jni/src/hud.cpp                           \
 		jni/src/imagefilters.cpp                  \
-		jni/src/intlGUIEditBox.cpp                \
+		jni/src/gui/intlGUIEditBox.cpp            \
 		jni/src/inventory.cpp                     \
 		jni/src/inventorymanager.cpp              \
 		jni/src/itemdef.cpp                       \
@@ -175,24 +175,24 @@ LOCAL_SRC_FILES := \
 		jni/src/map_settings_manager.cpp          \
 		jni/src/mapblock.cpp                      \
 		jni/src/mapblock_mesh.cpp                 \
-		jni/src/mapgen.cpp                        \
-		jni/src/mapgen_carpathian.cpp             \
-		jni/src/mapgen_flat.cpp                   \
-		jni/src/mapgen_fractal.cpp                \
-		jni/src/mapgen_singlenode.cpp             \
-		jni/src/mapgen_v5.cpp                     \
-		jni/src/mapgen_v6.cpp                     \
-		jni/src/mapgen_v7.cpp                     \
-		jni/src/mapgen_valleys.cpp                \
+		jni/src/mapgen/mapgen.cpp                 \
+		jni/src/mapgen/mapgen_carpathian.cpp      \
+		jni/src/mapgen/mapgen_flat.cpp            \
+		jni/src/mapgen/mapgen_fractal.cpp         \
+		jni/src/mapgen/mapgen_singlenode.cpp      \
+		jni/src/mapgen/mapgen_v5.cpp              \
+		jni/src/mapgen/mapgen_v6.cpp              \
+		jni/src/mapgen/mapgen_v7.cpp              \
+		jni/src/mapgen/mapgen_valleys.cpp         \
 		jni/src/mapnode.cpp                       \
 		jni/src/mapsector.cpp                     \
 		jni/src/mesh.cpp                          \
 		jni/src/mesh_generator_thread.cpp         \
 		jni/src/metadata.cpp                      \
-		jni/src/mg_biome.cpp                      \
-		jni/src/mg_decoration.cpp                 \
-		jni/src/mg_ore.cpp                        \
-		jni/src/mg_schematic.cpp                  \
+		jni/src/mapgen/mg_biome.cpp               \
+		jni/src/mapgen/mg_decoration.cpp          \
+		jni/src/mapgen/mg_ore.cpp                 \
+		jni/src/mapgen/mg_schematic.cpp           \
 		jni/src/minimap.cpp                       \
 		jni/src/mods.cpp                          \
 		jni/src/nameidmapping.cpp                 \
@@ -228,7 +228,7 @@ LOCAL_SRC_FILES := \
 		jni/src/subgame.cpp                       \
 		jni/src/tileanimation.cpp                 \
 		jni/src/tool.cpp                          \
-		jni/src/treegen.cpp                       \
+		jni/src/mapgen/treegen.cpp                \
 		jni/src/version.cpp                       \
 		jni/src/voxel.cpp                         \
 		jni/src/voxelalgorithms.cpp               \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -371,15 +371,19 @@ add_custom_target(GenerateVersion
 
 
 add_subdirectory(threading)
+add_subdirectory(database)
+add_subdirectory(gui)
+add_subdirectory(mapgen)
 add_subdirectory(network)
 add_subdirectory(script)
 add_subdirectory(unittest)
 add_subdirectory(util)
 add_subdirectory(irrlicht_changes)
 
 set(common_SRCS
+	${database_SRCS}
+	${mapgen_SRCS}
 	ban.cpp
-	cavegen.cpp
 	chat.cpp
 	clientiface.cpp
 	collision.cpp
@@ -388,16 +392,8 @@ set(common_SRCS
 	content_sao.cpp
 	convert_json.cpp
 	craftdef.cpp
-	database-dummy.cpp
-	database-files.cpp
-	database-leveldb.cpp
-	database-postgresql.cpp
-	database-redis.cpp
-	database-sqlite3.cpp
-	database.cpp
 	debug.cpp
 	defaultsettings.cpp
-	dungeongen.cpp
 	emerge.cpp
 	environment.cpp
 	face_position_cache.cpp
@@ -414,22 +410,9 @@ set(common_SRCS
 	map.cpp
 	map_settings_manager.cpp
 	mapblock.cpp
-	mapgen.cpp
-	mapgen_carpathian.cpp
-	mapgen_flat.cpp
-	mapgen_fractal.cpp
-	mapgen_singlenode.cpp
-	mapgen_v5.cpp
-	mapgen_v6.cpp
-	mapgen_v7.cpp
-	mapgen_valleys.cpp
 	mapnode.cpp
 	mapsector.cpp
 	metadata.cpp
-	mg_biome.cpp
-	mg_decoration.cpp
-	mg_ore.cpp
-	mg_schematic.cpp
 	modchannels.cpp
 	mods.cpp
 	nameidmapping.cpp
@@ -462,7 +445,6 @@ set(common_SRCS
 	tileanimation.cpp
 	tool.cpp
 	translation.cpp
-	treegen.cpp
 	version.cpp
 	voxel.cpp
 	voxelalgorithms.cpp
@@ -503,6 +485,7 @@ endif(BUILD_CLIENT)
 set(client_SRCS
 	${client_SRCS}
 	${common_SRCS}
+	${gui_SRCS}
 	${sound_SRCS}
 	${client_network_SRCS}
 	${client_irrlicht_changes_SRCS}
@@ -520,19 +503,9 @@ set(client_SRCS
 	filecache.cpp
 	fontengine.cpp
 	game.cpp
-	guiChatConsole.cpp
-	guiEditBoxWithScrollbar.cpp
-	guiEngine.cpp
-	guiPathSelectMenu.cpp
-	guiFormSpecMenu.cpp
-	guiKeyChangeMenu.cpp
-	guiPasswordChange.cpp
 	guiscalingfilter.cpp
-	guiTable.cpp
-	guiVolumeChange.cpp
 	hud.cpp
 	imagefilters.cpp
-	intlGUIEditBox.cpp
 	keycode.cpp
 	localplayer.cpp
 	main.cpp

diff --git a/src/client.cpp b/src/client.cpp
@@ -47,7 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "clientmap.h"
 #include "clientmedia.h"
 #include "version.h"
-#include "database-sqlite3.h"
+#include "database/database-sqlite3.h"
 #include "serialization.h"
 #include "guiscalingfilter.h"
 #include "script/scripting_client.h"

diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
@@ -17,18 +17,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "mainmenumanager.h"
+#include "gui/mainmenumanager.h"
 #include "clouds.h"
 #include "server.h"
 #include "filesys.h"
-#include "guiMainMenu.h"
+#include "gui/guiMainMenu.h"
 #include "game.h"
 #include "player.h"
 #include "chat.h"
 #include "gettext.h"
 #include "profiler.h"
 #include "serverlist.h"
-#include "guiEngine.h"
+#include "gui/guiEngine.h"
 #include "fontengine.h"
 #include "clientlauncher.h"
 #include "version.h"

diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "util/numeric.h"
 #include "inputhandler.h"
-#include "mainmenumanager.h"
+#include "gui/mainmenumanager.h"
 
 bool MyEventReceiver::OnEvent(const SEvent &event)
 {

diff --git a/src/client/inputhandler.h b/src/client/inputhandler.h
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "renderingengine.h"
 
 #ifdef HAVE_TOUCHSCREENGUI
-#include "touchscreengui.h"
+#include "gui/touchscreengui.h"
 #endif
 
 class KeyList : private std::list<KeyPress>

diff --git a/src/client/joystick_controller.cpp b/src/client/joystick_controller.cpp
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "gettime.h"
 #include "porting.h"
-#include "../util/string.h"
+#include "util/string.h"
 
 bool JoystickButtonCmb::isTriggered(const irr::SEvent::SJoystickEvent &ev) const
 {

diff --git a/src/database/CMakeLists.txt b/src/database/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(database_SRCS
+	${CMAKE_CURRENT_SOURCE_DIR}/database.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/database-dummy.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/database-files.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/database-leveldb.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/database-postgresql.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/database-redis.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/database-sqlite3.cpp
+	PARENT_SCOPE
+)
diff --git a/src/database-dummy.cpp → src/database/database-dummy.cpp b/src/database-dummy.cpp → src/database/database-dummy.cpp
diff --git a/src/database-dummy.h → src/database/database-dummy.h b/src/database-dummy.h → src/database/database-dummy.h
diff --git a/src/database-files.cpp → src/database/database-files.cpp b/src/database-files.cpp → src/database/database-files.cpp
diff --git a/src/database-files.h → src/database/database-files.h b/src/database-files.h → src/database/database-files.h
diff --git a/src/database-leveldb.cpp → src/database/database-leveldb.cpp b/src/database-leveldb.cpp → src/database/database-leveldb.cpp
diff --git a/src/database-leveldb.h → src/database/database-leveldb.h b/src/database-leveldb.h → src/database/database-leveldb.h
diff --git a/src/database-postgresql.cpp → src/database/database-postgresql.cpp b/src/database-postgresql.cpp → src/database/database-postgresql.cpp
diff --git a/src/database-postgresql.h → src/database/database-postgresql.h b/src/database-postgresql.h → src/database/database-postgresql.h
diff --git a/src/database-redis.cpp → src/database/database-redis.cpp b/src/database-redis.cpp → src/database/database-redis.cpp
diff --git a/src/database-redis.h → src/database/database-redis.h b/src/database-redis.h → src/database/database-redis.h
diff --git a/src/database-sqlite3.cpp → src/database/database-sqlite3.cpp b/src/database-sqlite3.cpp → src/database/database-sqlite3.cpp
diff --git a/src/database-sqlite3.h → src/database/database-sqlite3.h b/src/database-sqlite3.h → src/database/database-sqlite3.h
diff --git a/src/database.cpp → src/database/database.cpp b/src/database.cpp → src/database/database.cpp
diff --git a/src/database.h → src/database/database.h b/src/database.h → src/database/database.h
diff --git a/src/emerge.cpp b/src/emerge.cpp
@@ -34,10 +34,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "map.h"
 #include "mapblock.h"
-#include "mg_biome.h"
-#include "mg_ore.h"
-#include "mg_decoration.h"
-#include "mg_schematic.h"
+#include "mapgen/mg_biome.h"
+#include "mapgen/mg_ore.h"
+#include "mapgen/mg_decoration.h"
+#include "mapgen/mg_schematic.h"
 #include "nodedef.h"
 #include "profiler.h"
 #include "scripting_server.h"

diff --git a/src/emerge.h b/src/emerge.h
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "network/networkprotocol.h"
 #include "irr_v3d.h"
 #include "util/container.h"
-#include "mapgen.h" // for MapgenParams
+#include "mapgen/mapgen.h" // for MapgenParams
 #include "map.h"
 
 #define BLOCK_EMERGE_ALLOW_GEN   (1 << 0)

diff --git a/src/game.cpp b/src/game.cpp
@@ -39,12 +39,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "filesys.h"
 #include "gettext.h"
-#include "guiChatConsole.h"
-#include "guiFormSpecMenu.h"
-#include "guiKeyChangeMenu.h"
-#include "guiPasswordChange.h"
-#include "guiVolumeChange.h"
-#include "mainmenumanager.h"
+#include "gui/guiChatConsole.h"
+#include "gui/guiFormSpecMenu.h"
+#include "gui/guiKeyChangeMenu.h"
+#include "gui/guiPasswordChange.h"
+#include "gui/guiVolumeChange.h"
+#include "gui/mainmenumanager.h"
 #include "mapblock.h"
 #include "minimap.h"
 #include "nodedef.h"         // Needed for determining pointing to nodes

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(gui_SRCS
+	${CMAKE_CURRENT_SOURCE_DIR}/guiChatConsole.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guiEditBoxWithScrollbar.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guiEngine.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guiFormSpecMenu.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guiKeyChangeMenu.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guiPasswordChange.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guiPathSelectMenu.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guiTable.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guiVolumeChange.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intlGUIEditBox.cpp
+	PARENT_SCOPE
+)
diff --git a/src/guiChatConsole.cpp → src/gui/guiChatConsole.cpp b/src/guiChatConsole.cpp → src/gui/guiChatConsole.cpp
diff --git a/src/guiChatConsole.h → src/gui/guiChatConsole.h b/src/guiChatConsole.h → src/gui/guiChatConsole.h
diff --git a/src/guiEditBoxWithScrollbar.cpp → src/gui/guiEditBoxWithScrollbar.cpp b/src/guiEditBoxWithScrollbar.cpp → src/gui/guiEditBoxWithScrollbar.cpp
diff --git a/src/guiEditBoxWithScrollbar.h → src/gui/guiEditBoxWithScrollbar.h b/src/guiEditBoxWithScrollbar.h → src/gui/guiEditBoxWithScrollbar.h
diff --git a/src/guiEngine.cpp → src/gui/guiEngine.cpp b/src/guiEngine.cpp → src/gui/guiEngine.cpp
diff --git a/src/guiEngine.h → src/gui/guiEngine.h b/src/guiEngine.h → src/gui/guiEngine.h
diff --git a/src/guiFormSpecMenu.cpp → src/gui/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp → src/gui/guiFormSpecMenu.cpp
diff --git a/src/guiFormSpecMenu.h → src/gui/guiFormSpecMenu.h b/src/guiFormSpecMenu.h → src/gui/guiFormSpecMenu.h
diff --git a/src/guiKeyChangeMenu.cpp → src/gui/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp → src/gui/guiKeyChangeMenu.cpp
diff --git a/src/guiKeyChangeMenu.h → src/gui/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h → src/gui/guiKeyChangeMenu.h
diff --git a/src/guiMainMenu.h → src/gui/guiMainMenu.h b/src/guiMainMenu.h → src/gui/guiMainMenu.h
diff --git a/src/guiPasswordChange.cpp → src/gui/guiPasswordChange.cpp b/src/guiPasswordChange.cpp → src/gui/guiPasswordChange.cpp
diff --git a/src/guiPasswordChange.h → src/gui/guiPasswordChange.h b/src/guiPasswordChange.h → src/gui/guiPasswordChange.h
diff --git a/src/guiPathSelectMenu.cpp → src/gui/guiPathSelectMenu.cpp b/src/guiPathSelectMenu.cpp → src/gui/guiPathSelectMenu.cpp
diff --git a/src/guiPathSelectMenu.h → src/gui/guiPathSelectMenu.h b/src/guiPathSelectMenu.h → src/gui/guiPathSelectMenu.h
diff --git a/src/guiTable.cpp → src/gui/guiTable.cpp b/src/guiTable.cpp → src/gui/guiTable.cpp
diff --git a/src/guiTable.h → src/gui/guiTable.h b/src/guiTable.h → src/gui/guiTable.h
diff --git a/src/guiVolumeChange.cpp → src/gui/guiVolumeChange.cpp b/src/guiVolumeChange.cpp → src/gui/guiVolumeChange.cpp
diff --git a/src/guiVolumeChange.h → src/gui/guiVolumeChange.h b/src/guiVolumeChange.h → src/gui/guiVolumeChange.h
diff --git a/src/intlGUIEditBox.cpp → src/gui/intlGUIEditBox.cpp b/src/intlGUIEditBox.cpp → src/gui/intlGUIEditBox.cpp
diff --git a/src/intlGUIEditBox.h → src/gui/intlGUIEditBox.h b/src/intlGUIEditBox.h → src/gui/intlGUIEditBox.h
diff --git a/src/mainmenumanager.h → src/gui/mainmenumanager.h b/src/mainmenumanager.h → src/gui/mainmenumanager.h
diff --git a/src/modalMenu.h → src/gui/modalMenu.h b/src/modalMenu.h → src/gui/modalMenu.h
diff --git a/src/touchscreengui.cpp → src/gui/touchscreengui.cpp b/src/touchscreengui.cpp → src/gui/touchscreengui.cpp
diff --git a/src/touchscreengui.h → src/gui/touchscreengui.h b/src/touchscreengui.h → src/gui/touchscreengui.h
diff --git a/src/hud.cpp b/src/hud.cpp
@@ -37,7 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client/renderingengine.h"
 
 #ifdef HAVE_TOUCHSCREENGUI
-#include "touchscreengui.h"
+#include "gui/touchscreengui.h"
 #endif
 
 Hud::Hud(gui::IGUIEnvironment *guienv, Client *client, LocalPlayer *player,

diff --git a/src/main.cpp b/src/main.cpp
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "quicktune.h"
 #include "httpfetch.h"
 #include "gameparams.h"
-#include "database.h"
+#include "database/database.h"
 #include "config.h"
 #include "player.h"
 #include "porting.h"
@@ -41,14 +41,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#include "terminal_chat_console.h"
 #endif
 #ifndef SERVER
-#include "guiMainMenu.h"
+#include "gui/guiMainMenu.h"
 #include "client/clientlauncher.h"
-#include "guiEngine.h"
-#include "mainmenumanager.h"
+#include "gui/guiEngine.h"
+#include "gui/mainmenumanager.h"
 #endif
 
 #ifdef HAVE_TOUCHSCREENGUI
-	#include "touchscreengui.h"
+	#include "gui/touchscreengui.h"
 #endif
 
 #if !defined(SERVER) && \

diff --git a/src/map.cpp b/src/map.cpp
@@ -37,24 +37,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "reflowscan.h"
 #include "emerge.h"
-#include "mapgen_v6.h"
-#include "mg_biome.h"
+#include "mapgen/mapgen_v6.h"
+#include "mapgen/mg_biome.h"
 #include "config.h"
 #include "server.h"
-#include "database.h"
-#include "database-dummy.h"
-#include "database-sqlite3.h"
+#include "database/database.h"
+#include "database/database-dummy.h"
+#include "database/database-sqlite3.h"
 #include "script/scripting_server.h"
 #include <deque>
 #include <queue>
 #if USE_LEVELDB
-#include "database-leveldb.h"
+#include "database/database-leveldb.h"
 #endif
 #if USE_REDIS
-#include "database-redis.h"
+#include "database/database-redis.h"
 #endif
 #if USE_POSTGRESQL
-#include "database-postgresql.h"
+#include "database/database-postgresql.h"
 #endif