WINCE: Run astyle over WinCE source files.

11 files changed, 37 insertions, 39 deletions

diff --git a/backends/platform/wince/CEgui/GUIElement.cpp b/backends/platform/wince/CEgui/GUIElement.cpp
index dd463c22a1..e7ffc8d473 100644
--- a/backends/platform/wince/CEgui/GUIElement.cpp
+++ b/backends/platform/wince/CEgui/GUIElement.cpp
@@ -32,7 +32,7 @@
 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) {
+	_background(0), _drawn(false), _visible(true), _x(x), _y(y), _width(width), _height(height) {
 }
 
 bool GUIElement::setBackground(WORD backgroundReference) {
@@ -45,9 +45,7 @@ bool GUIElement::setBackground(WORD backgroundReference) {
 	if (!_height && !_width) {
 		_height = _background->height();
 		_width = _background->width();
-	}
-	else
-	if (_background->height() != _height || _background->width() != _width) {
+	} else if (_background->height() != _height || _background->width() != _width) {
 		delete _background;
 		_background = NULL;
 		return false;
@@ -74,8 +72,7 @@ bool GUIElement::draw(SDL_Surface *surface) {
 		_drawn = true;
 
 		return true;
-	}
-	else
+	} else
 		return false;
 }
 
diff --git a/backends/platform/wince/CEgui/ItemAction.cpp b/backends/platform/wince/CEgui/ItemAction.cpp
index 55805744e6..efbc43ce00 100644
--- a/backends/platform/wince/CEgui/ItemAction.cpp
+++ b/backends/platform/wince/CEgui/ItemAction.cpp
@@ -28,7 +28,7 @@
 namespace CEGUI {
 
 ItemAction::ItemAction(WORD reference, GUI::ActionType action) :
-PanelItem(reference) {
+	PanelItem(reference) {
 	_action = action;
 	if (!GUI::Actions::Instance()->isEnabled(_action))
 		_visible = false;
diff --git a/backends/platform/wince/CEgui/ItemSwitch.cpp b/backends/platform/wince/CEgui/ItemSwitch.cpp
index d4648f7556..8eb62bf365 100644
--- a/backends/platform/wince/CEgui/ItemSwitch.cpp
+++ b/backends/platform/wince/CEgui/ItemSwitch.cpp
@@ -40,7 +40,7 @@ void ItemSwitch::init(WORD referenceTrue, WORD referenceFalse) {
 }
 
 ItemSwitch::ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item) :
-PanelItem(referenceTrue) {
+	PanelItem(referenceTrue) {
 	init(referenceTrue, referenceFalse);
 	_item = item;
 	_itemmax = -1;
@@ -49,8 +49,8 @@ PanelItem(referenceTrue) {
 }
 
 ItemSwitch::ItemSwitch(WORD referenceTrue, WORD referenceFalse, int *item, int max) :
-PanelItem(referenceTrue) {
-	 init(referenceTrue, referenceFalse);
+	PanelItem(referenceTrue) {
+	init(referenceTrue, referenceFalse);
 	_itemmultiple = item;
 	_itemmax = max;
 	if (!*item)
diff --git a/backends/platform/wince/CEgui/Panel.cpp b/backends/platform/wince/CEgui/Panel.cpp
index dfdd6526be..576da23029 100644
--- a/backends/platform/wince/CEgui/Panel.cpp
+++ b/backends/platform/wince/CEgui/Panel.cpp
@@ -34,7 +34,7 @@ Panel::Panel(int interleave_first, int interleave) : Toolbar() {
 
 
 bool Panel::add(const String &name, const PanelItem *item) {
-	_itemsMap[name] = (PanelItem*)item;
+	_itemsMap[name] = (PanelItem *)item;
 	_itemsMap[name]->move(_currentItem, _y + 10);
 	_itemsMap[name]->setPanel(this);
 	_currentItem += _interleave;
@@ -47,11 +47,10 @@ bool Panel::draw(SDL_Surface *surface) {
 	if (!_drawn && _visible) {
 		GUIElement::draw(surface);
 		for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator) {
-			((GUIElement*)(iterator->_value))->draw(surface);
+			((GUIElement *)(iterator->_value))->draw(surface);
 		}
 		return true;
-	}
-	else
+	} else
 		return false;
 }
 
@@ -59,7 +58,7 @@ void Panel::forceRedraw() {
 	ItemMap::const_iterator iterator;
 	GUIElement::forceRedraw();
 	for (iterator = _itemsMap.begin(); iterator != _itemsMap.end(); ++iterator)
-		((GUIElement*)(iterator->_value))->forceRedraw();
+		((GUIElement *)(iterator->_value))->forceRedraw();
 }
 
 bool Panel::action(int x, int y, bool pushed) {
@@ -69,7 +68,7 @@ bool Panel::action(int x, int y, bool pushed) {
 		return false;
 
 	for (iterator = _itemsMap.begin(); !result && iterator != _itemsMap.end(); ++iterator)
-		result = ((GUIElement*)(iterator->_value))->action(x, y, pushed);
+		result = ((GUIElement *)(iterator->_value))->action(x, y, pushed);
 	return result;
 }
 
diff --git a/backends/platform/wince/CEgui/Panel.h b/backends/platform/wince/CEgui/Panel.h
index e6b693360d..1a8a580dba 100644
--- a/backends/platform/wince/CEgui/Panel.h
+++ b/backends/platform/wince/CEgui/Panel.h
@@ -51,7 +51,7 @@ public:
 	virtual bool action(int x, int y, bool pushed);
 private:
 
-	typedef HashMap<String, PanelItem*, Common::IgnoreCase_Hash , Common::IgnoreCase_EqualTo> ItemMap;
+	typedef HashMap<String, PanelItem *, Common::IgnoreCase_Hash , Common::IgnoreCase_EqualTo> ItemMap;
 
 	ItemMap _itemsMap;
 	int _interleave;
diff --git a/backends/platform/wince/CEgui/PanelItem.h b/backends/platform/wince/CEgui/PanelItem.h
index 14b62f0f20..9968aa8d5e 100644
--- a/backends/platform/wince/CEgui/PanelItem.h
+++ b/backends/platform/wince/CEgui/PanelItem.h
@@ -36,7 +36,7 @@ namespace CEGUI {
 class Panel;
 
 class PanelItem : public GUIElement {
-friend class Panel;
+	friend class Panel;
 public:
 	PanelItem(WORD reference);
 	virtual ~PanelItem();
diff --git a/backends/platform/wince/CEgui/PanelKeyboard.cpp b/backends/platform/wince/CEgui/PanelKeyboard.cpp
index 5ca125898d..3512b34da3 100644
--- a/backends/platform/wince/CEgui/PanelKeyboard.cpp
+++ b/backends/platform/wince/CEgui/PanelKeyboard.cpp
@@ -30,8 +30,9 @@ 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 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);
@@ -51,21 +52,23 @@ bool PanelKeyboard::action(int x, int y, bool pushed) {
 		int keyCode = 0;
 		if (x < 185) {
 			// Alpha selection
-			keyCode = keyAscii = KEYBOARD_MAPPING_ALPHA[y >= _y+20][((x + 10) / 14) - 1];
+			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];
+			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];
+			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) {
+			if (y < _y + 20) {
 				// Backspace
-				keyAscii = VK_BACK; keyCode = keyAscii;
+				keyAscii = VK_BACK;
+				keyCode = keyAscii;
 			} else {
 				// Enter
-				keyAscii = 13; keyCode = 13;
+				keyAscii = 13;
+				keyCode = 13;
 			}
 		}
 
diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.cpp b/backends/platform/wince/CEgui/SDL_ImageResource.cpp
index 8dad5f0a0c..872b94a442 100644
--- a/backends/platform/wince/CEgui/SDL_ImageResource.cpp
+++ b/backends/platform/wince/CEgui/SDL_ImageResource.cpp
@@ -32,7 +32,7 @@ SDL_ImageResource::SDL_ImageResource() :
 	_surface(0) {
 }
 
-SDL_Surface* SDL_ImageResource::load(WORD resourceID) {
+SDL_Surface *SDL_ImageResource::load(WORD resourceID) {
 	HRSRC resource;
 	HGLOBAL resourceGlobal;
 	LPVOID resourcePointer;
@@ -62,7 +62,7 @@ SDL_Surface* SDL_ImageResource::load(WORD resourceID) {
 	return _surface;
 }
 
-SDL_Surface* SDL_ImageResource::get() {
+SDL_Surface *SDL_ImageResource::get() {
 	return _surface;
 }
 
diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.h b/backends/platform/wince/CEgui/SDL_ImageResource.h
index 5affd5c33c..397ced1434 100644
--- a/backends/platform/wince/CEgui/SDL_ImageResource.h
+++ b/backends/platform/wince/CEgui/SDL_ImageResource.h
@@ -36,8 +36,8 @@ namespace CEGUI {
 class SDL_ImageResource {
 public:
 	SDL_ImageResource();
-	SDL_Surface* load(WORD resourceID);
-	SDL_Surface* get();
+	SDL_Surface *load(WORD resourceID);
+	SDL_Surface *get();
 	int height();
 	int width();
 	virtual ~SDL_ImageResource();
diff --git a/backends/platform/wince/CEgui/ToolbarHandler.cpp b/backends/platform/wince/CEgui/ToolbarHandler.cpp
index 78f69119c3..ed2a72245a 100644
--- a/backends/platform/wince/CEgui/ToolbarHandler.cpp
+++ b/backends/platform/wince/CEgui/ToolbarHandler.cpp
@@ -29,15 +29,15 @@
 namespace CEGUI {
 
 ToolbarHandler::ToolbarHandler():
-_current(""), _active(NULL) {
+	_current(""), _active(NULL) {
 }
 
 
 bool ToolbarHandler::add(const String &name, const Toolbar &toolbar) {
-	_toolbarMap[name] = (Toolbar*)&toolbar;
+	_toolbarMap[name] = (Toolbar *)&toolbar;
 
 	if (!_active) {
-		_active = &((Toolbar&)toolbar);
+		_active = &((Toolbar &)toolbar);
 		_current = name;
 	}
 
@@ -53,7 +53,7 @@ bool ToolbarHandler::setActive(const String &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)
+	_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();
@@ -67,8 +67,7 @@ bool ToolbarHandler::action(int x, int y, bool pushed) {
 			return _active->action(x / 2, (y - _offset) / 2, pushed);
 		else
 			return _active->action(x, y - _offset, pushed);
-	}
-	else
+	} else
 		return false;
 }
 
@@ -118,7 +117,7 @@ int ToolbarHandler::getOffset() {
 	return _offset;
 }
 
-Toolbar* ToolbarHandler::active() {
+Toolbar *ToolbarHandler::active() {
 	return _active;
 }
 
diff --git a/backends/platform/wince/CEgui/ToolbarHandler.h b/backends/platform/wince/CEgui/ToolbarHandler.h
index e3bf590768..0f794d7d61 100644
--- a/backends/platform/wince/CEgui/ToolbarHandler.h
+++ b/backends/platform/wince/CEgui/ToolbarHandler.h
@@ -57,7 +57,7 @@ public:
 	virtual ~ToolbarHandler();
 private:
 
-	HashMap<String, Toolbar*, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _toolbarMap;
+	HashMap<String, Toolbar *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _toolbarMap;
 	String _current;
 	Toolbar *_active;
 	int _offset;