Formatting corrections to conform to ScummVM formatting guidelines

svn-id: r47733

15 files changed, 41 insertions, 41 deletions

diff --git a/engines/m4/console.h b/engines/m4/console.h
index 5724f8a985..05284d1b68 100644
--- a/engines/m4/console.h
+++ b/engines/m4/console.h
@@ -33,7 +33,7 @@ namespace M4 {
 class MadsM4Engine;
 class MadsEngine;
 
-class Console: public GUI::Debugger {
+class Console : public GUI::Debugger {
 private:
 	MadsM4Engine *_vm;
 
@@ -58,7 +58,7 @@ public:
 	virtual ~Console();
 };
 
-class MadsConsole: public Console {
+class MadsConsole : public Console {
 private:
 	MadsEngine *_vm;
 
@@ -69,7 +69,7 @@ public:
 	virtual ~MadsConsole() {};
 };
 
-class M4Console: public Console {
+class M4Console : public Console {
 public:
 	M4Console(MadsM4Engine *vm): Console(vm) {};
 	virtual ~M4Console() {};
diff --git a/engines/m4/converse.h b/engines/m4/converse.h
index a71de24492..973122b9f2 100644
--- a/engines/m4/converse.h
+++ b/engines/m4/converse.h
@@ -135,7 +135,7 @@ enum ConverseStyle {CONVSTYLE_EARTH, CONVSTYLE_SPACE};
 typedef Common::HashMap<Common::String,EntryInfo,Common::IgnoreCase_Hash,Common::IgnoreCase_EqualTo> OffsetHashMap;
 typedef Common::HashMap<Common::String,int32,Common::IgnoreCase_Hash,Common::IgnoreCase_EqualTo> ConvVarHashMap;
 
-class ConversationView: public View {
+class ConversationView : public View {
 public:
 	ConversationView(MadsM4Engine *vm);
 	~ConversationView();
diff --git a/engines/m4/dialogs.h b/engines/m4/dialogs.h
index 190a06c267..192ba5c23c 100644
--- a/engines/m4/dialogs.h
+++ b/engines/m4/dialogs.h
@@ -44,7 +44,7 @@ public:
 
 typedef void (*GetValueFn)(MadsM4Engine *vm, int result);
 
-class Dialog: public View {
+class Dialog : public View {
 private:
 	Common::Array<DialogLine> _lines;
 	int _widthChars;
diff --git a/engines/m4/globals.h b/engines/m4/globals.h
index 9b26e12070..8d9f3118b4 100644
--- a/engines/m4/globals.h
+++ b/engines/m4/globals.h
@@ -196,7 +196,7 @@ public:
 
 };
 
-class M4Globals: public Globals {
+class M4Globals : public Globals {
 private:
 	M4Engine *_vm;
 public:
@@ -206,7 +206,7 @@ public:
 	bool invSuppressClickSound;
 };
 
-class MadsGlobals: public Globals {
+class MadsGlobals : public Globals {
 private:
 	struct MessageItem {
 		uint32 id;
diff --git a/engines/m4/gui.h b/engines/m4/gui.h
index 9d0f3e3f17..343b6811fd 100644
--- a/engines/m4/gui.h
+++ b/engines/m4/gui.h
@@ -210,7 +210,7 @@ enum TextColors {
 
 enum MenuObjectState {OS_GREYED = 0, OS_NORMAL = 1, OS_MOUSEOVER = 2, OS_PRESSED = 3};
 
-class DialogView: public View {
+class DialogView : public View {
 public:
 	DialogView(MadsM4Engine *Vm, const Common::Rect &viewBounds, bool transparent = false):
 		View(Vm, viewBounds, transparent) {};
@@ -245,7 +245,7 @@ public:
 	virtual void onRefresh() {}
 };
 
-class MenuObject: public GUIObject {
+class MenuObject : public GUIObject {
 public:
 	typedef void (*Callback)(DialogView *view, MenuObject *item);
 protected:
@@ -271,7 +271,7 @@ public:
 	virtual bool onEvent(M4EventType event, int32 param, int x, int y, MenuObject *&currentItem) { return false; }
 };
 
-class MenuButton: public MenuObject {
+class MenuButton : public MenuObject {
 public:
 	MenuButton(DialogView *owner, int buttonId, int xs, int ys, int width, int height,
 		Callback callbackFn = NULL, bool greyed = false, bool transparent = false,
@@ -285,7 +285,7 @@ public:
 enum MenuHorizSliderState {HSLIDER_THUMB_NORMAL = 0, HSLIDER_THUMB_MOUSEOVER = 1, HSLIDER_THUMB_PRESSED = 2};
 #define SLIDER_BAR_COLOR 129
 
-class MenuHorizSlider: public MenuObject {
+class MenuHorizSlider : public MenuObject {
 protected:
 	MenuHorizSliderState _sliderState;
 	Common::Point _thumbSize;
@@ -310,7 +310,7 @@ enum MenuVertSliderState {
 	VSLIDER_DOWN      = 0x0050
 };
 
-class MenuVertSlider: public MenuObject {
+class MenuVertSlider : public MenuObject {
 protected:
 	MenuVertSliderState _sliderState;
 	Common::Point _thumbSize;
@@ -332,14 +332,14 @@ public:
 	void setPercentage(int value);
 };
 
-class MenuMessage: public MenuObject {
+class MenuMessage : public MenuObject {
 public:
 	MenuMessage(DialogView *owner, int objectId, int x, int y, int w, int h, bool transparent = false);
 
 	void onRefresh();
 };
 
-class MenuImage: public MenuObject {
+class MenuImage : public MenuObject {
 private:
 	M4Surface *_sprite;
 public:
@@ -354,7 +354,7 @@ public:
 	}
 };
 
-class MenuSaveLoadText: public MenuButton {
+class MenuSaveLoadText : public MenuButton {
 private:
 	bool _loadFlag;
 	const char *_displayText;
@@ -375,7 +375,7 @@ public:
 	void setVisible(bool value);
 };
 
-class MenuTextField: public MenuObject {
+class MenuTextField : public MenuObject {
 private:
 	int _displayValue;
 	char _displayText[MAX_SAVEGAME_NAME];
@@ -395,7 +395,7 @@ public:
 
 };
 
-class GUIRect: public GUIObject {
+class GUIRect : public GUIObject {
 private:
 	int _tag;
 public:
@@ -407,7 +407,7 @@ public:
 
 enum GUIButtonState {BUTTON_NORMAL, BUTTON_MOUSEOVER, BUTTON_PRESSED};
 
-class GUIButton: public GUIRect {
+class GUIButton : public GUIRect {
 protected:
 	M4Surface *_normalSprite, *_mouseOverSprite, *_pressedSprite;
 	GUIButtonState _buttonState;
@@ -422,7 +422,7 @@ public:
 	GUIButtonState getState() const { return _buttonState; }
 };
 
-class GUITextField: public GUIRect {
+class GUITextField : public GUIRect {
 private:
 	Common::String _text;
 public:
@@ -441,7 +441,7 @@ public:
 	void keyMouseCollision() {}
 };
 
-class GameInterfaceView: public View {
+class GameInterfaceView : public View {
 public:
 	GameInterfaceView(MadsM4Engine *vm, const Common::Rect &rect): View(vm, rect) {};
 	~GameInterfaceView() {};
diff --git a/engines/m4/m4.h b/engines/m4/m4.h
index 80aba64188..6d79b47f5f 100644
--- a/engines/m4/m4.h
+++ b/engines/m4/m4.h
@@ -202,7 +202,7 @@ public:
 	Scene *scene() { return _scene; };
 };
 
-class MadsEngine: public MadsM4Engine {
+class MadsEngine : public MadsM4Engine {
 public:
 	MadsEngine(OSystem *syst, const M4GameDescription *gameDesc);
 	virtual ~MadsEngine();
@@ -213,7 +213,7 @@ public:
 	MadsScene *scene() { return (MadsScene *)_scene; };
 };
 
-class M4Engine: public MadsM4Engine {
+class M4Engine : public MadsM4Engine {
 public:
 	M4Engine(OSystem *syst, const M4GameDescription *gameDesc);
 	virtual ~M4Engine();
diff --git a/engines/m4/m4_menus.h b/engines/m4/m4_menus.h
index fb237c2a3d..ecfd778c95 100644
--- a/engines/m4/m4_menus.h
+++ b/engines/m4/m4_menus.h
@@ -41,7 +41,7 @@ namespace M4 {
 
 typedef Common::List<MenuObject *> MenuObjectList;
 
-class OrionMenuView: public DialogView {
+class OrionMenuView : public DialogView {
 	typedef MenuObjectList::iterator MenuObjectsIterator;
 private:
 	MenuType _menuType;
diff --git a/engines/m4/m4_views.h b/engines/m4/m4_views.h
index 0cf8ceac5d..9a0651a2c5 100644
--- a/engines/m4/m4_views.h
+++ b/engines/m4/m4_views.h
@@ -46,7 +46,7 @@ public:
 	}
 };
 
-class GUIInventory: public GUIRect {
+class GUIInventory : public GUIRect {
 	typedef Common::List<Common::SharedPtr<GUIInventoryItem> > InventoryList;
 	typedef InventoryList::iterator ItemsIterator;
 private:
@@ -87,7 +87,7 @@ public:
 	void setVisible(bool value) { _visible = value; }
 };
 
-class M4InterfaceView: public GameInterfaceView {
+class M4InterfaceView : public GameInterfaceView {
 	typedef Common::List<Common::SharedPtr<GUIButton> > ButtonList;
 	typedef ButtonList::iterator ButtonsIterator;
 public:
diff --git a/engines/m4/mads_anim.h b/engines/m4/mads_anim.h
index 420e0af983..e4732f25b2 100644
--- a/engines/m4/mads_anim.h
+++ b/engines/m4/mads_anim.h
@@ -46,7 +46,7 @@ enum SceneTransition {
 
 typedef void (*TextviewCallback)(MadsM4Engine *vm);
 
-class TextviewView: public View {
+class TextviewView : public View {
 private:
 	bool _animating;
 
@@ -87,7 +87,7 @@ public:
 
 typedef void (*AnimviewCallback)(MadsM4Engine *vm);
 
-class AAFile: public MadsPack {
+class AAFile : public MadsPack {
 public:
 	AAFile(const char *resourceName, MadsM4Engine* vm);
 
@@ -106,7 +106,7 @@ public:
 
 enum AAFlags {AA_HAS_FONT = 0x20, AA_HAS_SOUND = 0x8000};
 
-class AnimviewView: public View {
+class AnimviewView : public View {
 private:
 	char _resourceName[80];
 	Common::SeekableReadStream *_script;
diff --git a/engines/m4/mads_menus.h b/engines/m4/mads_menus.h
index f259a6a560..aced1d907b 100644
--- a/engines/m4/mads_menus.h
+++ b/engines/m4/mads_menus.h
@@ -34,7 +34,7 @@ namespace M4 {
 
 enum MadsGameAction {START_GAME, RESUME_GAME, SHOW_INTRO, CREDITS, QUOTES, EXIT};
 
-class RexMainMenuView: public View {
+class RexMainMenuView : public View {
 private:
 	M4Surface *_bgSurface;
 	RGBList *_bgPalData;
@@ -56,7 +56,7 @@ public:
 	void updateState();
 };
 
-class DragonMainMenuView: public View {
+class DragonMainMenuView : public View {
 private:
 	//M4Surface *_bgSurface;
 	RGBList *_bgPalData;
@@ -78,7 +78,7 @@ public:
 	void updateState();
 };
 
-class MadsMainMenuView: public View {
+class MadsMainMenuView : public View {
 public:
 	MadsMainMenuView(MadsM4Engine *vm);
 
diff --git a/engines/m4/mads_views.h b/engines/m4/mads_views.h
index 3fbd20c2b1..d984f77589 100644
--- a/engines/m4/mads_views.h
+++ b/engines/m4/mads_views.h
@@ -34,7 +34,7 @@
 
 namespace M4 {
 
-class IntegerList: public Common::Array<int> {
+class IntegerList : public Common::Array<int> {
 public:
 	int indexOf(int v) {
 		for (uint i = 0; i < size(); ++i)
@@ -49,7 +49,7 @@ enum InterfaceFontMode {ITEM_NORMAL, ITEM_HIGHLIGHTED, ITEM_SELECTED};
 enum InterfaceObjects {ACTIONS_START = 0, SCROLL_UP = 10, SCROLL_SCROLLER = 11, SCROLL_DOWN = 12,
 		INVLIST_START = 13, VOCAB_START = 18};
 
-class MadsInterfaceView: public GameInterfaceView {
+class MadsInterfaceView : public GameInterfaceView {
 private:
 	IntegerList _inventoryList;
 	RectList _screenObjects;
diff --git a/engines/m4/resource.h b/engines/m4/resource.h
index 69431558b0..b243362fbb 100644
--- a/engines/m4/resource.h
+++ b/engines/m4/resource.h
@@ -112,7 +112,7 @@ public:
 enum ResourceType {RESTYPE_ROOM, RESTYPE_SC, RESTYPE_TEXT, RESTYPE_QUO, RESTYPE_I,
 	RESTYPE_OB, RESTYPE_FONT, RESTYPE_SOUND, RESTYPE_SPEECH, RESTYPE_HAS_EXT, RESTYPE_NO_EXT};
 
-class MADSResourceManager: public ResourceManager {
+class MADSResourceManager : public ResourceManager {
 private:
 	ResourceType getResourceType(const char *resourceName);
 	const char *getResourceFilename(const char *resourceName);
@@ -123,7 +123,7 @@ public:
 	bool resourceExists(const char *resourceName);
 };
 
-class M4ResourceManager: public ResourceManager {
+class M4ResourceManager : public ResourceManager {
 protected:
 	Common::SeekableReadStream *loadResource(const char *resourceName, bool loadFlag);
 public:
diff --git a/engines/m4/scene.h b/engines/m4/scene.h
index a5ea10ac00..f452fb1485 100644
--- a/engines/m4/scene.h
+++ b/engines/m4/scene.h
@@ -82,7 +82,7 @@ class M4Engine;
 class MadsEngine;
 class InterfaceView;
 
-class Scene: public View {
+class Scene : public View {
 private:
 	byte *_inverseColorTable;
 	HotSpotList _sceneHotspots;
@@ -131,7 +131,7 @@ public:
 	bool onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents);
 };
 
-class M4Scene: public Scene {
+class M4Scene : public Scene {
 private:
 	M4Engine *_vm;
 	SpriteAsset *_sceneSprites;
@@ -157,7 +157,7 @@ public:
 	M4InterfaceView *getInterface() { return (M4InterfaceView *)_interfaceSurface; };
 };
 
-class MadsScene: public Scene {
+class MadsScene : public Scene {
 private:
 	MadsEngine *_vm;
 
diff --git a/engines/m4/sprite.h b/engines/m4/sprite.h
index 1f39cc3c3e..49a96a6c4a 100644
--- a/engines/m4/sprite.h
+++ b/engines/m4/sprite.h
@@ -100,7 +100,7 @@ struct SpriteFrameHeader {
 	uint32 reserved8;
 };
 
-class M4Sprite: public M4Surface {
+class M4Sprite : public M4Surface {
 public:
 	int x, y;
 	int xOffset, yOffset;
diff --git a/engines/m4/viewmgr.h b/engines/m4/viewmgr.h
index 966b29084d..c3055c6706 100644
--- a/engines/m4/viewmgr.h
+++ b/engines/m4/viewmgr.h
@@ -76,7 +76,7 @@ struct ScreenFlags {
 	_screenFlags.get = SCREVENT_ALL; _screenFlags.blocks = SCREVENT_ALL; \
 	_screenFlags.visible = true;
 
-class RectList: public Common::Array<Common::Rect> {
+class RectList : public Common::Array<Common::Rect> {
 public:
 	RectList();
 	~RectList();
@@ -107,7 +107,7 @@ private:
 	View *_view;
 };
 
-class View: public M4Surface {
+class View : public M4Surface {
 public:
 	View(MadsM4Engine *vm, const Common::Rect &viewBounds, bool transparent = false);
 	View(MadsM4Engine *vm, int x = 0, int y = 0, bool transparent = false);