[Scummvm-cvs-logs] CVS: scummvm/backends/epoc ScummApp.h,1.2,1.3 SymbianActions.cpp,1.1,1.2 SymbianActions.h,1.1,1.2 SymbianOS.cpp,1.2,1.3 SymbianOS.h,1.2,1.3 portdefs.h,1.1,1.2

[Eugene Sandulenko]

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

Modified Files:
	ScummApp.h SymbianActions.cpp SymbianActions.h SymbianOS.cpp 
	SymbianOS.h portdefs.h 
Log Message:
Remove trailing whitespaces.


Index: ScummApp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/ScummApp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ScummApp.h	5 Jul 2005 20:22:36 -0000	1.2
+++ ScummApp.h	30 Jul 2005 21:10:50 -0000	1.3
@@ -38,7 +38,7 @@
 
 	TUid AppDllUid() const;
 #ifdef EPOC_AS_APP
-	TECompXL    iECompXL;        
+	TECompXL    iECompXL;
 #endif
 };
 #endif

Index: SymbianActions.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/SymbianActions.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SymbianActions.cpp	5 Jul 2005 20:22:36 -0000	1.1
+++ SymbianActions.cpp	30 Jul 2005 21:10:50 -0000	1.2
@@ -35,10 +35,10 @@
 
 // SumthinWicked says: we either split our Actions like WinCE did with Pocket/Smartphone
 // or we put them in this file separated by #ifdefs, this one is up to you, AnotherGuest :)
- 
-const Common::String actionNames[] = { 
-	"Up", 
-	"Down", 
+
+const Common::String actionNames[] = {
+	"Up",
+	"Down",
 	"Left",
 	"Right",
 	"Left Click",
@@ -48,8 +48,8 @@
 	"Zone",
 	"FT Cheat",
 	"Swap character",
-	"Skip text",	
-	"Pause", 
+	"Skip text",
+	"Pause",
 	"Quit"
 };
 
@@ -96,7 +96,7 @@
 
 void SymbianActions::initInstanceMain(OSystem *mainSystem) {
 	Actions::initInstanceMain(mainSystem);
-	
+
 	// Mouse Up
 	_action_enabled[ACTION_UP] = true;
 
@@ -125,7 +125,7 @@
 	bool is_sky = (_detector->_targetName == "sky");
 	bool is_queen = (_detector->_targetName == "queen");
 	bool is_gob = (strncmp(_detector->_targetName.c_str(), "gob", 3) == 0);
-	
+
 	Actions::initInstanceGame();
 
 	// See if a right click mapping could be needed
@@ -134,7 +134,7 @@
 
 	// Initialize keys for different actions
 	// Save
-	if (is_simon || is_gob) 
+	if (is_simon || is_gob)
 		_action_enabled[ACTION_SAVE] = false;
 	else
 	if (is_queen) {
@@ -144,7 +144,7 @@
 	else
 	if (is_sky) {
 		_action_enabled[ACTION_SAVE] = true;
-		_key_action[ACTION_SAVE].setAscii(63); 
+		_key_action[ACTION_SAVE].setAscii(63);
 	}
 	else {
 		_action_enabled[ACTION_SAVE] = true;

Index: SymbianActions.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/SymbianActions.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SymbianActions.h	5 Jul 2005 20:22:36 -0000	1.1
+++ SymbianActions.h	30 Jul 2005 21:10:50 -0000	1.2
@@ -70,7 +70,7 @@
 private:
 	SymbianActions(GameDetector &detector);
 	bool _right_click_needed;
-};	
+};
 
 } // namespace GUI
 

Index: SymbianOS.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/SymbianOS.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SymbianOS.cpp	5 Jul 2005 20:22:36 -0000	1.2
+++ SymbianOS.cpp	30 Jul 2005 21:10:50 -0000	1.3
@@ -53,7 +53,7 @@
 	ConfMan.flushToDisk();
 	// Initialize global key mapping for Smartphones
 	GUI::Actions* actions = GUI::Actions::Instance();
-	actions->initInstanceMain(this);	
+	actions->initInstanceMain(this);
 	actions->loadMapping();
 	initZones();
 }
@@ -77,14 +77,14 @@
 }
 
 /*
- * SumthinWicked says: the stuff below is copied from common/scaler.cpp, 
+ * SumthinWicked says: the stuff below is copied from common/scaler.cpp,
  * so we can skip compiling the scalers. ESDL still needs 1x and the scaler
  * architecture because we inherit from OSystem_SDL.
  */
 int gBitFormat = 565;
 void InitScalers(uint32 BitFormat) {} // called by OSystem_SDL functions, not relevant for ESDL
-	
-/** 
+
+/**
  * Trivial 'scaler' - in fact it doesn't do any scaling but just copies the
  * source to the destination.
  */
@@ -100,7 +100,7 @@
 bool OSystem_SDL_Symbian::setSoundCallback(SoundProc proc, void *param) {
 
 	// First save the proc and param
-	_sound_proc_param = param; 
+	_sound_proc_param = param;
 	_sound_proc = proc;
 	SDL_AudioSpec desired;
 	SDL_AudioSpec obtained;
@@ -200,12 +200,12 @@
 {
 	if(!GUI::Actions::Instance()->mappingActive() && ev.key.keysym.sym>SDLK_UNKNOWN)
 	for(TInt loop=0;loop<GUI::ACTION_LAST;loop++){
-		if(GUI::Actions::Instance()->getMapping(loop) ==ev.key.keysym.sym && 
+		if(GUI::Actions::Instance()->getMapping(loop) ==ev.key.keysym.sym &&
 			GUI::Actions::Instance()->isEnabled(loop)){
 		// Create proper event instead
 		switch(loop)
 		{
-			case GUI::ACTION_UP:	
+			case GUI::ACTION_UP:
 				if(ev.type == SDL_KEYDOWN)
 				{
 				_km.y_vel =  -1;
@@ -218,7 +218,7 @@
 				}
 				event.type = EVENT_MOUSEMOVE;
 				fillMouseEvent(event, _km.x, _km.y);
-				return true;			
+				return true;
 			case GUI::ACTION_DOWN:
 				if(ev.type == SDL_KEYDOWN)
 				{
@@ -232,7 +232,7 @@
 				}
 				event.type = EVENT_MOUSEMOVE;
 				fillMouseEvent(event, _km.x, _km.y);
-				return true;	
+				return true;
 			case GUI::ACTION_LEFT:
 				if(ev.type == SDL_KEYDOWN)
 				{
@@ -272,8 +272,8 @@
 			case GUI::ACTION_ZONE:
 				if(ev.type == SDL_KEYDOWN)
 				{
-					int i;				
-					
+					int i;
+
 					for (i=0; i<TOTAL_ZONES; i++)
 						if (_km.x >= _zones[i].x && _km.y >= _zones[i].y &&
 							_km.x <= _zones[i].x + _zones[i].width && _km.y <= _zones[i].y + _zones[i].height
@@ -287,7 +287,7 @@
 							_currentZone = 0;
 						event.type = EVENT_MOUSEMOVE;
 						fillMouseEvent(event, _mouseXZone[_currentZone],_mouseYZone[_currentZone]);
-						SDL_WarpMouse(event.mouse.x,event.mouse.y);					
+						SDL_WarpMouse(event.mouse.x,event.mouse.y);
 				}
 				return true;
 			case GUI::ACTION_SAVE:
@@ -301,7 +301,7 @@
 					ev.key.keysym.scancode= key.keycode();
 					ev.key.keysym.mod =(SDLMod) key.flags();
 					return false;
-				}			
+				}
 			case GUI::ACTION_QUIT:{
 			GUI::MessageDialog alert("Do you want to quit ?", "Yes", "No");
 			if (alert.runModal() == GUI::kMessageOK)

Index: SymbianOS.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/SymbianOS.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SymbianOS.h	5 Jul 2005 20:22:36 -0000	1.2
+++ SymbianOS.h	30 Jul 2005 21:10:50 -0000	1.3
@@ -36,7 +36,7 @@
 	const OSystem::GraphicsMode *getSupportedGraphicsModes() const;
 	bool setGraphicsMode(const char *name);
 
-	// Set function that generates samples 
+	// Set function that generates samples
 	/**
 	 * This function is overridden by the symbian port in order to provide MONO audio
 	 * downmix is done by supplying our own audiocallback

Index: portdefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/portdefs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- portdefs.h	21 Jun 2005 20:19:39 -0000	1.1
+++ portdefs.h	30 Jul 2005 21:10:50 -0000	1.2
@@ -65,14 +65,14 @@
 // somehow nobody has this function...
 #define hypot(a, b)					sqrt((a)*(a) + (b)*(b))
 
-// Symbian bsearch implementation is flawed	
+// Symbian bsearch implementation is flawed
 void inline *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) {
 	size_t i;
 
-	for (i=0; i<nmemb; i++) 
+	for (i=0; i<nmemb; i++)
 		if (compar(key, (void*)((size_t)base + size * i)) == 0)
 			return (void*)((size_t)base + size * i);
 	return NULL;
 }
 #define bsearch						scumm_bsearch
-	
+