Skip to content

Commit

Permalink
JANITORIAL: Format forward declarations to follow convention
Browse files Browse the repository at this point in the history
  • Loading branch information
salty-horse committed Apr 28, 2011
1 parent 80c90a5 commit cd6ee05
Show file tree
Hide file tree
Showing 76 changed files with 132 additions and 115 deletions.
4 changes: 3 additions & 1 deletion audio/decoders/adpcm.h
Expand Up @@ -40,7 +40,9 @@
#include "common/scummsys.h"
#include "common/types.h"

namespace Common { class SeekableReadStream; }
namespace Common {
class SeekableReadStream;
}


namespace Audio {
Expand Down
4 changes: 3 additions & 1 deletion audio/decoders/aiff.h
Expand Up @@ -37,7 +37,9 @@
#include "common/scummsys.h"
#include "common/types.h"

namespace Common { class SeekableReadStream; }
namespace Common {
class SeekableReadStream;
}

namespace Audio {

Expand Down
2 changes: 1 addition & 1 deletion audio/decoders/flac.h
Expand Up @@ -49,7 +49,7 @@
#ifdef USE_FLAC

namespace Common {
class SeekableReadStream;
class SeekableReadStream;
}

namespace Audio {
Expand Down
2 changes: 1 addition & 1 deletion audio/decoders/iff_sound.h
Expand Up @@ -33,7 +33,7 @@
#define SOUND_IFF_H

namespace Common {
class ReadStream;
class ReadStream;
}

namespace Audio {
Expand Down
4 changes: 3 additions & 1 deletion audio/decoders/mac_snd.h
Expand Up @@ -35,7 +35,9 @@
#include "common/scummsys.h"
#include "common/types.h"

namespace Common { class SeekableReadStream; }
namespace Common {
class SeekableReadStream;
}

namespace Audio {

Expand Down
2 changes: 1 addition & 1 deletion audio/decoders/mp3.h
Expand Up @@ -50,7 +50,7 @@
#ifdef USE_MAD

namespace Common {
class SeekableReadStream;
class SeekableReadStream;
}

namespace Audio {
Expand Down
5 changes: 3 additions & 2 deletions audio/decoders/raw.h
Expand Up @@ -32,8 +32,9 @@
#include "common/list.h"


namespace Common { class SeekableReadStream; }

namespace Common {
class SeekableReadStream;
}

namespace Audio {

Expand Down
2 changes: 1 addition & 1 deletion audio/decoders/vag.h
Expand Up @@ -35,7 +35,7 @@
#define SOUND_VAG_H

namespace Common {
class SeekableReadStream;
class SeekableReadStream;
}

namespace Audio {
Expand Down
6 changes: 4 additions & 2 deletions audio/decoders/voc.h
Expand Up @@ -41,8 +41,10 @@
#include "common/scummsys.h"
#include "common/types.h"

namespace Common { class ReadStream; }
namespace Common { class SeekableReadStream; }
namespace Common {
class ReadStream;
class SeekableReadStream;
}

namespace Audio {

Expand Down
2 changes: 1 addition & 1 deletion audio/decoders/vorbis.h
Expand Up @@ -49,7 +49,7 @@
#ifdef USE_VORBIS

namespace Common {
class SeekableReadStream;
class SeekableReadStream;
}

namespace Audio {
Expand Down
4 changes: 3 additions & 1 deletion audio/decoders/wave.h
Expand Up @@ -43,7 +43,9 @@
#include "common/scummsys.h"
#include "common/types.h"

namespace Common { class SeekableReadStream; }
namespace Common {
class SeekableReadStream;
}

namespace Audio {

Expand Down
6 changes: 4 additions & 2 deletions audio/mididrv.h
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions backends/events/default/default-events.h
Expand Up @@ -31,10 +31,10 @@

namespace Common {
#ifdef ENABLE_KEYMAPPER
class Keymapper;
class Keymapper;
#endif
#ifdef ENABLE_VKEYBD
class VirtualKeyboard;
class VirtualKeyboard;
#endif
}

Expand Down
4 changes: 2 additions & 2 deletions backends/keymapper/remap-dialog.h
Expand Up @@ -33,8 +33,8 @@
#include "gui/dialog.h"

namespace GUI {
class PopupWidget;
class ScrollBarWidget;
class PopupWidget;
class ScrollBarWidget;
}

namespace Common {
Expand Down
4 changes: 2 additions & 2 deletions backends/platform/ps2/systemps2.h
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion backends/platform/psp/mp3.h
Expand Up @@ -30,7 +30,7 @@
#include "common/scummsys.h"

namespace Common {
class SeekableReadStream;
class SeekableReadStream;
}

namespace Audio {
Expand Down
4 changes: 2 additions & 2 deletions base/plugins.h
Expand Up @@ -33,8 +33,8 @@
#include "backends/plugins/elf/version.h"

namespace Common {
class FSList;
class FSNode;
class FSList;
class FSNode;
}


Expand Down
18 changes: 9 additions & 9 deletions common/system.h
Expand Up @@ -35,22 +35,22 @@
#include "graphics/pixelformat.h"

namespace Audio {
class Mixer;
class Mixer;
}

namespace Graphics {
struct Surface;
}

namespace Common {
struct Event;
class EventManager;
class SaveFileManager;
class SearchSet;
class TimerManager;
class SeekableReadStream;
class WriteStream;
class HardwareKeySet;
struct Event;
class EventManager;
class SaveFileManager;
class SearchSet;
class TimerManager;
class SeekableReadStream;
class WriteStream;
class HardwareKeySet;
}

class AudioCDManager;
Expand Down
4 changes: 3 additions & 1 deletion engines/agi/agi.h
Expand Up @@ -45,7 +45,9 @@
#include "agi/sound.h"


namespace Common { class RandomSource; }
namespace Common {
class RandomSource;
}

/**
* This is the namespace of the AGI engine.
Expand Down
2 changes: 1 addition & 1 deletion engines/agos/midi.h
Expand Up @@ -31,7 +31,7 @@
#include "common/mutex.h"

namespace Common {
class File;
class File;
}

namespace AGOS {
Expand Down
2 changes: 1 addition & 1 deletion engines/cine/sound.h
Expand Up @@ -30,7 +30,7 @@
#include "audio/mixer.h"

namespace Audio {
class AudioStream;
class AudioStream;
}

namespace Cine {
Expand Down
6 changes: 3 additions & 3 deletions engines/dialogs.h
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion engines/draci/game.h
Expand Up @@ -31,7 +31,7 @@
#include "draci/walking.h"

namespace Common {
class Serializer;
class Serializer;
}

namespace Draci {
Expand Down
2 changes: 1 addition & 1 deletion engines/draci/script.h
Expand Up @@ -30,7 +30,7 @@
#include "common/stream.h"

namespace Common {
class ReadStream;
class ReadStream;
}

namespace Draci {
Expand Down
12 changes: 6 additions & 6 deletions engines/engine.h
Expand Up @@ -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;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion engines/gob/dataio.h
Expand Up @@ -33,7 +33,7 @@
#include "common/file.h"

namespace Common {
class SeekableReadStream;
class SeekableReadStream;
}

namespace Gob {
Expand Down
2 changes: 1 addition & 1 deletion engines/gob/gob.h
Expand Up @@ -35,7 +35,7 @@
#include "gob/console.h"

namespace GUI {
class StaticTextWidget;
class StaticTextWidget;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion engines/gob/resources.h
Expand Up @@ -29,7 +29,7 @@
#include "common/str.h"

namespace Common {
class SeekableReadStream;
class SeekableReadStream;
}

namespace Gob {
Expand Down
2 changes: 1 addition & 1 deletion engines/gob/surface.h
Expand Up @@ -34,7 +34,7 @@
#include "graphics/iff.h"

namespace Common {
class SeekableReadStream;
class SeekableReadStream;
}

namespace Gob {
Expand Down
2 changes: 1 addition & 1 deletion engines/gob/totfile.h
Expand Up @@ -29,7 +29,7 @@
#include "common/str.h"

namespace Common {
class SeekableReadStream;
class SeekableReadStream;
}

namespace Gob {
Expand Down
2 changes: 1 addition & 1 deletion engines/groovie/cursor.h
Expand Up @@ -30,7 +30,7 @@
#include "common/system.h"

namespace Common {
class MacResManager;
class MacResManager;
}

namespace Groovie {
Expand Down
2 changes: 1 addition & 1 deletion engines/groovie/groovie.h
Expand Up @@ -33,7 +33,7 @@
#include "graphics/pixelformat.h"

namespace Common {
class MacResManager;
class MacResManager;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion engines/groovie/resource.h
Expand Up @@ -27,7 +27,7 @@
#define GROOVIE_RESOURCE_H

namespace Common {
class MacResManager;
class MacResManager;
}

namespace Groovie {
Expand Down
2 changes: 1 addition & 1 deletion engines/groovie/vdx.h
Expand Up @@ -29,7 +29,7 @@
#include "groovie/player.h"

namespace Common {
class ReadStream;
class ReadStream;
}

namespace Groovie {
Expand Down
4 changes: 2 additions & 2 deletions engines/lastexpress/data/snd.h
Expand Up @@ -42,8 +42,8 @@
#include "audio/mixer.h"

namespace Audio {
class AudioStream;
class QueuingAudioStream;
class AudioStream;
class QueuingAudioStream;
}

namespace Common {
Expand Down

0 comments on commit cd6ee05

Please sign in to comment.