DM: Clean up includes

Swap <> to "" with scummvm files Add dm/ prefix to dm files Reorder includes to system files, dm files
scummvm · Sep 3, 2016 · cd3b485 · cd3b485
1 parent 0d7481b
commit cd3b485
Show file tree

Hide file tree

Showing 37 changed files with 216 additions and 212 deletions.
diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp
@@ -25,18 +25,18 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
-#include "champion.h"
-#include "dungeonman.h"
-#include "eventman.h"
-#include "menus.h"
-#include "inventory.h"
-#include "objectman.h"
-#include "text.h"
-#include "timeline.h"
-#include "projexpl.h"
-#include "group.h"
-#include "movesens.h"
-#include "sounds.h"
+#include "dm/champion.h"
+#include "dm/dungeonman.h"
+#include "dm/eventman.h"
+#include "dm/menus.h"
+#include "dm/inventory.h"
+#include "dm/objectman.h"
+#include "dm/text.h"
+#include "dm/timeline.h"
+#include "dm/projexpl.h"
+#include "dm/group.h"
+#include "dm/movesens.h"
+#include "dm/sounds.h"
 
 
 namespace DM {

diff --git a/engines/dm/champion.h b/engines/dm/champion.h
@@ -30,8 +30,8 @@
 
 #include "common/str.h"
 
-#include "dm.h"
-#include "gfx.h"
+#include "dm/dm.h"
+#include "dm/gfx.h"
 
 namespace DM {
 

diff --git a/engines/dm/console.cpp b/engines/dm/console.cpp
@@ -25,12 +25,12 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
-#include "console.h"
-#include "dm.h"
-#include "champion.h"
-#include "dungeonman.h"
-#include "movesens.h"
-#include "objectman.h"
+#include "dm/console.h"
+#include "dm/dm.h"
+#include "dm/champion.h"
+#include "dm/dungeonman.h"
+#include "dm/movesens.h"
+#include "dm/objectman.h"
 
 
 namespace DM {

diff --git a/engines/dm/detection.cpp b/engines/dm/detection.cpp
@@ -25,14 +25,15 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
-#include "dm/dm.h"
 
 #include "common/config-manager.h"
 #include "common/error.h"
 #include "common/fs.h"
+#include "common/system.h"
 
 #include "engines/advancedDetector.h"
-#include <common/system.h>
+
+#include "dm/dm.h"
 
 namespace DM {
 static const PlainGameDescriptor DMGames[] = {

diff --git a/engines/dm/dialog.cpp b/engines/dm/dialog.cpp
@@ -25,11 +25,10 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
-#include "dialog.h"
-#include "gfx.h"
-#include "text.h"
-#include "eventman.h"
-
+#include "dm/dialog.h"
+#include "dm/gfx.h"
+#include "dm/text.h"
+#include "dm/eventman.h"
 
 namespace DM {
 

diff --git a/engines/dm/dialog.h b/engines/dm/dialog.h
@@ -25,8 +25,7 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
-#include "dm.h"
-
+#include "dm/dm.h"
 
 namespace DM {
 

diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
@@ -25,6 +25,8 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
+#include "advancedDetector.h"
+
 #include "common/config-manager.h"
 #include "common/scummsys.h"
 #include "common/system.h"
@@ -33,35 +35,37 @@
 #include "common/debug-channels.h"
 #include "common/error.h"
 
-#include "engines/util.h"
-#include "engines/engine.h"
-#include "graphics/palette.h"
 #include "common/file.h"
 #include "common/events.h"
 #include "common/array.h"
 #include "common/algorithm.h"
+#include "common/translation.h"
+
+#include "engines/util.h"
+#include "engines/engine.h"
+
+#include "graphics/cursorman.h"
+#include "graphics/palette.h"
+#include "graphics/surface.h"
+
+#include "gui/saveload.h"
 
 #include "dm/dm.h"
-#include "gfx.h"
-#include "dungeonman.h"
-#include "eventman.h"
-#include "menus.h"
-#include "champion.h"
-#include "loadsave.h"
-#include "objectman.h"
-#include "inventory.h"
-#include "text.h"
-#include "movesens.h"
-#include "group.h"
-#include "timeline.h"
-#include "projexpl.h"
-#include "dialog.h"
-#include <graphics/cursorman.h>
-#include <advancedDetector.h>
-#include "sounds.h"
-#include <graphics/surface.h>
-#include <common/translation.h>
-#include <gui/saveload.h>
+#include "dm/gfx.h"
+#include "dm/dungeonman.h"
+#include "dm/eventman.h"
+#include "dm/menus.h"
+#include "dm/champion.h"
+#include "dm/loadsave.h"
+#include "dm/objectman.h"
+#include "dm/inventory.h"
+#include "dm/text.h"
+#include "dm/movesens.h"
+#include "dm/group.h"
+#include "dm/timeline.h"
+#include "dm/projexpl.h"
+#include "dm/dialog.h"
+#include "dm/sounds.h"
 
 namespace DM {
 const char *debugGetDirectionName(Direction dir) {

diff --git a/engines/dm/dm.h b/engines/dm/dm.h
@@ -28,16 +28,17 @@
 #ifndef DM_H
 #define DM_H
 
-#include "common/random.h"
 #include "engines/engine.h"
+#include "engines/savestate.h"
+
+#include "common/random.h"
 #include "common/savefile.h"
 #include "common/str.h"
-#include "engines/savestate.h"
+#include "common/memstream.h"
 
-#include "console.h"
-#include <common/memstream.h>
-#include <advancedDetector.h>
+#include "advancedDetector.h"
 
+#include "dm/console.h"
 
 struct ADGameDescription;
 

diff --git a/engines/dm/dmglobals.cpp b/engines/dm/dmglobals.cpp
@@ -26,18 +26,18 @@
 */
 
 #include "common/system.h"
+
 #include "dm/dm.h"
-#include "gfx.h"
-#include "dungeonman.h"
-#include "eventman.h"
-#include "menus.h"
-#include "champion.h"
-#include "loadsave.h"
-#include "objectman.h"
-#include "inventory.h"
-#include "text.h"
-#include "movesens.h"
-#include "string.h"
+#include "dm/gfx.h"
+#include "dm/dungeonman.h"
+#include "dm/eventman.h"
+#include "dm/menus.h"
+#include "dm/champion.h"
+#include "dm/loadsave.h"
+#include "dm/objectman.h"
+#include "dm/inventory.h"
+#include "dm/text.h"
+#include "dm/movesens.h"
 
 namespace DM {
 

diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp
@@ -28,12 +28,12 @@
 #include "common/file.h"
 #include "common/memstream.h"
 
-#include "dungeonman.h"
-#include "timeline.h"
-#include "champion.h"
-#include "group.h"
-#include "movesens.h"
-#include "projexpl.h"
+#include "dm/dungeonman.h"
+#include "dm/timeline.h"
+#include "dm/champion.h"
+#include "dm/group.h"
+#include "dm/movesens.h"
+#include "dm/projexpl.h"
 
 namespace DM {
 

diff --git a/engines/dm/dungeonman.h b/engines/dm/dungeonman.h
@@ -28,8 +28,8 @@
 #ifndef DUNGEONMAN_H
 #define DUNGEONMAN_H
 
-#include "dm.h"
-#include "gfx.h"
+#include "dm/dm.h"
+#include "dm/gfx.h"
 
 namespace DM {
 

diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp
@@ -27,20 +27,20 @@
 
 #include "common/system.h"
 #include "graphics/cursorman.h"
-
-#include "eventman.h"
-#include "dungeonman.h"
-#include "movesens.h"
-#include "objectman.h"
-#include "inventory.h"
-#include "menus.h"
-#include "timeline.h"
-#include "projexpl.h"
-#include "text.h"
-#include "group.h"
-#include "dialog.h"
-#include "sounds.h"
-#include <mortevielle/saveload.h>
+#include "graphics/thumbnail.h"
+
+#include "dm/eventman.h"
+#include "dm/dungeonman.h"
+#include "dm/movesens.h"
+#include "dm/objectman.h"
+#include "dm/inventory.h"
+#include "dm/menus.h"
+#include "dm/timeline.h"
+#include "dm/projexpl.h"
+#include "dm/text.h"
+#include "dm/group.h"
+#include "dm/dialog.h"
+#include "dm/sounds.h"
 
 
 namespace DM {

diff --git a/engines/dm/eventman.h b/engines/dm/eventman.h
@@ -32,9 +32,9 @@
 #include "common/queue.h"
 #include "common/array.h"
 
-#include "dm.h"
-#include "gfx.h"
-#include "champion.h"
+#include "dm/dm.h"
+#include "dm/gfx.h"
+#include "dm/champion.h"
 
 namespace DM {
 

diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp
@@ -28,17 +28,17 @@
 #include "engines/util.h"
 #include "common/system.h"
 #include "common/file.h"
-#include "graphics/palette.h"
 #include "common/endian.h"
+#include "graphics/palette.h"
 
-#include "gfx.h"
-#include "dungeonman.h"
-#include "group.h"
-#include "timeline.h"
-#include "champion.h"
-#include "eventman.h"
-#include "lzw.h"
-#include "text.h"
+#include "dm/gfx.h"
+#include "dm/dungeonman.h"
+#include "dm/group.h"
+#include "dm/timeline.h"
+#include "dm/champion.h"
+#include "dm/eventman.h"
+#include "dm/lzw.h"
+#include "dm/text.h"
 
 namespace DM {
 DisplayMan::DisplayMan(DMEngine *dmEngine) : _vm(dmEngine) {

diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h
@@ -31,9 +31,10 @@
 #include "common/scummsys.h"
 #include "common/rect.h"
 #include "common/memstream.h"
-#include "dm.h"
 #include "common/array.h"
 
+#include "dm/dm.h"
+
 namespace DM {
 
 #define k0_viewFloor_D3L 0 // @ C0_VIEW_FLOOR_D3L

diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp
@@ -25,15 +25,15 @@
 * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
 */
 
-#include "group.h"
-#include "dungeonman.h"
-#include "champion.h"
-#include "movesens.h"
-#include "projexpl.h"
-#include "timeline.h"
-#include "objectman.h"
-#include "menus.h"
-#include "sounds.h"
+#include "dm/group.h"
+#include "dm/dungeonman.h"
+#include "dm/champion.h"
+#include "dm/movesens.h"
+#include "dm/projexpl.h"
+#include "dm/timeline.h"
+#include "dm/objectman.h"
+#include "dm/menus.h"
+#include "dm/sounds.h"
 
 
 namespace DM {

diff --git a/engines/dm/group.h b/engines/dm/group.h
@@ -28,7 +28,7 @@
 #ifndef DM_GROUP_H
 #define DM_GROUP_H
 
-#include "dm.h"
+#include "dm/dm.h"
 
 namespace DM {
 	class Champion;