WINCE: Code formatting

svn-id: r53979

24 files changed, 605 insertions, 600 deletions

diff --git a/backends/platform/wince/CEActionsPocket.cpp b/backends/platform/wince/CEActionsPocket.cpp
index 2005c86847..99d0be2bdc 100644
--- a/backends/platform/wince/CEActionsPocket.cpp
+++ b/backends/platform/wince/CEActionsPocket.cpp
@@ -85,8 +85,7 @@ int CEActionsPocket::version() {
 }
 
 CEActionsPocket::CEActionsPocket(const Common::String &gameid) :
-GUI::Actions()
-{
+GUI::Actions() {
 	int i;
 
 	_right_click_needed = false;
diff --git a/backends/platform/wince/CEActionsPocket.h b/backends/platform/wince/CEActionsPocket.h
index 0a15e25648..72a2064fbf 100644
--- a/backends/platform/wince/CEActionsPocket.h
+++ b/backends/platform/wince/CEActionsPocket.h
@@ -61,32 +61,32 @@ enum pocketActionType {
 class OSystem_WINCE3;
 
 class CEActionsPocket : public GUI::Actions {
-	public:
-		// Actions
-		bool perform(GUI::ActionType action, bool pushed = true);
-		Common::String actionName(GUI::ActionType action);
-		int size();
+public:
+	// Actions
+	bool perform(GUI::ActionType action, bool pushed = true);
+	Common::String actionName(GUI::ActionType action);
+	int size();
 
-		static void init();
-		void initInstanceMain(OSystem *mainSystem);
-		void initInstanceGame();
+	static void init();
+	void initInstanceMain(OSystem *mainSystem);
+	void initInstanceGame();
 
-		// Action domain
-		Common::String domain();
-		int version();
+	// Action domain
+	Common::String domain();
+	int version();
 
-		// Utility
-		bool needsRightClickMapping();
-		bool needsHideToolbarMapping();
-		bool needsZoomMapping();
+	// Utility
+	bool needsRightClickMapping();
+	bool needsHideToolbarMapping();
+	bool needsZoomMapping();
 
-		~CEActionsPocket();
-	private:
-		CEActionsPocket(const Common::String &gameid);
-		bool _right_click_needed;
-		bool _hide_toolbar_needed;
-		bool _zoom_needed;
-		OSystem_WINCE3 *_CESystem;
-	};
+	~CEActionsPocket();
+private:
+	CEActionsPocket(const Common::String &gameid);
+	bool _right_click_needed;
+	bool _hide_toolbar_needed;
+	bool _zoom_needed;
+	OSystem_WINCE3 *_CESystem;
+};
 
 #endif
diff --git a/backends/platform/wince/CEActionsSmartphone.h b/backends/platform/wince/CEActionsSmartphone.h
index d7a6f535b6..29156bb152 100644
--- a/backends/platform/wince/CEActionsSmartphone.h
+++ b/backends/platform/wince/CEActionsSmartphone.h
@@ -55,24 +55,24 @@ enum smartphoneActionType {
 
 
 class CEActionsSmartphone : public GUI::Actions {
-	public:
-		// Actions
-		bool perform(GUI::ActionType action, bool pushed = true);
-		Common::String actionName(GUI::ActionType action);
-		int size();
-		static void init();
-		void initInstanceMain(OSystem *mainSystem);
-		void initInstanceGame();
+public:
+	// Actions
+	bool perform(GUI::ActionType action, bool pushed = true);
+	Common::String actionName(GUI::ActionType action);
+	int size();
+	static void init();
+	void initInstanceMain(OSystem *mainSystem);
+	void initInstanceGame();
 
-		// Action domain
-		Common::String domain();
-		int version();
+	// Action domain
+	Common::String domain();
+	int version();
 
-		~CEActionsSmartphone();
-	private:
-		CEActionsSmartphone();
-		bool _right_click_needed;
-		OSystem_WINCE3 *_CESystem;
-	};
+	~CEActionsSmartphone();
+private:
+	CEActionsSmartphone();
+	bool _right_click_needed;
+	OSystem_WINCE3 *_CESystem;
+};
 
 #endif
diff --git a/backends/platform/wince/CEDevice.h b/backends/platform/wince/CEDevice.h
index ca2f908c6d..b2b20d05ce 100644
--- a/backends/platform/wince/CEDevice.h
+++ b/backends/platform/wince/CEDevice.h
@@ -31,20 +31,20 @@
 #include "common/str.h"
 
 class CEDevice {
-	public:
-		static void init();
-		static void end();
-		static void wakeUp();
-		static bool hasPocketPCResolution();
-		static bool hasSquareQVGAResolution();
-		static bool hasDesktopResolution();
-		static bool hasWideResolution();
-		static bool hasSmartphoneResolution();
-		static bool isSmartphone();
+public:
+	static void init();
+	static void end();
+	static void wakeUp();
+	static bool hasPocketPCResolution();
+	static bool hasSquareQVGAResolution();
+	static bool hasDesktopResolution();
+	static bool hasWideResolution();
+	static bool hasSmartphoneResolution();
+	static bool isSmartphone();
 
-	private:
-		static DWORD reg_access(TCHAR *key, TCHAR *val, DWORD data);
-		static void backlight_xchg();
+private:
+	static DWORD reg_access(TCHAR *key, TCHAR *val, DWORD data);
+	static void backlight_xchg();
 };
 
 #endif
diff --git a/backends/platform/wince/CEScaler.cpp b/backends/platform/wince/CEScaler.cpp
index fd47635e05..182a7e0c94 100644
--- a/backends/platform/wince/CEScaler.cpp
+++ b/backends/platform/wince/CEScaler.cpp
@@ -22,6 +22,7 @@
  * $Id$
  *
  */
+
 #include "graphics/scaler/intern.h"
 #include "CEScaler.h"
 
diff --git a/backends/platform/wince/CEgui/GUIElement.cpp b/backends/platform/wince/CEgui/GUIElement.cpp
index 26ec7d93d5..7689837e3d 100644
--- a/backends/platform/wince/CEgui/GUIElement.cpp
+++ b/backends/platform/wince/CEgui/GUIElement.cpp
@@ -34,98 +34,97 @@
 
 namespace CEGUI {
 
-	GUIElement::GUIElement(int x, int y, int width, int height) :
-	_background(0), _drawn(false), _visible(true), _x(x), _y(y), _width(width), _height(height)
-	{
-	}
+GUIElement::GUIElement(int x, int y, int width, int height) :
+_background(0), _drawn(false), _visible(true), _x(x), _y(y), _width(width), _height(height) {
+}
 
-	bool GUIElement::setBackground(WORD backgroundReference) {
-		_background = new SDL_ImageResource();
-		if (!_background->load(backgroundReference)) {
-			delete _background;
-			_background = NULL;
-			return false;
-		}
-		if (!_height && !_width) {
-			_height = _background->height();
-			_width = _background->width();
-		}
-		else
-		if (_background->height() != _height || _background->width() != _width) {
-			delete _background;
-			_background = NULL;
-			return false;
-		}
-		return true;
+bool GUIElement::setBackground(WORD backgroundReference) {
+	_background = new SDL_ImageResource();
+	if (!_background->load(backgroundReference)) {
+		delete _background;
+		_background = NULL;
+		return false;
 	}
-
-	void GUIElement::move(int x, int y) {
-		_x = x;
-		_y = y;
+	if (!_height && !_width) {
+		_height = _background->height();
+		_width = _background->width();
 	}
+	else
+	if (_background->height() != _height || _background->width() != _width) {
+		delete _background;
+		_background = NULL;
+		return false;
+	}
+	return true;
+}
 
-	bool GUIElement::draw(SDL_Surface *surface) {
-		if (_background && !_drawn && _visible) {
-			SDL_Rect rect;
-
-			rect.x = _x;
-			rect.y = _y;
-			rect.w = _width;
-			rect.h = _height;
+void GUIElement::move(int x, int y) {
+	_x = x;
+	_y = y;
+}
 
-			SDL_BlitSurface(_background->get(), NULL, surface, &rect);
+bool GUIElement::draw(SDL_Surface *surface) {
+	if (_background && !_drawn && _visible) {
+		SDL_Rect rect;
 
-			_drawn = true;
+		rect.x = _x;
+		rect.y = _y;
+		rect.w = _width;
+		rect.h = _height;
 
-			return true;
-		}
-		else
-			return false;
-	}
+		SDL_BlitSurface(_background->get(), NULL, surface, &rect);
 
-	bool GUIElement::checkInside(int x, int y) {
-		if (x >= _x && x <= _x + _width && y >= _y && y <= _y + _height)
-			return true;
-		else
-			return false;
-	}
+		_drawn = true;
 
-	void GUIElement::setVisible(bool visibility) {
-		if (visibility && !_visible)
-			_drawn = false;
-		_visible = visibility;
+		return true;
 	}
+	else
+		return false;
+}
 
-	bool GUIElement::visible() {
-		return _visible;
-	}
+bool GUIElement::checkInside(int x, int y) {
+	if (x >= _x && x <= _x + _width && y >= _y && y <= _y + _height)
+		return true;
+	else
+		return false;
+}
 
-	void GUIElement::forceRedraw() {
+void GUIElement::setVisible(bool visibility) {
+	if (visibility && !_visible)
 		_drawn = false;
-	}
+	_visible = visibility;
+}
 
-	bool GUIElement::drawn() {
-		return _drawn;
-	}
+bool GUIElement::visible() {
+	return _visible;
+}
 
-	int GUIElement::x() {
-		return _x;
-	}
+void GUIElement::forceRedraw() {
+	_drawn = false;
+}
 
-	int GUIElement::y() {
-		return _y;
-	}
+bool GUIElement::drawn() {
+	return _drawn;
+}
 
-	int GUIElement::width() {
-		return _width;
-	}
+int GUIElement::x() {
+	return _x;
+}
 
-	int GUIElement::height() {
-		return _height;
-	}
+int GUIElement::y() {
+	return _y;
+}
 
-	GUIElement::~GUIElement() {
-		delete _background;
-	}
+int GUIElement::width() {
+	return _width;
+}
+
+int GUIElement::height() {
+	return _height;
+}
 
+GUIElement::~GUIElement() {
+	delete _background;
 }
+
+} // End of namespace CEGUI
diff --git a/backends/platform/wince/CEgui/GUIElement.h b/backends/platform/wince/CEgui/GUIElement.h
index b8ac3e1a66..c599ebe9b5 100644
--- a/backends/platform/wince/CEgui/GUIElement.h
+++ b/backends/platform/wince/CEgui/GUIElement.h
@@ -33,35 +33,36 @@ struct SDL_Surface;
 
 namespace CEGUI {
 
-	class SDL_ImageResource;
+class SDL_ImageResource;
 
-	class GUIElement {
-	public:
-		bool setBackground(WORD backgroundReference);
-		void setVisible(bool visibility);
-		virtual void forceRedraw();
-		virtual bool draw(SDL_Surface *surface);
-		virtual ~GUIElement();
-		void move(int x, int y);
-		int width();
-		int height();
-		int x();
-		int y();
-		virtual bool action(int x, int y, bool pushed) = 0;
-		bool visible();
-		bool drawn();
-	protected:
-		GUIElement(int x = 0, int y = 0, int width = 0, int height = 0);
-		bool checkInside(int x, int y);
-		bool _visible;
-		SDL_ImageResource *_background;
-		int _x;
-		int _y;
-		bool _drawn;
-	private:
-		int _width;
-		int _height;
-	};
-}
+class GUIElement {
+public:
+	bool setBackground(WORD backgroundReference);
+	void setVisible(bool visibility);
+	virtual void forceRedraw();
+	virtual bool draw(SDL_Surface *surface);
+	virtual ~GUIElement();
+	void move(int x, int y);
+	int width();
+	int height();
+	int x();
+	int y();
+	virtual bool action(int x, int y, bool pushed) = 0;
+	bool visible();
+	bool drawn();
+protected:
+	GUIElement(int x = 0, int y = 0, int width = 0, int height = 0);
+	bool checkInside(int x, int y);
+	bool _visible;
+	SDL_ImageResource *_background;
+	int _x;
+	int _y;
+	bool _drawn;
+private:
+	int _width;
+	int _height;
+};
+
+} // End of namespace CEGUI
 
 #endif
diff --git a/backends/platform/wince/CEgui/ItemAction.cpp b/backends/platform/wince/CEgui/ItemAction.cpp
index 3808622b2e..55805744e6 100644
--- a/backends/platform/wince/CEgui/ItemAction.cpp
+++ b/backends/platform/wince/CEgui/ItemAction.cpp
@@ -27,25 +27,25 @@
 
 namespace CEGUI {
 
-	ItemAction::ItemAction(WORD reference, GUI::ActionType action) :
-	PanelItem(reference) {
-		_action = action;
-		if (!GUI::Actions::Instance()->isEnabled(_action))
-			_visible = false;
-	}
-
-
-	ItemAction::~ItemAction() {
-	}
-
-	bool ItemAction::action(int x, int y, bool pushed) {
-
-		if (checkInside(x, y) && _visible && pushed) {
-			GUI::Actions::Instance()->perform(_action, true);
-			GUI::Actions::Instance()->perform(_action, false);
-			return true;
-		}
-		else
-			return false;
-	}
+ItemAction::ItemAction(WORD reference, GUI::ActionType action) :
+PanelItem(reference) {
+	_action = action;
+	if (!GUI::Actions::Instance()->isEnabled(_action))
+		_visible = false;
 }
+
+
+ItemAction::~ItemAction() {
+}
+
+bool ItemAction::action(int x, int y, bool pushed) {
+
+	if (checkInside(x, y) && _visible && pushed) {
+		GUI::Actions::Instance()->perform(_action, true);
+		GUI::Actions::Instance()->perform(_action, false);
+		return true;
+	} else
+		return false;
+}
+
+} // End of namespace CEGUI
diff --git a/backends/platform/wince/CEgui/ItemAction.h b/backends/platform/wince/CEgui/ItemAction.h
index 74ed6bec4d..4f35b3090d 100644
--- a/backends/platform/wince/CEgui/ItemAction.h
+++ b/backends/platform/wince/CEgui/ItemAction.h
@@ -31,16 +31,18 @@
 
 #include "gui/Actions.h"
 #include "CEgui/PanelItem.h"
+
 namespace CEGUI {
 
-	class ItemAction : public PanelItem {
-	public:
-		ItemAction(WORD reference, GUI::ActionType action);
-		virtual ~ItemAction();
-		virtual bool action(int x, int y, bool pushed);
-	private:
-		GUI::ActionType _action;
-	};
-}
+class ItemAction : public PanelItem {
+public:
+	ItemAction(WORD reference, GUI::ActionType action);
+	virtual ~ItemAction();
+	virtual bool action(int x, int y, bool pushed);
+private:
+	GUI::ActionType _action;
+};
+
+} // End of namespace CEGUI
 
 #endif
diff --git a/backends/platform/wince/CEgui/ItemSwitch.cpp b/backends/platform/wince/CEgui/ItemSwitch.cpp
index 76ea5fbdff..d4648f7556 100644
--- a/backends/platform/wince/CEgui/ItemSwitch.cpp
+++ b/backends/platform/wince/CEgui/ItemSwitch.cpp
@@ -28,68 +28,69 @@
 
 namespace CEGUI {
 
-	void ItemSwitch::init(WORD referenceTrue, WORD referenceFalse) {
-		_backgroundTrue = _background;
-		_backgroundFalse = new SDL_ImageResource();
-		if (!_backgroundFalse->load(referenceFalse)) {
-			delete _backgroundFalse;
-			delete _background;
-			_background = NULL;
-			_backgroundFalse = NULL;
-		}
+void ItemSwitch::init(WORD referenceTrue, WORD referenceFalse) {
+	_backgroundTrue = _background;
+	_backgroundFalse = new SDL_ImageResource();
+	if (!_backgroundFalse->load(referenceFalse)) {
+		delete _backgroundFalse;
+		delete _background;
+		_background = NULL;
+		_backgroundFalse = NULL;
 	}
+}
 
-	ItemSwitch::ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item) :
-	PanelItem(referenceTrue) {
-		init(referenceTrue, referenceFalse);
-		_item = item;
-		_itemmax = -1;
-		if (!*_item)
-			_background = _backgroundFalse;
-	}
+ItemSwitch::ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item) :
+PanelItem(referenceTrue) {
+	init(referenceTrue, referenceFalse);
+	_item = item;
+	_itemmax = -1;
+	if (!*_item)
+		_background = _backgroundFalse;
+}
 
-	ItemSwitch::ItemSwitch(WORD referenceTrue, WORD referenceFalse, int *item, int max) :
-	PanelItem(referenceTrue) {
-		 init(referenceTrue, referenceFalse);
-		_itemmultiple = item;
-		_itemmax = max;
-		if (!*item)
-			_background = _backgroundFalse;
-	}
+ItemSwitch::ItemSwitch(WORD referenceTrue, WORD referenceFalse, int *item, int max) :
+PanelItem(referenceTrue) {
+	 init(referenceTrue, referenceFalse);
+	_itemmultiple = item;
+	_itemmax = max;
+	if (!*item)
+		_background = _backgroundFalse;
+}
 
-	ItemSwitch::~ItemSwitch() {
-		delete _backgroundFalse;
-	}
+ItemSwitch::~ItemSwitch() {
+	delete _backgroundFalse;
+}
 
-	bool ItemSwitch::action(int x, int y, bool pushed) {
+bool ItemSwitch::action(int x, int y, bool pushed) {
 
-		if (checkInside(x, y) && _visible && pushed) {
-			if (_itemmax <= 0) {
-				*_item = !*_item;
-				if (*_item)
-					_background = _backgroundTrue;
-				else
-					_background = _backgroundFalse;
+	if (checkInside(x, y) && _visible && pushed) {
+		if (_itemmax <= 0) {
+			*_item = !*_item;
+			if (*_item)
+				_background = _backgroundTrue;
+			else
+				_background = _backgroundFalse;
 
-				if (_panel)
-					_panel->forceRedraw();
+			if (_panel)
+				_panel->forceRedraw();
 
-				return true;
-			} else {
-				*_itemmultiple = *_itemmultiple + 1;
-				if (*_itemmultiple > _itemmax)
-					*_itemmultiple = 0;
-				if (*_itemmultiple)
-					_background = _backgroundTrue;
-				else
-					_background = _backgroundFalse;
+			return true;
+		} else {
+			*_itemmultiple = *_itemmultiple + 1;
+			if (*_itemmultiple > _itemmax)
+				*_itemmultiple = 0;
+			if (*_itemmultiple)
+				_background = _backgroundTrue;
+			else
+				_background = _backgroundFalse;
 
-				if (_panel)
-					_panel->forceRedraw();
+			if (_panel)
+				_panel->forceRedraw();
 
-				return true;
-			}
-		} else
-			return false;
-	}
+			return true;
+		}
+	} else
+		return false;
 }
+
+} // End of namespace CEGUI
diff --git a/backends/platform/wince/CEgui/ItemSwitch.h b/backends/platform/wince/CEgui/ItemSwitch.h
index f766612abb..1ca6f3c288 100644
--- a/backends/platform/wince/CEgui/ItemSwitch.h
+++ b/backends/platform/wince/CEgui/ItemSwitch.h
@@ -35,22 +35,24 @@
 using GUI::Key;
 
 namespace CEGUI {
-	class SDL_ImageResource;
-
-	class ItemSwitch : public PanelItem {
-	public:
-		ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item);
-		ItemSwitch(WORD referenceTrue, WORD referenceFalse, int *item, int max);
-		virtual ~ItemSwitch();
-		virtual bool action(int x, int y, bool pushed);
-	private:
-		void init(WORD referenceTrue, WORD referenceFalse);
-		bool *_item;
-		static bool _itemdummy;
-		int  *_itemmultiple, _itemmax;
-		SDL_ImageResource *_backgroundTrue;
-		SDL_ImageResource *_backgroundFalse;
-	};
-}
+
+class SDL_ImageResource;
+
+class ItemSwitch : public PanelItem {
+public:
+	ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item);
+	ItemSwitch(WORD referenceTrue, WORD referenceFalse, int *item, int max);
+	virtual ~ItemSwitch();
+	virtual bool action(int x, int y, bool pushed);
+private:
+	void init(WORD referenceTrue, WORD referenceFalse);
+	bool *_item;
+	static bool _itemdummy;
+	int  *_itemmultiple, _itemmax;
+	SDL_ImageResource *_backgroundTrue;
+	SDL_ImageResource *_backgroundFalse;
+};
+
+} // End of namespace CEGUI
 
 #endif
diff --git a/backends/platform/wince/CEgui/Panel.cpp b/backends/platform/wince/CEgui/Panel.cpp
index a2d965ca78..dfdd6526be 100644
--- a/backends/platform/wince/CEgui/Panel.cpp
+++ b/backends/platform/wince/CEgui/Panel.cpp
@@ -27,59 +27,58 @@
 
 namespace CEGUI {
 
-	Panel::Panel(int interleave_first, int interleave) : Toolbar()
-	{
-		_interleave = interleave;
-		_currentItem = interleave_first;
-	}
+Panel::Panel(int interleave_first, int interleave) : Toolbar() {
+	_interleave = interleave;
+	_currentItem = interleave_first;
+}
 
 
-	bool Panel::add(const String &name, const PanelItem *item) {
-		_itemsMap[name] = (PanelItem*)item;
-		_itemsMap[name]->move(_currentItem, _y + 10);
-		_itemsMap[name]->setPanel(this);
-		_currentItem += _interleave;
+bool Panel::add(const String &name, const PanelItem *item) {
+	_itemsMap[name] = (PanelItem*)item;
+	_itemsMap[name]->move(_currentItem, _y + 10);
+	_itemsMap[name]->setPanel(this);
+	_currentItem += _interleave;
 
-		return true;
-	}
+	return true;
+}
 
-	bool Panel::draw(SDL_Surface *surface) {
-		ItemMap::const_iterator iterator;
-		if (!_drawn && _visible) {
-			GUIElement::draw(surface);
-			for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator) {
-				((GUIElement*)(iterator->_value))->draw(surface);
-			}
-			return true;
+bool Panel::draw(SDL_Surface *surface) {
+	ItemMap::const_iterator iterator;
+	if (!_drawn && _visible) {
+		GUIElement::draw(surface);
+		for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator) {
+			((GUIElement*)(iterator->_value))->draw(surface);
 		}
-		else
-			return false;
+		return true;
 	}
+	else
+		return false;
+}
 
-	void Panel::forceRedraw() {
-		ItemMap::const_iterator iterator;
-		GUIElement::forceRedraw();
-		for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator)
-			((GUIElement*)(iterator->_value))->forceRedraw();
-	}
+void Panel::forceRedraw() {
+	ItemMap::const_iterator iterator;
+	GUIElement::forceRedraw();
+	for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator)
+		((GUIElement*)(iterator->_value))->forceRedraw();
+}
 
-	bool Panel::action(int x, int y, bool pushed) {
-		ItemMap::const_iterator iterator;
-		bool result = false;
-		if (!_visible || !checkInside(x, y))
-			return false;
+bool Panel::action(int x, int y, bool pushed) {
+	ItemMap::const_iterator iterator;
+	bool result = false;
+	if (!_visible || !checkInside(x, y))
+		return false;
 
-		for (iterator = _itemsMap.begin(); !result && iterator != _itemsMap.end(); ++iterator)
-			result = ((GUIElement*)(iterator->_value))->action(x, y, pushed);
-		return result;
-	}
+	for (iterator = _itemsMap.begin(); !result && iterator != _itemsMap.end(); ++iterator)
+		result = ((GUIElement*)(iterator->_value))->action(x, y, pushed);
+	return result;
+}
 
-	void Panel::clear() {
-		_itemsMap.clear();
-	}
+void Panel::clear() {
+	_itemsMap.clear();
+}
 
-	Panel::~Panel() {
-		_itemsMap.clear();
-	}
+Panel::~Panel() {
+	_itemsMap.clear();
 }
 
+} // End of namespace CEGUI
diff --git a/backends/platform/wince/CEgui/Panel.h b/backends/platform/wince/CEgui/Panel.h
index 6626e41866..e6b693360d 100644
--- a/backends/platform/wince/CEgui/Panel.h
+++ b/backends/platform/wince/CEgui/Panel.h
@@ -40,23 +40,24 @@ using Common::HashMap;
 
 namespace CEGUI {
 
-	class Panel : public Toolbar {
-	public:
-		Panel(int interleave_first, int interleave);
-		virtual bool draw(SDL_Surface *surface);
-		virtual ~Panel();
-		bool add(const String &name, const PanelItem *item);
-		void clear();
-		virtual void forceRedraw();
-		virtual bool action(int x, int y, bool pushed);
-	private:
-
-		typedef HashMap<String, PanelItem*, Common::IgnoreCase_Hash , Common::IgnoreCase_EqualTo> ItemMap;
-
-		ItemMap _itemsMap;
-		int _interleave;
-		int _currentItem;
-	};
-}
+class Panel : public Toolbar {
+public:
+	Panel(int interleave_first, int interleave);
+	virtual bool draw(SDL_Surface *surface);
+	virtual ~Panel();
+	bool add(const String &name, const PanelItem *item);
+	void clear();
+	virtual void forceRedraw();
+	virtual bool action(int x, int y, bool pushed);
+private:
+
+	typedef HashMap<String, PanelItem*, Common::IgnoreCase_Hash , Common::IgnoreCase_EqualTo> ItemMap;
+
+	ItemMap _itemsMap;
+	int _interleave;
+	int _currentItem;
+};
+
+} // End of namespace CEGUI
 
 #endif
diff --git a/backends/platform/wince/CEgui/PanelItem.cpp b/backends/platform/wince/CEgui/PanelItem.cpp
index 0898839c5d..8c68c79784 100644
--- a/backends/platform/wince/CEgui/PanelItem.cpp
+++ b/backends/platform/wince/CEgui/PanelItem.cpp
@@ -27,21 +27,21 @@
 
 namespace CEGUI {
 
-	PanelItem::PanelItem(WORD reference) : GUIElement() {
-		setBackground(reference);
-		_panel = NULL;
-	}
+PanelItem::PanelItem(WORD reference) : GUIElement() {
+	setBackground(reference);
+	_panel = NULL;
+}
 
 
-	PanelItem::~PanelItem() {
-	}
+PanelItem::~PanelItem() {
+}
 
-	bool PanelItem::action(int x, int y, bool pushed) {
-		return false;
-	}
+bool PanelItem::action(int x, int y, bool pushed) {
+	return false;
+}
 
-	void PanelItem::setPanel(Panel *panel) {
-		_panel = panel;
-	}
+void PanelItem::setPanel(Panel *panel) {
+	_panel = panel;
 }
 
+} // End of namespace CEGUI
diff --git a/backends/platform/wince/CEgui/PanelItem.h b/backends/platform/wince/CEgui/PanelItem.h
index 55920c304a..14b62f0f20 100644
--- a/backends/platform/wince/CEgui/PanelItem.h
+++ b/backends/platform/wince/CEgui/PanelItem.h
@@ -33,18 +33,19 @@
 
 namespace CEGUI {
 
-	class Panel;
-
-	class PanelItem : public GUIElement {
-	friend class Panel;
-	public:
-		PanelItem(WORD reference);
-		virtual ~PanelItem();
-		virtual bool action(int x, int y, bool pushed);
-	protected:
-		void setPanel(Panel *panel);
-		Panel *_panel;
-	};
-}
+class Panel;
+
+class PanelItem : public GUIElement {
+friend class Panel;
+public:
+	PanelItem(WORD reference);
+	virtual ~PanelItem();
+	virtual bool action(int x, int y, bool pushed);
+protected:
+	void setPanel(Panel *panel);
+	Panel *_panel;
+};
+
+} // End of namespace CEGUI
 
 #endif
diff --git a/backends/platform/wince/CEgui/PanelKeyboard.cpp b/backends/platform/wince/CEgui/PanelKeyboard.cpp
index 1e59760e96..1b2a478746 100644
--- a/backends/platform/wince/CEgui/PanelKeyboard.cpp
+++ b/backends/platform/wince/CEgui/PanelKeyboard.cpp
@@ -32,73 +32,72 @@
 
 namespace CEGUI {
 
-	const char KEYBOARD_MAPPING_ALPHA[][14] = { {"abcdefghijklm"}, {"nopqrstuvwxyz"} };
-	const char KEYBOARD_MAPPING_NUMERIC[][6] = { {"12345"}, {"67890"} };
-	const int  KEYBOARD_MAPPING_SPECIAL[][3][2] = { { {1,SDLK_ESCAPE}, {224,SDLK_UP}, {32,SDLK_SPACE} },
-						      { {224,SDLK_LEFT}, {224,SDLK_DOWN}, {224,SDLK_RIGHT} } };
+const char KEYBOARD_MAPPING_ALPHA[][14] = { {"abcdefghijklm"}, {"nopqrstuvwxyz"} };
+const char KEYBOARD_MAPPING_NUMERIC[][6] = { {"12345"}, {"67890"} };
+const int  KEYBOARD_MAPPING_SPECIAL[][3][2] = { { {1,SDLK_ESCAPE}, {224,SDLK_UP}, {32,SDLK_SPACE} },
+						  { {224,SDLK_LEFT}, {224,SDLK_DOWN}, {224,SDLK_RIGHT} } };
 
-	PanelKeyboard::PanelKeyboard(WORD reference) : Toolbar() {
-		setBackground(reference);
-		_state = false;
-		_lastKey.setKey(0);
-	}
-
-
-	PanelKeyboard::~PanelKeyboard() {
-	}
-
-	bool PanelKeyboard::action(int x, int y, bool pushed) {
-		Key key;
-
-		if (checkInside(x, y)) {
-			int keyAscii = 0;
-			int keyCode = 0;
-			if (x < 185) {
-				// Alpha selection
-				keyCode = keyAscii = KEYBOARD_MAPPING_ALPHA[y >= _y+20][((x + 10) / 14) - 1];
-			} else if (x >= 186 && x <= 255) {
-				// Numeric selection
-				keyCode = keyAscii = KEYBOARD_MAPPING_NUMERIC[y >= _y+20][((x - 187 + 10) / 14) - 1];
-			} else if (x >= 258 && x <= 300) {
-				// Special keys
-				keyAscii = KEYBOARD_MAPPING_SPECIAL[y >= _y+20][((x - 259 + 10) / 14) - 1][0];
-				keyCode = KEYBOARD_MAPPING_SPECIAL[y >= _y+20][((x - 259 + 10) / 14) - 1][1];
-			} else if (x >= 302 && x <= 316) {
-				if (y < _y +20) {
-					// Backspace
-					keyAscii = VK_BACK; keyCode = keyAscii;
-				} else {
-					// Enter
-					keyAscii = 13; keyCode = 13;
-				}
-			}
+PanelKeyboard::PanelKeyboard(WORD reference) : Toolbar() {
+	setBackground(reference);
+	_state = false;
+	_lastKey.setKey(0);
+}
+
+
+PanelKeyboard::~PanelKeyboard() {
+}
+
+bool PanelKeyboard::action(int x, int y, bool pushed) {
+	Key key;
 
-			if (keyAscii != 0) {
-				if (_state && pushed && keyCode != _lastKey.keycode()) // if cursor is still down and off the current key
-					return false;
-				else if (_state && !pushed && keyCode != _lastKey.keycode()) { // cursor is up but off the current key
-					keyAscii = _lastKey.ascii();
-					keyCode = _lastKey.keycode();
-				}
-				_state = pushed;
-				_lastKey.setKey(keyAscii, tolower(keyCode));
-
-				key.setKey(keyAscii, tolower(keyCode));
-				return EventsBuffer::simulateKey(&key, pushed);
+	if (checkInside(x, y)) {
+		int keyAscii = 0;
+		int keyCode = 0;
+		if (x < 185) {
+			// Alpha selection
+			keyCode = keyAscii = KEYBOARD_MAPPING_ALPHA[y >= _y+20][((x + 10) / 14) - 1];
+		} else if (x >= 186 && x <= 255) {
+			// Numeric selection
+			keyCode = keyAscii = KEYBOARD_MAPPING_NUMERIC[y >= _y+20][((x - 187 + 10) / 14) - 1];
+		} else if (x >= 258 && x <= 300) {
+			// Special keys
+			keyAscii = KEYBOARD_MAPPING_SPECIAL[y >= _y+20][((x - 259 + 10) / 14) - 1][0];
+			keyCode = KEYBOARD_MAPPING_SPECIAL[y >= _y+20][((x - 259 + 10) / 14) - 1][1];
+		} else if (x >= 302 && x <= 316) {
+			if (y < _y +20) {
+				// Backspace
+				keyAscii = VK_BACK; keyCode = keyAscii;
+			} else {
+				// Enter
+				keyAscii = 13; keyCode = 13;
 			}
-			else if (_state && !pushed) { // cursor is in some forbidden region and is up
-				_state = false;
-				key = _lastKey;
-				return EventsBuffer::simulateKey(&key, false);
-			} else
-				return false;
 		}
-		else if (_state && !pushed) { // cursor left the keyboard area and is up
+
+		if (keyAscii != 0) {
+			if (_state && pushed && keyCode != _lastKey.keycode()) // if cursor is still down and off the current key
+				return false;
+			else if (_state && !pushed && keyCode != _lastKey.keycode()) { // cursor is up but off the current key
+				keyAscii = _lastKey.ascii();
+				keyCode = _lastKey.keycode();
+			}
+			_state = pushed;
+			_lastKey.setKey(keyAscii, tolower(keyCode));
+
+			key.setKey(keyAscii, tolower(keyCode));
+			return EventsBuffer::simulateKey(&key, pushed);
+		} else if (_state && !pushed) { // cursor is in some forbidden region and is up
 			_state = false;
 			key = _lastKey;
 			return EventsBuffer::simulateKey(&key, false);
 		} else
 			return false;
-	}
+	} else if (_state && !pushed) { // cursor left the keyboard area and is up
+		_state = false;
+		key = _lastKey;
+		return EventsBuffer::simulateKey(&key, false);
+	} else
+		return false;
 }
 
+} // End of namespace CEGUI
+
diff --git a/backends/platform/wince/CEgui/PanelKeyboard.h b/backends/platform/wince/CEgui/PanelKeyboard.h
index f441e14771..b98e6ff3a8 100644
--- a/backends/platform/wince/CEgui/PanelKeyboard.h
+++ b/backends/platform/wince/CEgui/PanelKeyboard.h
@@ -37,15 +37,16 @@ using CEKEYS::EventsBuffer;
 
 namespace CEGUI {
 
-	class PanelKeyboard : public Toolbar {
-	public:
-		PanelKeyboard(WORD reference);
-		virtual ~PanelKeyboard();
-		virtual bool action(int x, int y, bool pushed);
-	private:
-		bool _state;
-		Key _lastKey;
-	};
-}
+class PanelKeyboard : public Toolbar {
+public:
+	PanelKeyboard(WORD reference);
+	virtual ~PanelKeyboard();
+	virtual bool action(int x, int y, bool pushed);
+private:
+	bool _state;
+	Key _lastKey;
+};
+
+} // End of namespace CEGUI
 
 #endif
diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.cpp b/backends/platform/wince/CEgui/SDL_ImageResource.cpp
index b6cfa0cb1f..567013b5ff 100644
--- a/backends/platform/wince/CEgui/SDL_ImageResource.cpp
+++ b/backends/platform/wince/CEgui/SDL_ImageResource.cpp
@@ -31,59 +31,59 @@
 
 namespace CEGUI {
 
-	SDL_ImageResource::SDL_ImageResource() :
-		_surface(0)
-	{
-	}
+SDL_ImageResource::SDL_ImageResource() :
+	_surface(0) {
+}
 
-	SDL_Surface* SDL_ImageResource::load(WORD resourceID) {
-		HRSRC resource;
-		HGLOBAL resourceGlobal;
-		LPVOID resourcePointer;
-		DWORD resourceSize;
-		SDL_RWops *surfaceData;
-		HMODULE moduleHandle;
+SDL_Surface* SDL_ImageResource::load(WORD resourceID) {
+	HRSRC resource;
+	HGLOBAL resourceGlobal;
+	LPVOID resourcePointer;
+	DWORD resourceSize;
+	SDL_RWops *surfaceData;
+	HMODULE moduleHandle;
 
-		moduleHandle = GetModuleHandle(NULL);
-		resource = FindResource(moduleHandle, MAKEINTRESOURCE(resourceID), TEXT("BINARY"));
-		if (!resource)
-			return NULL;
-		resourceSize = SizeofResource(moduleHandle, resource);
-		if (!resourceSize)
-			return NULL;
-		resourceGlobal = LoadResource(moduleHandle, resource);
-		if (!resourceGlobal)
-			return NULL;
-		resourcePointer = LockResource(resourceGlobal);
-		if (!resourcePointer)
-			return NULL;
+	moduleHandle = GetModuleHandle(NULL);
+	resource = FindResource(moduleHandle, MAKEINTRESOURCE(resourceID), TEXT("BINARY"));
+	if (!resource)
+		return NULL;
+	resourceSize = SizeofResource(moduleHandle, resource);
+	if (!resourceSize)
+		return NULL;
+	resourceGlobal = LoadResource(moduleHandle, resource);
+	if (!resourceGlobal)
+		return NULL;
+	resourcePointer = LockResource(resourceGlobal);
+	if (!resourcePointer)
+		return NULL;
 
-		surfaceData = SDL_RWFromMem(resourcePointer, resourceSize);
-		if (!surfaceData)
-			return NULL;
-		_surface = SDL_LoadBMP_RW(surfaceData, 1);
+	surfaceData = SDL_RWFromMem(resourcePointer, resourceSize);
+	if (!surfaceData)
+		return NULL;
+	_surface = SDL_LoadBMP_RW(surfaceData, 1);
 
-		return _surface;
-	}
+	return _surface;
+}
 
-	SDL_Surface* SDL_ImageResource::get() {
-		return _surface;
-	}
+SDL_Surface* SDL_ImageResource::get() {
+	return _surface;
+}
 
-	int SDL_ImageResource::height() {
-		if (_surface)
-			return _surface->h;
-		return 0;
-	}
+int SDL_ImageResource::height() {
+	if (_surface)
+		return _surface->h;
+	return 0;
+}
 
-	int SDL_ImageResource::width() {
-		if (_surface)
-			return _surface->w;
-		return 0;
-	}
+int SDL_ImageResource::width() {
+	if (_surface)
+		return _surface->w;
+	return 0;
+}
 
-	SDL_ImageResource::~SDL_ImageResource() {
-		if (_surface)
-			SDL_FreeSurface(_surface);
-	}
+SDL_ImageResource::~SDL_ImageResource() {
+	if (_surface)
+		SDL_FreeSurface(_surface);
 }
+
+} // End of namespace CEGUI
diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.h b/backends/platform/wince/CEgui/SDL_ImageResource.h
index 269dfe49ea..5affd5c33c 100644
--- a/backends/platform/wince/CEgui/SDL_ImageResource.h
+++ b/backends/platform/wince/CEgui/SDL_ImageResource.h
@@ -32,17 +32,19 @@
 struct SDL_Surface;
 
 namespace CEGUI {
-	class SDL_ImageResource {
-	public:
-		SDL_ImageResource();
-		SDL_Surface* load(WORD resourceID);
-		SDL_Surface* get();
-		int height();
-		int width();
-		virtual ~SDL_ImageResource();
-	private:
-		SDL_Surface *_surface;
-	};
-}
+
+class SDL_ImageResource {
+public:
+	SDL_ImageResource();
+	SDL_Surface* load(WORD resourceID);
+	SDL_Surface* get();
+	int height();
+	int width();
+	virtual ~SDL_ImageResource();
+private:
+	SDL_Surface *_surface;
+};
+
+} // End of namespace CEGUI
 
 #endif
diff --git a/backends/platform/wince/CEgui/Toolbar.cpp b/backends/platform/wince/CEgui/Toolbar.cpp
index 0501249de9..c41a30cb43 100644
--- a/backends/platform/wince/CEgui/Toolbar.cpp
+++ b/backends/platform/wince/CEgui/Toolbar.cpp
@@ -27,12 +27,12 @@
 
 namespace CEGUI {
 
-	// Not to be drawn on game screen !
-	Toolbar::Toolbar() : GUIElement(0, 0, 320, 40)
-	{
-	}
+// Not to be drawn on game screen !
+Toolbar::Toolbar() : GUIElement(0, 0, 320, 40) {
+}
 
 
-	Toolbar::~Toolbar() {
-	}
+Toolbar::~Toolbar() {
 }
+
+} // End of namespace CEGUI
diff --git a/backends/platform/wince/CEgui/Toolbar.h b/backends/platform/wince/CEgui/Toolbar.h
index 961aa15200..9fdf05ab3f 100644
--- a/backends/platform/wince/CEgui/Toolbar.h
+++ b/backends/platform/wince/CEgui/Toolbar.h
@@ -30,18 +30,17 @@
 
 #include "GUIElement.h"
 
-
-
 namespace CEGUI {
 
-	class Toolbar : public GUIElement {
-	public:
-		virtual ~Toolbar();
-		virtual bool action(int x, int y, bool pushed) = 0;
-	protected:
-		Toolbar();
+class Toolbar : public GUIElement {
+public:
+	virtual ~Toolbar();
+	virtual bool action(int x, int y, bool pushed) = 0;
+protected:
+	Toolbar();
+
+};
 
-	};
-}
+} // End of namespace CEGUI
 
 #endif
diff --git a/backends/platform/wince/CEgui/ToolbarHandler.cpp b/backends/platform/wince/CEgui/ToolbarHandler.cpp
index 310dd24bfb..f74d24ad25 100644
--- a/backends/platform/wince/CEgui/ToolbarHandler.cpp
+++ b/backends/platform/wince/CEgui/ToolbarHandler.cpp
@@ -32,102 +32,102 @@
 
 namespace CEGUI {
 
-	ToolbarHandler::ToolbarHandler():
-	_current(""), _active(NULL) {
-	}
+ToolbarHandler::ToolbarHandler():
+_current(""), _active(NULL) {
+}
 
 
-	bool ToolbarHandler::add(const String &name, const Toolbar &toolbar) {
-		_toolbarMap[name] = (Toolbar*)&toolbar;
+bool ToolbarHandler::add(const String &name, const Toolbar &toolbar) {
+	_toolbarMap[name] = (Toolbar*)&toolbar;
 
-		if (!_active) {
-			_active = &((Toolbar&)toolbar);
-			_current = name;
-		}
-
-		return true;
+	if (!_active) {
+		_active = &((Toolbar&)toolbar);
+		_current = name;
 	}
 
-	String ToolbarHandler::activeName() {
-		return _current;
-	}
+	return true;
+}
 
-	bool ToolbarHandler::setActive(const String &name) {
-		if (!_toolbarMap.contains(name))
-			return false;
-		if (_current == name)
-			return true;
-		_active->action(0, 0, false);	// make sure any items are unpushed when changing toolbars (e.g. forced VK->main panel)
-		_current = name;
-		_active = _toolbarMap[name];
-		_active->forceRedraw();
+String ToolbarHandler::activeName() {
+	return _current;
+}
+
+bool ToolbarHandler::setActive(const String &name) {
+	if (!_toolbarMap.contains(name))
+		return false;
+	if (_current == name)
 		return true;
-	}
+	_active->action(0, 0, false);	// make sure any items are unpushed when changing toolbars (e.g. forced VK->main panel)
+	_current = name;
+	_active = _toolbarMap[name];
+	_active->forceRedraw();
+	return true;
+}
 
-	bool ToolbarHandler::action(int x, int y, bool pushed) {
-		if (_active && _active->visible()) {
-			// FIXME !
-			if (_offset > 240)
-				return _active->action(x / 2, (y - _offset) / 2, pushed);
-			else
-				return _active->action(x, y - _offset, pushed);
-		}
+bool ToolbarHandler::action(int x, int y, bool pushed) {
+	if (_active && _active->visible()) {
+		// FIXME !
+		if (_offset > 240)
+			return _active->action(x / 2, (y - _offset) / 2, pushed);
 		else
-			return false;
+			return _active->action(x, y - _offset, pushed);
 	}
+	else
+		return false;
+}
 
-	void ToolbarHandler::setVisible(bool visible) {
-		if (_active)
-			_active->setVisible(visible);
-	}
+void ToolbarHandler::setVisible(bool visible) {
+	if (_active)
+		_active->setVisible(visible);
+}
 
-	bool ToolbarHandler::visible() {
-		if (_active)
-			return _active->visible();
-		else
-			return false;
-	}
+bool ToolbarHandler::visible() {
+	if (_active)
+		return _active->visible();
+	else
+		return false;
+}
 
-	void ToolbarHandler::forceRedraw() {
-		if (_active)
-			_active->forceRedraw();
-	}
+void ToolbarHandler::forceRedraw() {
+	if (_active)
+		_active->forceRedraw();
+}
 
-	bool ToolbarHandler::drawn() {
-		if (_active)
-			return _active->drawn();
-		else
-			return false;
-	}
+bool ToolbarHandler::drawn() {
+	if (_active)
+		return _active->drawn();
+	else
+		return false;
+}
 
-	bool ToolbarHandler::draw(SDL_Surface *surface, SDL_Rect *rect) {
-		if (_active) {
-			bool result = _active->draw(surface);
-			if (result) {
-				rect->x = _active->x();
-				rect->y = _active->y();
-				rect->w = _active->width();
-				rect->h = _active->height();
-			}
-			return result;
+bool ToolbarHandler::draw(SDL_Surface *surface, SDL_Rect *rect) {
+	if (_active) {
+		bool result = _active->draw(surface);
+		if (result) {
+			rect->x = _active->x();
+			rect->y = _active->y();
+			rect->w = _active->width();
+			rect->h = _active->height();
 		}
-		else
-			return false;
-	}
+		return result;
+	} else
+		return false;
+}
 
-	void ToolbarHandler::setOffset(int offset) {
-		_offset = offset;
-	}
+void ToolbarHandler::setOffset(int offset) {
+	_offset = offset;
+}
 
-	int ToolbarHandler::getOffset() {
-		return _offset;
-	}
+int ToolbarHandler::getOffset() {
+	return _offset;
+}
 
-	Toolbar* ToolbarHandler::active() {
-		return _active;
-	}
+Toolbar* ToolbarHandler::active() {
+	return _active;
+}
 
-	ToolbarHandler::~ToolbarHandler() {
-		_toolbarMap.clear();
-	}
+ToolbarHandler::~ToolbarHandler() {
+	_toolbarMap.clear();
 }
+
+} // End of namespace CEGUI
diff --git a/backends/platform/wince/CEgui/ToolbarHandler.h b/backends/platform/wince/CEgui/ToolbarHandler.h
index 4a79ed1609..e3bf590768 100644
--- a/backends/platform/wince/CEgui/ToolbarHandler.h
+++ b/backends/platform/wince/CEgui/ToolbarHandler.h
@@ -39,29 +39,30 @@ using Common::HashMap;
 
 namespace CEGUI {
 
-	class ToolbarHandler {
-	public:
-		ToolbarHandler();
-		bool add(const String &name, const Toolbar &toolbar);
-		bool setActive(const String &name);
-		bool action(int x, int y, bool pushed);
-		void setVisible(bool visible);
-		bool visible();
-		String activeName();
-		void forceRedraw();
-		void setOffset(int offset);
-		int getOffset();
-		bool draw(SDL_Surface *surface, SDL_Rect *rect);
-		bool drawn();
-		Toolbar *active();
-		virtual ~ToolbarHandler();
-	private:
+class ToolbarHandler {
+public:
+	ToolbarHandler();
+	bool add(const String &name, const Toolbar &toolbar);
+	bool setActive(const String &name);
+	bool action(int x, int y, bool pushed);
+	void setVisible(bool visible);
+	bool visible();
+	String activeName();
+	void forceRedraw();
+	void setOffset(int offset);
+	int getOffset();
+	bool draw(SDL_Surface *surface, SDL_Rect *rect);
+	bool drawn();
+	Toolbar *active();
+	virtual ~ToolbarHandler();
+private:
 
-		HashMap<String, Toolbar*, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _toolbarMap;
-		String _current;
-		Toolbar *_active;
-		int _offset;
-	};
-}
+	HashMap<String, Toolbar*, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _toolbarMap;
+	String _current;
+	Toolbar *_active;
+	int _offset;
+};
+
+} // End of namespace CEGUI
 
 #endif
diff --git a/gui/Actions.cpp b/gui/Actions.cpp
index ce7d081991..f44479a5a8 100644
--- a/gui/Actions.cpp
+++ b/gui/Actions.cpp
@@ -42,8 +42,7 @@ Actions* Actions::Instance() {
 }
 
 Actions::Actions() :
-	_mapping_active(false), _initialized(false)
-{
+	_mapping_active(false), _initialized(false) {
 }
 
 
@@ -95,7 +94,7 @@ bool Actions::mappingActive() {
 bool Actions::performMapped(unsigned int keyCode, bool pushed) {
 	int i;
 
-	for (i=0; i<size(); i++) {
+	for (i = 0; i < size(); ++i) {
 		if (_action_mapping[i] == keyCode && _action_enabled[i])
 				return perform((ActionType)i, pushed);
 	}
@@ -112,7 +111,7 @@ bool Actions::loadMapping() {
 		return false;
 	tempo = ConfMan.get("action_mapping", domain()).c_str();
 	if (tempo && strlen(tempo)) {
-		for (i=0; i<size(); i++) {
+		for (i = 0; i < size(); ++i) {
 			char x[7];
 			int j;
 			memset(x, 0, sizeof(x));
@@ -121,8 +120,7 @@ bool Actions::loadMapping() {
 			_action_mapping[i] = j;
 		}
 		return true;
-	}
-	else
+	} else
 		return false;
 }
 
@@ -131,7 +129,7 @@ bool Actions::saveMapping() {
 	int i;
 	tempo[0] = '\0';
 	ConfMan.setInt("action_mapping_version", version(), domain());
-	for (i=0; i<size(); i++) {
+	for (i = 0; i < size(); ++i) {
 		char x[10];
 		sprintf(x, "%.4x ", _action_mapping[i]);
 		strcat(tempo, x);
@@ -149,7 +147,7 @@ unsigned int Actions::getMapping(ActionType action) {
 void Actions::setMapping(ActionType action, unsigned int keyCode) {
 	int i;
 
-	for (i=0; i<size(); i++) {
+	for (i = 0; i < size(); ++i) {
 		if (_action_mapping[i] == keyCode)
 			_action_mapping[i] = 0;
 	}
@@ -157,8 +155,7 @@ void Actions::setMapping(ActionType action, unsigned int keyCode) {
 	_action_mapping[action] = keyCode;
 }
 
-Key& Actions::getKeyAction(ActionType action)
-{
+Key& Actions::getKeyAction(ActionType action) {
 	return _key_action[action];
 }