From 92c896d88317b64a2cc99fc3617f3405481e90a2 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 22 Mar 2010 20:28:08 +0000
Subject: Patch #2973290: Semicolon cleanup

svn-id: r48359
---
 engines/m4/console.h    |  4 ++--
 engines/m4/globals.h    |  8 ++++----
 engines/m4/gui.h        | 16 ++++++++--------
 engines/m4/m4.h         | 10 +++++-----
 engines/m4/m4_scene.h   |  4 ++--
 engines/m4/mads_scene.h |  4 ++--
 engines/m4/resource.h   |  4 ++--
 engines/m4/scene.h      |  4 ++--
 engines/m4/script.h     |  6 +++---
 engines/m4/viewmgr.h    |  4 ++--
 10 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'engines/m4')

diff --git a/engines/m4/console.h b/engines/m4/console.h
index 008531c0ac..b592f041cf 100644
--- a/engines/m4/console.h
+++ b/engines/m4/console.h
@@ -66,7 +66,7 @@ private:
 	bool cmdSceneInfo(int argc, const char **argv);
 public:
 	MadsConsole(MadsEngine *vm);
-	virtual ~MadsConsole() {};
+	virtual ~MadsConsole() {}
 };
 
 class M4Console : public Console {
@@ -76,7 +76,7 @@ private:
 	bool cmdSceneInfo(int argc, const char **argv);
 public:
 	M4Console(M4Engine *vm);
-	virtual ~M4Console() {};
+	virtual ~M4Console() {}
 };
 
 } // End of namespace M4
diff --git a/engines/m4/globals.h b/engines/m4/globals.h
index 0a591d131f..4b0d7ce3d5 100644
--- a/engines/m4/globals.h
+++ b/engines/m4/globals.h
@@ -173,10 +173,10 @@ struct VocabEntry {
 
 class MadsObject {
 public:
-	MadsObject() {};
+	MadsObject() {}
 	MadsObject(Common::SeekableReadStream *stream);
 	void load(Common::SeekableReadStream *stream);
-	bool isInInventory() const { return roomNumber == PLAYER_INVENTORY; };
+	bool isInInventory() const { return roomNumber == PLAYER_INVENTORY; }
 
 	uint16 descId;
 	uint16 roomNumber;
@@ -192,7 +192,7 @@ private:
 	MadsM4Engine *_vm;
 public:
 	Globals(MadsM4Engine *vm);
-	virtual ~Globals() {};
+	virtual ~Globals() {}
 
 	bool isInterfaceVisible();
 
@@ -203,7 +203,7 @@ private:
 	M4Engine *_vm;
 public:
 	M4Globals(M4Engine *vm);
-	virtual ~M4Globals() {};
+	virtual ~M4Globals() {}
 
 	bool invSuppressClickSound;
 };
diff --git a/engines/m4/gui.h b/engines/m4/gui.h
index 343b6811fd..7e1c8bf070 100644
--- a/engines/m4/gui.h
+++ b/engines/m4/gui.h
@@ -213,9 +213,9 @@ enum MenuObjectState {OS_GREYED = 0, OS_NORMAL = 1, OS_MOUSEOVER = 2, OS_PRESSED
 class DialogView : public View {
 public:
 	DialogView(MadsM4Engine *Vm, const Common::Rect &viewBounds, bool transparent = false):
-		View(Vm, viewBounds, transparent) {};
+		View(Vm, viewBounds, transparent) {}
 	DialogView(MadsM4Engine *Vm, int x = 0, int y = 0, bool transparent = false):
-		View(Vm, x, y, transparent) {};
+		View(Vm, x, y, transparent) {}
 
 	MadsM4Engine *vm() { return _vm; }
 	virtual SpriteAsset *sprites() = 0;
@@ -399,7 +399,7 @@ class GUIRect : public GUIObject {
 private:
 	int _tag;
 public:
-	GUIRect(View *owner, const Common::Rect &bounds, int tag): GUIObject(owner, bounds) { _tag = tag; };
+	GUIRect(View *owner, const Common::Rect &bounds, int tag): GUIObject(owner, bounds) { _tag = tag; }
 
 	virtual bool onEvent(M4EventType eventType, int32 param, int x, int y, GUIObject *&currentItem) { return false; }
 	int getTag() const { return _tag; }
@@ -443,12 +443,12 @@ public:
 
 class GameInterfaceView : public View {
 public:
-	GameInterfaceView(MadsM4Engine *vm, const Common::Rect &rect): View(vm, rect) {};
-	~GameInterfaceView() {};
+	GameInterfaceView(MadsM4Engine *vm, const Common::Rect &rect): View(vm, rect) {}
+	~GameInterfaceView() {}
 
-	virtual void initialise() {};
-	virtual void setSelectedObject(int objectNumber) {};
-	virtual void addObjectToInventory(int objectNumber) {};
+	virtual void initialise() {}
+	virtual void setSelectedObject(int objectNumber) {}
+	virtual void addObjectToInventory(int objectNumber) {}
 };
 
 }
diff --git a/engines/m4/m4.h b/engines/m4/m4.h
index cadf03b944..618e942ba5 100644
--- a/engines/m4/m4.h
+++ b/engines/m4/m4.h
@@ -202,7 +202,7 @@ public:
 	Animation *_animation;
 	Common::RandomSource *_random;
 
-	Scene *scene() { return _scene; };
+	Scene *scene() { return _scene; }
 };
 
 class MadsEngine : public MadsM4Engine {
@@ -216,8 +216,8 @@ public:
 
 	virtual Common::Error run();
 
-	MadsGlobals *globals() { return (MadsGlobals *)_globals; };
-	MadsScene *scene() { return (MadsScene *)_scene; };
+	MadsGlobals *globals() { return (MadsGlobals *)_globals; }
+	MadsScene *scene() { return (MadsScene *)_scene; }
 };
 
 class M4Engine : public MadsM4Engine {
@@ -229,8 +229,8 @@ public:
 
 	virtual Common::Error run();
 
-	M4Globals *globals() { return (M4Globals *)_globals; };
-	M4Scene *scene() { return (M4Scene *)_scene; };
+	M4Globals *globals() { return (M4Globals *)_globals; }
+	M4Scene *scene() { return (M4Scene *)_scene; }
 };
 
 // FIXME: remove globals
diff --git a/engines/m4/m4_scene.h b/engines/m4/m4_scene.h
index 25546fe491..329582caf4 100644
--- a/engines/m4/m4_scene.h
+++ b/engines/m4/m4_scene.h
@@ -76,8 +76,8 @@ public:
 	virtual void showHotSpots();
 
 	byte *getInverseColourTable() const { return _inverseColourTable; }
-	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
-	M4SceneResources &getSceneResources() { return _sceneResources; };
+	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; }
+	M4SceneResources &getSceneResources() { return _sceneResources; }
 	void setStatusText(const char *text);
 	void setAction(int action, int objectId = -1);
 };
diff --git a/engines/m4/mads_scene.h b/engines/m4/mads_scene.h
index 0ed0d7cace..d5d3a5a477 100644
--- a/engines/m4/mads_scene.h
+++ b/engines/m4/mads_scene.h
@@ -206,8 +206,8 @@ public:
 	void loadPlayerSprites(const char *prefix);
 	void showMADSV2TextBox(char *text, int x, int y, char *faceName);
 
-	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; };
-	MadsSceneResources &getSceneResources() { return _sceneResources; };
+	MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; }
+	MadsSceneResources &getSceneResources() { return _sceneResources; }
 	MadsAction &getAction() { return _action; }
 	void setStatusText(const char *text) {};//***DEPRECATED***
 };
diff --git a/engines/m4/resource.h b/engines/m4/resource.h
index b41b1b0799..eed6e6dcd9 100644
--- a/engines/m4/resource.h
+++ b/engines/m4/resource.h
@@ -94,7 +94,7 @@ protected:
 
 	virtual Common::SeekableReadStream *loadResource(const char *resourceName, bool loadFlag) = 0;
 public:
-	ResourceManager(MadsM4Engine *vm): _vm(vm) {};
+	ResourceManager(MadsM4Engine *vm): _vm(vm) {}
 	virtual ~ResourceManager();
 
 	Common::SeekableReadStream *get(const char *resourceName, bool loadFlag = true);
@@ -124,7 +124,7 @@ private:
 protected:
 	Common::SeekableReadStream *loadResource(const char *resourceName, bool loadFlag);
 public:
-	MADSResourceManager(MadsM4Engine *vm): ResourceManager(vm) {};
+	MADSResourceManager(MadsM4Engine *vm): ResourceManager(vm) {}
 	bool resourceExists(const char *resourceName);
 
 	static const char *getResourceName(char asciiCh, int prefix, ExtensionType extType, const char *suffix, int index);
diff --git a/engines/m4/scene.h b/engines/m4/scene.h
index be383605ec..5dafb138db 100644
--- a/engines/m4/scene.h
+++ b/engines/m4/scene.h
@@ -111,8 +111,8 @@ public:
 	M4Surface *getBackgroundSurface() const { return _backgroundSurface; }
 	void showInterface();
 	void hideInterface();
-	GameInterfaceView *getInterface() { return _interfaceSurface; };
-	SceneResources &getSceneResources() { return *_sceneResources; };
+	GameInterfaceView *getInterface() { return _interfaceSurface; }
+	SceneResources &getSceneResources() { return *_sceneResources; }
 
 	void onRefresh(RectList *rects, M4Surface *destSurface);
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
diff --git a/engines/m4/script.h b/engines/m4/script.h
index 1aeebbe57a..7382c05b67 100644
--- a/engines/m4/script.h
+++ b/engines/m4/script.h
@@ -88,10 +88,10 @@ struct ScriptValue {
 		int value;
 	};
 
-	ScriptValue() : type(kInteger), value(0) {};
-	ScriptValue(ScriptValueType itype, int ivalue) : type(itype), value(ivalue) {};
+	ScriptValue() : type(kInteger), value(0) {}
+	ScriptValue(ScriptValueType itype, int ivalue) : type(itype), value(ivalue) {}
 
-	ScriptValue(const int intValue) : type(kInteger), value(intValue) {};
+	ScriptValue(const int intValue) : type(kInteger), value(intValue) {}
 
 	ScriptValue& operator=(const int intValue) {
 		type = kInteger;
diff --git a/engines/m4/viewmgr.h b/engines/m4/viewmgr.h
index c3055c6706..dccfffb8aa 100644
--- a/engines/m4/viewmgr.h
+++ b/engines/m4/viewmgr.h
@@ -90,7 +90,7 @@ public:
 struct Hotkey {
 public:
 	typedef void (*Callback)(MadsM4Engine *vm, View *view, uint32 key);
-	Hotkey(uint32 keyVal, Hotkey::Callback callbackFn) : key(keyVal), callback(callbackFn) {};
+	Hotkey(uint32 keyVal, Hotkey::Callback callbackFn) : key(keyVal), callback(callbackFn) {}
 	uint32 key;
 	Hotkey::Callback callback;
 };
@@ -136,7 +136,7 @@ public:
 
 	virtual void onRefresh(RectList *rects, M4Surface *destSurface);
 	virtual bool onEvent(M4EventType eventType, int32 param, int x, int y, bool &captureEvents) { return false; }
-	virtual void updateState() {};
+	virtual void updateState() {}
 
 protected:
 	MadsM4Engine *_vm;
-- 
cgit v1.2.3