cpp/openttd-patchpack/source Changeset - r21028:e5db3f83cafa

Changeset - r21028:e5db3f83cafa

Parent rev.

Child rev.

[Not reviewed]

master

0 36 0

rubidium - 11 years ago 2013-11-25 14:30:22
rubidium@openttd.org

(svn r26108) -Codechange: some coding style (whitespace)

36 files changed with 38 insertions and 38 deletions:

src/blitter/32bpp_anim.hpp

src/blitter/32bpp_optimized.hpp

src/blitter/32bpp_simple.hpp

src/blitter/8bpp_optimized.hpp

src/blitter/8bpp_simple.hpp

src/blitter/factory.hpp

src/blitter/null.hpp

src/cargoaction.h

src/driver.h

src/music/allegro_m.h

src/music/bemidi.h

src/music/cocoa_m.h

src/music/dmusic.h

src/music/extmidi.h

src/music/libtimidity.h

src/music/music_driver.hpp

src/music/null_m.h

src/music/os2_m.h

src/music/qtmidi.h

src/music/win32_m.h

src/sound/allegro_s.h

src/sound/cocoa_s.h

src/sound/null_s.h

src/sound/sdl_s.h

src/sound/sound_driver.hpp

src/sound/win32_s.h

src/video/allegro_v.h

src/video/cocoa/cocoa_v.h

src/video/cocoa/fullscreen.mm

src/video/cocoa/wnd_quartz.mm

src/video/cocoa/wnd_quickdraw.mm

src/video/dedicated_v.h

src/video/null_v.h

src/video/sdl_v.h

src/video/video_driver.hpp

src/video/win32_v.h

0 comments (0 inline, 0 general)

src/blitter/32bpp_anim.hpp

➞

Show inline comments

@@ @@ -53,13 +53,13 @@ public: @@
+	}
 	template <BlitterMode mode> void Draw(const Blitter::BlitterParams *bp, ZoomLevel zoom);
 };
 /** Factory for the 32bpp blitter with animation. */
 class FBlitter_32bppAnim: public BlitterFactory<FBlitter_32bppAnim> {
+class FBlitter_32bppAnim : public BlitterFactory<FBlitter_32bppAnim> {
 public:
 	/* virtual */ const char *GetName() { return "32bpp-anim"; }
 	/* virtual */ const char *GetDescription() { return "32bpp Animation Blitter (palette animation)"; }
 	/* virtual */ Blitter *CreateInstance() { return new Blitter_32bppAnim(); }
 };

src/blitter/32bpp_optimized.hpp

➞

Show inline comments

@@ @@ -29,13 +29,13 @@ public: @@
 	/* virtual */ const char *GetName() { return "32bpp-optimized"; }
 	template <BlitterMode mode> void Draw(const Blitter::BlitterParams *bp, ZoomLevel zoom);
 };
 /** Factory for the optimised 32 bpp blitter (without palette animation). */
 class FBlitter_32bppOptimized: public BlitterFactory<FBlitter_32bppOptimized> {
+class FBlitter_32bppOptimized : public BlitterFactory<FBlitter_32bppOptimized> {
 public:
 	/* virtual */ const char *GetName() { return "32bpp-optimized"; }
 	/* virtual */ const char *GetDescription() { return "32bpp Optimized Blitter (no palette animation)"; }
 	/* virtual */ Blitter *CreateInstance() { return new Blitter_32bppOptimized(); }
 };

src/blitter/32bpp_simple.hpp

➞

Show inline comments

@@ @@ -31,13 +31,13 @@ public: @@
 	/* virtual */ Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
 	/* virtual */ const char *GetName() { return "32bpp-simple"; }
 };
 /** Factory for the simple 32 bpp blitter. */
 class FBlitter_32bppSimple: public BlitterFactory<FBlitter_32bppSimple> {
+class FBlitter_32bppSimple : public BlitterFactory<FBlitter_32bppSimple> {
 public:
 	/* virtual */ const char *GetName() { return "32bpp-simple"; }
 	/* virtual */ const char *GetDescription() { return "32bpp Simple Blitter (no palette animation)"; }
 	/* virtual */ Blitter *CreateInstance() { return new Blitter_32bppSimple(); }
 };

src/blitter/8bpp_optimized.hpp

➞

Show inline comments

@@ @@ -28,13 +28,13 @@ public: @@
 	/* virtual */ Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
 	/* virtual */ const char *GetName() { return "8bpp-optimized"; }
 };
 /** Factory for the 8bpp blitter optimised for speed. */
 class FBlitter_8bppOptimized: public BlitterFactory<FBlitter_8bppOptimized> {
+class FBlitter_8bppOptimized : public BlitterFactory<FBlitter_8bppOptimized> {
 public:
 	/* virtual */ const char *GetName() { return "8bpp-optimized"; }
 	/* virtual */ const char *GetDescription() { return "8bpp Optimized Blitter (compression + all-ZoomLevel cache)"; }
 	/* virtual */ Blitter *CreateInstance() { return new Blitter_8bppOptimized(); }
 };

src/blitter/8bpp_simple.hpp

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ public: @@
 	/* virtual */ Sprite *Encode(const SpriteLoader::Sprite *sprite, AllocatorProc *allocator);
 	/* virtual */ const char *GetName() { return "8bpp-simple"; }
 };
 /** Factory for the most trivial 8bpp blitter. */
 class FBlitter_8bppSimple: public BlitterFactory<FBlitter_8bppSimple> {
+class FBlitter_8bppSimple : public BlitterFactory<FBlitter_8bppSimple> {
 public:
 	/* virtual */ const char *GetName() { return "8bpp-simple"; }
 	/* virtual */ const char *GetDescription() { return "8bpp Simple Blitter (relative slow, but never wrong)"; }
 	/* virtual */ Blitter *CreateInstance() { return new Blitter_8bppSimple(); }
 };

src/blitter/factory.hpp

➞

Show inline comments

@@ @@ -160,13 +160,13 @@ public: @@
 };
 /**
  * A template factory, so ->GetName() works correctly. This because else some compiler will complain.
  */
 template <class T>
 class BlitterFactory: public BlitterFactoryBase {
+class BlitterFactory : public BlitterFactoryBase {
 public:
 	BlitterFactory() { this->RegisterBlitter(((T *)this)->GetName()); }
 	/**
 	 * Get the long, human readable, name for the Blitter-class.
 	 */

src/blitter/null.hpp

➞

Show inline comments

@@ @@ -35,13 +35,13 @@ public: @@
 	/* virtual */ const char *GetName() { return "null"; }
 	/* virtual */ int GetBytesPerPixel() { return 0; }
 };
 /** Factory for the blitter that does nothing. */
 class FBlitter_Null: public BlitterFactory<FBlitter_Null> {
+class FBlitter_Null : public BlitterFactory<FBlitter_Null> {
 public:
 	/* virtual */ const char *GetName() { return "null"; }
 	/* virtual */ const char *GetDescription() { return "Null Blitter (does nothing)"; }
 	/* virtual */ Blitter *CreateInstance() { return new Blitter_Null(); }
 };

src/cargoaction.h

➞

Show inline comments

 	CargoLoad(StationCargoList *source, VehicleCargoList *destination, uint max_move, TileIndex load_place) :
 			CargoMovement<StationCargoList, VehicleCargoList>(source, destination, max_move), load_place(load_place) {}
 	bool operator()(CargoPacket *cp);
 };
 /** 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) {}
 	bool operator()(CargoPacket *cp);
 };
 /** Action of returning previously reserved cargo from the vehicle to the station. */
 class CargoReturn: public CargoMovement<VehicleCargoList, StationCargoList> {
+class CargoReturn : public CargoMovement<VehicleCargoList, StationCargoList> {
 	StationID next;
 public:
 	CargoReturn(VehicleCargoList *source, StationCargoList *destination, uint max_move, StationID next) :
 			CargoMovement<VehicleCargoList, StationCargoList>(source, destination, max_move), next(next) {}
 	bool operator()(CargoPacket *cp);
 };

src/driver.h

➞

Show inline comments

@@ @@ -56,15 +56,15 @@ public: @@
 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<const char *, DriverFactoryBase *, StringCompare> Drivers; ///< Type for a map of drivers.
 	/**
 	 * Get the map with drivers.

src/music/allegro_m.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef MUSIC_ALLEGRO_H
 #define MUSIC_ALLEGRO_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ void PlaySong(const char *filename);

src/music/bemidi.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef MUSIC_BEMIDI_H
 #define MUSIC_BEMIDI_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ void PlaySong(const char *filename);

src/music/cocoa_m.h

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 #ifndef MUSIC_MACOSX_COCOA_H
 #define MUSIC_MACOSX_COCOA_H
 #include "music_driver.hpp"
 class MusicDriver_Cocoa: public MusicDriver {
+class MusicDriver_Cocoa : public MusicDriver {
 public:
 	/* virtual */ const char *Start(const char * const *param);
 	/* virtual */ void Stop();
 	/* virtual */ void PlaySong(const char *filename);

src/music/dmusic.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef MUSIC_DMUSIC_H
 #define MUSIC_DMUSIC_H
 #include "music_driver.hpp"
 /** Music player making use of DirectX. */
 class MusicDriver_DMusic: public MusicDriver {
+class MusicDriver_DMusic : public MusicDriver {
 public:
 	virtual ~MusicDriver_DMusic();
 	/* virtual */ const char *Start(const char * const *param);
 	/* virtual */ void Stop();

src/music/extmidi.h

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 #ifndef MUSIC_EXTERNAL_H
 #define MUSIC_EXTERNAL_H
 #include "music_driver.hpp"
 class MusicDriver_ExtMidi: public MusicDriver {
+class MusicDriver_ExtMidi : public MusicDriver {
 private:
 	char *command;
 	char song[MAX_PATH];
 	pid_t pid;
 	void DoPlay();

src/music/libtimidity.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef MUSIC_LIBTIMIDITY_H
 #define MUSIC_LIBTIMIDITY_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ void PlaySong(const char *filename);

src/music/music_driver.hpp

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef MUSIC_MUSIC_DRIVER_HPP
 #define MUSIC_MUSIC_DRIVER_HPP
 #include "../driver.h"
 /** Driver for all music playback. */
 class MusicDriver: public Driver {
+class MusicDriver : public Driver {
 public:
 	/**
 	 * Play a particular song.
 	 * @param filename The name of file with the song to play.
 	 */
 	virtual void PlaySong(const char *filename) = 0;

src/music/null_m.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef MUSIC_NULL_H
 #define MUSIC_NULL_H
 #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; }
 	/* virtual */ void Stop() { }
 	/* virtual */ void PlaySong(const char *filename) { }

src/music/os2_m.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef MUSIC_OS2_H
 #define MUSIC_OS2_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ void PlaySong(const char *filename);

src/music/qtmidi.h

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 #ifndef MUSIC_MACOSX_QUICKTIME_H
 #define MUSIC_MACOSX_QUICKTIME_H
 #include "music_driver.hpp"
 class MusicDriver_QtMidi: public MusicDriver {
+class MusicDriver_QtMidi : public MusicDriver {
 public:
 	/* virtual */ const char *Start(const char * const *param);
 	/* virtual */ void Stop();
 	/* virtual */ void PlaySong(const char *filename);

src/music/win32_m.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef MUSIC_WIN32_H
 #define MUSIC_WIN32_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ void PlaySong(const char *filename);

src/sound/allegro_s.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef SOUND_ALLEGRO_H
 #define SOUND_ALLEGRO_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ void MainLoop();

src/sound/cocoa_s.h

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 #ifndef SOUND_COCOA_H
 #define SOUND_COCOA_H
 #include "sound_driver.hpp"
 class SoundDriver_Cocoa: public SoundDriver {
+class SoundDriver_Cocoa : public SoundDriver {
 public:
 	/* virtual */ const char *Start(const char * const *param);
 	/* virtual */ void Stop();
 	/* virtual */ const char *GetName() const { return "cocoa"; }
 };

src/sound/null_s.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef SOUND_NULL_H
 #define SOUND_NULL_H
 #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; }
 	/* virtual */ void Stop() { }
 	/* virtual */ const char *GetName() const { return "null"; }
 };

src/sound/sdl_s.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef SOUND_SDL_H
 #define SOUND_SDL_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ const char *GetName() const { return "sdl"; }
 };

src/sound/sound_driver.hpp

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef SOUND_SOUND_DRIVER_HPP
 #define SOUND_SOUND_DRIVER_HPP
 #include "../driver.h"
 /** Base for all sound drivers. */
 class SoundDriver: public Driver {
+class SoundDriver : public Driver {
 public:
 	/** Called once every tick */
 	virtual void MainLoop() {}
 };
 extern SoundDriver *_sound_driver;

src/sound/win32_s.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef SOUND_WIN32_H
 #define SOUND_WIN32_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ const char *GetName() const { return "win32"; }
 };

src/video/allegro_v.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef VIDEO_ALLEGRO_H
 #define VIDEO_ALLEGRO_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ void MakeDirty(int left, int top, int width, int height);

src/video/cocoa/cocoa_v.h

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 #ifndef VIDEO_COCOA_H
 #define VIDEO_COCOA_H
 #include "../video_driver.hpp"
 class VideoDriver_Cocoa: public VideoDriver {
+class VideoDriver_Cocoa : public VideoDriver {
 public:
 	/* virtual */ const char *Start(const char * const *param);
 	/** Stop the video driver */
 	/* virtual */ void Stop();

src/video/cocoa/fullscreen.mm

➞

Show inline comments

@@ @@ -73,13 +73,13 @@ struct OTTD_QuartzGammaTable { @@
 #if !__LP64__
 	_frame = frame;
 #endif
+}
 @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
 	CGDirectPaletteRef palette;            ///< palette of an 8-bit display

src/video/cocoa/wnd_quartz.mm

➞

Show inline comments

@@ @@ -54,13 +54,13 @@ class WindowQuartzSubdriver; @@
 /* Subclass of OTTD_CocoaView to fix Quartz rendering */
 @interface OTTD_QuartzView : OTTD_CocoaView
 - (void)setDriver:(WindowQuartzSubdriver*)drv;
 - (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.
+	 *
 	 * @param left The x coord for the left edge of the box to blit.
 	 * @param top The y coord for the top edge of the box to blit.

src/video/cocoa/wnd_quickdraw.mm

➞

Show inline comments

@@ @@ -42,13 +42,13 @@ @@
  */
 class WindowQuickdrawSubdriver;
 class WindowQuickdrawSubdriver: public CocoaSubdriver {
+class WindowQuickdrawSubdriver : public CocoaSubdriver {
 private:
 	/**
 	 * This function copies 32bpp pixels from the screen buffer in 16bpp windowed mode.
+	 *
 	 * @param left The x coord for the left edge of the box to blit.
 	 * @param top The y coord for the top edge of the box to blit.

src/video/dedicated_v.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef VIDEO_DEDICATED_H
 #define VIDEO_DEDICATED_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ void MakeDirty(int left, int top, int width, int height);

src/video/null_v.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef VIDEO_NULL_H
 #define VIDEO_NULL_H
 #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.
 public:
 	/* virtual */ const char *Start(const char * const *param);

src/video/sdl_v.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef VIDEO_SDL_H
 #define VIDEO_SDL_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ void MakeDirty(int left, int top, int width, int height);

src/video/video_driver.hpp

➞

Show inline comments

@@ @@ -13,13 +13,13 @@ @@
 #define VIDEO_VIDEO_DRIVER_HPP
 #include "../driver.h"
 #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.
 	 * @param left   The left most line of the dirty area.
 	 * @param top    The top most line of the dirty area.
 	 * @param width  The width of the dirty area.

src/video/win32_v.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 #ifndef VIDEO_WIN32_H
 #define VIDEO_WIN32_H
 #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);
 	/* virtual */ void Stop();
 	/* virtual */ void MakeDirty(int left, int top, int width, int height);

0 comments (0 inline, 0 general)