diff --git a/src/blitter/32bpp_anim.hpp b/src/blitter/32bpp_anim.hpp --- a/src/blitter/32bpp_anim.hpp +++ b/src/blitter/32bpp_anim.hpp @@ -56,7 +56,7 @@ public: }; /** Factory for the 32bpp blitter with animation. */ -class FBlitter_32bppAnim: public BlitterFactory { +class FBlitter_32bppAnim : public BlitterFactory { public: /* virtual */ const char *GetName() { return "32bpp-anim"; } /* virtual */ const char *GetDescription() { return "32bpp Animation Blitter (palette animation)"; } diff --git a/src/blitter/32bpp_optimized.hpp b/src/blitter/32bpp_optimized.hpp --- a/src/blitter/32bpp_optimized.hpp +++ b/src/blitter/32bpp_optimized.hpp @@ -32,7 +32,7 @@ public: }; /** Factory for the optimised 32 bpp blitter (without palette animation). */ -class FBlitter_32bppOptimized: public BlitterFactory { +class FBlitter_32bppOptimized : public BlitterFactory { public: /* virtual */ const char *GetName() { return "32bpp-optimized"; } /* virtual */ const char *GetDescription() { return "32bpp Optimized Blitter (no palette animation)"; } diff --git a/src/blitter/32bpp_simple.hpp b/src/blitter/32bpp_simple.hpp --- a/src/blitter/32bpp_simple.hpp +++ b/src/blitter/32bpp_simple.hpp @@ -34,7 +34,7 @@ public: }; /** Factory for the simple 32 bpp blitter. */ -class FBlitter_32bppSimple: public BlitterFactory { +class FBlitter_32bppSimple : public BlitterFactory { public: /* virtual */ const char *GetName() { return "32bpp-simple"; } /* virtual */ const char *GetDescription() { return "32bpp Simple Blitter (no palette animation)"; } diff --git a/src/blitter/8bpp_optimized.hpp b/src/blitter/8bpp_optimized.hpp --- a/src/blitter/8bpp_optimized.hpp +++ b/src/blitter/8bpp_optimized.hpp @@ -31,7 +31,7 @@ public: }; /** Factory for the 8bpp blitter optimised for speed. */ -class FBlitter_8bppOptimized: public BlitterFactory { +class FBlitter_8bppOptimized : public BlitterFactory { public: /* virtual */ const char *GetName() { return "8bpp-optimized"; } /* virtual */ const char *GetDescription() { return "8bpp Optimized Blitter (compression + all-ZoomLevel cache)"; } diff --git a/src/blitter/8bpp_simple.hpp b/src/blitter/8bpp_simple.hpp --- a/src/blitter/8bpp_simple.hpp +++ b/src/blitter/8bpp_simple.hpp @@ -25,7 +25,7 @@ public: }; /** Factory for the most trivial 8bpp blitter. */ -class FBlitter_8bppSimple: public BlitterFactory { +class FBlitter_8bppSimple : public BlitterFactory { public: /* virtual */ const char *GetName() { return "8bpp-simple"; } /* virtual */ const char *GetDescription() { return "8bpp Simple Blitter (relative slow, but never wrong)"; } diff --git a/src/blitter/factory.hpp b/src/blitter/factory.hpp --- a/src/blitter/factory.hpp +++ b/src/blitter/factory.hpp @@ -163,7 +163,7 @@ public: * A template factory, so ->GetName() works correctly. This because else some compiler will complain. */ template -class BlitterFactory: public BlitterFactoryBase { +class BlitterFactory : public BlitterFactoryBase { public: BlitterFactory() { this->RegisterBlitter(((T *)this)->GetName()); } diff --git a/src/blitter/null.hpp b/src/blitter/null.hpp --- a/src/blitter/null.hpp +++ b/src/blitter/null.hpp @@ -38,7 +38,7 @@ public: }; /** Factory for the blitter that does nothing. */ -class FBlitter_Null: public BlitterFactory { +class FBlitter_Null : public BlitterFactory { public: /* virtual */ const char *GetName() { return "null"; } /* virtual */ const char *GetDescription() { return "Null Blitter (does nothing)"; } diff --git a/src/cargoaction.h b/src/cargoaction.h --- a/src/cargoaction.h +++ b/src/cargoaction.h @@ -88,7 +88,7 @@ public: }; /** Action of reserving cargo from a station to be loaded onto a vehicle. */ -class CargoReservation: public CargoLoad { +class CargoReservation : public CargoLoad { public: CargoReservation(StationCargoList *source, VehicleCargoList *destination, uint max_move, TileIndex load_place) : CargoLoad(source, destination, max_move, load_place) {} @@ -96,7 +96,7 @@ public: }; /** Action of returning previously reserved cargo from the vehicle to the station. */ -class CargoReturn: public CargoMovement { +class CargoReturn : public CargoMovement { StationID next; public: CargoReturn(VehicleCargoList *source, StationCargoList *destination, uint max_move, StationID next) : diff --git a/src/driver.h b/src/driver.h --- a/src/driver.h +++ b/src/driver.h @@ -59,9 +59,9 @@ DECLARE_POSTFIX_INCREMENT(Driver::Type) /** Base for all driver factories. */ class DriverFactoryBase { private: - Driver::Type type; ///< The type of driver. + Driver::Type type; ///< The type of driver. int priority; ///< The priority of this factory. - const char *name; ///< The name of the drivers of this factory. + const char *name; ///< The name of the drivers of this factory. const char *description; ///< The description of this driver. typedef std::map Drivers; ///< Type for a map of drivers. diff --git a/src/music/allegro_m.h b/src/music/allegro_m.h --- a/src/music/allegro_m.h +++ b/src/music/allegro_m.h @@ -15,7 +15,7 @@ #include "music_driver.hpp" /** Allegro's music player. */ -class MusicDriver_Allegro: public MusicDriver { +class MusicDriver_Allegro : public MusicDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/music/bemidi.h b/src/music/bemidi.h --- a/src/music/bemidi.h +++ b/src/music/bemidi.h @@ -15,7 +15,7 @@ #include "music_driver.hpp" /** The midi player for BeOS. */ -class MusicDriver_BeMidi: public MusicDriver { +class MusicDriver_BeMidi : public MusicDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/music/cocoa_m.h b/src/music/cocoa_m.h --- a/src/music/cocoa_m.h +++ b/src/music/cocoa_m.h @@ -14,7 +14,7 @@ #include "music_driver.hpp" -class MusicDriver_Cocoa: public MusicDriver { +class MusicDriver_Cocoa : public MusicDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/music/dmusic.h b/src/music/dmusic.h --- a/src/music/dmusic.h +++ b/src/music/dmusic.h @@ -15,7 +15,7 @@ #include "music_driver.hpp" /** Music player making use of DirectX. */ -class MusicDriver_DMusic: public MusicDriver { +class MusicDriver_DMusic : public MusicDriver { public: virtual ~MusicDriver_DMusic(); diff --git a/src/music/extmidi.h b/src/music/extmidi.h --- a/src/music/extmidi.h +++ b/src/music/extmidi.h @@ -14,7 +14,7 @@ #include "music_driver.hpp" -class MusicDriver_ExtMidi: public MusicDriver { +class MusicDriver_ExtMidi : public MusicDriver { private: char *command; char song[MAX_PATH]; diff --git a/src/music/libtimidity.h b/src/music/libtimidity.h --- a/src/music/libtimidity.h +++ b/src/music/libtimidity.h @@ -15,7 +15,7 @@ #include "music_driver.hpp" /** Music driver making use of libtimidity. */ -class MusicDriver_LibTimidity: public MusicDriver { +class MusicDriver_LibTimidity : public MusicDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/music/music_driver.hpp b/src/music/music_driver.hpp --- a/src/music/music_driver.hpp +++ b/src/music/music_driver.hpp @@ -15,7 +15,7 @@ #include "../driver.h" /** Driver for all music playback. */ -class MusicDriver: public Driver { +class MusicDriver : public Driver { public: /** * Play a particular song. diff --git a/src/music/null_m.h b/src/music/null_m.h --- a/src/music/null_m.h +++ b/src/music/null_m.h @@ -15,7 +15,7 @@ #include "music_driver.hpp" /** The music player that does nothing. */ -class MusicDriver_Null: public MusicDriver { +class MusicDriver_Null : public MusicDriver { public: /* virtual */ const char *Start(const char * const *param) { return NULL; } diff --git a/src/music/os2_m.h b/src/music/os2_m.h --- a/src/music/os2_m.h +++ b/src/music/os2_m.h @@ -15,7 +15,7 @@ #include "music_driver.hpp" /** OS/2's music player. */ -class MusicDriver_OS2: public MusicDriver { +class MusicDriver_OS2 : public MusicDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/music/qtmidi.h b/src/music/qtmidi.h --- a/src/music/qtmidi.h +++ b/src/music/qtmidi.h @@ -14,7 +14,7 @@ #include "music_driver.hpp" -class MusicDriver_QtMidi: public MusicDriver { +class MusicDriver_QtMidi : public MusicDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/music/win32_m.h b/src/music/win32_m.h --- a/src/music/win32_m.h +++ b/src/music/win32_m.h @@ -15,7 +15,7 @@ #include "music_driver.hpp" /** The Windows music player. */ -class MusicDriver_Win32: public MusicDriver { +class MusicDriver_Win32 : public MusicDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/sound/allegro_s.h b/src/sound/allegro_s.h --- a/src/sound/allegro_s.h +++ b/src/sound/allegro_s.h @@ -15,7 +15,7 @@ #include "sound_driver.hpp" /** Implementation of the allegro sound driver. */ -class SoundDriver_Allegro: public SoundDriver { +class SoundDriver_Allegro : public SoundDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/sound/cocoa_s.h b/src/sound/cocoa_s.h --- a/src/sound/cocoa_s.h +++ b/src/sound/cocoa_s.h @@ -14,7 +14,7 @@ #include "sound_driver.hpp" -class SoundDriver_Cocoa: public SoundDriver { +class SoundDriver_Cocoa : public SoundDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/sound/null_s.h b/src/sound/null_s.h --- a/src/sound/null_s.h +++ b/src/sound/null_s.h @@ -15,7 +15,7 @@ #include "sound_driver.hpp" /** Implementation of the null sound driver. */ -class SoundDriver_Null: public SoundDriver { +class SoundDriver_Null : public SoundDriver { public: /* virtual */ const char *Start(const char * const *param) { return NULL; } diff --git a/src/sound/sdl_s.h b/src/sound/sdl_s.h --- a/src/sound/sdl_s.h +++ b/src/sound/sdl_s.h @@ -15,7 +15,7 @@ #include "sound_driver.hpp" /** Implementation of the SDL sound driver. */ -class SoundDriver_SDL: public SoundDriver { +class SoundDriver_SDL : public SoundDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/sound/sound_driver.hpp b/src/sound/sound_driver.hpp --- a/src/sound/sound_driver.hpp +++ b/src/sound/sound_driver.hpp @@ -15,7 +15,7 @@ #include "../driver.h" /** Base for all sound drivers. */ -class SoundDriver: public Driver { +class SoundDriver : public Driver { public: /** Called once every tick */ virtual void MainLoop() {} diff --git a/src/sound/win32_s.h b/src/sound/win32_s.h --- a/src/sound/win32_s.h +++ b/src/sound/win32_s.h @@ -15,7 +15,7 @@ #include "sound_driver.hpp" /** Implementation of the sound driver for Windows. */ -class SoundDriver_Win32: public SoundDriver { +class SoundDriver_Win32 : public SoundDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/video/allegro_v.h b/src/video/allegro_v.h --- a/src/video/allegro_v.h +++ b/src/video/allegro_v.h @@ -15,7 +15,7 @@ #include "video_driver.hpp" /** The allegro video driver. */ -class VideoDriver_Allegro: public VideoDriver { +class VideoDriver_Allegro : public VideoDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h --- a/src/video/cocoa/cocoa_v.h +++ b/src/video/cocoa/cocoa_v.h @@ -14,7 +14,7 @@ #include "../video_driver.hpp" -class VideoDriver_Cocoa: public VideoDriver { +class VideoDriver_Cocoa : public VideoDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/video/cocoa/fullscreen.mm b/src/video/cocoa/fullscreen.mm --- a/src/video/cocoa/fullscreen.mm +++ b/src/video/cocoa/fullscreen.mm @@ -76,7 +76,7 @@ struct OTTD_QuartzGammaTable { } @end -class FullscreenSubdriver: public CocoaSubdriver { +class FullscreenSubdriver : public CocoaSubdriver { CGDirectDisplayID display_id; ///< 0 == main display (only support single display) CFDictionaryRef cur_mode; ///< current mode of the display CFDictionaryRef save_mode; ///< original mode of the display diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm --- a/src/video/cocoa/wnd_quartz.mm +++ b/src/video/cocoa/wnd_quartz.mm @@ -57,7 +57,7 @@ class WindowQuartzSubdriver; - (void)drawRect:(NSRect)invalidRect; @end -class WindowQuartzSubdriver: public CocoaSubdriver { +class WindowQuartzSubdriver : public CocoaSubdriver { private: /** * This function copies 8bpp pixels from the screen buffer in 32bpp windowed mode. diff --git a/src/video/cocoa/wnd_quickdraw.mm b/src/video/cocoa/wnd_quickdraw.mm --- a/src/video/cocoa/wnd_quickdraw.mm +++ b/src/video/cocoa/wnd_quickdraw.mm @@ -45,7 +45,7 @@ class WindowQuickdrawSubdriver; -class WindowQuickdrawSubdriver: public CocoaSubdriver { +class WindowQuickdrawSubdriver : public CocoaSubdriver { private: /** * This function copies 32bpp pixels from the screen buffer in 16bpp windowed mode. diff --git a/src/video/dedicated_v.h b/src/video/dedicated_v.h --- a/src/video/dedicated_v.h +++ b/src/video/dedicated_v.h @@ -15,7 +15,7 @@ #include "video_driver.hpp" /** The dedicated server video driver. */ -class VideoDriver_Dedicated: public VideoDriver { +class VideoDriver_Dedicated : public VideoDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/video/null_v.h b/src/video/null_v.h --- a/src/video/null_v.h +++ b/src/video/null_v.h @@ -15,7 +15,7 @@ #include "video_driver.hpp" /** The null video driver. */ -class VideoDriver_Null: public VideoDriver { +class VideoDriver_Null : public VideoDriver { private: uint ticks; ///< Amount of ticks to run. diff --git a/src/video/sdl_v.h b/src/video/sdl_v.h --- a/src/video/sdl_v.h +++ b/src/video/sdl_v.h @@ -15,7 +15,7 @@ #include "video_driver.hpp" /** The SDL video driver. */ -class VideoDriver_SDL: public VideoDriver { +class VideoDriver_SDL : public VideoDriver { public: /* virtual */ const char *Start(const char * const *param); diff --git a/src/video/video_driver.hpp b/src/video/video_driver.hpp --- a/src/video/video_driver.hpp +++ b/src/video/video_driver.hpp @@ -16,7 +16,7 @@ #include "../core/geometry_type.hpp" /** The base of all video drivers. */ -class VideoDriver: public Driver { +class VideoDriver : public Driver { public: /** * Mark a particular area dirty. diff --git a/src/video/win32_v.h b/src/video/win32_v.h --- a/src/video/win32_v.h +++ b/src/video/win32_v.h @@ -15,7 +15,7 @@ #include "video_driver.hpp" /** The video driver for windows. */ -class VideoDriver_Win32: public VideoDriver { +class VideoDriver_Win32 : public VideoDriver { public: /* virtual */ const char *Start(const char * const *param);