JANITORIAL: Format forward declarations to follow convention

audio/decoders/adpcm.h

@@ -40,7 +40,9 @@
 #include "common/scummsys.h"
 #include "common/types.h"
 
-namespace Common { class SeekableReadStream; }
+namespace Common {
+class SeekableReadStream;
+}
 
 
 namespace Audio {

audio/decoders/aiff.h

@@ -37,7 +37,9 @@
 #include "common/scummsys.h"
 #include "common/types.h"
 
-namespace Common { class SeekableReadStream; }
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Audio {
 

audio/decoders/flac.h

@@ -49,7 +49,7 @@
 #ifdef USE_FLAC
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Audio {

audio/decoders/iff_sound.h

@@ -33,7 +33,7 @@
 #define SOUND_IFF_H
 
 namespace Common {
-	class ReadStream;
+class ReadStream;
 }
 
 namespace Audio {

audio/decoders/mac_snd.h

@@ -35,7 +35,9 @@
 #include "common/scummsys.h"
 #include "common/types.h"
 
-namespace Common { class SeekableReadStream; }
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Audio {
 

audio/decoders/mp3.h

@@ -50,7 +50,7 @@
 #ifdef USE_MAD
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Audio {

audio/decoders/raw.h

@@ -32,8 +32,9 @@
 #include "common/list.h"
 
 
-namespace Common { class SeekableReadStream; }
+namespace Common {
-
+class SeekableReadStream;
+}
 
 namespace Audio {
 

audio/decoders/vag.h

@@ -35,7 +35,7 @@
 #define SOUND_VAG_H
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Audio {

audio/decoders/voc.h

@@ -41,8 +41,10 @@
 #include "common/scummsys.h"
 #include "common/types.h"
 
-namespace Common { class ReadStream; }
+namespace Common {
-namespace Common { class SeekableReadStream; }
+class ReadStream;
+class SeekableReadStream;
+}
 
 namespace Audio {
 

audio/decoders/vorbis.h

@@ -49,7 +49,7 @@
 #ifdef USE_VORBIS
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Audio {

audio/decoders/wave.h

@@ -43,7 +43,9 @@
 #include "common/scummsys.h"
 #include "common/types.h"
 
-namespace Common { class SeekableReadStream; }
+namespace Common {
+class SeekableReadStream;
+}
 
 namespace Audio {
 

audio/mididrv.h

@@ -33,9 +33,11 @@ class MidiChannel;
 class MusicDevice;
 
 namespace Audio {
-	class Mixer;
+class Mixer;
+}
+namespace Common {
+class String;
 }
-namespace Common { class String; }
 
 /**
  * Music types that music drivers can implement and engines can rely on.

backends/events/default/default-events.h

@@ -31,10 +31,10 @@
 
 namespace Common {
 #ifdef ENABLE_KEYMAPPER
-	class Keymapper;
+class Keymapper;
 #endif
 #ifdef ENABLE_VKEYBD
-	class VirtualKeyboard;
+class VirtualKeyboard;
 #endif
 }
 

backends/keymapper/remap-dialog.h

@@ -33,8 +33,8 @@
 #include "gui/dialog.h"
 
 namespace GUI {
-	class PopupWidget;
+class PopupWidget;
-	class ScrollBarWidget;
+class ScrollBarWidget;
 }
 
 namespace Common {

backends/platform/ps2/systemps2.h

@@ -47,11 +47,11 @@ struct Ps2Mutex {
 };
 
 namespace Common {
-	class TimerManager;
+class TimerManager;
 };
 
 namespace Audio {
-	class MixerImpl;
+class MixerImpl;
 };
 
 class OSystem_PS2 : public BaseBackend, public PaletteManager {

backends/platform/psp/mp3.h

@@ -30,7 +30,7 @@
 #include "common/scummsys.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Audio {

base/plugins.h

@@ -33,8 +33,8 @@
 #include "backends/plugins/elf/version.h"
 
 namespace Common {
-	class FSList;
+class FSList;
-	class FSNode;
+class FSNode;
 }
 
 

common/system.h

@@ -35,7 +35,7 @@
 #include "graphics/pixelformat.h"
 
 namespace Audio {
-	class Mixer;
+class Mixer;
 }
 
 namespace Graphics {
@@ -43,14 +43,14 @@ namespace Graphics {
 }
 
 namespace Common {
-	struct Event;
+struct Event;
-	class EventManager;
+class EventManager;
-	class SaveFileManager;
+class SaveFileManager;
-	class SearchSet;
+class SearchSet;
-	class TimerManager;
+class TimerManager;
-	class SeekableReadStream;
+class SeekableReadStream;
-	class WriteStream;
+class WriteStream;
-	class HardwareKeySet;
+class HardwareKeySet;
 }
 
 class AudioCDManager;

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.

engines/agos/midi.h

@@ -31,7 +31,7 @@
 #include "common/mutex.h"
 
 namespace Common {
-	class File;
+class File;
 }
 
 namespace AGOS {

engines/cine/sound.h

@@ -30,7 +30,7 @@
 #include "audio/mixer.h"
 
 namespace Audio {
-	class AudioStream;
+class AudioStream;
 }
 
 namespace Cine {

engines/dialogs.h

@@ -31,9 +31,9 @@
 class Engine;
 
 namespace GUI {
-	class ButtonWidget;
+class ButtonWidget;
-	class GraphicsWidget;
+class GraphicsWidget;
-	class SaveLoadChooser;
+class SaveLoadChooser;
 }
 
 class MainMenuDialog : public GUI::Dialog {

engines/draci/game.h

@@ -31,7 +31,7 @@
 #include "draci/walking.h"
 
 namespace Common {
-	class Serializer;
+class Serializer;
 }
 
 namespace Draci {

engines/draci/script.h

@@ -30,7 +30,7 @@
 #include "common/stream.h"
 
 namespace Common {
-	class ReadStream;
+class ReadStream;
 }
 
 namespace Draci {

engines/engine.h

@@ -32,16 +32,16 @@
 class OSystem;
 
 namespace Audio {
-	class Mixer;
+class Mixer;
 }
 namespace Common {
-	class EventManager;
+class EventManager;
-	class SaveFileManager;
+class SaveFileManager;
-	class TimerManager;
+class TimerManager;
 }
 namespace GUI {
-	class Debugger;
+class Debugger;
-	class Dialog;
+class Dialog;
 }
 
 /**

engines/gob/dataio.h

@@ -33,7 +33,7 @@
 #include "common/file.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Gob {

engines/gob/gob.h

@@ -35,7 +35,7 @@
 #include "gob/console.h"
 
 namespace GUI {
-	class StaticTextWidget;
+class StaticTextWidget;
 }
 
 /**

engines/gob/resources.h

@@ -29,7 +29,7 @@
 #include "common/str.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Gob {

engines/gob/surface.h

@@ -34,7 +34,7 @@
 #include "graphics/iff.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Gob {

engines/gob/totfile.h

@@ -29,7 +29,7 @@
 #include "common/str.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Gob {

engines/groovie/cursor.h

@@ -30,7 +30,7 @@
 #include "common/system.h"
 
 namespace Common {
-	class MacResManager;
+class MacResManager;
 }
 
 namespace Groovie {

engines/groovie/groovie.h

@@ -33,7 +33,7 @@
 #include "graphics/pixelformat.h"
 
 namespace Common {
-	class MacResManager;
+class MacResManager;
 }
 
 /**

engines/groovie/resource.h

@@ -27,7 +27,7 @@
 #define GROOVIE_RESOURCE_H
 
 namespace Common {
-	class MacResManager;
+class MacResManager;
 }
 
 namespace Groovie {

engines/groovie/vdx.h

@@ -29,7 +29,7 @@
 #include "groovie/player.h"
 
 namespace Common {
-	class ReadStream;
+class ReadStream;
 }
 
 namespace Groovie {

engines/lastexpress/data/snd.h

@@ -42,8 +42,8 @@
 #include "audio/mixer.h"
 
 namespace Audio {
-	class AudioStream;
+class AudioStream;
-	class QueuingAudioStream;
+class QueuingAudioStream;
 }
 
 namespace Common {

engines/lure/disk.h

@@ -33,7 +33,7 @@
 #include "lure/res_struct.h"
 
 namespace Common {
-	class File;
+class File;
 }
 
 namespace Lure {

engines/made/scriptfuncs.h

@@ -34,7 +34,7 @@
 #include "made/resource.h"
 
 namespace Audio {
-	class PCSpeaker;
+class PCSpeaker;
 }
 
 namespace Made {

engines/metaengine.h

@@ -37,8 +37,8 @@ class Engine;
 class OSystem;
 
 namespace Common {
-	class FSList;
+class FSList;
-	class String;
+class String;
 }
 
 /**

engines/mohawk/cursors.h

@@ -29,11 +29,11 @@
 #include "common/scummsys.h"
 
 namespace Common {
-	class MacResManager;
+class MacResManager;
-	class NEResources;
+class NEResources;
-	class PEResources;
+class PEResources;
-	class SeekableReadStream;
+class SeekableReadStream;
-	class String;
+class String;
 }
 
 #include "mohawk/resource.h"

engines/mohawk/graphics.h

@@ -33,7 +33,7 @@
 #include "graphics/pict.h"
 
 namespace Graphics {
-	class JPEG;
+class JPEG;
 }
 
 namespace Mohawk {

engines/mohawk/mohawk.h

@@ -34,7 +34,7 @@
 class OSystem;
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 /**

engines/mohawk/myst_state.h

@@ -31,7 +31,7 @@
 #include "common/str.h"
 
 namespace Common {
-	class Serializer;
+class Serializer;
 }
 
 namespace Mohawk {

engines/parallaction/disk.h

@@ -34,7 +34,7 @@
 #include "graphics/iff.h"
 
 namespace Common {
-	class FSDirectory;
+class FSDirectory;
 }
 
 

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)

engines/queen/sound.h

@@ -32,7 +32,7 @@
 #include "queen/defs.h"
 
 namespace Common {
-	class File;
+class File;
 }
 
 namespace Queen {

engines/sci/decompressor.h

@@ -28,7 +28,9 @@
 
 #include "common/scummsys.h"
 
-namespace Common { class ReadStream; }
+namespace Common {
+class ReadStream;
+}
 
 namespace Sci {
 

engines/sci/engine/state.h

@@ -32,8 +32,8 @@
 #include "common/str-array.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
-	class WriteStream;
+class WriteStream;
 }
 
 #include "sci/sci.h"

engines/sci/graphics/fontsjis.h

@@ -29,7 +29,7 @@
 #include "sci/graphics/helpers.h"
 
 namespace Graphics {
-	class FontSJIS;
+class FontSJIS;
 }
 
 namespace Sci {

engines/sci/resource_intern.h

@@ -29,7 +29,7 @@
 #include "sci/resource.h"
 
 namespace Common {
-	class MacResManager;
+class MacResManager;
 }
 
 namespace Sci {

engines/scumm/dialogs.h

@@ -33,8 +33,8 @@
 #include "scumm/detection.h"
 
 namespace GUI {
-	class ListWidget;
+class ListWidget;
-	class CommandSender;
+class CommandSender;
 }
 
 

engines/scumm/player_mod.h

@@ -31,7 +31,7 @@
 #include "audio/mixer.h"
 
 namespace Audio {
-	class RateConverter;
+class RateConverter;
 }
 
 namespace Scumm {

engines/scumm/player_nes.h

@@ -35,7 +35,7 @@ namespace Scumm {
 
 class ScummEngine;
 namespace APUe {
-	class APU;
+class APU;
 }
 
 static const int MAXVOLUME = 0x7F;

engines/scumm/saveload.h

@@ -30,8 +30,8 @@
 #include <stddef.h>	// for ptrdiff_t
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
-	class WriteStream;
+class WriteStream;
 }
 
 namespace Scumm {

engines/scumm/scumm.h

@@ -56,12 +56,12 @@
 #endif
 
 namespace GUI {
-	class Dialog;
+class Dialog;
 }
 using GUI::Dialog;
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
-	class WriteStream;
+class WriteStream;
 }
 
 /**

engines/scumm/smush/channel.h

@@ -29,7 +29,7 @@
 #include "common/util.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Scumm {

engines/sky/compact.h

@@ -31,7 +31,7 @@
 #include "sky/skydefs.h"
 
 namespace Common {
-	class File;
+class File;
 }
 
 enum CptIds {

engines/sky/control.h

@@ -33,7 +33,7 @@
 
 class OSystem;
 namespace Common {
-	class SaveFileManager;
+class SaveFileManager;
 }
 
 namespace Sky {

engines/sky/disk.h

@@ -34,7 +34,7 @@
 #define MAX_FILES_IN_LIST 60
 
 namespace Common {
-	class File;
+class File;
 }
 
 namespace Sky {

engines/sword1/control.h

@@ -33,7 +33,7 @@
 
 class OSystem;
 namespace Common {
-	class SaveFileManager;
+class SaveFileManager;
 }
 
 namespace Sword1 {

engines/sword1/sound.h

@@ -34,7 +34,7 @@
 #include "audio/mixer.h"
 
 namespace Audio {
-	class Mixer;
+class Mixer;
 }
 
 namespace Sword1 {

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

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 {

engines/tinsel/pcode.h

@@ -31,7 +31,7 @@
 #include "tinsel/sched.h"	// for PROCESS
 
 namespace Common {
-	class Serializer;
+class Serializer;
 }
 
 namespace Tinsel {

engines/tinsel/timers.h

@@ -31,7 +31,7 @@
 #include "tinsel/dw.h"
 
 namespace Common {
-	class Serializer;
+class Serializer;
 }
 
 namespace Tinsel {

engines/touche/midi.h

@@ -34,7 +34,7 @@
 class MidiParser;
 
 namespace Common {
-	class ReadStream;
+class ReadStream;
 }
 
 namespace Touche {

graphics/fonts/winfont.h

@@ -28,8 +28,8 @@
 #include "graphics/font.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
-	class String;
+class String;
 }
 
 namespace Graphics {

graphics/pict.h

@@ -32,7 +32,7 @@
 #include "graphics/pixelformat.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Graphics {

graphics/wincursor.h

@@ -30,9 +30,9 @@
 #include "common/winexe.h"
 
 namespace Common {
-	class NEResources;
+class NEResources;
-	class PEResources;
+class PEResources;
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Graphics {

gui/ThemeLayout.h

@@ -30,8 +30,8 @@
 
 #ifdef LAYOUT_DEBUG_DIALOG
 namespace Graphics {
-	class Font;
+class Font;
-	class Surface;
+class Surface;
 }
 #endif
 

video/codecs/qdm2.h

@@ -30,11 +30,11 @@
 #define VIDEO_CODECS_QDM2_H
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Audio {
-	class AudioStream;
+class AudioStream;
 }
 
 namespace Video {

video/coktel_decoder.h

@@ -42,7 +42,7 @@
 #include "audio/mixer.h"
 
 namespace Audio {
-	class QueuingAudioStream;
+class QueuingAudioStream;
 }
 
 namespace Video {

video/flic_decoder.h

@@ -31,7 +31,7 @@
 #include "common/rect.h"
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Video {

video/mpeg_player.h

@@ -81,7 +81,7 @@ typedef sequence_t mpeg2_sequence_t;
 #define BUFFER_SIZE 4096
 
 namespace Common {
-	class File;
+class File;
 }
 
 class OSystem;

video/qt_decoder.h

@@ -45,8 +45,8 @@
 #include "audio/mixer.h"
 
 namespace Common {
-	class File;
+class File;
-	class MacResManager;
+class MacResManager;
 }
 
 namespace Video {

video/smk_decoder.h

@@ -30,7 +30,7 @@
 #include "audio/mixer.h"
 
 namespace Audio {
-	class QueuingAudioStream;
+class QueuingAudioStream;
 }
 
 namespace Video {

video/video_decoder.h

@@ -37,7 +37,7 @@
 
 
 namespace Common {
-	class SeekableReadStream;
+class SeekableReadStream;
 }
 
 namespace Video {