[Scummvm-cvs-logs] CVS: scummvm/backends/wince/CEgui GUIElement.cpp,1.4,1.5 GUIElement.h,1.3,1.4 ItemAction.cpp,1.7,1.8 ItemAction.h,1.4,1.5 ItemSwitch.cpp,1.5,1.6 ItemSwitch.h,1.5,1.6 Panel.cpp,1.8,1.9 Panel.h,1.3,1.4 PanelItem.cpp,1.5,1.6 PanelKeyboard.cpp,1.6,1.7 PanelKeyboard.h,1.5,1.6 SDL_ImageResource.cpp,1.5,1.6 Toolbar.cpp,1.5,1.6 Toolbar.h,1.3,1.4 ToolbarHandler.cpp,1.6,1.7 ToolbarHandler.h,1.4,1.5

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/backends/wince/CEgui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/backends/wince/CEgui

Modified Files:
	GUIElement.cpp GUIElement.h ItemAction.cpp ItemAction.h 
	ItemSwitch.cpp ItemSwitch.h Panel.cpp Panel.h PanelItem.cpp 
	PanelKeyboard.cpp PanelKeyboard.h SDL_ImageResource.cpp 
	Toolbar.cpp Toolbar.h ToolbarHandler.cpp ToolbarHandler.h 
Log Message:
Remove trailing whitespaces.


Index: GUIElement.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/GUIElement.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- GUIElement.cpp	24 Jun 2005 15:22:34 -0000	1.4
+++ GUIElement.cpp	30 Jul 2005 21:10:56 -0000	1.5
@@ -42,7 +42,7 @@
 			_height = _background->height();
 			_width = _background->width();
 		}
-		else 
+		else
 		if (_background->height() != _height || _background->width() != _width) {
 			delete _background;
 			_background = NULL;
@@ -50,7 +50,7 @@
 		}
 		return true;
 	}
-	 
+
 	void GUIElement::move(int x, int y) {
 		_x = x;
 		_y = y;
@@ -79,7 +79,7 @@
 		if (x >= _x && x <= _x + _width && y >= _y && y <= _y + _height)
 			return true;
 		else
-			return false; 
+			return false;
 	}
 
 	void GUIElement::setVisible(bool visibility) {

Index: GUIElement.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/GUIElement.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- GUIElement.h	1 Jan 2005 16:08:48 -0000	1.3
+++ GUIElement.h	30 Jul 2005 21:10:56 -0000	1.4
@@ -33,29 +33,29 @@
 namespace CEGUI {
 
 	class GUIElement {
-	public:		
-		bool setBackground(WORD backgroundReference);		
+	public:
+		bool setBackground(WORD backgroundReference);
 		void setVisible(bool visibility);
 		virtual void forceRedraw();
-		virtual bool draw(SDL_Surface *surface);		
+		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;	
+		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;	
+		SDL_ImageResource *_background;
 		int _x;
 		int _y;
 		bool _drawn;
-	private:			
+	private:
 		int _width;
 		int _height;
 	};

Index: ItemAction.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/ItemAction.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ItemAction.cpp	5 Jul 2005 20:27:14 -0000	1.7
+++ ItemAction.cpp	30 Jul 2005 21:10:56 -0000	1.8
@@ -30,9 +30,9 @@
 		if (!GUI::Actions::Instance()->isEnabled(_action))
 			_visible = false;
 	}
- 
-	
-	ItemAction::~ItemAction() {   
+
+
+	ItemAction::~ItemAction() {
 	}
 
 	bool ItemAction::action(int x, int y, bool pushed) {

Index: ItemAction.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/ItemAction.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ItemAction.h	5 Jul 2005 20:27:14 -0000	1.4
+++ ItemAction.h	30 Jul 2005 21:10:56 -0000	1.5
@@ -34,7 +34,7 @@
 	public:
 		ItemAction(WORD reference, GUI::ActionType action);
 		virtual ~ItemAction();
-		virtual bool action(int x, int y, bool pushed); 
+		virtual bool action(int x, int y, bool pushed);
 	private:
 		GUI::ActionType _action;
 	};

Index: ItemSwitch.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/ItemSwitch.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ItemSwitch.cpp	24 Jun 2005 16:03:13 -0000	1.5
+++ ItemSwitch.cpp	30 Jul 2005 21:10:56 -0000	1.6
@@ -37,10 +37,10 @@
 		}
 		if (!*_item)
 			_background = _backgroundFalse;
-	} 
- 
-	
-	ItemSwitch::~ItemSwitch() {   
+	}
+
+
+	ItemSwitch::~ItemSwitch() {
 		if (_backgroundFalse)
 			delete _backgroundFalse;
 	}
@@ -53,7 +53,7 @@
 				_background = _backgroundTrue;
 			else
 				_background = _backgroundFalse;
-			
+
 			if (_panel)
 				_panel->forceRedraw();
 

Index: ItemSwitch.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/ItemSwitch.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ItemSwitch.h	5 Jul 2005 20:27:14 -0000	1.5
+++ ItemSwitch.h	30 Jul 2005 21:10:56 -0000	1.6
@@ -37,11 +37,11 @@
 	public:
 		ItemSwitch(WORD referenceTrue, WORD referenceFalse, bool *item);
 		virtual ~ItemSwitch();
-		virtual bool action(int x, int y, bool pushed); 
+		virtual bool action(int x, int y, bool pushed);
 	private:
 		bool *_item;
 		SDL_ImageResource *_backgroundTrue;
-		SDL_ImageResource *_backgroundFalse;	
+		SDL_ImageResource *_backgroundFalse;
 	};
 }
 

Index: Panel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/Panel.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Panel.cpp	24 Jun 2005 15:22:34 -0000	1.8
+++ Panel.cpp	30 Jul 2005 21:10:56 -0000	1.9
@@ -67,7 +67,7 @@
 		if (!_visible || !checkInside(x, y))
 			return false;
 
-		for (iterator = _itemsMap.begin(); !result && iterator != _itemsMap.end(); ++iterator) 
+		for (iterator = _itemsMap.begin(); !result && iterator != _itemsMap.end(); ++iterator)
 			result = ((GUIElement*)(iterator->_value))->action(x, y, pushed);
 		return result;
 	}

Index: Panel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/Panel.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Panel.h	1 Jan 2005 16:08:48 -0000	1.3
+++ Panel.h	30 Jul 2005 21:10:56 -0000	1.4
@@ -39,15 +39,15 @@
 	class Panel : public Toolbar {
 	public:
 		Panel(int interleave_first, int interleave);
-		virtual bool draw(SDL_Surface *surface);		
+		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);		
+		virtual bool action(int x, int y, bool pushed);
 	private:
 		struct IgnoreCaseComparator {
-          int operator()(const String& x, const String& y) const { 
+          int operator()(const String& x, const String& y) const {
 			  return scumm_stricmp(x.c_str(), y.c_str()); }
         };
 

Index: PanelItem.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/PanelItem.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PanelItem.cpp	24 Jun 2005 15:22:34 -0000	1.5
+++ PanelItem.cpp	30 Jul 2005 21:10:56 -0000	1.6
@@ -29,7 +29,7 @@
 		_panel = NULL;
 	}
 
-	
+
 	PanelItem::~PanelItem() {
 	}
 

Index: PanelKeyboard.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/PanelKeyboard.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PanelKeyboard.cpp	24 Jun 2005 15:22:34 -0000	1.6
+++ PanelKeyboard.cpp	30 Jul 2005 21:10:56 -0000	1.7
@@ -31,9 +31,9 @@
 
 	PanelKeyboard::PanelKeyboard(WORD reference) : Toolbar() {
 		setBackground(reference);
-	} 
+	}
+
 
-	
 	PanelKeyboard::~PanelKeyboard() {
 	}
 
@@ -44,7 +44,7 @@
 			char keyCode = 0;
 			if (x < 185) {
 				// Alpha selection
-				if (y <= _y + 20) 
+				if (y <= _y + 20)
 					keyAscii = KEYBOARD_MAPPING_ALPHA_HIGH[((x + 10) / 14) - 1];
 				else
 					keyAscii = KEYBOARD_MAPPING_ALPHA_LOW[((x + 10) / 14) - 1];

Index: PanelKeyboard.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/PanelKeyboard.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PanelKeyboard.h	5 Jul 2005 20:27:14 -0000	1.5
+++ PanelKeyboard.h	30 Jul 2005 21:10:56 -0000	1.6
@@ -37,7 +37,7 @@
 	class PanelKeyboard : public Toolbar {
 	public:
 		PanelKeyboard(WORD reference);
-		virtual ~PanelKeyboard(); 
+		virtual ~PanelKeyboard();
 		virtual bool action(int x, int y, bool pushed);
 	private:
 		Key _key;

Index: SDL_ImageResource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/SDL_ImageResource.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SDL_ImageResource.cpp	24 Jun 2005 16:03:13 -0000	1.5
+++ SDL_ImageResource.cpp	30 Jul 2005 21:10:56 -0000	1.6
@@ -24,7 +24,7 @@
 
 namespace CEGUI {
 
-	SDL_ImageResource::SDL_ImageResource() : 
+	SDL_ImageResource::SDL_ImageResource() :
 		_surface(0)
 	{
 	}
@@ -36,7 +36,7 @@
 		DWORD resourceSize;
 		SDL_RWops *surfaceData;
 		HMODULE moduleHandle;
-		
+
 		moduleHandle = GetModuleHandle(NULL);
 		resource = FindResource(moduleHandle, MAKEINTRESOURCE(resourceID), TEXT("BINARY"));
 		if (!resource)
@@ -78,5 +78,5 @@
 	SDL_ImageResource::~SDL_ImageResource() {
 		if (_surface)
 			SDL_FreeSurface(_surface);
-	}		
+	}
 }

Index: Toolbar.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/Toolbar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Toolbar.cpp	24 Jun 2005 15:22:34 -0000	1.5
+++ Toolbar.cpp	30 Jul 2005 21:10:56 -0000	1.6
@@ -24,12 +24,12 @@
 
 namespace CEGUI {
 
-	// Not to be drawn on game screen ! 
+	// Not to be drawn on game screen !
 	Toolbar::Toolbar() : GUIElement(0, 0, 320, 40)
 	{
 	}
 
-	
+
 	Toolbar::~Toolbar() {
 	}
 }

Index: Toolbar.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/Toolbar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Toolbar.h	1 Jan 2005 16:08:48 -0000	1.3
+++ Toolbar.h	30 Jul 2005 21:10:56 -0000	1.4
@@ -36,12 +36,12 @@
 namespace CEGUI {
 
 	class Toolbar : public GUIElement {
-	public:	
+	public:
 		virtual ~Toolbar();
 		virtual bool action(int x, int y, bool pushed) = 0;
 	protected:
 		Toolbar();
-		
+
 	};
 }
 

Index: ToolbarHandler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/ToolbarHandler.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ToolbarHandler.cpp	24 Jun 2005 16:03:13 -0000	1.6
+++ ToolbarHandler.cpp	30 Jul 2005 21:10:56 -0000	1.7
@@ -33,7 +33,7 @@
 		_toolbarMap.addKey(name);
 		_toolbarMap[name] = (Toolbar*)&toolbar;
 
-		
+
 		if (!_active) {
 			_active = &((Toolbar&)toolbar);
 			_current = name;
@@ -63,7 +63,7 @@
 			if (_offset > 240)
 				return _active->action(x / 2, (y - _offset) / 2, pushed);
 			else
-				return _active->action(x, y - _offset, pushed);			
+				return _active->action(x, y - _offset, pushed);
 		}
 		else
 			return false;

Index: ToolbarHandler.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/ToolbarHandler.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ToolbarHandler.h	1 Jan 2005 16:08:48 -0000	1.4
+++ ToolbarHandler.h	30 Jul 2005 21:10:56 -0000	1.5
@@ -54,7 +54,7 @@
 	private:
 
 		struct IgnoreCaseComparator {
-          int operator()(const String& x, const String& y) const { 
+          int operator()(const String& x, const String& y) const {
 			  return scumm_stricmp(x.c_str(), y.c_str()); }
         };