Sat Jul 30 14:15:00 CEST 2005

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

Modified Files:
	app.cpp args.cpp cd_default.cpp cd_default.h cd_msa.cpp 
	cd_msa.h cd_pockettunes.cpp cd_pockettunes.h cdaudio.h 
	extend.cpp games.cpp games.h globals.h i_zodiac.cpp 
	init_arm.cpp init_mathlib.cpp init_palmos.cpp init_sony.cpp 
	launch.cpp modules.cpp modules.h palm.cpp palm.h palmevt.cpp 
	palmgfx.cpp palmmos.cpp palmovl.cpp palmrdr.cpp palmsave.cpp 
	palmsnd.cpp rumble.cpp scumm_globals.cpp skin.cpp skin.h 
	snd_pa1.cpp snd_stream.cpp start.cpp start.h vibrate.h 
Log Message:
Remove trailing whitespaces.


Index: app.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/app.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13

--- app.cpp	9 Feb 2005 12:17:33 -0000	1.12
+++ app.cpp	30 Jul 2005 21:10:48 -0000	1.13
@@ -65,7 +65,7 @@
 	UInt32 romVersion;
 	Err err;
 
-	err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion); 
+	err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion);
 	if (!err) {
 		UInt16 cardNo;
 		LocalID dbID;
@@ -111,13 +111,13 @@
 	if (err)
 		FrmCustomAlert(FrmWarnAlert,"No skin found.\nScummVM will start in direct mode.",0,0);
 		//FrmCustomAlert(FrmErrorAlert,"No skin found.\nPlease install a skin and restart ScummVM.",0,0);
-	
+
 	return err;
 }
 
 static Err AppStartCheckMathLib() {
 	Err e = MathlibInit();
-	
+
 	switch (e) {
 		case errNone:
 			break;
@@ -128,7 +128,7 @@
 			FrmCustomAlert(FrmErrorAlert,"Can't open MathLib !",0,0);
 			break;
 	}
-	
+
 	return e;
 }
 
@@ -143,7 +143,7 @@
 		WinScreenGetAttribute(winScreenRowBytes, &(gVars->screenPitch));
 		if (OPTIONS_TST(kOptMode16Bit))
 			gVars->screenPitch /= 2;	// this value is used only in-game and in 8bit mode, so if we are in 16Bit 8bit = 16bit/2
-		
+
 		// FIXME : hack for TT3 simulator (and real ?) return 28 on landscape mode
 		if (gVars->screenPitch < gVars->screenFullWidth)
 			gVars->screenPitch = gVars->screenFullWidth;
@@ -175,12 +175,12 @@
 			gVars->screenFullHeight = y << 1;
 
 			OPTIONS_SET(kOptModeWide);
-			
+
 			if (curOrientation == sysOrientationLandscape ||
 				curOrientation == sysOrientationReverseLandscape
 					)
 				OPTIONS_SET(kOptModeLandscape);
-			
+
 			StatShow();
 			PINSetInputAreaState(pinInputAreaOpen);
 			PINSetInputTriggerState(pinInputTriggerDisabled);
@@ -208,7 +208,7 @@
 			SilkLibResizeDispWin(slkRefNum, silkResizeMax);
 			HRWinGetWindowExtent(gVars->HRrefNum, &gVars->screenFullWidth, &gVars->screenFullHeight);
 			SilkLibResizeDispWin(slkRefNum, silkResizeNormal);
-			SilkLibDisableResize(slkRefNum);			
+			SilkLibDisableResize(slkRefNum);
 
 		} else {
 			VskSetState(slkRefNum, vskStateEnable, (gVars->slkVersion == vskVersionNum2 ? vskResizeVertically : vskResizeHorizontally));
@@ -218,7 +218,7 @@
 			VskSetState(slkRefNum, vskStateEnable, vskResizeDisable);
 			OPTIONS_SET((version == vskVersionNum3 ? kOptModeLandscape : kOptNone));
 		}
-		
+
 		OPTIONS_SET(kOptModeWide);
 
 	// Tapwave Zodiac and other DIA API compatible devices
@@ -226,7 +226,7 @@
 	} else {
 		PINGetScreenDimensions();
 	}
-	
+
 	WinScreenGetPitch();
 }
 
@@ -261,7 +261,7 @@
 	min(kMemScummNewCostGames, 2500000);
 	min(kMemSimon1Games, 1000000);
 	min(kMemSimon2Games, 2000000);
-	
+
 }
 
 #undef threshold
@@ -352,7 +352,7 @@
 		gPrefs->debug = false;
 		gPrefs->exitLauncher = true;
 		gPrefs->stdPalette = OPTIONS_TST(kOptDeviceOS5);
-		
+
 	} else {
 		PrefGetAppPreferences(appFileCreator, appPrefID, gPrefs, &dataSize, true);
 	}
@@ -362,7 +362,7 @@
 
 	error = AppStartCheckHRmode();
 	if (error) return (error);
-	
+
 //	error = AppStartLoadSkin();
 //	if (error) return (error);
 	bDirectMode = (AppStartLoadSkin() != errNone);
@@ -410,8 +410,8 @@
 {
 	UInt32 romVersion;
 	Err err;
-	
-	err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion); 
+
+	err = FtrGet(sysFtrCreator, sysFtrNumNotifyMgrVersion, &romVersion);
 	if (!err) {
 		UInt16 cardNo;
 		LocalID dbID;
@@ -424,7 +424,7 @@
 			SysNotifyUnregister(cardNo, dbID, sysNotifyDisplayResizedEvent, sysNotifyNormalPriority);
 		}
 	}
-	
+
 	return err;
 }
 
@@ -437,7 +437,7 @@
 	// Close and move Game list database
 	GamCloseDatabase(false);
 
-	// Write the saved preferences / saved-state information.  This data 
+	// Write the saved preferences / saved-state information.  This data
 	// will saved during a HotSync backup.
 	SavePrefs();
 

Index: args.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/args.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- args.cpp	9 Nov 2004 10:45:47 -0000	1.1
+++ args.cpp	30 Jul 2005 21:10:48 -0000	1.2
@@ -17,7 +17,7 @@
 		UInt16 len2 = 0;
 		UInt16 len1 = StrLen(argP);
 
-		if (len1 > 0) {	
+		if (len1 > 0) {
 			if (parmP)
 				len2 = StrLen(parmP);
 
@@ -25,7 +25,7 @@
 			newArg = MemHandleNew(len1 + len2 + 1); // +1 = NULL CHAR
 			*argvP = (Char *)MemHandleLock(newArg);
 			StrCopy(*argvP, argP);
-			
+
 			if (parmP)
 				StrCat(*argvP, parmP);
 		}
@@ -44,7 +44,7 @@
 			MemHandleUnlock(oldH);
 			MemHandleFree(oldH);
 		}
-	
+
 	oldH = MemPtrRecoverHandle(argvP);
 	MemHandleUnlock(oldH);
 	MemHandleFree(oldH);

Index: cd_default.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/cd_default.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cd_default.cpp	24 Jun 2005 15:22:09 -0000	1.4
+++ cd_default.cpp	30 Jul 2005 21:10:48 -0000	1.5
@@ -54,7 +54,7 @@
 	// not fully played
 	if (_sys->getMillis() < _defTrackEndFrame)
 		return;
-		
+
 	if (_defLoops == 0)
 		return;
 
@@ -77,14 +77,14 @@
 void DefaultCDPlayer::play(int track, int num_loops, int start_frame, int duration) {
 	if (!num_loops && !start_frame)
 		return;
-		
+
 	UInt32 fullLength;
-	
+
 	_defLoops = num_loops;
 	start_frame = TO_MSECS(start_frame);
 	duration = TO_MSECS(duration);
 
-	// frame in milli-seconds 
+	// frame in milli-seconds
 	_defStopTime = 0;
 	fullLength  = start_frame + gVars->CD.defaultTrackLength * 1000;
 
@@ -96,7 +96,7 @@
 	} else {
 		_defTrackLength = fullLength;
 	}
-				
+
 	// try to play the track
 	_defTrackEndFrame = _sys->getMillis() + _defTrackLength;
 }

Index: cd_default.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/cd_default.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cd_default.h	1 Jan 2005 16:08:44 -0000	1.2
+++ cd_default.h	30 Jul 2005 21:10:48 -0000	1.3
@@ -19,30 +19,30 @@
  * $Header$
  *
  */
- 
+
  #ifndef CD_DEFAULT_H
  #define CD_DEFAULT_H
- 
+
  #include "cdaudio.h"
- 
+
  class DefaultCDPlayer : public CDAudio {
  public:
  	DefaultCDPlayer(OSystem *sys);
 
  	bool init();
  	void release();
- 	
+
  	bool poll();
  	void update();
  	void play(int track, int num_loops, int start_frame, int duration);
  	void stop();
- 	
+
  private:
  	OSystem *_sys;
- 	
+
  	// cdrom
 	UInt16 _defLoops;
 	UInt32 _defStopTime, _defTrackEndFrame, _defTrackLength;
  };
- 
+
  #endif
\ No newline at end of file

Index: cd_msa.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/cd_msa.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cd_msa.cpp	24 Jun 2005 15:22:09 -0000	1.7
+++ cd_msa.cpp	30 Jul 2005 21:10:48 -0000	1.8
@@ -47,7 +47,7 @@
 
 	if (!(error = FtrGet(sonySysFtrCreator, sonySysFtrNumSysInfoP, (UInt32*)&sonySysFtrSysInfoP))) {
 		// not found with audio adapter ?!
-		//if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrMsa) {		
+		//if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrMsa) {
 			if ((error = SysLibFind(sonySysLibNameMsa, &_msaRefNum)))
 				if (error == sysErrLibNotFound)
 					error = SysLibLoad(sonySysFileTMsaLib, sonySysFileCMsaLib, &_msaRefNum);
@@ -57,11 +57,11 @@
 			// this doesn't work the same way on build-in MP3 device and external MP3 devices
 			if (!error) {
 				//MsaLibClose(_msaRefNum, msaLibOpenModeAlbum);	// close the lib if we previously let it open (?) Need to add Notify for sonySysNotifyMsaEnforceOpenEvent just in case ...
-				error = MsaLibOpen(_msaRefNum, msaLibOpenModeAlbum);			
+				error = MsaLibOpen(_msaRefNum, msaLibOpenModeAlbum);
 
 				//if (error == msaErrAlreadyOpen)
 				//	error = MsaLibEnforceOpen(_msaRefNum, msaLibOpenModeAlbum, appFileCreator);
-			
+
 				//error = (error != msaErrStillOpen) ? error : errNone;
 			}
 		//}
@@ -147,7 +147,7 @@
 	}
 
 	MsaStop(_msaRefNum, true);
-		
+
 	if (_msaLoops == 0)
 		return;
 
@@ -185,13 +185,13 @@
 
 	if (!num_loops && !start_frame)
 		return;
-	
+
 	_msaTrack = track + gVars->CD.firstTrack - 1;	// first track >= 1 ?, not 0 (0=album)
 	_msaLoops = num_loops;
 	_msaStartFrame = TO_MSECS(start_frame);
 	_msaDuration = TO_MSECS(duration);
 
-	Err e;	
+	Err e;
 	MemHandle trackH;
 
 	// stop current play if any
@@ -206,19 +206,19 @@
 		MsaTime msaTime;
 		MsaTrackInfo *trackP;
 		UInt32 SU, fullLength;
-	
+
 		// FIXME (?) : this enable MsaSuToTime to return the right value in some cases
 		MsaPlay(_msaRefNum, _msaTrack, 0, msa_PBRATE_SP);
 		MsaStop(_msaRefNum, true);
-		
-		// get the msa time 
-		trackP = (MsaTrackInfo *)MemHandleLock(trackH);	
+
+		// get the msa time
+		trackP = (MsaTrackInfo *)MemHandleLock(trackH);
 		MsaSuToTime(_msaRefNum, trackP->totalsu, &msaTime);
 		SU = trackP->totalsu;
 		MemPtrUnlock(trackP);
 		MemHandleFree(trackH);
-		
-		// MSA frame in milli-seconds 
+
+		// MSA frame in milli-seconds
 		fullLength  = FROM_MIN(msaTime.minute);
 		fullLength += FROM_SEC(msaTime.second);
 		fullLength += msaTime.frame;
@@ -231,7 +231,7 @@
 		} else {
 			_msaTrackLength = fullLength;
 		}
-				
+
 		// try to play the track
 		if (start_frame == 0 && duration == 0) {
 			MsaPlay(_msaRefNum, _msaTrack, 0, msa_PBRATE_SP);
@@ -241,7 +241,7 @@
 			_msaTrackStartSu = (UInt32) ((float)(_msaStartFrame)  / ((float)fullLength / (float)SU));
 			_msaTrackEndSu	 = (UInt32) ((float)(_msaTrackLength) / ((float)fullLength / (float)SU));
 			_msaTrackEndSu	+= _msaTrackStartSu;
-			
+
 			if (_msaTrackEndSu > SU)
 				_msaTrackEndSu = SU;
 

Index: cd_msa.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/cd_msa.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cd_msa.h	1 Jan 2005 16:08:44 -0000	1.4
+++ cd_msa.h	30 Jul 2005 21:10:48 -0000	1.5
@@ -19,30 +19,30 @@
  * $Header$
  *
  */
- 
+
  #ifndef CD_MSA_H
  #define CD_MSA_H
- 
+
  #include "cdaudio.h"
- 
+
  class MsaCDPlayer : public CDAudio {
  public:
  	MsaCDPlayer(OSystem *sys);
 
  	bool init();
  	void release();
- 	
+
  	bool poll();
  	void update();
  	void play(int track, int num_loops, int start_frame, int duration);
  	void stop();
- 	
+
  private:
  	void initInternal();
- 
+
  	OSystem *_sys;
  	UInt16 _msaRefNum;
- 	
+
  	// cdrom
 	AlbumInfoType _msaAlbum;
 	UInt16 _msaLoops;
@@ -57,5 +57,5 @@
 	UInt32 _msaTrackLength;
 
  };
- 
+
  #endif
\ No newline at end of file

Index: cd_pockettunes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/cd_pockettunes.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cd_pockettunes.cpp	24 Jun 2005 15:22:09 -0000	1.4
+++ cd_pockettunes.cpp	30 Jul 2005 21:10:48 -0000	1.5
@@ -49,7 +49,7 @@
 
 	EventType e;
 	UInt32 status;
-	
+
 	PocketTunesAction *pAction = (PocketTunesAction*)MemPtrNew (sizeof(PocketTunesAction));
 	if (!pAction)
 		return kPtunesStopped;
@@ -60,9 +60,9 @@
 		status = pAction->data.getStatusAction.status;
 	else
 		status = kPtunesStopped;
-	
+
 	MemPtrFree(pAction);
-	return status;	
+	return status;
 }
 
 UInt32 PckTunesCDPlayer::getPosition(UInt32 deflt) {
@@ -78,7 +78,7 @@
 
 	pAction->action = kPocketTunesActionGetValue;
 	pAction->data.getValueAction.which = kPtunesValueSongPosition;
-	
+
 	EvtGetEvent(&e, evtNoWait);
 	if (PocketTunesCallSynch(pAction) == errNone)
 		value = pAction->data.getValueAction.value;
@@ -112,22 +112,22 @@
 
 	EventType e;
 	UInt32 value;
-	
+
 	PocketTunesAction *pAction = (PocketTunesAction*)MemPtrNew (sizeof(PocketTunesAction));
 	if (!pAction)
 		return gVars->CD.defaultTrackLength;
 
 	pAction->action = kPocketTunesActionGetValue;
 	pAction->data.getValueAction.which = kPtunesValueSongDuration;
-	
+
 	EvtGetEvent(&e, evtNoWait);
 	if (PocketTunesCallSynch(pAction) == errNone)
 		value = pAction->data.getValueAction.value;
 	else
 		value = gVars->CD.defaultTrackLength;
-	
+
 	MemPtrFree(pAction);
-	return value;	
+	return value;
 }
 
 bool PckTunesCDPlayer::poll() {
@@ -186,7 +186,7 @@
 	EventType e;
 	Char nameP[256], fileP[100];
 	Char *ext[]	= { "mp3", "ogg" };
-	
+
 //	if (duration > 0)
 //		duration += 5;
 
@@ -197,9 +197,9 @@
 
 	// stop current play if any
 	VFSVolumeGetLabel(gVars->volRefNum, nameP, 256);
-	
+
 	StrPrintF(fileP, "/Palm/Programs/ScummVM/Audio/%s_%03ld.%s", gameP, (track + gVars->CD.firstTrack - 1), ext[gVars->CD.format]);
-	
+
 	if (PocketTunesOpenFile(nameP, fileP, 0) == errNone) {
 		EvtGetEvent(&e, evtNoWait);
 		PocketTunesPauseIfPlaying();

Index: cd_pockettunes.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/cd_pockettunes.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cd_pockettunes.h	1 Jan 2005 16:08:44 -0000	1.2
+++ cd_pockettunes.h	30 Jul 2005 21:10:48 -0000	1.3
@@ -19,39 +19,39 @@
  * $Header$
  *
  */
- 
+
  #ifndef CD_POCKETTUNES_H
  #define CD_POCKETTUNES_H
- 
+
  #include "cdaudio.h"
  #include "pockettunes.h"
- 
+
  class PckTunesCDPlayer : public CDAudio {
  public:
  	PckTunesCDPlayer(OSystem *sys);
 
  	bool init();
  	void release();
- 	
+
  	bool poll();
  	void update();
  	void play(int track, int num_loops, int start_frame, int duration);
  	void stop();
- 	
+
  private:
  	OSystem *_sys;
  	Char gameP[15];
- 	
+
  	UInt32 getStatus();
  	void setPosition(UInt32 value);
  	UInt32 getDuration();
  	UInt32 getPosition(UInt32 deft);
- 	
+
  	Boolean _isPlaying;
  	// cdrom
 	UInt16 _pckLoops, _pckTrack;
 	UInt32 _pckTrackStartFrame, _pckTrackEndFrame;
 	UInt32 _pckStopTime, _pckTrackDuration;
  };
- 
+
  #endif
\ No newline at end of file

Index: cdaudio.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/cdaudio.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cdaudio.h	1 Jan 2005 16:08:44 -0000	1.4
+++ cdaudio.h	30 Jul 2005 21:10:48 -0000	1.5
@@ -19,7 +19,7 @@
  * $Header$
  *
  */
- 
+
 #ifndef CDAUDIO_H
 #define CDAUDIO_H
 
@@ -34,7 +34,7 @@
 #define FROM_SEC(secs)	((UInt32)((secs) * 1000))
 
 class CDAudio {
-public:	
+public:
 	CDAudio() {
 		_isInitialized = false;
 		_volumeLevel = 100;
@@ -42,7 +42,7 @@
 
 	virtual bool init() = 0;
 	virtual void release() = 0;
-	
+
 	// OSystem functions
 	virtual bool poll() = 0;
 	virtual void play(int track, int num_loops, int start_frame, int duration) = 0;

Index: extend.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/extend.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- extend.cpp	1 Jan 2005 16:08:44 -0000	1.13
+++ extend.cpp	30 Jul 2005 21:10:48 -0000	1.14
@@ -19,7 +19,7 @@
  * $Header$
  *
  */
- 
+
 #include <PalmOS.h>
 #include <string.h>
 
@@ -36,7 +36,7 @@
 	// unlock to show the alert box
 	if (gVars->screenLocked)
 		WinScreenUnlock();
-	
+
 	if (OPTIONS_TST(kOptModeHiDensity))
 		WinSetCoordinateSystem(kCoordinatesStandard);
 
@@ -78,10 +78,10 @@
 	UInt16 l2 = 0;
 	UInt16 l3 = StrLen(ioStr);
 	UInt16 next = 0;
-		
+
 	if (inParamStr)
 		l2 = StrLen(inParamStr); // can be null to know how many occur.
-	
+
 	while (((found = StrStr(ioStr+next, fndParamStr)) != NULL) && (!quit)) {
 		occurences++;
 		newLength = (StrLen(ioStr) - l1 + l2);
@@ -98,7 +98,7 @@
 		} else
 			next = found - ioStr + l1;
 	}
-	
+
 	if (inParamStr)
 		ioStr[l3 + l2*occurences - l1*occurences] = 0;
 

Index: games.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/games.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- games.cpp	1 Jan 2005 16:08:44 -0000	1.9
+++ games.cpp	30 Jul 2005 21:10:48 -0000	1.10
@@ -38,7 +38,7 @@
 static Err GamUpdateList() {
 	if (gameDB) {
 		UInt16 numRecs = DmNumRecords(gameDB);
-		
+
 		if (numRecs > 0) {
 			MemHandle tmpH;
 			UInt32 version, size;
@@ -57,7 +57,7 @@
 				GameInfoType gitCur;
 				void *tmpP;
 				FormPtr ofmP, frmP;
-				
+
 				// show dialog
 				ofmP = FrmGetActiveForm();
 				frmP = FrmInitForm(ConvertForm);
@@ -73,25 +73,25 @@
 					version == itemVersion_25) {
 
 					for (index = 0; index < numRecs; index++) {
-						
+
 						// get old data
 						tmpH = DmQueryRecord(gameDB, index);
 						tmpP = MemHandleLock(tmpH);
 						MemMove(&gitCur, tmpP, MemHandleSize(tmpH));
 						MemHandleUnlock(tmpH);
-						
+
 						if (version != itemVersion_30) {
 							gitCur.musicInfo.volume.master = 192;
 							gitCur.musicInfo.volume.music = 192;
 							gitCur.musicInfo.volume.sfx = 192;
 							gitCur.musicInfo.volume.speech = 192;
 							gitCur.musicInfo.volume.audiocd = 50;
-							
+
 							gitCur.musicInfo.sound.tempo = 100;
 							gitCur.musicInfo.sound.defaultTrackLength = 10;
 							gitCur.musicInfo.sound.firstTrack = 1;
 						}
-						
+
 						gitCur.engine = 0;
 
 						// simply resize the old record
@@ -100,13 +100,13 @@
 						DmWrite(tmpP, 0, &gitCur, sizeof(GameInfoType));
 						MemPtrUnlock(tmpP);
 					}
-					
+
 				} else if (version == itemVersion_20) {
 					// need conversion from V2 -> V2.7
 					GameInfoTypeV2 git0;
 
 					for (index = 0; index < numRecs; index++) {
-						
+
 						// get old data
 						tmpH = DmQueryRecord(gameDB, index);
 						tmpP = MemHandleLock(tmpH);
@@ -121,7 +121,7 @@
 						StrCopy(gitCur.pathP, git0.pathP);
 						StrCopy(gitCur.gameP, git0.gameP);
 						gitCur.gfxMode = git0.gfxMode;
-						
+
 						gitCur.autoLoad = git0.autoLoad;
 						gitCur.bootParam = git0.bootParam;
 						gitCur.setPlatform = git0.setPlatform;
@@ -139,11 +139,11 @@
 						gitCur.musicInfo.volume.sfx = 192;
 						gitCur.musicInfo.volume.speech = 192;
 						gitCur.musicInfo.volume.audiocd = 50;
-						
+
 						gitCur.musicInfo.sound.tempo = 100;
 						gitCur.musicInfo.sound.defaultTrackLength = 10;
 						gitCur.musicInfo.sound.firstTrack = 1;
-						
+
 						gitCur.engine = 0;
 
 						tmpH = DmResizeRecord(gameDB, index, sizeof(GameInfoType));	// TODO : check error on resize tmpH==NULL
@@ -156,7 +156,7 @@
 					GameInfoTypeV0 git0;
 
 					for (index = 0; index < numRecs; index++) {
-						
+
 						// get old data
 						tmpH = DmQueryRecord(gameDB, index);
 						tmpP = MemHandleLock(tmpH);
@@ -171,7 +171,7 @@
 						StrCopy(gitCur.pathP, git0.pathP);
 						StrCopy(gitCur.gameP, git0.gameP);
 						gitCur.gfxMode = git0.gfxMode;
-						
+
 						gitCur.autoLoad = git0.autoLoad;
 						gitCur.bootParam = git0.bootParam;
 						gitCur.setPlatform = git0.amiga;	// amiga become platform amiga/atari-st/machintosh
@@ -189,11 +189,11 @@
 						gitCur.musicInfo.volume.sfx = 192;
 						gitCur.musicInfo.volume.speech = 192;
 						gitCur.musicInfo.volume.audiocd = 50;
-						
+
 						gitCur.musicInfo.sound.tempo = 100;
 						gitCur.musicInfo.sound.defaultTrackLength = 10;
 						gitCur.musicInfo.sound.firstTrack = 1;
-						
+
 						gitCur.engine = 0;
 
 						tmpH = DmResizeRecord(gameDB, index, sizeof(GameInfoType));	// TODO : check error on resize tmpH==NULL
@@ -207,10 +207,10 @@
 				FrmDeleteForm(frmP);
 				if (ofmP)
 					FrmReturnToForm(MainForm);
-			}	
+			}
 		}
 	}
-	
+
 	return errNone;
 }
 
@@ -223,7 +223,7 @@
 		err = DmCreateDatabase(0, "ScummVM-Data", appFileCreator, 'DATA', false);
 		if (!err) {
 			gameDB = DmOpenDatabaseByTypeCreator( 'DATA', appFileCreator, dmModeReadWrite);
-			
+
 			if (!gameDB)
 				err = DmGetLastErr();
 		}
@@ -241,7 +241,7 @@
 	if (gPrefs->card.volRefNum != sysInvalidRefNum && gPrefs->card.moveDB) {
 		FileRef file;
 		Err e;
-		
+
 		e = VFSFileOpen(gPrefs->card.volRefNum, "/Palm/Programs/ScummVM/listdata.pdb", vfsModeRead, &file);
 		if (!e) {
 			UInt16 oCardNo, nCardNo;
@@ -254,7 +254,7 @@
 					gPrefs->card.moveDB = false;
 					return;
 				}
- 			
+
  			// get current db info and rename it
  			DmOpenDatabaseInfo(gameDB, &oDbID, 0, 0, &oCardNo, 0);
 			GamCloseDatabase(true);
@@ -273,7 +273,7 @@
 	if (gameDB) {
 		LocalID dbID;
 		UInt16 cardNo;
-		
+
 		DmOpenDatabaseInfo(gameDB, &dbID, 0, 0, &cardNo, 0);
 		DmCloseDatabase(gameDB);
 
@@ -309,13 +309,13 @@
 	UInt16 index;
 
 	index = GamGetSelected();
-	
+
 	if (index != dmMaxRecordIndex) {
 		Boolean newValue;
-		
+
 		recordH = DmGetRecord(gameDB, index);
 		game = (GameInfoType *)MemHandleLock(recordH);
-		
+
 		newValue = false;
 		DmWrite(game, OffsetOf(GameInfoType,selected), &newValue, sizeof(Boolean));
 
@@ -329,7 +329,7 @@
 	GameInfoType *game;
 	Boolean selected;
 	UInt16 index = DmNumRecords(gameDB)-1;
-	
+
 	while (index != (UInt16)-1) {
 		record = DmQueryRecord(gameDB, index);
 		game = (GameInfoType *)MemHandleLock(record);
@@ -356,7 +356,7 @@
 	while (index < maxIndex) {
 		record = DmGetRecord(gameDB, index);
 		game = (GameInfoType *)MemHandleLock(record);
-		
+
 		if (tolower(game->nameP[0]) == tolower(letter)) {
 			found = true;
 
@@ -370,7 +370,7 @@
 
 				GamUnselect();
 				DmWrite(game, OffsetOf(GameInfoType,selected), &newValue, sizeof(Boolean));
-				
+
 				if (index < gPrefs->listPosition || index >= (gPrefs->listPosition + maxView))
 					gPrefs->listPosition = index;
 			}
@@ -380,7 +380,7 @@
 		DmReleaseRecord (gameDB, index, 0);
 
 		index++;
-		
+
 		if (found)
 			return found;
 	}

Index: games.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/games.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- games.h	1 Jan 2005 16:08:44 -0000	1.9
+++ games.h	30 Jul 2005 21:10:48 -0000	1.10
@@ -88,7 +88,7 @@
 		UInt16 speech;
 		UInt16 audiocd;
 	} volume;
-	
+
 	struct {
 		// midi
 		Boolean multiMidi;
@@ -127,13 +127,13 @@
 	UInt16 talkValue;
 	UInt8 platform;
 	UInt8 language;			// |- 	v2.5
-	
+
 	Boolean filter;			// 		v2.6
 	Boolean fullscreen;		// |
 	Boolean aspectRatio;	// |-	v2.7
-	
+
 	MusicInfoType musicInfo;// 		v3.0
-	
+
 	UInt8 engine;			// |-	v3.1
 
 } GameInfoType;

Index: globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/globals.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- globals.h	1 Jan 2005 16:08:44 -0000	1.16
+++ globals.h	30 Jul 2005 21:10:48 -0000	1.17
@@ -42,14 +42,14 @@
 	kOpt5WayNavigator		=	1 <<	0x0A,
 	kOptPalmSoundAPI		=	1 <<	0x0B,
 	kOptSonyPa1LibAPI		=	1 <<	0x0C,
-		
+
 	kOptDeviceProcX86		=	1 <<	0x1F	// DEBUG only
 };
 
 enum {
 	kMemScummOldCostGames = 0,
 	kMemScummNewCostGames,
-	kMemSimon1Games,	
+	kMemSimon1Games,
 	kMemSimon2Games,
 
 	kMemGamesCount
@@ -101,15 +101,15 @@
 		UInt8 *pageAddr1;
 		UInt8 *pageAddr2;
 	} flipping;
-	
+
 	struct {
 		Boolean enable;
 		UInt8 driver, format;
 		UInt16 defaultTrackLength;
 		UInt16 firstTrack;
-		UInt16 volume;		
+		UInt16 volume;
 	} CD;
-	
+
 } GlobalsDataType, *GlobalsDataPtr;
 
 extern GlobalsDataPtr gVars;

Index: i_zodiac.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/i_zodiac.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- i_zodiac.cpp	12 Sep 2004 13:25:15 -0000	1.2
+++ i_zodiac.cpp	30 Jul 2005 21:10:48 -0000	1.3
@@ -9,7 +9,7 @@
 // _twBmpV3 = offscreen bitmap, must be set before this call
 Err ZodiacInit(void **ptrP, Int32 w, Int32 h) {
 	Err e;
-	
+
 	TwGfxSurfaceInfoType surface = {
 		sizeof(TwGfxSurfaceInfoType),
 		w, h, w * 2,

Index: init_arm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/init_arm.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- init_arm.cpp	20 Dec 2004 17:36:54 -0000	1.3
+++ init_arm.cpp	30 Jul 2005 21:10:48 -0000	1.4
@@ -5,15 +5,15 @@
 static void PnoInit(DmResID resID,PNOInitType *pnoP) {
 	// Load and allocate PNO
 	MemHandle armH = DmGetResource('ARMC', resID);
-	
+
 	if (armH) {
 		MemPtr armP = MemHandleLock(armH);
 		PnoLoad(&pnoP->pnoDesc, armP);
 		MemPtrUnlock(armP);
 		DmReleaseResource(armH);
-		
+
 		// Init PNO
-		PnoEntryHeader *header = (PnoEntryHeader *)ALIGN_4BYTE(pnoP->headerBuffer); 
+		PnoEntryHeader *header = (PnoEntryHeader *)ALIGN_4BYTE(pnoP->headerBuffer);
 		pnoP->alignedHeader = header;
 
 		header->r10Value		= pnoP->pnoDesc.r10Value;

Index: init_mathlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/init_mathlib.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init_mathlib.cpp	9 Nov 2004 10:45:47 -0000	1.1
+++ init_mathlib.cpp	30 Jul 2005 21:10:48 -0000	1.2
@@ -23,7 +23,7 @@
 
 	if (MathLibRef != sysInvalidRefNum) {
 		MathLibClose(MathLibRef, &useCount);
-		
+
 		if (!useCount)
 			SysLibRemove(MathLibRef);
 	}

Index: init_palmos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/init_palmos.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init_palmos.cpp	9 Nov 2004 10:45:47 -0000	1.1
+++ init_palmos.cpp	30 Jul 2005 21:10:48 -0000	1.2
@@ -7,7 +7,7 @@
 
 void PalmInit(UInt8 init) {
 	// set screen depth
-	UInt32 depth = 8;		
+	UInt32 depth = 8;
 	WinScreenMode(winScreenModeSet, NULL, NULL, &depth, NULL);
 
 	if (init & INIT_AUTOOFF) {
@@ -27,12 +27,12 @@
 	UInt32 width = 320;
 	UInt32 height = 320;
 	Boolean color = true;
-	
+
 	e = WinScreenMode (winScreenModeSet, &width, &height, &depth, &color);
 
 	if (!e) {
 		UInt32 attr;
-		WinScreenGetAttribute(winScreenDensity, &attr); 
+		WinScreenGetAttribute(winScreenDensity, &attr);
 		e = (attr != kDensityDouble);
 	}
 

Index: init_sony.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/init_sony.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init_sony.cpp	9 Nov 2004 10:45:47 -0000	1.1
+++ init_sony.cpp	30 Jul 2005 21:10:48 -0000	1.2
@@ -13,7 +13,7 @@
 		if (sonySysFtrSysInfoP->libr & sonySysFtrSysInfoLibrSilk) {
 
 			if ((e = SysLibFind(sonySysLibNameSilk, &slkRefNum)))
-				if (e == sysErrLibNotFound)	
+				if (e == sysErrLibNotFound)
 					e = SysLibLoad(sonySysFileTSilkLib, sonySysFileCSilkLib, &slkRefNum);
 
 			if (!e) {
@@ -37,7 +37,7 @@
 		version = 0;
 		slkRefNum = sysInvalidRefNum;
 	}
-	
+
 	*retVersion = version;
 	return slkRefNum;
 }
@@ -66,12 +66,12 @@
 	}
 
 	if (e) HRrefNum = sysInvalidRefNum;
-	
+
 	if (HRrefNum != sysInvalidRefNum) {
 		UInt32 width = hrWidth;
 		UInt32 height = hrHeight;
 		Boolean color = true;
-		
+
 		e = HRWinScreenMode(HRrefNum, winScreenModeSet, &width, &height, &depth, &color);
 		// error ? release and return an invalid reference number
 		if (e) {

Index: launch.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/launch.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- launch.cpp	20 Dec 2004 17:19:05 -0000	1.13
+++ launch.cpp	30 Jul 2005 21:10:48 -0000	1.14
@@ -52,11 +52,11 @@
 
 static void ModSetStack(UInt32 newSize, UInt16 cardNo, LocalID dbID) {
 	DmOpenRef dbRef = DmOpenDatabase(cardNo, dbID, dmModeReadWrite);
-	
+
 	if (dbRef) {
 		MemHandle pref = DmGetResource('pref',0);
 		UInt32 size = 0;
-		
+
 		if (pref) {
 			SysAppPrefsType *data = (SysAppPrefsType *)MemHandleLock(pref);
 			size = data->stackSize;
@@ -71,7 +71,7 @@
 			MemPtrUnlock(data);
 			DmReleaseResource(pref);
 		}
-		
+
 		DmCloseDatabase(dbRef);
 	}
 }
@@ -84,7 +84,7 @@
 		{ "sword1" },
 		{ "sky" }
 	};
-	
+
 	char filename[256];
 	UInt16 dum1;
 	UInt32 dum2;
@@ -147,10 +147,10 @@
 		FormPtr frmP = FrmInitForm(EngineForm);
 		whichButton = FrmDoDialog(frmP);
 		FrmDeleteForm(frmP);
-		
+
 		if (whichButton == EngineCancelButton)
 			return false;
-		
+
 		engine = (whichButton - Engine0Button);
 
 	} else {
@@ -168,7 +168,7 @@
 			StrCopy(pathP,gameInfoP->pathP);
 		else
 			StrCat(pathP,gameInfoP->pathP);
-		
+
 /*		// path exists ?
 		if (!checkPath(pathP)) {
 			MemHandleUnlock(recordH);
@@ -252,7 +252,7 @@
 				case 5:
 					ArgsAdd(&argvP[argc], "--platform=", "windows", &argc);
 					break;
-			}		
+			}
 		}
 
 		// subtitles
@@ -300,7 +300,7 @@
 					ArgsAdd(&argvP[argc], "-e", "towns", &argc);
 				case 5: // AdLib
 					ArgsAdd(&argvP[argc], "-e", "adlib", &argc);
-			}		
+			}
 		}
 		else	// NULL as default
 			ArgsAdd(&argvP[argc], "-e", "null", &argc);
@@ -347,13 +347,13 @@
 		StrIToA(num, gPrefs->debugLevel);
 		ArgsAdd(&argvP[argc], "-d", num, &argc);
 	}
-	
+
 	if (engine == ENGINE_QUEEN || engine == ENGINE_SKY) {
 		// alternative intro ?
 		if (gPrefs->altIntro)
 			ArgsAdd(&argvP[argc], "--alt-intro", NULL, &argc);
 	}
-	
+
 	if (engine == ENGINE_SCUMM) {
 		// copy protection ?
 		if (gPrefs->copyProtection)
@@ -370,7 +370,7 @@
 	lightspeed= (gPrefs->lightspeed.enable ? gPrefs->lightspeed.mode : 255);
 	toLauncher= (gPrefs->exitLauncher);
 
-	// gVars values 
+	// gVars values
 	// (gVars->HRrefNum defined in checkHRmode on Clié)
 	gVars->screenLocked	= false;
 	gVars->volRefNum	= gPrefs->card.volRefNum;
@@ -379,7 +379,7 @@
 
 	// user params
 	HWR_RSTALL();
-	
+
 	if (!gPrefs->autoOff)
 		HWR_SET(INIT_AUTOOFF);
 

Index: modules.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/modules.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- modules.cpp	9 Nov 2004 10:50:30 -0000	1.1
+++ modules.cpp	30 Jul 2005 21:10:48 -0000	1.2
@@ -34,7 +34,7 @@
 	// create file for printf, warnings, etc...
 	StdioInit(gVars->volRefNum, "/PALM/Programs/ScummVM/scumm.log", DrawStatus);
 	gUnistdCWD = SCUMMVM_SAVEPATH;
-	
+
 	// init hardware
 	if (HWR_INIT(INIT_PA1LIB))							Pa1libInit();
 	if (HWR_INIT(INIT_VIBRATOR))	gVars->vibrator =	RumbleInit();
@@ -59,7 +59,7 @@
 	if (HWR_INIT(INIT_ARM))			ARMRelease();
 	if (HWR_INIT(INIT_VIBRATOR))	RumbleRelease();
 	if (HWR_INIT(INIT_PA1LIB))		Pa1libRelease();
-	
+
 	// close log file
 	StdioRelease();
 
@@ -85,7 +85,7 @@
 				LocalID dbID;
 
 				LaunchParamType *lp = (LaunchParamType *)cmdPBP;
-				
+
 				gVars = lp->gVars;
 				argvP = lp->args.argv;
 
@@ -105,7 +105,7 @@
 	//			MemPtrSetOwner(gVars, ownerID);
 	//			ArgsSetOwner(argvP, ownerID);	// will be freed by main(...)
 	//			MemPtrFree(lp);					// will be freed by the system on exit
-				
+
 				run(lp->args.argc, argvP);
 
 				cardNo = 0;

Index: modules.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/modules.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- modules.h	9 Nov 2004 10:50:30 -0000	1.1
+++ modules.h	30 Jul 2005 21:10:48 -0000	1.2
@@ -15,7 +15,7 @@
 		UInt8 argc;
 		Char **argv;
 	} args;
-		
+
 	GlobalsDataPtr gVars;
 } LaunchParamType;
 

Index: palm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- palm.cpp	24 Jun 2005 15:22:09 -0000	1.43
+++ palm.cpp	30 Jul 2005 21:10:48 -0000	1.44
@@ -119,7 +119,7 @@
 
 	// erase the screen
 	WinEraseWindow();
-	
+
 	if (_useHRmode) {
 		y = 160 - (h >> 1) - 10;
 		HRFntSetFont(gVars->HRrefNum,hrTinyBoldFont);
@@ -140,7 +140,7 @@
 				size = 2;
 				h = (h - 2) / 2 + 2;
 			}
-		
+
 		BitmapTypeV3 *bmp2P;
 		BitmapType *bmp1P = BmpCreate(320, (h << 1), 8, NULL, &e);
 		WinHandle tmpH = WinCreateBitmapWindow(bmp1P, &e);
@@ -206,7 +206,7 @@
 	free(_currentPalette);
 	free(_mouseBackupP);
 	free(_mouseDataP);
-	
+
 	if (_cdPlayer) {
 		_cdPlayer->release();
 		_cdPlayer = NULL;
@@ -224,9 +224,9 @@
 
 	_paletteDirtyStart = 0;
 	_paletteDirtyEnd = 0;
-	
+
 	memset(&_sound, 0, sizeof(SoundDataType));
-	
+
 	_currentPalette = NULL;
 	_modeChanged = false;
 	_gfxLoaded = false;
@@ -234,7 +234,7 @@
 	_lastKeyPressed = kLastKeyNone;
 	_lastKeyRepeat = 100;
 	_lastKeyModifier = MD_NONE;
-	
+
 	_useNumPad = false;
 	_showBatLow = false;
 
@@ -248,14 +248,14 @@
 
 	_currentPalette = (RGBColorType*)calloc(sizeof(RGBColorType), 256);
 	_mouseBackupP = (byte*)malloc(MAX_MOUSE_W * MAX_MOUSE_H);
-	
+
 	// overlay
 	_tmpScreenP = NULL;
 	_tmpBackupP = NULL;
-	
+
 	// HiRes
 	_useHRmode	= (gVars->HRrefNum != sysInvalidRefNum);
-	
+
 	// mouse emu
 	// TODO : add UX50 arrow keys
 	if (OPTIONS_TST(kOpt5WayNavigator)) {
@@ -272,7 +272,7 @@
 		_keyMouse.bitButLeft= keyBitHard3|0x00100000; // keyBitRockerCenter on TwKeys.h but conflict with palmnavigator.h
 	}
 	_keyMask = (_keyMouse.bitUp | _keyMouse.bitDown | _keyMouse.bitLeft | _keyMouse.bitRight | _keyMouse.bitButLeft);
-	
+
 	// enable cdrom ?
 	_cdPlayer = NULL;
 	if (gVars->CD.enable) {
@@ -287,7 +287,7 @@
 				_cdPlayer = new PckTunesCDPlayer(this);
 				break;
 		}
-		
+
 		if (_cdPlayer) {
 			if (!_cdPlayer->init()) {
 				_cdPlayer->release();
@@ -295,7 +295,7 @@
 			}
 		}
 	}
-	
+
 	// sound
 	memset(&_sound,0,sizeof(SoundDataType));
 }

Index: palm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- palm.h	10 May 2005 23:17:12 -0000	1.37
+++ palm.h	30 Jul 2005 21:10:48 -0000	1.38
@@ -72,7 +72,7 @@
 	bool setGraphicsMode(int mode);
 	int getGraphicsMode() const;
 	int getDefaultGraphicsMode() const;
-	
+
 	int getOutputSampleRate() const;
 	bool openCD(int drive);
 	void setWindowCaption(const char *caption);	// TODO : _inGame = true = don't set
@@ -111,17 +111,17 @@
 
 	// Shaking is used in SCUMM. Set current shake position.
 	void setShakePos(int shake_pos);
-		
+
 	// Get the number of milliseconds since the program was started.
 	uint32 getMillis();
-	
+
 	// Delay for a specified amount of milliseconds
 	void delayMillis(uint msecs);
-	
+
 	// Get the next event.
-	// Returns true if an event was retrieved.	
+	// Returns true if an event was retrieved.
 	bool pollEvent(Event &event);
-	
+
 	void SimulateArrowKeys(Event &event, Int8 iHoriz, Int8 iVert);
 
 	/** @name Sound */
@@ -133,14 +133,14 @@
 	 * @param param		an arbitrary parameter which is stored and passed to proc.
 	 */
 	bool setSoundCallback(SoundProc proc, void *param);
-	
+
 	/**
 	 * Remove any audio callback previously set via setSoundCallback, thus effectively
 	 * stopping all audio output immediately.
 	 * @see setSoundCallback
 	 */
 	void clearSoundCallback();
-	//@} 
+	//@}
 
 	// Poll cdrom status
 	// Returns true if cd audio is playing
@@ -239,9 +239,9 @@
 	int _current_shake_pos;
 	int _new_shake_pos;
 	byte _mouseKeyColor;
-	
+
 	UInt32 _exit_delay;
-	
+
 	struct {
 		uint32 duration, nextExpiry;
 		bool active;
@@ -258,10 +258,10 @@
 
 	void draw_mouse();
 	void undraw_mouse();
-	
+
 	void sound_handler();
 	void timer_handler(UInt32 current_msecs);
-	
+
 	void getCoordinates(EventPtr event, Coord *x, Coord *y);
 	void draw1BitGfx(UInt16 id, Int32 x, Int32 y, Boolean clear);
 
@@ -283,12 +283,12 @@
 	enum {
 		kLastKeyNone			= 0,
 		kLastKeyMouse			= 1	<< 0,
-	
+
 		kLastKeyCalc			= 1 << 30,
 		kLastKeyAny				= 1 << 31
 	};
 
-	
+
 	UInt32 _keyMask;
 	struct {
 		UInt32 bitUp;
@@ -301,7 +301,7 @@
 	Int32 _lastKeyPressed;
 	UInt32 _lastKeyRepeat;
 	UInt8 _lastKeyModifier;
-	
+
 	Boolean _useNumPad;
 	Boolean _useHRmode;
 
@@ -311,7 +311,7 @@
 	void init_intern();
 };
 
-Err HwrDisplayPalette(UInt8 operation, Int16 startIndex, 
+Err HwrDisplayPalette(UInt8 operation, Int16 startIndex,
 			 	  			 UInt16 paletteEntries, RGBColorType *tableP)
 							SYS_TRAP(sysTrapHwrDisplayPalette);
 

Index: palmevt.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palmevt.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- palmevt.cpp	24 Jun 2005 15:22:09 -0000	1.9
+++ palmevt.cpp	30 Jul 2005 21:10:48 -0000	1.10
@@ -75,7 +75,7 @@
 		// wide landscape
 		if (OPTIONS_TST(kOptModeLandscape)) {
 
-			// zodiac have mutliple ratio 
+			// zodiac have mutliple ratio
 			if (OPTIONS_TST(kOptDeviceZodiac)) {
 				Int32 w,h;
 
@@ -94,7 +94,7 @@
 		// wide portrait, only for 320x200
 		} else {
 			*y =       ((event->screenX - _screenOffset.y) << 1) / 3;
-			*x = 320 - ((event->screenY - _screenOffset.x) << 1) / 3 - 1;	
+			*x = 320 - ((event->screenY - _screenOffset.x) << 1) / 3 - 1;
 		}
 
 	// normal coord
@@ -137,12 +137,12 @@
 				sy = -1;
 			else if (keyCurrentState & _keyMouse.bitDown)
 				sy = +1;
-				
+
 			if (keyCurrentState & _keyMouse.bitLeft)
 				sx = -1;
 			else if (keyCurrentState & _keyMouse.bitRight)
-				sx = +1;					
-			
+				sx = +1;
+
 			SimulateArrowKeys(event, sx, sy);
 			updateScreen();
 			updateCD();
@@ -161,7 +161,7 @@
 
 		if (ev.eType == keyDownEvent) {
 			switch (ev.data.keyDown.chr) {
-			
+
 				// ESC key
 				case vchrLaunch:
 					_lastKeyPressed = kLastKeyNone;
@@ -170,7 +170,7 @@
 					event.kbd.ascii = 27;
 					event.kbd.flags = 0;
 					return true;
-				
+
 				// F5 = menu
 				case vchrJogPushRepeat:
 				case vchrMenu:
@@ -204,7 +204,7 @@
 					return true;
 
 				case vchrJogPushedUp:
-				case vchrJogPushedDown: // hot swap gfx mode 
+				case vchrJogPushedDown: // hot swap gfx mode
 					if (_initMode == GFX_WIDE)
 						hotswap_gfx_mode(_mode == GFX_WIDE ? GFX_NORMAL: GFX_WIDE);
 					else
@@ -238,7 +238,7 @@
 					if (OPTIONS_TST(kOptPalmSoundAPI) && _sound.active)
 						SndStreamPause(*((SndStreamRef *)_sound.handle), true);
 					break;
-				
+
 				case vchrLateWakeup:
 					// resume the sound thread if any
 					if (OPTIONS_TST(kOptPalmSoundAPI) && _sound.active)
@@ -265,7 +265,7 @@
 						event.kbd.ascii = 27;
 						event.kbd.flags = 0;
 						return true;
-					
+
 					// F5 = menu
 					case vchrHard3:
 						_lastKeyPressed = kLastKeyNone;
@@ -279,10 +279,10 @@
 		}
 
 		// prevent crash when alarm is raised
-		handled = ((ev.eType == keyDownEvent) && 
-						(ev.data.keyDown.modifiers & commandKeyMask) && 
-						((ev.data.keyDown.chr == vchrAttnStateChanged) || 
-						(ev.data.keyDown.chr == vchrAttnUnsnooze))); 
+		handled = ((ev.eType == keyDownEvent) &&
+						(ev.data.keyDown.modifiers & commandKeyMask) &&
+						((ev.data.keyDown.chr == vchrAttnStateChanged) ||
+						(ev.data.keyDown.chr == vchrAttnUnsnooze)));
 
 		// graffiti strokes, auto-off, etc...
 		if (!handled)
@@ -299,7 +299,7 @@
 				if (ev.data.keyDown.chr == vchrCommand && (ev.data.keyDown.modifiers & commandKeyMask)) {
 					_lastKeyModifier++;
 					_lastKeyModifier %= 4;
-					
+
 					if (_lastKeyModifier)
 						draw1BitGfx((kDrawKeyState + _lastKeyModifier - 1), 2, _screenHeight + 2, true);
 					else
@@ -312,14 +312,14 @@
 					if (_lastKeyModifier == MD_CMD)  b = KBD_CTRL|KBD_ALT;
 					if (_lastKeyModifier == MD_ALT)  b = KBD_ALT;
 					if (_lastKeyModifier == MD_CTRL) b = KBD_CTRL;
-					
+
 					keycode = ev.data.keyDown.chr;
-					
+
 					// F1 -> F10 key
 					if  (keycode >= '0' && keycode <= '9' && b == (KBD_CTRL|KBD_ALT)) {
 						keycode = keycode == '0' ? 324 : (315 + keycode - '1');
 						b = 0;
-					
+
 					} else if  ((keycode == 'z' && b == KBD_CTRL) || (b == KBD_ALT && keycode == 'x')) {
 						event.type = EVENT_QUIT;
 						return true;
@@ -343,12 +343,12 @@
 							setFeatureState(kFeatureFullscreenMode, !_fullscreen);
 #endif
 					}
-					
+
 					event.type = EVENT_KEYDOWN;
 					event.kbd.keycode = keycode;
 					event.kbd.ascii = keycode; //(keycode>='a' && keycode<='z' && (event.kbd.flags & KBD_SHIFT) ? keycode &~ 0x20 : keycode);
 					event.kbd.flags = b;
-					
+
 					if (_lastKeyModifier) {
 						_lastKeyModifier = MD_NONE;
 						draw1BitGfx(kDrawKeyState, 2, getHeight() + 2, false);
@@ -383,10 +383,10 @@
 				if (y >= y2 && y < (y2 + 34) && x >= x2 && x < (x2 + 40)) {	// numpad location
 					UInt8 key = '1';
 					key += 9 - ( (3 - ((x - x2) / 13)) + (3 * ((y - y2) / 11)) );
-					
+
 					_lastEvent = keyDownEvent;
 					_lastKeyPressed = kLastKeyNone;
-					
+
 					event.type = EVENT_KEYDOWN;
 					event.kbd.keycode = key;
 					event.kbd.ascii = key;

Index: palmgfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palmgfx.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- palmgfx.cpp	24 Jun 2005 15:22:09 -0000	1.9
+++ palmgfx.cpp	30 Jul 2005 21:10:48 -0000	1.10
@@ -68,7 +68,7 @@
 	case GFX_WIDE:
 		_setMode = mode;
 		break;
-	
+
 	default:
 		warning("unknown gfx mode %d", mode);
 		_setMode = GFX_NORMAL;
@@ -103,10 +103,10 @@
 		SysSetOrientationTriggerState(sysOrientationTriggerDisabled);
 
 	set_mouse_pos(200,150);
-	
+
 	unload_gfx_mode();
 
-	// force WIDE mode for 640x480 games 
+	// force WIDE mode for 640x480 games
 	if (h == 480)
 		_setMode = GFX_WIDE;
 
@@ -145,14 +145,14 @@
 
 		// get the actual palette
 		WinPalette(winPaletteGet, 0, 256, _currentPalette);
-	
+
 		// set only if _mode not changed
 		const byte startupPalette[] = {
 			0	,0	,0	,0,
 			0	,0	,171,0,
 			0	,171, 0	,0,
 			0	,171,171,0,
-			171	,0	,0	,0, 
+			171	,0	,0	,0,
 			171	,0	,171,0,
 			171	,87	,0	,0,
 			171	,171,171,0,
@@ -267,7 +267,7 @@
 			_offScreenP	= WinScreenLock(winLockErase) + _screenOffset.addr;
 			_screenP	= _offScreenP;
 			_offScreenH	= WinGetDisplayWindow();
-			_screenH	= _offScreenH;	
+			_screenH	= _offScreenH;
 			_renderer_proc = &OSystem_PALMOS::updateScreen_flipping;
 			break;
 		case GFX_WIDE:
@@ -287,11 +287,11 @@
 					_screenP = (byte *)(BmpGetBits(WinGetBitmap(_screenH)));
 					_renderer_proc =  &OSystem_PALMOS::updateScreen_wideZodiac;
 				} else
-#endif			
+#endif
 				{
 					gVars->screenLocked = true;
 					_screenP = WinScreenLock(winLockErase) + _screenOffset.addr;
-									
+
 					_renderer_proc = (OPTIONS_TST(kOptModeLandscape)) ?
 						&OSystem_PALMOS::updateScreen_wideLandscape :
 						&OSystem_PALMOS::updateScreen_widePortrait;
@@ -324,7 +324,7 @@
 
 		_gfxLoaded = true;
 	}
-	
+
 }
 
 void OSystem_PALMOS::unload_gfx_mode() {
@@ -407,25 +407,25 @@
 		DmWrite(dst, offset, src, _screenWidth);
 		offset += _screenWidth;
 		src += _offScreenPitch;
-	} while (--h);	
+	} while (--h);
 	_modeChanged = true;
-	
+
 	// reset offscreen pitch
 	_offScreenPitch	= gVars->screenPitch;
 
 	// free old mode memory
 	unload_gfx_mode();
-	
+
 	// load new gfx mode
 	_mode = mode;
 	load_gfx_mode();
-	
+
 	// restore offscreen
 	WinPalette(winPaletteSet, 0, 256, _currentPalette);
 	clearScreen();
 	copyRectToScreen(_tmpHotSwapP, _screenWidth, 0, 0, _screenWidth, _screenHeight);
 	_modeChanged = false;
-	
+
 	// force palette update
 	_paletteDirtyStart = 0;
 	_paletteDirtyEnd = 256;
@@ -483,7 +483,7 @@
 			}
 		}
 	}
-	
+
 	return color;
 }
 
@@ -549,7 +549,7 @@
 
 void OSystem_PALMOS::updateScreen() {
 	// Check whether the palette was changed in the meantime and update the
-	// screen surface accordingly. 
+	// screen surface accordingly.
 	if (_paletteDirtyEnd != 0) {
 		UInt8 oldCol;
 
@@ -563,11 +563,11 @@
 		oldCol = gVars->indicator.on;
 		gVars->indicator.on = RGBToColor(0,255,0);
 
-		if (oldCol != gVars->indicator.on) {	
+		if (oldCol != gVars->indicator.on) {
 			// redraw if needed
 			if (_lastKeyModifier)
 				draw1BitGfx((kDrawKeyState + _lastKeyModifier - 1), 2, getHeight() + 2, true);
-			
+
 			if(_useNumPad)
 				draw1BitGfx(kDrawNumPad, (getWidth() >> 1) - 32, getHeight() + 2, true);
 
@@ -583,7 +583,7 @@
 		byte *src = _tmpScreenP;
 		byte *dst = _offScreenP;
 		UInt16 h = _screenHeight;
-		
+
 		do {
 			memcpy(dst, src, _screenWidth);
 			dst += _offScreenPitch;
@@ -600,7 +600,7 @@
 		return;
 
 	MemHandle hTemp = DmGetResource(bitmapRsc, id);
-	
+
 	if (hTemp) {
 		BitmapType *bmTemp;
 		UInt32 *bmData;
@@ -619,12 +619,12 @@
 
 		if (next)
 			blocks++;
-		
+
 		for (ih = 0; ih < h; ih++) {			// line
 			for (ib = 0; ib < blocks; ib++) {	// 32pix block
 				next = w - (ib << 5);
 				next = MIN(next, (Coord)32);
-		
+
 				for (iw = 0; iw < next; iw++) {	// row
 
 					*scr++ = ((*bmData & (1 << (31 - iw))) && show) ?

Index: palmmos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palmmos.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- palmmos.cpp	24 Jun 2005 15:58:00 -0000	1.5
+++ palmmos.cpp	30 Jul 2005 21:10:48 -0000	1.6
@@ -26,7 +26,7 @@
 bool OSystem_PALMOS::showMouse(bool visible) {
 	if (_mouseVisible == visible)
 		return visible;
-	
+
 	bool last = _mouseVisible;
 	_mouseVisible = visible;
 
@@ -133,7 +133,7 @@
 	} else {
 		int offset = y * _screenWidth + x;
 		dst = _tmpScreenP;
-		
+
 		while (h > 0) {
 			width = w;
 			while (width > 0) {

Index: palmovl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palmovl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- palmovl.cpp	24 Jun 2005 15:22:09 -0000	1.3
+++ palmovl.cpp	30 Jul 2005 21:10:48 -0000	1.4
@@ -35,7 +35,7 @@
 		DmWrite(dst, offset, src, _screenWidth);
 		offset += _screenWidth;
 		src += _offScreenPitch;
-	} while (--h);	
+	} while (--h);
 
 	_overlayVisible = true;
 	clearOverlay();
@@ -109,9 +109,9 @@
 /*		RectangleType mouse = {_mouseCurState.x, _mouseCurState.y, _mouseCurState.w, _mouseCurState.h};
 		RectangleType copy	= {x, y, w, h};
 		RectangleType result;
-		
+
 		RctGetIntersection(&mouse, &copy, &result);
-		
+
 		if (result.extent.x !=0 && result.extent.y !=0)*/
 			undraw_mouse();
 	}

Index: palmrdr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palmrdr.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- palmrdr.cpp	24 Jun 2005 15:22:09 -0000	1.7
+++ palmrdr.cpp	30 Jul 2005 21:10:48 -0000	1.8
@@ -84,10 +84,10 @@
 		// clear bottom
 		RctSetRectangle(&r, 0, _screenOffset.y + h, 480, _current_shake_pos);
 		WinFillRectangle(&r, 0);
-		
+
 		destRect.y += _new_shake_pos;
 		_screenOffset.y += _new_shake_pos;
-		
+
 		rumblePack(_new_shake_pos >= 3);
 		_current_shake_pos = _new_shake_pos;
 	}
@@ -95,7 +95,7 @@
 	// update screen
 	WinSetDrawWindow(WinGetDisplayWindow());
 	e = TwGfxDrawPalmBitmap((TwGfxSurfaceType *)_twSrc, &destPoint, (BitmapPtr)_twBmpV3);
-	e = TwGfxStretchBlt2((TwGfxSurfaceType *)_twDst, &destRect, (TwGfxSurfaceType *)_twSrc, &srcRect, twGfxStretchFast| (gVars->filter ? twGfxStretchSmooth : 0)); 
+	e = TwGfxStretchBlt2((TwGfxSurfaceType *)_twDst, &destRect, (TwGfxSurfaceType *)_twSrc, &srcRect, twGfxStretchFast| (gVars->filter ? twGfxStretchSmooth : 0));
 }
 #endif
 
@@ -114,13 +114,13 @@
 		// clear bottom
 		RctSetRectangle(&r, _screenOffset.y + 300, 0, _current_shake_pos, 480);
 		WinFillRectangle(&r, 0);
-		
+
 		dst += _new_shake_pos;
 
 		rumblePack(_new_shake_pos >= 3);
 		_current_shake_pos = _new_shake_pos;
 	}
-	
+
 	// update screen
 	ARM_START(WideType)
 		ARM_INIT(COMMON_WPORTRAIT)
@@ -177,13 +177,13 @@
 		// clear bottom
 		RctSetRectangle(&r, 0, _screenOffset.y + 300, 480, _current_shake_pos);
 		WinFillRectangle(&r, 0);
-		
+
 		dst += _new_shake_pos * 480;
 
 		rumblePack(_new_shake_pos >= 3);
 		_current_shake_pos = _new_shake_pos;
 	}
-	
+
 	// update screen
 	ARM_START(WideType)
 		ARM_INIT(COMMON_WLANDSCAPE)

Index: palmsave.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palmsave.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- palmsave.cpp	24 Jun 2005 15:22:09 -0000	1.18
+++ palmsave.cpp	30 Jul 2005 21:10:48 -0000	1.19
@@ -32,7 +32,7 @@
 public:
 	PalmSaveFile(const char *filename, bool saveOrLoad);
 	~PalmSaveFile();
-	
+
 	bool isOpen() const { return file != NULL; }
 
 	uint32 read(void *buf, uint32 size);
@@ -56,15 +56,15 @@
 	if (file) {
 		if (saveOrLoad) {
 			_readWriteData = (byte *)malloc(MAX_BLOCK);
-			
+
 		} else {
 			// read : cache the whole file
 			::fseek(file, 0, SEEK_END);
 			length = ::ftell(file);
 			::fseek(file, 0, SEEK_SET);
-			
+
 			_readWriteData = (byte *)malloc(length);
-			_readWritePos = 0;				
+			_readWritePos = 0;
 
 			if (_readWriteData)
 				::fread(_readWriteData, 1, length, file);
@@ -76,7 +76,7 @@
 	if (file) {
 		if (_needDump)
 			::fwrite(_readWriteData, _readWritePos, 1, file);
-	
+
 		if (_readWriteData)
 			free(_readWriteData);
 

Index: palmsnd.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palmsnd.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- palmsnd.cpp	24 Jun 2005 15:22:10 -0000	1.5
+++ palmsnd.cpp	30 Jul 2005 21:10:48 -0000	1.6
@@ -51,18 +51,18 @@
 		_sound.active = true;	// always true when we call this function
 		_sound.dataP = NULL;	// required by sound_handler
 		_sound.handle = NULL;
-		
+
 		if (ConfMan.hasKey("output_rate"))
 			_samplesPerSec = ConfMan.getInt("output_rate");
 		else
 			_samplesPerSec = 8000;	// default value
-		
+
 		// try to create sound stream
 		if (OPTIONS_TST(kOptPalmSoundAPI)) {
 			void *sndFuncP;
-		
+
 			_sound.handle = MemPtrNew(sizeof(SndStreamRef));
-			sndFuncP = sndCallback;			
+			sndFuncP = sndCallback;
 
 			Err e = SndStreamCreateExtended(
 						(SndStreamRef *)_sound.handle,
@@ -83,14 +83,14 @@
 			_sound.set = false;
 			_sound.wait = true;
 			success = (e == errNone);
-			
+
 		} else if (OPTIONS_TST(kOptSonyPa1LibAPI)) {
 			static CallbackInfoType cbData;
 			_sound.handle = MemPtrNew(sizeof(UInt8));
-			
+
 			cbData.funcP = &ClieSoundCallback;
 			cbData.dwUserData = (UInt32)&_sound;
-		
+
 			_sound.size		= SND_BLOCK;
 			_sound.set		= false;
 			_sound.wait		= true;
@@ -101,7 +101,7 @@
 
 			Pa1Lib_adpcmOpen(ADPCM_8_KHZ, (UInt8 *)_sound.tmpP, MemPtrSize(_sound.tmpP), &cbData, (UInt8 *)_sound.handle);
 		}
-		// failed or not supported 
+		// failed or not supported
 		if (!success) {
 			_sound.size = SND_BLOCK;
 			_sound.set = false;
@@ -125,7 +125,7 @@
 		free(_sound.tmpP);
 		free(_sound.handle);
 	}
-	
+
 
 	_sound.active = false;
 	_sound.dataP = NULL;
@@ -139,9 +139,9 @@
 
 			if (!_sound.dataP)
 				_sound.dataP = MemPtrNew(_sound.size);
-			
+
 			((SoundProc)_sound.proc)(_sound.param, (byte *)_sound.dataP, _sound.size);
-			
+
 			if (OPTIONS_TST(kOptSonyPa1LibAPI)) {
 				pcm2adpcm((Int16 *)_sound.dataP, (UInt8 *)_sound.tmpP, _sound.size);
 				_sound.set = Pa1Lib_adpcmStart(*((UInt8 *)_sound.handle), ADPCM_MODE_NONCONTINUOUS_PB|ADPCM_MODE_INTERRUPT_MODE);
@@ -174,7 +174,7 @@
 bool OSystem_PALMOS::pollCD() {
 	if (!_cdPlayer)
 		return false;
-	
+
 	return _cdPlayer->poll();
 }
 

Index: rumble.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/rumble.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rumble.cpp	12 Sep 2004 12:46:34 -0000	1.1
+++ rumble.cpp	30 Jul 2005 21:10:48 -0000	1.2
@@ -20,7 +20,7 @@
 			exists = true;
 			TwDeviceClose(hRumble);
 		}
-		
+
 	} else
 #endif
 	{
@@ -49,7 +49,7 @@
 		} else {
 			TwDeviceControl(hRumble, 'stop', 0, 0);
 		}
-		
+
 	} else
 #endif
 	{
@@ -81,7 +81,7 @@
 			HwrVibrateAttributes(1, kHwrVibratePattern, &pattern);
 			HwrVibrateAttributes(1, kHwrVibrateDelay, &delay);
 			HwrVibrateAttributes(1, kHwrVibrateRepeatCount, &repeat);
-			
+
 			done = true;
 		}
 	}
@@ -93,7 +93,7 @@
 #ifndef DISABLE_TAPWAVE
 	if (OPTIONS_TST(kOptDeviceZodiac)) {
 		TwDeviceClose(hRumble);
-	
+
 	} else
 #endif
 	{

Index: scumm_globals.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/scumm_globals.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- scumm_globals.cpp	1 Jan 2005 16:08:45 -0000	1.10
+++ scumm_globals.cpp	30 Jul 2005 21:10:48 -0000	1.11
@@ -105,7 +105,7 @@
 	if (dbID) {
 		UInt32 dbType, dbCreator;
 		Err e = DmDatabaseInfo(0, dbID, 0, 0, 0, 0, 0, 0, 0, 0, 0, &dbType, &dbCreator);
-		
+
 		if (!e && dbType == 'GLBS' && dbCreator == appFileCreator)
 			return DmOpenDatabase(0, dbID, dmModeReadOnly);
 	}

Index: skin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/skin.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- skin.cpp	1 Jan 2005 16:08:45 -0000	1.8
+++ skin.cpp	30 Jul 2005 21:10:48 -0000	1.9
@@ -37,7 +37,7 @@
 	if (!OPTIONS_TST(kOptDeviceZodiac)) {
 		WinSetDrawWindow(WinGetDisplayWindow());
 		// WARNING : this doesn't work on < OS5 with 16bit mode
-		return WinScreenLock(initMode);	
+		return WinScreenLock(initMode);
 	}
 
 	Err e;
@@ -81,13 +81,13 @@
 
 	if (skinDBP) {
 		colIndex = DmFindResource (skinDBP, sknColorsRsc, skinColors, NULL);
-		
+
 		if (colIndex != (UInt16)-1) {
 			colH = DmGetResourceIndex(skinDBP, colIndex);
-			
+
 			if (colH) {
 				colTemp = (UInt8 *)MemHandleLock(colH);
-				
+
 				*text = colTemp[0];
 				*selected = colTemp[1];
 				*background = colTemp[2];
@@ -113,7 +113,7 @@
 
 		if (index != (UInt16)-1) {
 			hTemp = DmGetResourceIndex(skinDBP,index);
-			
+
 			if (hTemp) {
 				bmpTemp = (BitmapType *)MemHandleLock(hTemp);
 				BmpGlueGetDimensions(bmpTemp, &bw, &bh, 0);
@@ -129,7 +129,7 @@
 					cw = srcRect->extent.x;
 					ch = srcRect->extent.y;
 				}
-				
+
 				if (ch) {
 					WinGetClip(&old);
 					if (gVars->HRrefNum != sysInvalidRefNum) {
@@ -143,14 +143,14 @@
 					} else {
 						Err e;
 						BitmapTypeV3 *bmp2P;
-						
+
 						// create an uncompressed version of the bitmap
 						WinHandle win = WinCreateOffscreenWindow(bw, bh, screenFormat, &e);
 						WinHandle old = WinGetDrawWindow();
 						WinSetDrawWindow(win);
 						WinDrawBitmap(bmpTemp, 0, 0);
 						WinSetDrawWindow(old);
-						
+
  						bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL);
 
 						copy.topLeft.x = destX / 2;
@@ -183,7 +183,7 @@
 	SknScreenLock(winLockCopy);
 
 	skinDBP = SknOpenSkin();
-	
+
 	if (gPrefs->card.volRefNum != sysInvalidRefNum)
 		FrmShowObject(frmP, FrmGetObjectIndex (frmP, MainMSBitMap));
 	else
@@ -198,7 +198,7 @@
 	SknCopyBits(skinDBP, skinBackgroundImageTop, 0, r.topLeft.x, r.topLeft.y);
 	SknGetObjectBounds(skinDBP, skinBackgroundImageBottom, &r);
 	SknCopyBits(skinDBP, skinBackgroundImageBottom, 0, r.topLeft.x, r.topLeft.y);
-	
+
 	for (UInt16 resID = 1100; resID <= 7000; resID += 100) {
 		SknSetState(skinDBP, resID, sknStateNormal);
 		SknShowObject(skinDBP, resID);
@@ -217,30 +217,30 @@
 	UInt8 *strTemp;
 
 	RctSetRectangle(rP, 0, 0, 0, 0);
-	
+
 	if (skinDBP) {
 		bmpIndex = DmFindResource (skinDBP, bitmapRsc, resID, NULL);
-		
+
 		if (bmpIndex != (UInt16)-1) {						// if bmp exists
 			strIndex = DmFindResource (skinDBP, sknPosRsc, resID, NULL);
-			
+
 			if (strIndex != (UInt16)-1) {					// if params exist
 				hBmp = DmGetResourceIndex(skinDBP,bmpIndex);
 
 				if (hBmp) {
 					hStr = DmGetResourceIndex(skinDBP,strIndex);
-					
+
 					if (hStr) {
 					//	buttons : state|x|y|w/h slider|draw mode|x1/y1 keep|x2/y2 keep slider
 					//	list (160mode) : state|x|y|w|h|
 						bmpTemp = (BitmapType *)MemHandleLock(hBmp);
 						strTemp = (UInt8 *)MemHandleLock(hStr);
-						
+
 						BmpGlueGetDimensions(bmpTemp, &(rP->extent.x), &(rP->extent.y), 0);
 						rP->topLeft.x = strTemp[sknInfoPosX] * 2;
 						rP->topLeft.y = strTemp[sknInfoPosY] * 2;
-						
-						MemPtrUnlock(strTemp);					
+
+						MemPtrUnlock(strTemp);
 						DmReleaseResource(hStr);
 					}
 
@@ -270,20 +270,20 @@
 
 	if (skinDBP) {
 		index = DmFindResource (skinDBP, sknPosRsc, resID, NULL);
-		
+
 		if (index != (UInt16)-1) {
 			hStr = DmGetResourceIndex(skinDBP, index);
-			
+
 			if (hStr) {
 				strTemp = (UInt8 *)MemHandleLock(hStr);
 				oldState = strTemp[sknInfoState];
-				
+
 				if (oldState != newState) {
 					DmWrite(strTemp, 0, &newState, 1);
 				}
-				
-				MemPtrUnlock(strTemp);					
-				DmReleaseResource(hStr);				
+
+				MemPtrUnlock(strTemp);
+				DmReleaseResource(hStr);
 			}
 		}
 	}
@@ -299,19 +299,19 @@
 
 	if (skinDBP) {
 		index = DmFindResource (skinDBP, sknDepthRsc, skinDepth, NULL);
-		
+
 		if (index != (UInt16)-1) {
 			hStr = DmGetResourceIndex(skinDBP, index);
-			
+
 			if (hStr) {
 				strTemp = (UInt8 *)MemHandleLock(hStr);
 				depth = *strTemp;
-				MemPtrUnlock(strTemp);					
-				DmReleaseResource(hStr);				
+				MemPtrUnlock(strTemp);
+				DmReleaseResource(hStr);
 			}
 		}
 	}
-	
+
 	return depth;
 }
 
@@ -324,15 +324,15 @@
 
 	if (skinDBP) {
 		index = DmFindResource (skinDBP, sknPosRsc, resID, NULL);
-		
+
 		if (index != (UInt16)-1) {
 			hStr = DmGetResourceIndex(skinDBP, index);
-			
+
 			if (hStr) {
 				strTemp = (UInt8 *)MemHandleLock(hStr);
-				oldState = strTemp[sknInfoState];				
-				MemPtrUnlock(strTemp);					
-				DmReleaseResource(hStr);				
+				oldState = strTemp[sknInfoState];
+				MemPtrUnlock(strTemp);
+				DmReleaseResource(hStr);
 			}
 		}
 	}
@@ -358,7 +358,7 @@
 	skinDBP = DmOpenDatabase(gPrefs->skin.cardNo, gPrefs->skin.dbID, dmModeReadOnly);
 	if (skinDBP) {
 		strIndex = DmFindResource (skinDBP, sknPosRsc, skinList, NULL);
-		
+
 		if (strIndex != 0xFFFF) {					// if params exist
 			hStr = DmGetResourceIndex(skinDBP,strIndex);
 			if (hStr) {
@@ -368,7 +368,7 @@
 				y = strTemp[sknInfoPosY];
 				w = strTemp[sknInfoListWidth];
 				h = strTemp[sknInfoListSize] * sknInfoListItemSize;
-				
+
 				if (rAreaP)
 					RctSetRectangle(rAreaP ,x, y, w, h);
 				if (rArea2xP)
@@ -376,7 +376,7 @@
 
 				MemHandleUnlock(hStr);
 				DmReleaseResource(hStr);
-				
+
 			}
 		}
 
@@ -447,7 +447,7 @@
 
 	UInt8 txtColor, norColor, selColor, bkgColor;
 	UInt16 x,y;
-	
+
 	SknScreenLock(winLockCopy);
 
 	SknGetListBounds(&rArea, &rArea2x);
@@ -461,7 +461,7 @@
 	x = rCopy.topLeft.x;
 	y = rCopy.topLeft.y;
 	rCopy.topLeft.x	-= rField.topLeft.x;
-	rCopy.topLeft.y	-= rField.topLeft.y;	
+	rCopy.topLeft.y	-= rField.topLeft.y;
 	SknCopyBits(skinDBP, skinBackgroundImageTop, &rCopy, x, y);
 	// copy bottom bg
 	SknGetObjectBounds(skinDBP, skinBackgroundImageBottom, &rField);
@@ -469,7 +469,7 @@
 	x = rCopy.topLeft.x;
 	y = rCopy.topLeft.y;
 	rCopy.topLeft.x	-= rField.topLeft.x;
-	rCopy.topLeft.y	-= rField.topLeft.y;	
+	rCopy.topLeft.y	-= rField.topLeft.y;
 	SknCopyBits(skinDBP, skinBackgroundImageBottom, &rCopy, x, y);
 
 	FntSetFont(stdFont);
@@ -549,9 +549,9 @@
 				}
 			}
 		}
-		
+
 	}
-	
+
 	return 0;
 }
 
@@ -572,7 +572,7 @@
 
 		if (index < DmNumRecords(gameDB)) {
 			Boolean newValue;
-			
+
 			oldIndex = GamGetSelected();
 
 			if (oldIndex != index && oldIndex != dmMaxRecordIndex)
@@ -586,7 +586,7 @@
 
 			MemHandleUnlock(record);
 			DmReleaseRecord (gameDB, index, 0);
-			
+
 			lastIndex = index;
 			SknUpdateList();
 		}

Index: skin.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/skin.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- skin.h	1 Jan 2005 16:08:45 -0000	1.7
+++ skin.h	30 Jul 2005 21:10:48 -0000	1.8
@@ -22,7 +22,7 @@
 #ifndef __SKIN_H__
 #define __SKIN_H__
 
-// skin 
+// skin
 #define	sknInfoState		0
 #define	sknInfoPosX			1
 #define	sknInfoPosY			2

Index: snd_pa1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/snd_pa1.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- snd_pa1.cpp	6 Oct 2004 09:44:09 -0000	1.3
+++ snd_pa1.cpp	30 Jul 2005 21:10:48 -0000	1.4
@@ -30,11 +30,11 @@
 	if (OPTIONS_TST(kOptDeviceARM)) {
 		PnoDescriptor pno;
 		ARMPa1SndType userData = {src, dst, length};
-		
+
 		MemPtr armP =	_PnoInit(ARM_PA1SND, &pno);
 						_PnoCall(&pno, &userData);
 						_PnoFree(&pno, armP);
-		
+
 		return;
 	}
 */
@@ -49,7 +49,7 @@
 	signal = 0;
 	step = 0x7F;
 	length >>= 3;	// 16bit stereo -> 4bit mono
-	
+
 	do {
 
 		// high nibble
@@ -58,14 +58,14 @@
 		src++;
 		chan2 = ByteSwap16(*src);
 		src++;
-		
+
 		diff = ((chan1 + chan2) >> 1) - signal;
 #else
 		diff = ((*src++ + *src++) >> 1) - signal;
 #endif
 		diff <<= 3;
 		diff /= step;
-		
+
 		val = abs(diff) >> 1;
 
 		if (val  > 7)	val = 7;
@@ -85,7 +85,7 @@
 		src++;
 		chan2 = ByteSwap16(*src);
 		src++;
-		
+
 		diff = ((chan1 + chan2) >> 1) - signal;
 #else
 		diff = ((*src++ + *src++) >> 1) - signal;

Index: snd_stream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/snd_stream.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- snd_stream.cpp	24 Jun 2005 15:58:00 -0000	1.4
+++ snd_stream.cpp	30 Jul 2005 21:10:48 -0000	1.5
@@ -16,7 +16,7 @@
 			*dst++ = READ_LE_UINT32(src++);
 			*dst++ = READ_LE_UINT32(src++);
 		}
-		snd->set = false;	
+		snd->set = false;
 
 	} else {
 		snd->size = size;

Index: start.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/start.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- start.cpp	1 Jan 2005 16:08:45 -0000	1.12
+++ start.cpp	30 Jul 2005 21:10:48 -0000	1.13
@@ -104,9 +104,9 @@
  *              minimum requirement.
  *
  * PARAMETERS:  requiredVersion - minimum rom version required
- *                                (see sysFtrNumROMVersion in SystemMgr.h 
+ *                                (see sysFtrNumROMVersion in SystemMgr.h
  *                                for format)
- *              launchFlags     - flags that indicate if the application 
+ *              launchFlags     - flags that indicate if the application
  *                                UI is initialized.
  *
  * RETURNED:    error code or zero if rom is compatible
@@ -127,8 +127,8 @@
 			(sysAppLaunchFlagNewGlobals | sysAppLaunchFlagUIApp))
 			{
 			FrmAlert (RomIncompatibleAlert);
-		
-			// Palm OS 1.0 will continuously relaunch this app unless we switch to 
+
+			// Palm OS 1.0 will continuously relaunch this app unless we switch to
 			// another safe one.
 			if (romVersion <= kPalmOS10Version)
 				{
@@ -220,7 +220,7 @@
 			}
 		return true;
 		}
-	
+
 	return false;
 }
 
@@ -228,7 +228,7 @@
  *
  * FUNCTION:    AppEventLoop
  *
- * DESCRIPTION: This routine is the event loop for the application.  
+ * DESCRIPTION: This routine is the event loop for the application.
  *
  * PARAMETERS:  nothing
  *
@@ -263,8 +263,8 @@
  *
  * DESCRIPTION: This is the main entry point for the application.
  *
- * PARAMETERS:  cmd - word value specifying the launch code. 
- *              cmdPB - pointer to a structure that is associated with the launch code. 
+ * PARAMETERS:  cmd - word value specifying the launch code.
+ *              cmdPB - pointer to a structure that is associated with the launch code.
  *              launchFlags -  word value providing extra information about the launch.
  *
  * RETURNED:    Result of launch
@@ -295,7 +295,7 @@
 				}
 			}
 			break;
-		
+
 		case sysNotifyVolumeUnmountedEvent:
 			if (gPrefs) {
 				CardSlotFormUpdate();
@@ -350,9 +350,9 @@
 #endif
 			break;
 
-		case sysAppLaunchCmdNormalLaunch:	
+		case sysAppLaunchCmdNormalLaunch:
 			error = AppStart();
-			if (error) 
+			if (error)
 				goto end;
 
 			if (!bDirectMode) {
@@ -380,8 +380,8 @@
  *
  * DESCRIPTION: This is the main entry point for the application.
  *
- * PARAMETERS:  cmd - word value specifying the launch code. 
- *              cmdPB - pointer to a structure that is associated with the launch code. 
+ * PARAMETERS:  cmd - word value specifying the launch code.
+ *              cmdPB - pointer to a structure that is associated with the launch code.
  *              launchFlags -  word value providing extra information about the launch.
  * RETURNED:    Result of launch
  *

Index: start.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/start.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- start.h	1 Jan 2005 16:08:45 -0000	1.11
+++ start.h	30 Jul 2005 21:10:48 -0000	1.12
@@ -19,7 +19,7 @@
  * $Header$
  *
  */
- 
+
 #ifndef __START_H__
 #define __START_H__
 
@@ -33,7 +33,7 @@
 
 	//skin params
 	SkinInfoType skin;	//	card where is located the skin
-	Boolean soundClick;	
+	Boolean soundClick;
 	//
 	Boolean vibrator;
 	Boolean autoOff;
@@ -56,7 +56,7 @@
 	Boolean copyProtection;
 	Boolean arm;
 	Boolean altIntro;
-	
+
 	struct {
 		Boolean enable;
 		UInt8 mode;

Index: vibrate.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/vibrate.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vibrate.h	30 Apr 2003 11:33:19 -0000	1.1
+++ vibrate.h	30 Jul 2005 21:10:48 -0000	1.2
@@ -24,7 +24,7 @@
               SYS_TRAP(sysTrapHwrVibrateAttributes);
 
 /* to determine whether the vibrator is supported on a specific device, you
-** need to make sure that you are running on PalmOS 4.x (so that the 
+** need to make sure that you are running on PalmOS 4.x (so that the
 ** trap exists), that the attention manager exists and you need to check
 ** whether HwrVibrateAttributes(0, 1, &active) returns an error code of
 ** 0. ('active' is a Boolean).
@@ -42,14 +42,14 @@
 ** value is in ticks (1/100 seconds) */
 #define kHwrVibrateRate                       2
 
-/* *value points to a UInt32, specifying the pattern of vibrating 
+/* *value points to a UInt32, specifying the pattern of vibrating
 **
 ** example:
 **    0xFFFFFFFF    stay on, no vibrating
 **    0x0F0F0F0F    vibrate four times in equal intervals
 **    0xAAAAAAAA    vibrate really fast (not recommended)
 **    0x0F0F0000    vibrate twice, then pause
-*/ 
+*/
 #define kHwrVibratePattern                    3
 
 /* *value points to a UInt16, specifying the delay between two



