libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 00:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DM: Clean up includes

Browse Source 
Swap <> to "" with scummvm files
Add dm/ prefix to dm files
Reorder includes to system files, dm files
This commit is contained in:
Bendegúz Nagy 2016-09-03 10:38:43 +02:00
parent 0d7481b2a5
commit cd3b485952
37 changed files with 214 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engines/dm/champion.cpp
View File

@ -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 {

4
engines/dm/champion.h
View File

@ -30,8 +30,8 @@
#include "common/str.h"
#include "dm.h"
#include "gfx.h"
#include "dm/dm.h"
#include "dm/gfx.h"
namespace DM {

12
engines/dm/console.cpp
View File

@ -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 {

5
engines/dm/detection.cpp
View File

@ -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[] = {

9
engines/dm/dialog.cpp
View File

@ -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 {

3
engines/dm/dialog.h
View File

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

50
engines/dm/dm.cpp
View File

@ -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) {

13
engines/dm/dm.h
View File

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

22
engines/dm/dmglobals.cpp
View File

@ -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 {

12
engines/dm/dungeonman.cpp
View File

@ -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 {

4
engines/dm/dungeonman.h
View File

@ -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 {

26
engines/dm/eventman.cpp
View File

@ -27,20 +27,20 @@
#include "common/system.h"
#include "graphics/cursorman.h"
#include "graphics/thumbnail.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 "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 {

6
engines/dm/eventman.h
View File

@ -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 {

18
engines/dm/gfx.cpp
View File

@ -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) {

3
engines/dm/gfx.h
View File

@ -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

18
engines/dm/group.cpp
View File

@ -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 {

2
engines/dm/group.h
View File

@ -28,7 +28,7 @@
#ifndef DM_GROUP_H
#define DM_GROUP_H
#include "dm.h"
#include "dm/dm.h"
namespace DM {
class Champion;

22
engines/dm/inventory.cpp
View File

@ -25,19 +25,19 @@
* maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
*/
#include <graphics/surface.h>
#include "graphics/surface.h"
#include "graphics/thumbnail.h"
#include "inventory.h"
#include "dungeonman.h"
#include "eventman.h"
#include "menus.h"
#include "gfx.h"
#include "text.h"
#include "objectman.h"
#include "timeline.h"
#include "projexpl.h"
#include "sounds.h"
#include "dm/inventory.h"
#include "dm/dungeonman.h"
#include "dm/eventman.h"
#include "dm/menus.h"
#include "dm/gfx.h"
#include "dm/text.h"
#include "dm/objectman.h"
#include "dm/timeline.h"
#include "dm/projexpl.h"
#include "dm/sounds.h"
namespace DM {

10
engines/dm/inventory.h
View File

@ -25,12 +25,10 @@
* maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
*/
#include "dm.h"
#include "gfx.h"
#include "champion.h"
#include "dungeonman.h"
#include "dm/dm.h"
#include "dm/gfx.h"
#include "dm/champion.h"
#include "dm/dungeonman.h"
namespace DM {

22
engines/dm/loadsave.cpp
View File

@ -26,19 +26,19 @@
*/
#include "common/system.h"
#include "common/savefile.h"
#include "common/translation.h"
#include "graphics/thumbnail.h"
#include "gui/saveload.h"
#include "dm.h"
#include "dungeonman.h"
#include "timeline.h"
#include "group.h"
#include "champion.h"
#include "menus.h"
#include "eventman.h"
#include "projexpl.h"
#include "dialog.h"
#include <gui/saveload.h>
#include <common/translation.h>
#include "dm/dm.h"
#include "dm/dungeonman.h"
#include "dm/timeline.h"
#include "dm/group.h"
#include "dm/champion.h"
#include "dm/menus.h"
#include "dm/eventman.h"
#include "dm/projexpl.h"
#include "dm/dialog.h"
namespace DM {

2
engines/dm/loadsave.h
View File

@ -28,7 +28,7 @@
#ifndef DM_LOADSAVE_H
#define DM_LOADSAVE_H
#include "dm.h"
#include "dm/dm.h"
namespace DM {

5
engines/dm/lzw.cpp
View File

@ -25,8 +25,9 @@
* maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
*/
#include "lzw.h"
#include <common/memstream.h>
#include "common/memstream.h"
#include "dm/lzw.h"
namespace DM {

4
engines/dm/lzw.h
View File

@ -25,9 +25,9 @@
* maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
*/
#include <common/file.h>
#include "common/file.h"
#include "dm.h"
#include "dm/dm.h"
namespace Common {
class MemoryReadStream;

26
engines/dm/menus.cpp
View File

@ -25,19 +25,19 @@
* maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
*/
#include "menus.h"
#include "gfx.h"
#include "champion.h"
#include "dungeonman.h"
#include "objectman.h"
#include "inventory.h"
#include "text.h"
#include "eventman.h"
#include "timeline.h"
#include "movesens.h"
#include "group.h"
#include "projexpl.h"
#include "sounds.h"
#include "dm/menus.h"
#include "dm/gfx.h"
#include "dm/champion.h"
#include "dm/dungeonman.h"
#include "dm/objectman.h"
#include "dm/inventory.h"
#include "dm/text.h"
#include "dm/eventman.h"
#include "dm/timeline.h"
#include "dm/movesens.h"
#include "dm/group.h"
#include "dm/projexpl.h"
#include "dm/sounds.h"
namespace DM {

6
engines/dm/menus.h
View File

@ -28,9 +28,9 @@
#ifndef DM_MENUS_H
#define DM_MENUS_H
#include "dm.h"
#include "champion.h"
#include "dungeonman.h"
#include "dm/dm.h"
#include "dm/champion.h"
#include "dm/dungeonman.h"
namespace DM {

20
engines/dm/movesens.cpp
View File

@ -26,16 +26,16 @@
*/
#include "movesens.h"
#include "champion.h"
#include "inventory.h"
#include "dungeonman.h"
#include "objectman.h"
#include "timeline.h"
#include "group.h"
#include "projexpl.h"
#include "text.h"
#include "sounds.h"
#include "dm/movesens.h"
#include "dm/champion.h"
#include "dm/inventory.h"
#include "dm/dungeonman.h"
#include "dm/objectman.h"
#include "dm/timeline.h"
#include "dm/group.h"
#include "dm/projexpl.h"
#include "dm/text.h"
#include "dm/sounds.h"
namespace DM {

2
engines/dm/movesens.h
View File

@ -29,7 +29,7 @@
#ifndef DM_MOVESENS_H
#define DM_MOVESENS_H
#include "dm.h"
#include "dm/dm.h"
namespace DM {
class Sensor;

6
engines/dm/objectman.cpp
View File

@ -25,9 +25,9 @@
* maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
*/
#include "objectman.h"
#include "dungeonman.h"
#include "text.h"
#include "dm/objectman.h"
#include "dm/dungeonman.h"
#include "dm/text.h"
namespace DM {

4
engines/dm/objectman.h
View File

@ -25,8 +25,8 @@
* maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
*/
#include "dm.h"
#include "champion.h"
#include "dm/dm.h"
#include "dm/champion.h"
namespace DM {

14
engines/dm/projexpl.cpp
View File

@ -26,13 +26,13 @@
*/
#include "projexpl.h"
#include "dungeonman.h"
#include "timeline.h"
#include "group.h"
#include "objectman.h"
#include "movesens.h"
#include "sounds.h"
#include "dm/projexpl.h"
#include "dm/dungeonman.h"
#include "dm/timeline.h"
#include "dm/group.h"
#include "dm/objectman.h"
#include "dm/movesens.h"
#include "dm/sounds.h"
namespace DM {

2
engines/dm/projexpl.h
View File

@ -27,7 +27,7 @@
#ifndef DM_PROJEXPL_H
#define DM_PROJEXPL_H
#include "dm.h"
#include "dm/dm.h"
namespace DM {

14
engines/dm/sounds.cpp
View File

@ -27,14 +27,14 @@
#include "audio/audiostream.h"
#include "audio/decoders/raw.h"
#include <advancedDetector.h>
#include "audio/mixer.h"
#include "advancedDetector.h"
#include "dm.h"
#include "gfx.h"
#include <audio/mixer.h>
#include "timeline.h"
#include "dungeonman.h"
#include "sounds.h"
#include "dm/dm.h"
#include "dm/gfx.h"
#include "dm/timeline.h"
#include "dm/dungeonman.h"
#include "dm/sounds.h"
namespace DM {

2
engines/dm/sounds.h
View File

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

4
engines/dm/text.cpp
View File

@ -25,9 +25,9 @@
* maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
*/
#include "text.h"
#include <common/system.h>
#include "common/system.h"
#include "dm/text.h"
namespace DM {

4
engines/dm/text.h
View File

@ -28,8 +28,8 @@
#ifndef DM_TEXT_H
#define DM_TEXT_H
#include "dm.h"
#include "gfx.h"
#include "dm/dm.h"
#include "dm/gfx.h"
namespace DM {

22
engines/dm/timeline.cpp
View File

@ -25,17 +25,17 @@
* maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
*/
#include "timeline.h"
#include "dungeonman.h"
#include "champion.h"
#include "inventory.h"
#include "group.h"
#include "projexpl.h"
#include "movesens.h"
#include "text.h"
#include "eventman.h"
#include "objectman.h"
#include "sounds.h"
#include "dm/timeline.h"
#include "dm/dungeonman.h"
#include "dm/champion.h"
#include "dm/inventory.h"
#include "dm/group.h"
#include "dm/projexpl.h"
#include "dm/movesens.h"
#include "dm/text.h"
#include "dm/eventman.h"
#include "dm/objectman.h"
#include "dm/sounds.h"
namespace DM {

2
engines/dm/timeline.h
View File

@ -28,7 +28,7 @@
#ifndef DM_TIMELINE_H
#define DM_TIMELINE_H
#include "dm.h"
#include "dm/dm.h"
namespace DM {
class Champion;