diff options
| author | David Fioramonti | 2017-08-24 04:05:49 -0700 |
|---|---|---|
| committer | David Fioramonti | 2017-08-24 04:06:54 -0700 |
| commit | c96b01b82e6213128bc03b1ed94fc2ebaf4f36d7 (patch) | |
| tree | 2caab7226643fa79cf4791ecfb18af327a200d17 /engines/titanic/sound | |
| parent | 78ed19d42986c2fb2f310476196963ba6709010f (diff) | |
| download | scummvm-rg350-c96b01b82e6213128bc03b1ed94fc2ebaf4f36d7.tar.gz scummvm-rg350-c96b01b82e6213128bc03b1ed94fc2ebaf4f36d7.tar.bz2 scummvm-rg350-c96b01b82e6213128bc03b1ed94fc2ebaf4f36d7.zip | |
TITANIC: Reduce header includes for titanic.h
I reduced the header includes a lot in Titanic.h and forward
declared when I could. Titanic.h was including a lot and
a lot of functions that were including it were not using its
API. This will help make it more clear which implementation
files are using which class since they will just need to include
which ones they need.
I also moved the debug related items in Titanic.h into the debugger
header.
I also reordered several of the the header includes to be local to
global.
Diffstat (limited to 'engines/titanic/sound')
| -rw-r--r-- | engines/titanic/sound/music_room_handler.cpp | 1 | ||||
| -rw-r--r-- | engines/titanic/sound/music_song.cpp | 1 | ||||
| -rw-r--r-- | engines/titanic/sound/qmixer.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/sound/sound_manager.cpp | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp index 76d7043d0c..dbbe4e4ca8 100644 --- a/engines/titanic/sound/music_room_handler.cpp +++ b/engines/titanic/sound/music_room_handler.cpp @@ -22,6 +22,7 @@ #include "titanic/sound/music_room_handler.h" #include "titanic/sound/sound_manager.h" +#include "titanic/events.h" #include "titanic/core/project_item.h" #include "titanic/titanic.h" diff --git a/engines/titanic/sound/music_song.cpp b/engines/titanic/sound/music_song.cpp index a5527da356..ea5f29a536 100644 --- a/engines/titanic/sound/music_song.cpp +++ b/engines/titanic/sound/music_song.cpp @@ -21,6 +21,7 @@ */ #include "titanic/sound/music_song.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" #include "common/util.h" diff --git a/engines/titanic/sound/qmixer.cpp b/engines/titanic/sound/qmixer.cpp index beb1502ab4..a3c06da2f8 100644 --- a/engines/titanic/sound/qmixer.cpp +++ b/engines/titanic/sound/qmixer.cpp @@ -20,9 +20,9 @@ * */ -#include "common/system.h" #include "titanic/sound/qmixer.h" -#include "titanic/titanic.h" +#include "titanic/debugger.h" +#include "common/system.h" namespace Titanic { diff --git a/engines/titanic/sound/sound_manager.cpp b/engines/titanic/sound/sound_manager.cpp index 4b5887b1e7..a4d838ce2f 100644 --- a/engines/titanic/sound/sound_manager.cpp +++ b/engines/titanic/sound/sound_manager.cpp @@ -21,6 +21,7 @@ */ #include "titanic/sound/sound_manager.h" +#include "titanic/events.h" #include "titanic/titanic.h" namespace Titanic { |