diff options
Diffstat (limited to 'engines')
47 files changed, 69 insertions, 65 deletions
diff --git a/engines/agi/agi.h b/engines/agi/agi.h index aca0b32a5c..70ffbf1a8b 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -45,7 +45,9 @@ #include "agi/sound.h" -namespace Common { class RandomSource; } +namespace Common { +class RandomSource; +} /** * This is the namespace of the AGI engine. diff --git a/engines/agos/midi.h b/engines/agos/midi.h index ad69a3ddde..40f54dbaf0 100644 --- a/engines/agos/midi.h +++ b/engines/agos/midi.h @@ -31,7 +31,7 @@ #include "common/mutex.h" namespace Common { - class File; +class File; } namespace AGOS { diff --git a/engines/cine/sound.h b/engines/cine/sound.h index e9a797989e..7b506ab5f3 100644 --- a/engines/cine/sound.h +++ b/engines/cine/sound.h @@ -30,7 +30,7 @@ #include "audio/mixer.h" namespace Audio { - class AudioStream; +class AudioStream; } namespace Cine { diff --git a/engines/dialogs.h b/engines/dialogs.h index 6e5338b317..885e86a91b 100644 --- a/engines/dialogs.h +++ b/engines/dialogs.h @@ -31,9 +31,9 @@ class Engine; namespace GUI { - class ButtonWidget; - class GraphicsWidget; - class SaveLoadChooser; +class ButtonWidget; +class GraphicsWidget; +class SaveLoadChooser; } class MainMenuDialog : public GUI::Dialog { diff --git a/engines/draci/game.h b/engines/draci/game.h index 0ecbcf68f0..0b5b3a03cc 100644 --- a/engines/draci/game.h +++ b/engines/draci/game.h @@ -31,7 +31,7 @@ #include "draci/walking.h" namespace Common { - class Serializer; +class Serializer; } namespace Draci { diff --git a/engines/draci/script.h b/engines/draci/script.h index e81691204e..a75f6bcbc3 100644 --- a/engines/draci/script.h +++ b/engines/draci/script.h @@ -30,7 +30,7 @@ #include "common/stream.h" namespace Common { - class ReadStream; +class ReadStream; } namespace Draci { diff --git a/engines/engine.h b/engines/engine.h index 168a1dc2a0..adec62beb6 100644 --- a/engines/engine.h +++ b/engines/engine.h @@ -32,16 +32,16 @@ class OSystem; namespace Audio { - class Mixer; +class Mixer; } namespace Common { - class EventManager; - class SaveFileManager; - class TimerManager; +class EventManager; +class SaveFileManager; +class TimerManager; } namespace GUI { - class Debugger; - class Dialog; +class Debugger; +class Dialog; } /** diff --git a/engines/gob/dataio.h b/engines/gob/dataio.h index 6e12d15af8..f2b39aed09 100644 --- a/engines/gob/dataio.h +++ b/engines/gob/dataio.h @@ -33,7 +33,7 @@ #include "common/file.h" namespace Common { - class SeekableReadStream; +class SeekableReadStream; } namespace Gob { diff --git a/engines/gob/gob.h b/engines/gob/gob.h index 9bdbed45cf..57ad11c54c 100644 --- a/engines/gob/gob.h +++ b/engines/gob/gob.h @@ -35,7 +35,7 @@ #include "gob/console.h" namespace GUI { - class StaticTextWidget; +class StaticTextWidget; } /** diff --git a/engines/gob/resources.h b/engines/gob/resources.h index 9921dc6e76..dec64f6b7c 100644 --- a/engines/gob/resources.h +++ b/engines/gob/resources.h @@ -29,7 +29,7 @@ #include "common/str.h" namespace Common { - class SeekableReadStream; +class SeekableReadStream; } namespace Gob { diff --git a/engines/gob/surface.h b/engines/gob/surface.h index 3dea18e36e..b84927af70 100644 --- a/engines/gob/surface.h +++ b/engines/gob/surface.h @@ -34,7 +34,7 @@ #include "graphics/iff.h" namespace Common { - class SeekableReadStream; +class SeekableReadStream; } namespace Gob { diff --git a/engines/gob/totfile.h b/engines/gob/totfile.h index 211232f870..ce467425e2 100644 --- a/engines/gob/totfile.h +++ b/engines/gob/totfile.h @@ -29,7 +29,7 @@ #include "common/str.h" namespace Common { - class SeekableReadStream; +class SeekableReadStream; } namespace Gob { diff --git a/engines/groovie/cursor.h b/engines/groovie/cursor.h index 7a1f3ccc0e..e40dc0c486 100644 --- a/engines/groovie/cursor.h +++ b/engines/groovie/cursor.h @@ -30,7 +30,7 @@ #include "common/system.h" namespace Common { - class MacResManager; +class MacResManager; } namespace Groovie { diff --git a/engines/groovie/groovie.h b/engines/groovie/groovie.h index f8fad8d91f..9335ffb7e4 100644 --- a/engines/groovie/groovie.h +++ b/engines/groovie/groovie.h @@ -33,7 +33,7 @@ #include "graphics/pixelformat.h" namespace Common { - class MacResManager; +class MacResManager; } /** diff --git a/engines/groovie/resource.h b/engines/groovie/resource.h index 37fa50f2ea..9c306beecb 100644 --- a/engines/groovie/resource.h +++ b/engines/groovie/resource.h @@ -27,7 +27,7 @@ #define GROOVIE_RESOURCE_H namespace Common { - class MacResManager; +class MacResManager; } namespace Groovie { diff --git a/engines/groovie/vdx.h b/engines/groovie/vdx.h index 38dd030bcb..31c7606cb7 100644 --- a/engines/groovie/vdx.h +++ b/engines/groovie/vdx.h @@ -29,7 +29,7 @@ #include "groovie/player.h" namespace Common { - class ReadStream; +class ReadStream; } namespace Groovie { diff --git a/engines/lastexpress/data/snd.h b/engines/lastexpress/data/snd.h index 2d28404f42..61d1c0951a 100644 --- a/engines/lastexpress/data/snd.h +++ b/engines/lastexpress/data/snd.h @@ -42,8 +42,8 @@ #include "audio/mixer.h" namespace Audio { - class AudioStream; - class QueuingAudioStream; +class AudioStream; +class QueuingAudioStream; } namespace Common { diff --git a/engines/lure/disk.h b/engines/lure/disk.h index d2848cc587..79aaf80bbc 100644 --- a/engines/lure/disk.h +++ b/engines/lure/disk.h @@ -33,7 +33,7 @@ #include "lure/res_struct.h" namespace Common { - class File; +class File; } namespace Lure { diff --git a/engines/made/scriptfuncs.h b/engines/made/scriptfuncs.h index 3bed27c5c8..b8b2a87d19 100644 --- a/engines/made/scriptfuncs.h +++ b/engines/made/scriptfuncs.h @@ -34,7 +34,7 @@ #include "made/resource.h" namespace Audio { - class PCSpeaker; +class PCSpeaker; } namespace Made { diff --git a/engines/metaengine.h b/engines/metaengine.h index 2afed0703b..ef34506991 100644 --- a/engines/metaengine.h +++ b/engines/metaengine.h @@ -37,8 +37,8 @@ class Engine; class OSystem; namespace Common { - class FSList; - class String; +class FSList; +class String; } /** diff --git a/engines/mohawk/cursors.h b/engines/mohawk/cursors.h index f8a9429689..1fb8b35714 100644 --- a/engines/mohawk/cursors.h +++ b/engines/mohawk/cursors.h @@ -29,11 +29,11 @@ #include "common/scummsys.h" namespace Common { - class MacResManager; - class NEResources; - class PEResources; - class SeekableReadStream; - class String; +class MacResManager; +class NEResources; +class PEResources; +class SeekableReadStream; +class String; } #include "mohawk/resource.h" diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h index 5cac68c510..c7e9b98d49 100644 --- a/engines/mohawk/graphics.h +++ b/engines/mohawk/graphics.h @@ -33,7 +33,7 @@ #include "graphics/pict.h" namespace Graphics { - class JPEG; +class JPEG; } namespace Mohawk { diff --git a/engines/mohawk/mohawk.h b/engines/mohawk/mohawk.h index 1bad8a08ce..8a853d151e 100644 --- a/engines/mohawk/mohawk.h +++ b/engines/mohawk/mohawk.h @@ -34,7 +34,7 @@ class OSystem; namespace Common { - class SeekableReadStream; +class SeekableReadStream; } /** diff --git a/engines/mohawk/myst_state.h b/engines/mohawk/myst_state.h index a543cb1c4f..074c3e5f10 100644 --- a/engines/mohawk/myst_state.h +++ b/engines/mohawk/myst_state.h @@ -31,7 +31,7 @@ #include "common/str.h" namespace Common { - class Serializer; +class Serializer; } namespace Mohawk { diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h index 8ff0efd3c6..69d3215d15 100644 --- a/engines/parallaction/disk.h +++ b/engines/parallaction/disk.h @@ -34,7 +34,7 @@ #include "graphics/iff.h" namespace Common { - class FSDirectory; +class FSDirectory; } diff --git a/engines/queen/queen.h b/engines/queen/queen.h index 93d705b182..6098a9f5c2 100644 --- a/engines/queen/queen.h +++ b/engines/queen/queen.h @@ -30,7 +30,7 @@ #include "common/random.h" namespace Common { - class SeekableReadStream; +class SeekableReadStream; } #if defined(_WIN32_WCE) && (_WIN32_WCE <= 300) diff --git a/engines/queen/sound.h b/engines/queen/sound.h index cee0463ed1..a89e345791 100644 --- a/engines/queen/sound.h +++ b/engines/queen/sound.h @@ -32,7 +32,7 @@ #include "queen/defs.h" namespace Common { - class File; +class File; } namespace Queen { diff --git a/engines/sci/decompressor.h b/engines/sci/decompressor.h index 88e24fcc47..8b6f955ddb 100644 --- a/engines/sci/decompressor.h +++ b/engines/sci/decompressor.h @@ -28,7 +28,9 @@ #include "common/scummsys.h" -namespace Common { class ReadStream; } +namespace Common { +class ReadStream; +} namespace Sci { diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h index d91118ec1e..cd6d56500a 100644 --- a/engines/sci/engine/state.h +++ b/engines/sci/engine/state.h @@ -32,8 +32,8 @@ #include "common/str-array.h" namespace Common { - class SeekableReadStream; - class WriteStream; +class SeekableReadStream; +class WriteStream; } #include "sci/sci.h" diff --git a/engines/sci/graphics/fontsjis.h b/engines/sci/graphics/fontsjis.h index 684e6cac5e..5538b5c2c5 100644 --- a/engines/sci/graphics/fontsjis.h +++ b/engines/sci/graphics/fontsjis.h @@ -29,7 +29,7 @@ #include "sci/graphics/helpers.h" namespace Graphics { - class FontSJIS; +class FontSJIS; } namespace Sci { diff --git a/engines/sci/resource_intern.h b/engines/sci/resource_intern.h index 98cca6283c..969e250e62 100644 --- a/engines/sci/resource_intern.h +++ b/engines/sci/resource_intern.h @@ -29,7 +29,7 @@ #include "sci/resource.h" namespace Common { - class MacResManager; +class MacResManager; } namespace Sci { diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h index 0e6e18905f..40e549471b 100644 --- a/engines/scumm/dialogs.h +++ b/engines/scumm/dialogs.h @@ -33,8 +33,8 @@ #include "scumm/detection.h" namespace GUI { - class ListWidget; - class CommandSender; +class ListWidget; +class CommandSender; } diff --git a/engines/scumm/player_mod.h b/engines/scumm/player_mod.h index 67d1bb4cbf..3f97c4cab9 100644 --- a/engines/scumm/player_mod.h +++ b/engines/scumm/player_mod.h @@ -31,7 +31,7 @@ #include "audio/mixer.h" namespace Audio { - class RateConverter; +class RateConverter; } namespace Scumm { diff --git a/engines/scumm/player_nes.h b/engines/scumm/player_nes.h index 5f6e8f2d8d..402eea7bf8 100644 --- a/engines/scumm/player_nes.h +++ b/engines/scumm/player_nes.h @@ -35,7 +35,7 @@ namespace Scumm { class ScummEngine; namespace APUe { - class APU; +class APU; } static const int MAXVOLUME = 0x7F; diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 91e780bcd1..eead241b90 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -30,8 +30,8 @@ #include <stddef.h> // for ptrdiff_t namespace Common { - class SeekableReadStream; - class WriteStream; +class SeekableReadStream; +class WriteStream; } namespace Scumm { diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 59b9e401e1..59ff0f1fc3 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -56,12 +56,12 @@ #endif namespace GUI { - class Dialog; +class Dialog; } using GUI::Dialog; namespace Common { - class SeekableReadStream; - class WriteStream; +class SeekableReadStream; +class WriteStream; } /** diff --git a/engines/scumm/smush/channel.h b/engines/scumm/smush/channel.h index c35ac0ac00..717a294d96 100644 --- a/engines/scumm/smush/channel.h +++ b/engines/scumm/smush/channel.h @@ -29,7 +29,7 @@ #include "common/util.h" namespace Common { - class SeekableReadStream; +class SeekableReadStream; } namespace Scumm { diff --git a/engines/sky/compact.h b/engines/sky/compact.h index cd80d5cfbe..4861273146 100644 --- a/engines/sky/compact.h +++ b/engines/sky/compact.h @@ -31,7 +31,7 @@ #include "sky/skydefs.h" namespace Common { - class File; +class File; } enum CptIds { diff --git a/engines/sky/control.h b/engines/sky/control.h index a0024ce73b..e4428c1876 100644 --- a/engines/sky/control.h +++ b/engines/sky/control.h @@ -33,7 +33,7 @@ class OSystem; namespace Common { - class SaveFileManager; +class SaveFileManager; } namespace Sky { diff --git a/engines/sky/disk.h b/engines/sky/disk.h index 3338cce385..9e260281c8 100644 --- a/engines/sky/disk.h +++ b/engines/sky/disk.h @@ -34,7 +34,7 @@ #define MAX_FILES_IN_LIST 60 namespace Common { - class File; +class File; } namespace Sky { diff --git a/engines/sword1/control.h b/engines/sword1/control.h index 2e5bfc7197..db910f521f 100644 --- a/engines/sword1/control.h +++ b/engines/sword1/control.h @@ -33,7 +33,7 @@ class OSystem; namespace Common { - class SaveFileManager; +class SaveFileManager; } namespace Sword1 { diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h index ae96132241..b6fcd6706f 100644 --- a/engines/sword1/sound.h +++ b/engines/sword1/sound.h @@ -34,7 +34,7 @@ #include "audio/mixer.h" namespace Audio { - class Mixer; +class Mixer; } namespace Sword1 { diff --git a/engines/sword2/resman.h b/engines/sword2/resman.h index dcc79927ea..75748e1568 100644 --- a/engines/sword2/resman.h +++ b/engines/sword2/resman.h @@ -29,7 +29,7 @@ #define SWORD2_RESMAN_H namespace Common { - class File; +class File; } #define MAX_MEM_CACHE (8 * 1024 * 1024) // we keep up to 8 megs of resource data files in memory diff --git a/engines/tinsel/dialogs.h b/engines/tinsel/dialogs.h index a256ed73e8..f81a59a0b7 100644 --- a/engines/tinsel/dialogs.h +++ b/engines/tinsel/dialogs.h @@ -32,7 +32,7 @@ #include "tinsel/events.h" // for PLR_EVENT, PLR_EVENT namespace Common { - class Serializer; +class Serializer; } namespace Tinsel { diff --git a/engines/tinsel/pcode.h b/engines/tinsel/pcode.h index f3690e9257..f31f2eb5c6 100644 --- a/engines/tinsel/pcode.h +++ b/engines/tinsel/pcode.h @@ -31,7 +31,7 @@ #include "tinsel/sched.h" // for PROCESS namespace Common { - class Serializer; +class Serializer; } namespace Tinsel { diff --git a/engines/tinsel/timers.h b/engines/tinsel/timers.h index 022604b662..1456d9a1d5 100644 --- a/engines/tinsel/timers.h +++ b/engines/tinsel/timers.h @@ -31,7 +31,7 @@ #include "tinsel/dw.h" namespace Common { - class Serializer; +class Serializer; } namespace Tinsel { diff --git a/engines/touche/midi.h b/engines/touche/midi.h index f0f55e64e6..bde4950b93 100644 --- a/engines/touche/midi.h +++ b/engines/touche/midi.h @@ -34,7 +34,7 @@ class MidiParser; namespace Common { - class ReadStream; +class ReadStream; } namespace Touche { |