From f8126d9da676e69dff384b8a8f7136ad27fb014d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 7 Dec 2009 18:22:18 +0000
Subject: M4: Make M4Surface member w, h, pixels protected; some cleanup

svn-id: r46280
---
 engines/m4/viewmgr.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/m4/viewmgr.cpp')

diff --git a/engines/m4/viewmgr.cpp b/engines/m4/viewmgr.cpp
index 108f97e979..6d91a12a9b 100644
--- a/engines/m4/viewmgr.cpp
+++ b/engines/m4/viewmgr.cpp
@@ -68,8 +68,7 @@ int RectList::find(const Common::Point &pt) {
 
 //--------------------------------------------------------------------------
 
-HotkeyList::HotkeyList(View *owner) {
-	_view = owner;
+HotkeyList::HotkeyList(View *owner) : _view(owner) {
 }
 
 HotkeyList::~HotkeyList() {
@@ -106,14 +105,15 @@ bool HotkeyList::call(uint32 key) {
 
 // View constructor
 
-View::View(M4Engine *vm, const Common::Rect &viewBounds, bool transparent):
-	_hotkeys(HotkeyList(this)), M4Surface(viewBounds.width(), viewBounds.height()), _vm(vm) {
+View::View(M4Engine *vm, const Common::Rect &viewBounds, bool transparent)
+	: M4Surface(viewBounds.width(), viewBounds.height()), _hotkeys(this), _vm(vm) {
 	SCREEN_FLAGS_DEFAULT;
 	_coords = viewBounds;
 	_transparent = transparent;
 }
 
-View::View(M4Engine *vm, int x, int y, bool transparent): _hotkeys(HotkeyList(this)), M4Surface(), _vm(vm) {
+View::View(M4Engine *vm, int x, int y, bool transparent)
+	: M4Surface(), _hotkeys(this), _vm(vm) {
 	SCREEN_FLAGS_DEFAULT;
 	_coords.left = x;
 	_coords.top = y;
-- 
cgit v1.2.3