From d4660cce55e8b49d1387a8f117b370fe76361720 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 26 Apr 2007 19:08:53 +0000
Subject: Removing more semicola

svn-id: r26597
---
 backends/platform/PalmOS/Src/be_base.h           |  2 +-
 backends/platform/PalmOS/Src/be_os5ex.h          |  4 ++--
 backends/platform/PalmOS/Src/cdaudio.h           |  4 ++--
 backends/platform/PalmOS/Src/missing/ext_stdio.c |  2 +-
 backends/platform/gp32/startup.c                 |  2 +-
 backends/platform/maemo/maemo-sdl.h              |  2 +-
 backends/platform/ps2/savefile.cpp               |  4 ++--
 common/rect.h                                    |  6 +++---
 engines/agos/sound.cpp                           | 14 +++++++-------
 engines/kyra/kyra.h                              |  2 +-
 engines/lure/hotspots.h                          |  2 +-
 engines/lure/intro.h                             |  2 +-
 engines/lure/res_struct.h                        |  2 +-
 engines/lure/strings.h                           |  2 +-
 engines/queen/sound.cpp                          |  2 +-
 engines/sky/music/musicbase.h                    |  2 +-
 sound/mods/paula.h                               |  2 +-
 17 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h
index cd4c38980e..d6bb4548d1 100644
--- a/backends/platform/PalmOS/Src/be_base.h
+++ b/backends/platform/PalmOS/Src/be_base.h
@@ -176,7 +176,7 @@ public:
 	void initBackend();
 
 /*
-	virtual void setFeatureState(Feature f, bool enable) {};
+	virtual void setFeatureState(Feature f, bool enable) {}
 
 
 	bool hasFeature(Feature f);
diff --git a/backends/platform/PalmOS/Src/be_os5ex.h b/backends/platform/PalmOS/Src/be_os5ex.h
index fb4027ccce..b8a8cbe61a 100644
--- a/backends/platform/PalmOS/Src/be_os5ex.h
+++ b/backends/platform/PalmOS/Src/be_os5ex.h
@@ -45,8 +45,8 @@ typedef struct {
 
 class OSystem_PalmOS5Ex : public OSystem_PalmOS5 {
 private:
-//	void timer_handler() {};
-	void sound_handler() {};
+//	void timer_handler() {}
+	void sound_handler() {}
 //	void int_quit();
 
 	SndStreamVariableBufferCallback sound_callback();
diff --git a/backends/platform/PalmOS/Src/cdaudio.h b/backends/platform/PalmOS/Src/cdaudio.h
index 1c1d42e7e9..206f6087c5 100644
--- a/backends/platform/PalmOS/Src/cdaudio.h
+++ b/backends/platform/PalmOS/Src/cdaudio.h
@@ -54,8 +54,8 @@ public:
 	virtual void setVolume(int volume) { _volumeLevel = volume; }
 	virtual int getVolume() const { return _volumeLevel; }
 
-	virtual void upVolume(int value) {};
-	virtual void downVolume(int value) {};
+	virtual void upVolume(int value) {}
+	virtual void downVolume(int value) {}
 
 protected:
 	int _volumeLevel;
diff --git a/backends/platform/PalmOS/Src/missing/ext_stdio.c b/backends/platform/PalmOS/Src/missing/ext_stdio.c
index f7d37a9140..713b9b723f 100644
--- a/backends/platform/PalmOS/Src/missing/ext_stdio.c
+++ b/backends/platform/PalmOS/Src/missing/ext_stdio.c
@@ -34,7 +34,7 @@ enum {
 };
 
 FILE gStdioOutput = {0,0,0,0,0,0};
-static void dummy(Boolean) {};
+static void dummy(Boolean) {}
 
 static LedProc	gStdioLedProc = dummy;
 static UInt16	gStdioVolRefNum = vfsInvalidVolRef;
diff --git a/backends/platform/gp32/startup.c b/backends/platform/gp32/startup.c
index b12cf3f077..6f74241e09 100644
--- a/backends/platform/gp32/startup.c
+++ b/backends/platform/gp32/startup.c
@@ -87,7 +87,7 @@ int main (int arg_len, char * arg_v)
 	GpKernelStart ();
 
    GpAppExit ();
-   while (1) {};
+   while (1) {}
    }
 
 void InitializeFont (void)
diff --git a/backends/platform/maemo/maemo-sdl.h b/backends/platform/maemo/maemo-sdl.h
index e342ead5f9..e497c2597d 100644
--- a/backends/platform/maemo/maemo-sdl.h
+++ b/backends/platform/maemo/maemo-sdl.h
@@ -33,7 +33,7 @@
 
 class OSystem_MAEMO : public OSystem_SDL {
 public:
-	OSystem_MAEMO() {};
+	OSystem_MAEMO() {}
 
 	void loadGFXMode();
 };
diff --git a/backends/platform/ps2/savefile.cpp b/backends/platform/ps2/savefile.cpp
index 71073bd23f..9c7d446d83 100644
--- a/backends/platform/ps2/savefile.cpp
+++ b/backends/platform/ps2/savefile.cpp
@@ -205,9 +205,9 @@ public:
 	AutoSaveFile(Ps2SaveFileManager *saveMan, const char *filename);
 	~AutoSaveFile(void);
 	virtual uint32 write(const void *ptr, uint32 size);
-	virtual void flush(void) { };
+	virtual void flush(void) {}
 	virtual bool ioFailed(void) { return false; };
-	virtual void clearIOFailed(void) {};
+	virtual void clearIOFailed(void) {}
 private:
 	Ps2SaveFileManager *_saveMan;
 	char _fileName[256];
diff --git a/common/rect.h b/common/rect.h
index 7751d9a84a..be1035669a 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -36,9 +36,9 @@ struct Point {
 	int16 x;	//!< The horizontal part of the point
 	int16 y;	//!< The vertical part of the point
 
-	Point() : x(0), y(0) {};
-	Point(const Point &p) : x(p.x), y(p.y) {};
-	explicit Point(int16 x1, int16 y1) : x(x1), y(y1) {};
+	Point() : x(0), y(0) {}
+	Point(const Point &p) : x(p.x), y(p.y) {}
+	explicit Point(int16 x1, int16 y1) : x(x1), y(y1) {}
 	Point & operator=(const Point & p) { x = p.x; y = p.y; return *this; };
 	bool operator==(const Point & p) const { return x == p.x && y == p.y; };
 	bool operator!=(const Point & p) const { return x != p.x || y != p.y; };
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index b11c130f87..1cfd465cd6 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -116,21 +116,21 @@ bool LoopingAudioStream::endOfData() const {
 
 class WavSound : public BaseSound {
 public:
-	WavSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {};
-	WavSound(Audio::Mixer *mixer, File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {};
+	WavSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {}
+	WavSound(Audio::Mixer *mixer, File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {}
 	Audio::AudioStream *makeAudioStream(uint sound);
 	void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0);
 };
 
 class VocSound : public BaseSound {
 public:
-	VocSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {};
+	VocSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {}
 	void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0);
 };
 
 class RawSound : public BaseSound {
 public:
-	RawSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {};
+	RawSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {}
 	void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0);
 };
 
@@ -267,7 +267,7 @@ void RawSound::playSound(uint sound, uint loopSound, Audio::SoundHandle *handle,
 #ifdef USE_MAD
 class MP3Sound : public BaseSound {
 public:
-	MP3Sound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
+	MP3Sound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {}
 	Audio::AudioStream *makeAudioStream(uint sound);
 	void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0);
 };
@@ -296,7 +296,7 @@ void MP3Sound::playSound(uint sound, uint loopSound, Audio::SoundHandle *handle,
 #ifdef USE_VORBIS
 class VorbisSound : public BaseSound {
 public:
-	VorbisSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
+	VorbisSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {}
 	Audio::AudioStream *makeAudioStream(uint sound);
 	void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0);
 };
@@ -325,7 +325,7 @@ void VorbisSound::playSound(uint sound, uint loopSound, Audio::SoundHandle *hand
 #ifdef USE_FLAC
 class FlacSound : public BaseSound {
 public:
-	FlacSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
+	FlacSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {}
 	Audio::AudioStream *makeAudioStream(uint sound);
 	void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0);
 };
diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h
index fa4ff7ef7d..ff72583241 100644
--- a/engines/kyra/kyra.h
+++ b/engines/kyra/kyra.h
@@ -747,7 +747,7 @@ protected:
 	// Kyra 2 and 3 main menu
 
 	static const char *_mainMenuStrings[];
-	virtual void gui_initMainMenu() {};
+	virtual void gui_initMainMenu() {}
 	int gui_handleMainMenu();
 	virtual void gui_updateMainMenuAnimation();
 	void gui_drawMainMenu(const char * const *strings, int select);
diff --git a/engines/lure/hotspots.h b/engines/lure/hotspots.h
index 1531c54467..9e849b0e28 100644
--- a/engines/lure/hotspots.h
+++ b/engines/lure/hotspots.h
@@ -166,7 +166,7 @@ private:
 	Direction _direction;
 	int _numSteps;
 public:
-	WalkingActionEntry(Direction dir, int steps): _direction(dir), _numSteps(steps) {};
+	WalkingActionEntry(Direction dir, int steps): _direction(dir), _numSteps(steps) {}
 	Direction direction() { return _direction; }
 	int &rawSteps() { return _numSteps; }
 	int numSteps();
diff --git a/engines/lure/intro.h b/engines/lure/intro.h
index 848d0ca19e..1a14ae1ec1 100644
--- a/engines/lure/intro.h
+++ b/engines/lure/intro.h
@@ -35,7 +35,7 @@ private:
 	bool showScreen(uint16 screenId, uint16 paletteId, uint16 delaySize);
 	bool delay(uint32 milliseconds);
 public:
-	Introduction(Screen &screen, OSystem &system): _screen(screen), _system(system) {};
+	Introduction(Screen &screen, OSystem &system): _screen(screen), _system(system) {}
 
 	bool show();
 };
diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h
index ac3bd4d6cf..8e4d9a8e54 100644
--- a/engines/lure/res_struct.h
+++ b/engines/lure/res_struct.h
@@ -303,7 +303,7 @@ class RoomPathsData {
 private:
 	byte _data[ROOM_PATHS_HEIGHT * ROOM_PATHS_WIDTH];
 public:
-	RoomPathsData() {};
+	RoomPathsData() {}
 	RoomPathsData(byte *srcData) { load(srcData); }
 
 	void load(byte *srcData) {
diff --git a/engines/lure/strings.h b/engines/lure/strings.h
index a2d6b187c0..1947a14b82 100644
--- a/engines/lure/strings.h
+++ b/engines/lure/strings.h
@@ -35,7 +35,7 @@ public:
 	char _ascii;
 
 	CharacterEntry(uint8 numBits, uint32 sequence, char ascii): _numBits(numBits),
-		_sequence(sequence), _ascii(ascii) {};
+		_sequence(sequence), _ascii(ascii) {}
 };
 
 #define MAX_NUM_CHARS 218
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index d3ffcd6c2e..378fc04e92 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -83,7 +83,7 @@ protected:
 #ifdef USE_FLAC
 class FLACSound : public PCSound {
 public:
-	FLACSound(Audio::Mixer *mixer, QueenEngine *vm) : PCSound(mixer, vm) {};
+	FLACSound(Audio::Mixer *mixer, QueenEngine *vm) : PCSound(mixer, vm) {}
 protected:
 	void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
 		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, Audio::makeFlacStream(f, size));
diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h
index 1f2bd58740..1adb03fc9c 100644
--- a/engines/sky/music/musicbase.h
+++ b/engines/sky/music/musicbase.h
@@ -39,7 +39,7 @@ typedef struct {
 
 class ChannelBase {
 public:
-	virtual ~ChannelBase() {};
+	virtual ~ChannelBase() {}
 	virtual uint8 process(uint16 aktTime) = 0;
 	virtual void updateVolume(uint16 pVolume) = 0;
 	virtual bool isActive(void) = 0;
diff --git a/sound/mods/paula.h b/sound/mods/paula.h
index 134ea8f845..f79ad87466 100644
--- a/sound/mods/paula.h
+++ b/sound/mods/paula.h
@@ -86,7 +86,7 @@ protected:
 		} else
 			*buf++ += tmp;
 	}
-	virtual void interrupt(void) {};
+	virtual void interrupt(void) {}
 };
 
 } // End of namespace Audio
-- 
cgit v1.2.3