Skip to content
Permalink
Browse files

Move files to subdirectories (#6599)

* Move files around
  • Loading branch information...
numberZero authored and nerzhul committed Nov 8, 2017
1 parent fc9747e commit 20a85d76d94c9c5c7fbe198c3d0e1fbee97a485f
Showing with 236 additions and 221 deletions.
  1. +30 −30 build/android/jni/Android.mk
  2. +6 −33 src/CMakeLists.txt
  3. +1 −1 src/client.cpp
  4. +3 −3 src/client/clientlauncher.cpp
  5. +1 −1 src/client/inputhandler.cpp
  6. +1 −1 src/client/inputhandler.h
  7. +1 −1 src/client/joystick_controller.cpp
  8. +10 −0 src/database/CMakeLists.txt
  9. 0 src/{ → database}/database-dummy.cpp
  10. 0 src/{ → database}/database-dummy.h
  11. 0 src/{ → database}/database-files.cpp
  12. 0 src/{ → database}/database-files.h
  13. 0 src/{ → database}/database-leveldb.cpp
  14. 0 src/{ → database}/database-leveldb.h
  15. 0 src/{ → database}/database-postgresql.cpp
  16. 0 src/{ → database}/database-postgresql.h
  17. 0 src/{ → database}/database-redis.cpp
  18. 0 src/{ → database}/database-redis.h
  19. 0 src/{ → database}/database-sqlite3.cpp
  20. 0 src/{ → database}/database-sqlite3.h
  21. 0 src/{ → database}/database.cpp
  22. 0 src/{ → database}/database.h
  23. +4 −4 src/emerge.cpp
  24. +1 −1 src/emerge.h
  25. +6 −6 src/game.cpp
  26. +13 −0 src/gui/CMakeLists.txt
  27. 0 src/{ → gui}/guiChatConsole.cpp
  28. 0 src/{ → gui}/guiChatConsole.h
  29. 0 src/{ → gui}/guiEditBoxWithScrollbar.cpp
  30. 0 src/{ → gui}/guiEditBoxWithScrollbar.h
  31. 0 src/{ → gui}/guiEngine.cpp
  32. 0 src/{ → gui}/guiEngine.h
  33. 0 src/{ → gui}/guiFormSpecMenu.cpp
  34. 0 src/{ → gui}/guiFormSpecMenu.h
  35. 0 src/{ → gui}/guiKeyChangeMenu.cpp
  36. 0 src/{ → gui}/guiKeyChangeMenu.h
  37. 0 src/{ → gui}/guiMainMenu.h
  38. 0 src/{ → gui}/guiPasswordChange.cpp
  39. 0 src/{ → gui}/guiPasswordChange.h
  40. 0 src/{ → gui}/guiPathSelectMenu.cpp
  41. 0 src/{ → gui}/guiPathSelectMenu.h
  42. 0 src/{ → gui}/guiTable.cpp
  43. 0 src/{ → gui}/guiTable.h
  44. 0 src/{ → gui}/guiVolumeChange.cpp
  45. 0 src/{ → gui}/guiVolumeChange.h
  46. 0 src/{ → gui}/intlGUIEditBox.cpp
  47. 0 src/{ → gui}/intlGUIEditBox.h
  48. 0 src/{ → gui}/mainmenumanager.h
  49. 0 src/{ → gui}/modalMenu.h
  50. 0 src/{ → gui}/touchscreengui.cpp
  51. 0 src/{ → gui}/touchscreengui.h
  52. +1 −1 src/hud.cpp
  53. +5 −5 src/main.cpp
  54. +8 −8 src/map.cpp
  55. +1 −1 src/map_settings_manager.cpp
  56. +1 −1 src/mapblock.h
  57. +19 −0 src/mapgen/CMakeLists.txt
  58. 0 src/{ → mapgen}/cavegen.cpp
  59. 0 src/{ → mapgen}/cavegen.h
  60. 0 src/{ → mapgen}/dungeongen.cpp
  61. 0 src/{ → mapgen}/dungeongen.h
  62. 0 src/{ → mapgen}/mapgen.cpp
  63. 0 src/{ → mapgen}/mapgen.h
  64. 0 src/{ → mapgen}/mapgen_carpathian.cpp
  65. 0 src/{ → mapgen}/mapgen_carpathian.h
  66. 0 src/{ → mapgen}/mapgen_flat.cpp
  67. 0 src/{ → mapgen}/mapgen_flat.h
  68. 0 src/{ → mapgen}/mapgen_fractal.cpp
  69. 0 src/{ → mapgen}/mapgen_fractal.h
  70. 0 src/{ → mapgen}/mapgen_singlenode.cpp
  71. 0 src/{ → mapgen}/mapgen_singlenode.h
  72. 0 src/{ → mapgen}/mapgen_v5.cpp
  73. 0 src/{ → mapgen}/mapgen_v5.h
  74. 0 src/{ → mapgen}/mapgen_v6.cpp
  75. 0 src/{ → mapgen}/mapgen_v6.h
  76. 0 src/{ → mapgen}/mapgen_v7.cpp
  77. 0 src/{ → mapgen}/mapgen_v7.h
  78. 0 src/{ → mapgen}/mapgen_valleys.cpp
  79. 0 src/{ → mapgen}/mapgen_valleys.h
  80. 0 src/{ → mapgen}/mg_biome.cpp
  81. 0 src/{ → mapgen}/mg_biome.h
  82. 0 src/{ → mapgen}/mg_decoration.cpp
  83. 0 src/{ → mapgen}/mg_decoration.h
  84. 0 src/{ → mapgen}/mg_ore.cpp
  85. 0 src/{ → mapgen}/mg_ore.h
  86. 0 src/{ → mapgen}/mg_schematic.cpp
  87. 0 src/{ → mapgen}/mg_schematic.h
  88. 0 src/{ → mapgen}/treegen.cpp
  89. 0 src/{ → mapgen}/treegen.h
  90. +1 −1 src/network/connectionthreads.h
  91. +1 −1 src/script/common/c_content.cpp
  92. +1 −1 src/script/cpp_api/s_env.cpp
  93. +1 −1 src/script/cpp_api/s_mainmenu.h
  94. +1 −1 src/script/lua_api/l_client.cpp
  95. +1 −1 src/script/lua_api/l_env.cpp
  96. +5 −5 src/script/lua_api/l_mainmenu.cpp
  97. +6 −6 src/script/lua_api/l_mapgen.cpp
  98. +1 −1 src/script/lua_api/l_sound.cpp
  99. +1 −1 src/script/lua_api/l_vmanip.cpp
  100. +3 −3 src/server.cpp
  101. +4 −4 src/serverenvironment.cpp
  102. +1 −1 src/subgame.cpp
  103. +1 −1 src/unittest/test_map_settings_manager.cpp
  104. +1 −1 src/unittest/test_schematic.cpp
  105. +4 −4 src/util/container.h
  106. +2 −2 src/util/directiontables.h
  107. +3 −3 src/util/numeric.cpp
  108. +4 −4 src/util/numeric.h
  109. +1 −1 src/util/pointedthing.cpp
  110. +2 −2 src/util/pointedthing.h
  111. +2 −2 src/util/pointer.h
  112. +2 −2 src/util/serialize.cpp
  113. +3 −3 src/util/serialize.h
  114. +2 −2 src/util/string.cpp
  115. +3 −3 src/util/thread.h
  116. +2 −2 src/util/timetaker.cpp
  117. +2 −2 src/util/timetaker.h
  118. +63 −63 util/travis/clang-format-whitelist.txt
@@ -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 \
@@ -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
@@ -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"
@@ -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"
@@ -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)
{
@@ -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>
@@ -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
{
@@ -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
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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"
@@ -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)
@@ -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
@@ -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
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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,
@@ -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) && \
@@ -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


0 comments on commit 20a85d7

Please sign in to comment.
You can’t perform that action at this time.