Removed trailing spaces.

svn-id: r30664

37 files changed, 353 insertions, 353 deletions

diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index b9640e61c1..ae10a7ed72 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -6,29 +6,29 @@ chdir("../../../");
 
 # list of project files to process
 @mmp_files = (
-	"mmp/scummvm_scumm.mmp", 
-	"mmp/scummvm_queen.mmp", 
-	"mmp/scummvm_agos.mmp", 
-	"mmp/scummvm_sky.mmp", 
-	"mmp/scummvm_gob.mmp", 
-	"mmp/scummvm_saga.mmp", 
-	"mmp/scummvm_kyra.mmp", 
-	"mmp/scummvm_sword1.mmp", 
-	"mmp/scummvm_sword2.mmp", 
-	"mmp/scummvm_lure.mmp", 
-	"mmp/scummvm_cine.mmp", 
-	"mmp/scummvm_agi.mmp", 
-	"mmp/scummvm_touche.mmp", 
-	"mmp/scummvm_parallaction.mmp", 
-	"mmp/scummvm_cruise.mmp", 
-	"mmp/scummvm_drascula.mmp", 
-	"mmp/scummvm_igor.mmp", 
-	"S60/ScummVM_S60.mmp",  
-	"S60v3/ScummVM_S60v3.mmp", 
-	"S80/ScummVM_S80.mmp", 
+	"mmp/scummvm_scumm.mmp",
+	"mmp/scummvm_queen.mmp",
+	"mmp/scummvm_agos.mmp",
+	"mmp/scummvm_sky.mmp",
+	"mmp/scummvm_gob.mmp",
+	"mmp/scummvm_saga.mmp",
+	"mmp/scummvm_kyra.mmp",
+	"mmp/scummvm_sword1.mmp",
+	"mmp/scummvm_sword2.mmp",
+	"mmp/scummvm_lure.mmp",
+	"mmp/scummvm_cine.mmp",
+	"mmp/scummvm_agi.mmp",
+	"mmp/scummvm_touche.mmp",
+	"mmp/scummvm_parallaction.mmp",
+	"mmp/scummvm_cruise.mmp",
+	"mmp/scummvm_drascula.mmp",
+	"mmp/scummvm_igor.mmp",
+	"S60/ScummVM_S60.mmp",
+	"S60v3/ScummVM_S60v3.mmp",
+	"S80/ScummVM_S80.mmp",
 	"S90/ScummVM_S90.mmp",
-	"UIQ2/ScummVM_UIQ2.mmp", 
-	"UIQ3/ScummVM_UIQ3.mmp" 
+	"UIQ2/ScummVM_UIQ2.mmp",
+	"UIQ3/ScummVM_UIQ3.mmp"
 );
 
 # do this first to set all *.mmp & *.inf files to *.*.in states
@@ -50,12 +50,12 @@ Preparing to update all the Symbian MMP project files with objects from module.m
 =======================================================================================
 
 ";
-	
+
 my @section_empty = (""); # section standard: no #ifdef's in module.mk files
 my @sections_scumm = ("", "DISABLE_SCUMM_7_8", "DISABLE_HE"); # special sections for engine SCUMM
 
 # files excluded from build, case insensitive, will be matched in filename string only
-my @excludes_snd = ( 
+my @excludes_snd = (
 	"mt32",
 	"fluidsynth",
 	"i386",
@@ -64,12 +64,12 @@ my @excludes_snd = (
 	"partialmanager.cpp",
 	"synth.cpp",
 	"tables.cpp",
-	"freeverb.cpp"        
-); 
+	"freeverb.cpp"
+);
 
-my @excludes_graphics = ( 
+my @excludes_graphics = (
 "iff.cpp"
-); 
+);
 
 my @excludes_scumm = (
 	"codec47ARM.cpp",
@@ -110,7 +110,7 @@ Done. Enjoy :P
 ##################################################################################################################
 ##################################################################################################################
 
-# parses multiple sections per mmp/module 
+# parses multiple sections per mmp/module
 sub ParseModule
 {
 	my ($mmp,$module,$sections,$exclusions) = @_;
@@ -135,7 +135,7 @@ sub CheckForModuleMK
 	if (-d $item)
 	{
 		#print "$item\n";
-		
+
 		opendir DIR, $item;
 		#my @Files = readdir DIR;
 		my @Files = grep s/^([^\.].*)$/$1/, readdir DIR;
@@ -153,7 +153,7 @@ sub CheckForModuleMK
 		my $sec = "";
 		my $ObjectsSelected = 0;
 		my $ObjectsTotal = 0;
-		
+
 		print "$item for section '$section' ... ";
 
 		open FILE, $item;
@@ -162,10 +162,10 @@ sub CheckForModuleMK
 
 		my $count = @lines;
 		print "$count lines";
-		
+
 		A: foreach $line (@lines)
 		{
-			# found a section? reset 
+			# found a section? reset
 			if ($line =~ /^ifndef (.*)/)
 			{
 				$sec = $1;
@@ -182,7 +182,7 @@ sub CheckForModuleMK
 					$line =~ s/ \\//; # remove possible trailing ' \'
 					$line =~ s/\//\\/g; # replace / with \
 					chop($line); # remove \n
-					
+
 					# do we need to skip this file? According to our own @exclusions array
 					foreach $exclusion (@exclusions)
 					{
@@ -192,7 +192,7 @@ sub CheckForModuleMK
 							next A;
 						}
 					}
-					
+
 					# do we need to skip this file? According to MACROs in .MMPs
 					foreach $DisableDefine (@DisableDefines)
 					{
@@ -202,7 +202,7 @@ sub CheckForModuleMK
 							next A;
 						}
 					}
-										
+
 					$ObjectsSelected++;
 					#print "\n         $line";
 					$output .= "SOURCE $line\n";
@@ -225,7 +225,7 @@ sub UpdateProjectFile
 	my $updated = " Updated @ ".localtime();
 	my $name;
 	my @mmp_files_plus_one = @mmp_files;
-	unshift @mmp_files_plus_one, "mmp/scummvm_base.mmp";	
+	unshift @mmp_files_plus_one, "mmp/scummvm_base.mmp";
 
 	foreach $name (@mmp_files_plus_one)
 	{
@@ -234,23 +234,23 @@ sub UpdateProjectFile
 		open FILE, "$file";
 		my @lines = <FILE>;
 		close FILE;
-		
+
 		my $onestr = join("",@lines);
-		
+
 		if ($onestr =~ /$n/)
 		{
 
 			print "      - $name @ $n updating ... ";
-	
+
 			$onestr =~ s/$a.*$b/$a$updated\n$output$b/s;
 			open FILE, ">$file";
 			print FILE $onestr;
 			close FILE;
-			
+
 			print "done.\n";
 		}
 	}
-		
+
 	$output = "";
 }
 
@@ -260,7 +260,7 @@ sub UpdateSlaveMacros
 {
 	my $updated = " Updated @ ".localtime();
 
-	my $name = "mmp/scummvm_base.mmp";	
+	my $name = "mmp/scummvm_base.mmp";
 	my $file = "$buildDir/$name";
 	print "Reading master MACROS from backends/symbian/$name ... ";
 
@@ -274,7 +274,7 @@ sub UpdateSlaveMacros
 	my $b = "\/\/STOP_$n\/\/";
 	$onestr =~ /$a(.*)$b/s;
 	my $macros = $1;
-	
+
 	my $libs_first = "\n// automagically enabled static libs from macros above\n";
 	my $libs_second = "STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs\n";
 	my $macro_counter = 0;
@@ -287,7 +287,7 @@ sub UpdateSlaveMacros
 		if ($line =~ /^.*MACRO\s*([0-9A-Z_]*)\s*\/\/\s*LIB\:(.*)$/)
 		{
 			my $macro = $1; my $lib = $2;
-			
+
 			# this macro enabled? then also add the .lib
 			if ($line =~ /^\s*MACRO\s*$macro/m)
 			{
@@ -298,10 +298,10 @@ sub UpdateSlaveMacros
 			{
 				# these are the non DISABLED_ libs
 				$libs_first .= "STATICLIBRARY	$lib\n" if ($macro =~ /^DISABLE_/);
-				
+
 				# add projects for BLD.INF's
 				my $projectname = substr("$lib",0,-4);
-				$projects .= "..\\mmp\\$projectname.mmp\n" if ($macro =~ /^DISABLE_/);				
+				$projects .= "..\\mmp\\$projectname.mmp\n" if ($macro =~ /^DISABLE_/);
 			}
 			$macro_counter++;
 		}
@@ -312,7 +312,7 @@ sub UpdateSlaveMacros
 			$macros2 .= "$line\n";
 			push @DisableDefines, $macro; # used in CheckForModuleMK()!!
 		}
-	}		
+	}
 
 	print "$macro_counter macro lines.\n";
 
@@ -323,23 +323,23 @@ sub UpdateSlaveMacros
 	$m = "AUTO_PROJECTS";
 	$p = "\/\/START_$m\/\/";
 	$q = "\/\/STOP_$m\/\/";
-	
+
 	foreach $name (@mmp_files)
 	{
 		$file = "$buildDir/$name";
 		$fileBLDINF = $buildDir .'/'. substr($name, 0, rindex($name, "/")) . "/BLD.INF";
 		print "Updating macros   in $file ... ";
 		#print "Updating macros in backends/symbian/$name ... ";
-	
+
 		open FILE, "$file";	@lines = <FILE>; close FILE;
 		$onestr = join("",@lines);
-	
+
 		my $extralibs = ""; # output
 		# slash in name means it's a phone specific build file: add LIBs
 		$extralibs .= "$libs_first$libs_second" if (-e $fileBLDINF);
-		
+
 		$onestr =~ s/$a.*$b/$a$updated$macros2$extralibs$b/s;
-		
+
 		open FILE, ">$file"; print FILE $onestr; close FILE;
 
 		my $count = @lines;
@@ -353,13 +353,13 @@ sub UpdateSlaveMacros
 
 			open FILE, "$fileBLDINF";	@lines = <FILE>; close FILE;
 			$onestr = join("",@lines);
-		
+
 			$onestr =~ s/$p.*$q/$p$updated$projects$q/s;
-			
+
 			open FILE, ">$fileBLDINF"; print FILE $onestr; close FILE;
 		}
 	}
-}		
+}
 
 ##################################################################################################################
 
@@ -367,10 +367,10 @@ sub ResetProjectFiles()
 {
 	my $onestr, @lines;
 	my @mmp_files_plus_one = @mmp_files;
-#	unshift @mmp_files_plus_one, "mmp/scummvm_base.mmp";	
-	
+#	unshift @mmp_files_plus_one, "mmp/scummvm_base.mmp";
+
 	print "Resetting project files: ";
-	
+
 	# we don't need to do mmp/scummvm_base.mmp", it was done in BuildPackageUpload.pl before the call to this script
 	foreach $name (@mmp_files_plus_one)
 	{
@@ -390,7 +390,7 @@ sub ResetProjectFiles()
 			$onestr = join("",@lines);
 			open FILE, ">$fileBLDINF"; print FILE $onestr; close FILE;
 		}
-	}	
+	}
 
 	print "... done.\n";
 }
diff --git a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
index 7a4d6e21e2..7b07993c4e 100644
--- a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
+++ b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
@@ -92,7 +92,7 @@ while( ($SDK, $Value) = each(%SDK_Variations) )
 					push @Packages, sprintf($file_tpl_sis, $version_tpl_sis, $SDK2, $Extra);
 					$PackagesQueued++;
 				}
-			}	
+			}
 		}
 		else
 		{
@@ -118,7 +118,7 @@ Preparing to Build, Package & Upload $PackagesQueued SymbianOS ScummVM variation
 
 	SDKs inst'd  \t$SDKs	".(	%SDK_LibraryDirs ? "
 	LIBs inst'd  \t$LIBs	" : "" )."
-	$PackagesQueued Variations \t$PackagesStr	
+	$PackagesQueued Variations \t$PackagesStr
 	DIR base     \t$base_dir
 	    build    \t$build_dir
 	    output   \t$output_dir
@@ -126,7 +126,7 @@ Preparing to Build, Package & Upload $PackagesQueued SymbianOS ScummVM variation
 	FTP host     \t$FTP_Host
 	    user     \t$FTP_User
 	    pass     \t"."*" x length($FTP_Pass)."
-	    dir      \t$FTP_Dir	
+	    dir      \t$FTP_Dir
 " : "" )."
 =======================================================================================
 Press Ctrl-C to abort or enter to continue Build, Package & Upload $PackagesQueued Variations...
@@ -142,7 +142,7 @@ unlink($build_log_out);
 unlink($build_log_err);
 
 # init _base.mmp now, so we can start changing it without affecting the CVS version _base.mmp.in!
-my $name = "mmp/scummvm_base.mmp";	
+my $name = "mmp/scummvm_base.mmp";
 my $file  = "$build_dir/$name";
 open FILE, "$file.in";	@lines = <FILE>; close FILE;
 my $onestr = join("",@lines);
@@ -164,7 +164,7 @@ while( ($SDK, $Value) = each(%SDK_LibraryDirs) )
 					$LibrariesQueued++;
 					DoLibrary($SDK2, $Library, $Path);
 				}
-			}	
+			}
 		}
 		else
 		{
@@ -194,7 +194,7 @@ while( ($SDK, $VariationsHash) = each(%SDK_Variations) )
 				{
 					DoVariation($SDK2, $Variation, $MacroBlock);
 				}
-			}	
+			}
 		}
 		else
 		{
@@ -248,7 +248,7 @@ print "       SumthinWicked wishes you a ridiculously good and optimally happy d
 ##################################################################################################################
 ##################################################################################################################
 
-# Build, Package & Upload a single Variation 
+# Build, Package & Upload a single Variation
 sub DoLibrary
 {
 	my ($SDK, $Library, $Path) = @_;
@@ -278,19 +278,19 @@ my $header = "
 	my $OK = 1;
 
 	PrepSdkPaths($SDK);
-	
+
 	chdir($Path) or $OK=0;
 	PrintErrorMessage("Changing to $Path failed!") if (!$OK);
-	return 0 if (!$OK);	
+	return 0 if (!$OK);
 
 	PrintMessage("Cleaning for $Target") if (!$ReallyQuiet);
 	system("bldmake bldfiles > NUL 2> NUL");
 	PrintErrorMessage("'bldmake bldfiles' exited with value " . ($? >> 8)) if ($? >> 8);
 	system("abld clean $TargetName urel > NUL 2> NUL");
-	PrintErrorMessage("'abld clean $TargetName urel' exited with value " . ($? >> 8)) if ($? >> 8);	
+	PrintErrorMessage("'abld clean $TargetName urel' exited with value " . ($? >> 8)) if ($? >> 8);
 	# remove file so we are sure that after .lib generation we have a fresh copy!
 	if (-e $TargetFilePath) { unlink($TargetFilePath) or PrintErrorMessage("Removing $TargetFilePath"); }
-	
+
 	my $Redirection = "OUT:file, ERR:".($RedirectSTDERR ? "file" : "screen");
 	my $Message = "Building $Target ($Redirection)";
 	PrintMessage($Message) if (!$ReallyQuiet);
@@ -302,14 +302,14 @@ my $header = "
 	$OK = 0 if ($? >> 8);
 #	print "  STDERR: ".((-s $build_log_err)-$OldSize)." bytes output written to $build_log_err\n+--------------------------------------------------------------------------------------\n" if ($OldSize != (-s $build_log_err));
 	PrintErrorMessage("'abld build $TargetName urel' exited with value " . ($? >> 8)) if ($? >> 8);
-	return 0 if (!$OK); # ABLD always returns ok :( grr	
+	return 0 if (!$OK); # ABLD always returns ok :( grr
 	PrintMessage("Done.") if (!$ReallyQuiet);
 
 	# did it work? :)
 	if (-e $TargetFilePath)
 	{
 		$LibrariesSucceeded++;
-		
+
 		if ($TargetIntermediatePath ne '' && $TargetIntermediatePath =~ /\\EPOC32\\BUILD\\/i) # make really sure it's a valid path!
 		{
 			system("del /S /Q $TargetIntermediatePath > NUL");
@@ -330,12 +330,12 @@ my $header = "
 
 ##################################################################################################################
 
-# Build, Package & Upload a single Variation 
+# Build, Package & Upload a single Variation
 sub DoVariation
 {
 	my ($SDK, $Variation, $MacroBlock) = @_;
 	my $Extra = ($Variation ne '' ? "_$Variation" : "");
-	my $Package = sprintf($file_tpl_sis, $version_tpl_sis, $SDK, $Extra);	
+	my $Package = sprintf($file_tpl_sis, $version_tpl_sis, $SDK, $Extra);
 
 	if ($SkipExistingPackages && -f "$output_dir/$Package")
 	{
@@ -366,7 +366,7 @@ my $header = "
 	if ($OK)
 	{
 		$OK = BuildVariation($SDK, $Variation, $Package, $MacroBlock);
-	
+
 		if ($OK && $FTP_Host ne '')
 		{
 			UploadVariation($SDK, $Variation, $Package);
@@ -382,17 +382,17 @@ sub PrepVariation()
 	my $OK = 1;
 
 	PrepSdkPaths($SDK);
-	
+
 	chdir($build_dir) or $OK=0;
 	PrintErrorMessage("Changing to $build_dir failed!") if (!$OK);
-	return 0 if (!$OK);	
+	return 0 if (!$OK);
 
 	# insert $MacroBlock into AUTO_MACRO_MASTER in scummvm_base.mmp
 	PrintMessage("Setting new AUTO_MACROS_MASTER in scummvm_base.mmp for '$Variation'") if (!$ReallyQuiet);
 	my $n = "AUTO_MACROS_MASTER";
 	my $a = "\/\/START_$n\/\/";
 	my $b = "\/\/STOP_$n\/\/";
-	my $name = "scummvm_base.mmp";	
+	my $name = "scummvm_base.mmp";
 	my $file = "$build_dir/mmp/$name";
 	my $updated = " Updated @ ".localtime();
 
@@ -401,11 +401,11 @@ sub PrepVariation()
 	return 0 if (!$OK);
 	my @lines = <FILE>;
 	close FILE;
-	
+
 	my $onestr = join("",@lines);
 	$MacroBlock =~ s/^\s*//gm;
 	$onestr =~ s/$a(.*)$b/$a$updated\n$ExtraMacros$MacroBlock$b/s;
-	
+
 	open FILE, ">$file" or $OK=0;
 	PrintErrorMessage("Writing file '$file'") if (!$OK);
 	return 0 if (!$OK);
@@ -418,7 +418,7 @@ sub PrepVariation()
 	$OK = 0 if ($? >> 8);
 	PrintErrorMessage("'AdaptAllMMPs.pl' exited with value " . ($? >> 8)) if ($? >> 8);
 	return 0 if (!$OK);
-	
+
 	# we are here: so all is ok :)
 	return 1;
 }
@@ -431,7 +431,7 @@ sub BuildVariation()
 	my $TargetName = $SDK_TargetName{$SDK};
 	my $TargetDir  = $SDK_TargetDir{$SDK};
 	my $OK = 1;
-	
+
 	my $dir = $build_dir."/".$SDK_BuildDirs{$SDK};
 	$dir =~ s#/#\\#g;
 	chdir($dir);
@@ -454,8 +454,8 @@ sub BuildVariation()
 	PrintErrorMessage("'bldmake bldfiles' exited with value " . ($? >> 8)) if ($? >> 8);
 
 	system("abld clean $TargetName urel 2> NUL > NUL");
-	PrintErrorMessage("'abld clean $TargetName urel' exited with value " . ($? >> 8)) if ($? >> 8);	
-	
+	PrintErrorMessage("'abld clean $TargetName urel' exited with value " . ($? >> 8)) if ($? >> 8);
+
 	my $Redirection = "OUT:file, ERR:".($RedirectSTDERR ? "file" : "screen");
 	my $Message = "Building $Package ($Redirection)";
 	PrintMessage($Message) if (!$ReallyQuiet);
@@ -467,7 +467,7 @@ sub BuildVariation()
 	$OK = 0 if ($? >> 8);
 	print "  STDERR: ".((-s $build_log_err)-$OldSize)." bytes output written to $build_log_err\n+--------------------------------------------------------------------------------------\n" if ($OldSize != (-s $build_log_err) && !$ReallyQuiet);
 	PrintErrorMessage("'abld build $TargetName urel' exited with value " . ($? >> 8)) if ($? >> 8);
-	return 0 if (!$OK); # ABLD always returns ok :( grr	
+	return 0 if (!$OK); # ABLD always returns ok :( grr
 	PrintMessage("Done.") if (!$ReallyQuiet);
 
 	# do we have an override suffix for the package name?
@@ -491,7 +491,7 @@ sub BuildVariation()
 	if (-e "$output_dir/$Package")
 	{
 		$PackagesCreated++;
-		
+
 		if ($TargetIntermediatePath ne '' && $TargetIntermediatePath =~ /\\EPOC32\\BUILD\\/i) # make really sure it's a valid path!
 		{
 			#PrintMessage("Cleaning $TargetIntermediatePath");
@@ -514,7 +514,7 @@ sub UploadVariation()
 
 	use Net::FTP;
 	my $newerr;
-	
+
 	PrintMessage("Connecting to FTP $FTP_Host") if (!$ReallyQuiet);
 
 	$ftp = Net::FTP->new($FTP_Host,Timeout=>240) or $newerr=1;
@@ -529,7 +529,7 @@ sub UploadVariation()
 			{
 				PrintMessage("Changing to dir $FTP_Dir");
 				$ftp->cwd($FTP_Dir) or $newerr=1;
-				
+
 				if ($newerr)
 				{
 					PrintErrorMessage("Changing to dir $FTP_Dir! Aborting!");
@@ -541,20 +541,20 @@ sub UploadVariation()
 # leave this for possible auto-deletion of old files?
 #			@files = $ftp->dir or $newerr=1;
 #			  push @ERRORS, "Can't get file list $!\n" if $newerr;
-#			print "Got  file list\n";   
+#			print "Got  file list\n";
 #			foreach(@files) {
 #			  print "$_\n";
 #			}
-		
+
 			PrintMessage("Uploading $Package (".(-s "$output_dir/$Package")." bytes)");
-			
+
 			$ftp->binary;
 			$ftp->put("$output_dir/$Package") or $newerr=1;
 			PrintErrorMessage("Uploading package! Aborting!") if $newerr;
 			$PackagesUploaded++ if (!$newerr);
-		}		
+		}
 
-		$ftp->quit;	
+		$ftp->quit;
 	}
 }
 
@@ -594,7 +594,7 @@ sub CleanupPath()
 	{
 		$path =~ s/\"\Q$ECompXL_BinDir\E\";//g;
 	}
-	
+
 	while( ($SDK, $RootDir) = each(%SDK_RootDirs) )
 	{
 		if ($SDK_RootDirs{$SDK} ne '')
@@ -602,8 +602,8 @@ sub CleanupPath()
 			my $path_component = "\"".$SDK_RootDirs{$SDK}."\\epoc32\\";
 			$path =~ s/\Q$path_component\E.*?\";//g;
 		}
-	}	
-	
+	}
+
 	return $path;
 }
 
@@ -634,4 +634,4 @@ sub PrintMessage()
 }
 
 ##################################################################################################################
- 
\ No newline at end of file
+
diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index 0d8efd5913..0275c2acd7 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -1,13 +1,13 @@
 
 ##################################################################################################################
 
-	# you can use these below for speed & clarity or override with custom settings	
+	# you can use these below for speed & clarity or override with custom settings
 	$DefaultTopMacros = "
 		MACRO			USE_ZLIB			// LIB:zlib.lib
 		MACRO			USE_MAD				// LIB:libmad.lib
 		MACRO			USE_TREMOR			// LIB:libtremor.lib
 	";
-		
+
 	$DefaultBottomMacros = "
 		MACRO			DISABLE_SWORD1		// LIB:scummvm_sword1.lib
 		MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
@@ -31,7 +31,7 @@
 		$HaltOnError = 1;
 		$SkipExistingPackages = 0;
 		$ReallyQuiet = 0;
-		
+
 		# specify an optional FTP server to upload to after each Build+Package (can leave empty)
 		#$FTP_Host = "host.domain";
 		#$FTP_User = "test";
@@ -42,7 +42,7 @@
 		$FTP_User = "something";
 		$FTP_Pass = "password";
 		$FTP_Dir  = "cvsbuilds";
-	
+
 		# possible SDKs: ("UIQ2", UIQ3", "S60v1", "S60v2", "S60v3", "S80", "S90")
 		# Note1: the \epoc32 directory needs to be in these rootdirs
 		# Note2: these paths do NOT end in a backslash!
@@ -67,12 +67,12 @@
 			#$SDK_LibraryDirs{'S90'}{'esdl.lib'}		= "C:\\S\\ESDL\\epoc\\S90";
 			#$SDK_LibraryDirs{'ALL'}{'libmpeg2.lib'} = "C:\\S\\mpeg2dec-0.4.0\\epoc";
 		}
-			
+
 		# backup :P
 		#Path=C:\Progra~1\Active\Python24\.;C:\Program Files\Active\Tcl\bin;C:\Progra~1\Active\Perl\bin\;C:\WINDOWS\system32;C:\W
 		#INDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel;C:\Program Files\GNU\cvsnt;C:\Progra
 		#m Files\WinSCP3\;"C:\Program Files\Common Files\Microsoft Shared\VSA\8.0\VsaEnv\";"c:\Program Files\Microsoft Visual Stu
-		#dio 8\VC\bin";"C:\Program Files\UltraEdit-32"		
+		#dio 8\VC\bin";"C:\Program Files\UltraEdit-32"
 	}
 	elsif ($ENV{'COMPUTERNAME'} eq "TSSLND0106")
 	{
@@ -81,12 +81,12 @@
 		$HaltOnError = 0;
 		$SkipExistingPackages = 0;
 		$ReallyQuiet = 0;
-		
+
 		#$FTP_Host = "host.com";
 		#$FTP_User = "ag@host.com";
 		#$FTP_Pass = "password";
 		#$FTP_Dir  = "cvsbuilds";
-		
+
 		#$SDK_RootDirs{'UIQ2'}= "C:\\UIQ2";
 		$SDK_RootDirs{'UIQ3'}= "C:\\UIQ3";
 		#$SDK_RootDirs{'S60v1'}= "C:\\S60v1";
@@ -115,12 +115,12 @@ elsif ($ENV{'COMPUTERNAME'} eq "BIGMACHINE")
 		$HaltOnError = 0;
 		$SkipExistingPackages = 1;
 		$ReallyQuiet = 1;
-		
+
 		#$FTP_Host = "host.com";
 		#$FTP_User = "ag@host.com";
 		#$FTP_Pass = "password";
 		#$FTP_Dir  = "cvsbuilds";
-		
+
 		#$SDK_RootDirs{'UIQ2'}= "E:\\UIQ2";
 		$SDK_RootDirs{'UIQ3'}= "E:\\UIQ3";
 		#$SDK_RootDirs{'S60v1'}= "E:\\S60v1";
@@ -146,7 +146,7 @@ if (0) # so we can turn them on/off easily
 	}
 	else
 	{
-		print "ERROR: Computer name ".$ENV{'COMPUTERNAME'}." not recognized! Plz edit _LocalSettings.pl!"; 
+		print "ERROR: Computer name ".$ENV{'COMPUTERNAME'}." not recognized! Plz edit _LocalSettings.pl!";
 		exit 1;
 	}
 
@@ -156,7 +156,7 @@ if (0) # so we can turn them on/off easily
 
 	# second hash index = literal string used in .sis file created.
 	# empty string also removes the trailing '_'. Some 051101 examples:
-	
+
 	# $SDK_Variations{'UIQ2'}{''} would produce:
 	#   scummvm-051101-SymbianUIQ2.sis
 
@@ -187,7 +187,7 @@ if (0) # so we can turn them on/off easily
 if (1) # all regular combo's
 {
 	# the first one includes all SDKs & release-ready engines
-	
+
 	$SDK_Variations{'ALL'}{'all'} = "$DefaultTopMacros
 		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
 		//MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
@@ -206,7 +206,7 @@ if (1) # all regular combo's
 	$DefaultBottomMacros";
 
 	# now one for each ready-for-release engine
-	
+
 	$SDK_Variations{'ALL'}{'scumm'} = "$DefaultTopMacros
 		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
 		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
@@ -217,7 +217,7 @@ if (1) # all regular combo's
 		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib	
+		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
 		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 		MACRO			DISABLE_IGOR		// LIB:scummvm_igor.lib
 	$DefaultBottomMacros";
@@ -247,7 +247,7 @@ if (1) # all regular combo's
 		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib	
+		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
 		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 		MACRO			DISABLE_IGOR		// LIB:scummvm_igor.lib
 	$DefaultBottomMacros";
@@ -305,9 +305,9 @@ if (1) # all regular combo's
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
 		//MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib		
+		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
-		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib	
+		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
 		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 		MACRO			DISABLE_IGOR		// LIB:scummvm_igor.lib
 	$DefaultBottomMacros";
@@ -317,7 +317,7 @@ if (1) # all regular combo's
 	$SDK_Variations{'ALL'}{'saga_mini'} = "
 		//MACRO			USE_ZLIB			// LIB:zlib.lib
 		//MACRO			USE_MAD				// LIB:libmad.lib
-		//MACRO			USE_TREMOR			// LIB:libtremor.lib		
+		//MACRO			USE_TREMOR			// LIB:libtremor.lib
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
 		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
@@ -325,9 +325,9 @@ if (1) # all regular combo's
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
 		//MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
 		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib		
+		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
-		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib		
+		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
 		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 		MACRO			DISABLE_IGOR		// LIB:scummvm_igor.lib
 	$DefaultBottomMacros";
@@ -337,7 +337,7 @@ if (1) # all regular combo's
 #		MACRO			USE_MAD				// LIB:libmad.lib
 #		//MACRO			USE_TREMOR			// LIB:libtremor.lib
 #		MACRO			DISABLE_SCUMM_7_8
-#		MACRO			DISABLE_SCUMM_HE		
+#		MACRO			DISABLE_SCUMM_HE
 #		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
 #		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 #		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
@@ -345,17 +345,17 @@ if (1) # all regular combo's
 #		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
 #		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
 #		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-#		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib		
+#		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
 #		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
-#		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib		
+#		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
 #		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 #	$DefaultBottomMacros";
-	
+
 #	$SDK_Variations{'ALL'}{'all_vorbis'} = "
 #		MACRO			USE_ZLIB			// LIB:zlib.lib
 #		MACRO			USE_MAD				// LIB:libmad.lib
 #		MACRO			USE_TREMOR			// LIB:libtremor.lib
-#		
+#
 #		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
 #		//MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 #		//MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
@@ -372,10 +372,10 @@ if (1) # all regular combo's
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
-		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib				
+		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 		//MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_agi.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib			
+		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
 		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 		MACRO			DISABLE_IGOR		// LIB:scummvm_igor.lib
 	$DefaultBottomMacros";
@@ -388,10 +388,10 @@ if (1) # all regular combo's
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
-		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib				
+		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		//MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib		
+		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
 		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 		MACRO			DISABLE_IGOR		// LIB:scummvm_igor.lib
 	$DefaultBottomMacros";
@@ -403,7 +403,7 @@ if (1) # all regular combo's
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB		// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
-		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib				
+		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
 		//MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
@@ -419,16 +419,16 @@ if (1) # all regular combo's
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB		// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
-		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib		
+		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib	
+		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
 		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 		//MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
 		MACRO			DISABLE_SWORD1		// LIB:scummvm_sword1.lib
 		MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
-		MACRO			DISABLE_PARALLACTION	// LIB:scummvm_parallaction.lib	
-		MACRO			DISABLE_DRASCULA	// LIB:scummvm_drascula.lib		
+		MACRO			DISABLE_PARALLACTION	// LIB:scummvm_parallaction.lib
+		MACRO			DISABLE_DRASCULA	// LIB:scummvm_drascula.lib
 		MACRO			DISABLE_IGOR		// LIB:scummvm_igor.lib
 	";
 }
diff --git a/backends/platform/symbian/README b/backends/platform/symbian/README
index 1ed9c6faf6..0f9df338c3 100644
--- a/backends/platform/symbian/README
+++ b/backends/platform/symbian/README
@@ -1,20 +1,20 @@
 
  ScummVM - ScummVM ported to EPOC/SymbianOS
- 
+
  Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson
  Copyright (C) 2007 Lars 'AnotherGuest' Persson
  Copyright (C) 2007 Jurgen 'SumthinWicked' Braam
  Copyright (C) 2007 ScummVM Team
- 
- $Id$ 
- 
- 
+
+ $Id$
+
+
 About ScummVM
 --------------
 	The original ports (uptil 0.7.1) were made by Andreas Karlsson and Lars Persson.
 	The main transition to 0.8.0CVS and all relevant changes were done by Jurgen Braam.
 	Jurgen and Lars have successfully transfered all needed changes into CVS, with additional helpful tools for Symbian OS
-	
+
 	Release version: 0.10.0
 	* This version is only supported on Symbian OS 9 devices due to compiler constraints for older devices. (That means UIQ3 and S60V3 devices)
 	* Updated to SDL version 1.2.11 (previous version used was 1.2.8)
@@ -30,13 +30,13 @@ Games supported
 
 
 Building ScummVM
----------------------   
+---------------------
 
 	Nescessary components
 	---------------------
 	Building ScummVM yourself using the UIQ 2.1/Nokia S60 SDK/Nokia S80 SDK/Nokia S90 SDK framework is not an easy task!
-	Lets just say the framework needs quite some time to set up and takes a while 
-	to get used to. If you choose to continue you will need the following items: 
+	Lets just say the framework needs quite some time to set up and takes a while
+	to get used to. If you choose to continue you will need the following items:
 
 	- UIQ 2.1 SDK (To build for UIQ2 devices);
 	  http://www.symbian.com/developer/sdks_uiq.asp
@@ -49,13 +49,13 @@ Building ScummVM
 
 	- ECompXL, an EPOC application compression library
 	  http://www.yipton.demon.co.uk/ecompxl/latest/readme.html (To build for UIQ devices)
-	  
-	- libsdl, Simple Directmedia Layer, a cross-platform multimedia library 
+
+	- libsdl, Simple Directmedia Layer, a cross-platform multimedia library
 	  http://www.libsdl.org/ (see note about ESDL below)
 
 	- libmad, a high-quality MPEG audio decoder
-	  http://www.underbit.com/products/mad/ 
-	
+	  http://www.underbit.com/products/mad/
+
 	- zlib, a massively spiffy yet delicately unobtrusive compression library
 	  http://www.zlib.net/
 
@@ -63,60 +63,60 @@ Building ScummVM
 
 	- libogg, the free media file container format
 	  http://www.xiph.org/ogg/
-	
+
 	- libvorbis, the free audio codec
 	  http://www.vorbis.com/
-	  
+
 	- flac, the Free Lossless Audio Codec
 	  http://flac.sourceforge.net/
-	  
+
 	- libmpeg2, a free MPEG-2 video stream decoder
 	  http://libmpeg2.sourceforge.net/
 
 
 	Compiling ScummVM
 	-----------------
-	
-	ECompXL (Only needed for UIQ2): 
+
+	ECompXL (Only needed for UIQ2):
 	this is a tool that will compress your executable with GZIP and glue
 	it to a predefined loader app. The app will uncompress your application at
 	runtime and run it without you even knowing it. A really interesting byproduct
-	of this method is that the general restriction of not having any writeable 
+	of this method is that the general restriction of not having any writeable
 	static data (WSD) for Symbian APP executables no longer applies. This makes
 	the life of an EPOC porter a lot easier! To install this tool you need to add
 	its \bin path to your PATH above the sybmian epocs32\tools path, so that ECompXL's
-	PETRAN.EXE will be the executable that is started. 
+	PETRAN.EXE will be the executable that is started.
 
-	
-	SDL: the latest version of SDL at this point in time is 1.2.12. This version 
+
+	SDL: the latest version of SDL at this point in time is 1.2.12. This version
 	works great for compiling on other platforms.
-	
-	zlib: the zlib-x.x.x.tar.gz does not come with UIQ .mpp build files, that's why 
-	I added them for you in epoc-zlib.zip. Extract in <DevRoot>/zlib/ which will 
+
+	zlib: the zlib-x.x.x.tar.gz does not come with UIQ .mpp build files, that's why
+	I added them for you in epoc-zlib.zip. Extract in <DevRoot>/zlib/ which will
 	create the epoc dir. In <DevRoot>/zlib/epoc/ go:
 	> bldmake bldfiles
 	> abld build
 
 	libmad: the libmad-x.x.x.tar.gz does not come with UIQ .mpp build files, that's
-	why I added them for you in epoc-libmad.zip. Extract in <DevRoot>/libmad/ which 
+	why I added them for you in epoc-libmad.zip. Extract in <DevRoot>/libmad/ which
 	will create the epoc dir. In <DevRoot>/libmad/epoc/ go:
 	> bldmake bldfiles
 	> abld build
 
-	ScummVM:	
+	ScummVM:
 	In <DevRoot>\scummvm\backends\platform\symbian\ go:
-	a) Edit and update the BuildPackageUpload_LocalSettings.pl for the kind of build (SDK installed etc) and variants 
+	a) Edit and update the BuildPackageUpload_LocalSettings.pl for the kind of build (SDK installed etc) and variants
 	   you want to build.
-      b) Run BuildPackageUpload_AllVersions.pl to build all the targets/variants that you have configured. 
+      b) Run BuildPackageUpload_AllVersions.pl to build all the targets/variants that you have configured.
 	   A detailed log will be placed in the symbian folder with Build.err.log and Build.out.log but it also depends on
 	   the configuration you select.
-	
-	Now you should have yourself a nice ScummVM_xxx.sis installer package in the packages folder for use 
+
+	Now you should have yourself a nice ScummVM_xxx.sis installer package in the packages folder for use
 	on your phone. Please note that for development it will be a lot faster if you
 	transfer the SCUMMVM.APP/Scummvm.EXE file directly to your !:\system\apps\ScummVM\ dir!
 
 	Platforms can be one of: ARMi, ARM4, THUMB, WINS, WINSCW, GCCE. The SE P900 uses the ARMi platform,
-	which is a combined ARM4/THUMB programming mode. Configurations can be one of: 
+	which is a combined ARM4/THUMB programming mode. Configurations can be one of:
 	UREL or UDEB.
 
 
@@ -130,11 +130,11 @@ Greetz & such
 	- the entire ScummVM Dev team for making a kicka$$ program
 	- the folks in #scummvm @ irc.freenode.net for their help, confort and support
 	- everybody else who wants to give me 'the look' for not including them here :P
-	
+
 
 	it's been swell,
 	gotta go now,
-	
+
 	greetz,
 	SumthinWicked & Anotherguest
-	
+
diff --git a/backends/platform/symbian/S60/ScummVM_S60.mmp.in b/backends/platform/symbian/S60/ScummVM_S60.mmp.in
index 83aba4e2f2..2720264971 100644
--- a/backends/platform/symbian/S60/ScummVM_S60.mmp.in
+++ b/backends/platform/symbian/S60/ScummVM_S60.mmp.in
@@ -65,7 +65,7 @@ USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
+SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
@@ -86,8 +86,8 @@ SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
 SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\platform\symbian\src\SymbianOS.cpp 
-SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
 SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
@@ -99,8 +99,8 @@ source graphics\iff.cpp
 
 // *** Dynamic Libraries
 
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
+LIBRARY cone.lib  eikcore.lib
+LIBRARY euser.lib apparc.lib fbscli.lib
 LIBRARY estlib.lib apgrfx.lib
 LIBRARY gdi.lib hal.lib bitgdi.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
diff --git a/backends/platform/symbian/S60/ScummVM_S60_App.mmp b/backends/platform/symbian/S60/ScummVM_S60_App.mmp
index 6caf91009b..0f58881584 100644
--- a/backends/platform/symbian/S60/ScummVM_S60_App.mmp
+++ b/backends/platform/symbian/S60/ScummVM_S60_App.mmp
@@ -43,7 +43,7 @@ sourcepath ..
 AIF			ScummVm.Aif ..\res\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp
 
 // libraries
-LIBRARY cone.lib  EIKCORE.lib 
-LIBRARY euser.lib apparc.lib  
+LIBRARY cone.lib  EIKCORE.lib
+LIBRARY euser.lib apparc.lib
 LIBRARY efsrv.lib  apgrfx.lib
 LIBRARY	avkon.lib
diff --git a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
index 9bb133c67f..bf3c69ae08 100644
--- a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
+++ b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
@@ -15,8 +15,8 @@
 ; along with this program; if not, write to the Free Software
 ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ;
-; $URL: 
-; $Id: 
+; $URL:$
+; $Id:$
 ;
 ;
 
@@ -60,4 +60,4 @@
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
\ No newline at end of file
+; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/platform/symbian/S60v3/ScummVM_Loc.rss b/backends/platform/symbian/S60v3/ScummVM_Loc.rss
index 83a8cfcc4c..d6800b3b20 100644
--- a/backends/platform/symbian/S60v3/ScummVM_Loc.rss
+++ b/backends/platform/symbian/S60v3/ScummVM_Loc.rss
@@ -9,9 +9,9 @@ RESOURCE LOCALISABLE_APP_INFO
 			{
 			// The caption text is defined in the rls file
 			caption = "ScummVM";
-			// Icons are used to represent applications in the 
+			// Icons are used to represent applications in the
 			// application launcher and application title bar.
-			// The number_of_icons value identifies how many icons 
+			// The number_of_icons value identifies how many icons
 			// that exist in the icon_file.
 			number_of_icons = 3;
 			// Using the application icons.
diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
index ba5242bdfc..ae43031356 100644
--- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
@@ -30,7 +30,7 @@ TARGET          ScummVM.exe
 TARGETPATH      sys\bin
 TARGETTYPE      exe
 
-UID             0x100039ce 0xA0000657 
+UID             0x100039ce 0xA0000657
 
 START RESOURCE  ScummVM_reg.rss
 TARGETPATH              \private\10003a3f\apps
@@ -48,7 +48,7 @@ TARGETPATH              \Resource\Apps
 LANG                    SC
 END
 
-EPOCSTACKSIZE	80000 
+EPOCSTACKSIZE	80000
 EPOCHEAPSIZE	3000000 32000000
 
 START BITMAP    ScummVM.mbm
@@ -91,7 +91,7 @@ USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
+SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
@@ -112,8 +112,8 @@ SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
 SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\abstract-fs-factory.cpp
-SOURCE backends\platform\symbian\src\SymbianOS.cpp 
-SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
 SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
@@ -124,8 +124,8 @@ SOURCE gui\Actions.cpp
 source graphics\iff.cpp
 
 // *** Dynamic Libraries
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
+LIBRARY cone.lib  eikcore.lib
+LIBRARY euser.lib apparc.lib fbscli.lib
 LIBRARY estlib.lib apgrfx.lib
 LIBRARY gdi.lib hal.lib bitgdi.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
diff --git a/backends/platform/symbian/S60v3/icons.mk b/backends/platform/symbian/S60v3/icons.mk
index 5f17dd7b8b..fdd09bffc4 100644
--- a/backends/platform/symbian/S60v3/icons.mk
+++ b/backends/platform/symbian/S60v3/icons.mk
@@ -20,7 +20,7 @@ LIB : do_nothing
 

 CLEANLIB : do_nothing

 

-RESOURCE :	

+RESOURCE :

 	mifconv $(ICONTARGETFILENAME) \

 	/c32 ..\res\scummvm.svg

 

@@ -31,4 +31,4 @@ SAVESPACE : do_nothing
 RELEASABLES :

 	@echo $(ICONTARGETFILENAME)

 

-FINAL : do_nothing
\ No newline at end of file
+FINAL : do_nothing

diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index 89cff15a38..a7126db4c8 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -15,8 +15,8 @@
 ; along with this program; if not, write to the Free Software
 ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ;
-; $URL: 
-; $Id: 
+; $URL:$
+; $Id:$
 ;
 ;
 
@@ -71,4 +71,4 @@
 ""-"c:\data\scummvm\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
\ No newline at end of file
+; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/platform/symbian/S60v3/scummvm_reg.rss b/backends/platform/symbian/S60v3/scummvm_reg.rss
index df99094b2e..1156694bd7 100644
--- a/backends/platform/symbian/S60v3/scummvm_reg.rss
+++ b/backends/platform/symbian/S60v3/scummvm_reg.rss
@@ -1,14 +1,14 @@
-// All registration files need to #include appinfo.rh. 
+// All registration files need to #include appinfo.rh.
 #include <AppInfo.rh>
 
-// All registration files must define UID2, which is always 
+// All registration files must define UID2, which is always
 // KUidAppRegistrationResourceFile, and UID3, which is the application's UID.
 UID2 KUidAppRegistrationResourceFile
 UID3 0xA0000657 // application UID
 
 // Registration file need to containo an APP_REGISTRATION_INFO resource that
-// minimally needs to provide the name of the application binary (using the 
-// app_file statement). 
+// minimally needs to provide the name of the application binary (using the
+// app_file statement).
 RESOURCE APP_REGISTRATION_INFO
 	{
 	app_file = "ScummVM"; // filename of application binary (minus extension)
diff --git a/backends/platform/symbian/S80/ScummVM_S80.mmp.in b/backends/platform/symbian/S80/ScummVM_S80.mmp.in
index 4bcb64060b..326e895941 100644
--- a/backends/platform/symbian/S80/ScummVM_S80.mmp.in
+++ b/backends/platform/symbian/S80/ScummVM_S80.mmp.in
@@ -63,7 +63,7 @@ USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
+SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
@@ -84,8 +84,8 @@ SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
 SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\platform\symbian\src\SymbianOS.cpp 
-SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
 SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
@@ -97,8 +97,8 @@ source graphics\iff.cpp
 
 // *** Dynamic Libraries
 
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
+LIBRARY cone.lib  eikcore.lib
+LIBRARY euser.lib apparc.lib fbscli.lib
 LIBRARY estlib.lib apgrfx.lib
 LIBRARY gdi.lib hal.lib bitgdi.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib bafl.lib
diff --git a/backends/platform/symbian/S80/ScummVM_S80_App.mmp b/backends/platform/symbian/S80/ScummVM_S80_App.mmp
index 09fa822bc7..2754eb49c6 100644
--- a/backends/platform/symbian/S80/ScummVM_S80_App.mmp
+++ b/backends/platform/symbian/S80/ScummVM_S80_App.mmp
@@ -44,6 +44,6 @@ sourcepath ..
 AIF			ScummVm.Aif ..\res\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp
 
 // libraries
-LIBRARY cone.lib  EIKCORE.lib 
-LIBRARY euser.lib apparc.lib  
+LIBRARY cone.lib  EIKCORE.lib
+LIBRARY euser.lib apparc.lib
 LIBRARY efsrv.lib  apgrfx.lib
diff --git a/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg b/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
index 675ce525cd..30c92304b8 100644
--- a/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
+++ b/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
@@ -15,8 +15,8 @@
 ; along with this program; if not, write to the Free Software
 ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ;
-; $URL: 
-; $Id: 
+; $URL:$
+; $Id:$
 ;
 ;
 
@@ -59,4 +59,4 @@
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
\ No newline at end of file
+; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/platform/symbian/S90/Scummvm_S90.mmp.in b/backends/platform/symbian/S90/Scummvm_S90.mmp.in
index e55acc63b1..df8872515f 100644
--- a/backends/platform/symbian/S90/Scummvm_S90.mmp.in
+++ b/backends/platform/symbian/S90/Scummvm_S90.mmp.in
@@ -42,7 +42,7 @@ EPOCHEAPSIZE	1024	161920000
 
 MACRO			S90
 
-//START_AUTO_MACROS_SLAVE// 
+//START_AUTO_MACROS_SLAVE//
 
 	// empty base file, will be updated by Perl build scripts
 
@@ -63,7 +63,7 @@ USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
+SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
@@ -84,8 +84,8 @@ SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
 SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\platform\symbian\src\SymbianOS.cpp 
-SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
 SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
@@ -97,8 +97,8 @@ source graphics\iff.cpp
 
 // *** Dynamic Libraries
 
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
+LIBRARY cone.lib  eikcore.lib
+LIBRARY euser.lib apparc.lib fbscli.lib
 LIBRARY estlib.lib apgrfx.lib
 LIBRARY gdi.lib hal.lib bitgdi.lib bafl.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
diff --git a/backends/platform/symbian/S90/Scummvm_S90_App.mmp b/backends/platform/symbian/S90/Scummvm_S90_App.mmp
index 62a045e146..eea89fca4b 100644
--- a/backends/platform/symbian/S90/Scummvm_S90_App.mmp
+++ b/backends/platform/symbian/S90/Scummvm_S90_App.mmp
@@ -44,6 +44,6 @@ sourcepath ..
 AIF			ScummVm.Aif ..\res\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp
 
 // libraries
-LIBRARY cone.lib  EIKCORE.lib 
-LIBRARY euser.lib apparc.lib  
-LIBRARY efsrv.lib  apgrfx.lib
\ No newline at end of file
+LIBRARY cone.lib  EIKCORE.lib
+LIBRARY euser.lib apparc.lib
+LIBRARY efsrv.lib  apgrfx.lib
diff --git a/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg b/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
index ac6c18c9dc..5366207a62 100644
--- a/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
+++ b/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
@@ -15,8 +15,8 @@
 ; along with this program; if not, write to the Free Software
 ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ;
-; $URL: 
-; $Id: 
+; $URL:$
+; $Id:$
 ;
 ;
 
@@ -59,4 +59,4 @@
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
\ No newline at end of file
+; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/platform/symbian/UIQ2/ScummVM.rss b/backends/platform/symbian/UIQ2/ScummVM.rss
index a55fabfc51..2c1d3d6971 100644
--- a/backends/platform/symbian/UIQ2/ScummVM.rss
+++ b/backends/platform/symbian/UIQ2/ScummVM.rss
@@ -27,10 +27,10 @@
 NAME SCUM
 
 // Include definitions of resource STRUCTS used by this
-// resource script 
+// resource script
 #include <eikon.rh>
 #include "..\src\Scummvm.hrh"
-// Include the standard Eikon resource ids 
+// Include the standard Eikon resource ids
 #include <eikon.rsg>
 
 
diff --git a/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in b/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
index 3e9c408c96..cfd6c27fd6 100644
--- a/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
+++ b/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
@@ -29,7 +29,7 @@
 TARGET          SCUMMVM.APP
 TARGETPATH      system\apps\ScummVM
 TARGETTYPE      app
-				
+
 OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
 OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
 
@@ -61,7 +61,7 @@ USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
+SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
@@ -82,8 +82,8 @@ SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
 SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\platform\symbian\src\SymbianOS.cpp 
-SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
 SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
@@ -95,8 +95,8 @@ source graphics\iff.cpp
 
 // *** Dynamic Libraries
 
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
+LIBRARY cone.lib  eikcore.lib
+LIBRARY euser.lib apparc.lib fbscli.lib
 LIBRARY estlib.lib apgrfx.lib
 LIBRARY gdi.lib hal.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
diff --git a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
index d55d70c823..aca927eadd 100644
--- a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
+++ b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
@@ -15,8 +15,8 @@
 ; along with this program; if not, write to the Free Software
 ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ;
-; $URL: 
-; $Id: 
+; $URL:$
+; $Id:$
 ;
 ;
 
@@ -58,4 +58,4 @@
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
\ No newline at end of file
+; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/platform/symbian/UIQ3/ScummVM.rss b/backends/platform/symbian/UIQ3/ScummVM.rss
index 9430f4a2ba..71e9ac8881 100644
--- a/backends/platform/symbian/UIQ3/ScummVM.rss
+++ b/backends/platform/symbian/UIQ3/ScummVM.rss
@@ -27,11 +27,11 @@
 NAME SCUM
 
 // Include definitions of resource STRUCTS used by this
-// resource script 
+// resource script
 #include <eikon.rh>
 #include <qikon.rh>
 #include "..\src\Scummvm.hrh"
-// Include the standard Eikon resource ids 
+// Include the standard Eikon resource ids
 #include <eikon.rsg>
 
 
diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
index 3fcecdac75..0b43f7b4c6 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
@@ -29,8 +29,8 @@
 TARGET          ScummVM.exe
 TARGETPATH      sys\bin
 TARGETTYPE      exe
-						
-UID             0x100039ce 0xA0000657 
+
+UID             0x100039ce 0xA0000657
 
 START RESOURCE  ScummVM_reg.rss
 TARGETPATH              \private\10003a3f\apps
@@ -48,7 +48,7 @@ TARGETPATH              \Resource\Apps
 LANG                    SC
 END
 
-EPOCSTACKSIZE	80000 
+EPOCSTACKSIZE	80000
 EPOCHEAPSIZE	3000000 32000000
 
 START BITMAP    ScummVM.mbm
@@ -91,7 +91,7 @@ USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
+SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
@@ -112,8 +112,8 @@ SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
 SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\abstract-fs-factory.cpp
-SOURCE backends\platform\symbian\src\SymbianOS.cpp 
-SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
 SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
@@ -124,10 +124,10 @@ SOURCE gui\Actions.cpp
 source graphics\iff.cpp
 
 // *** Dynamic Libraries
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
+LIBRARY cone.lib  eikcore.lib
+LIBRARY euser.lib apparc.lib fbscli.lib
 LIBRARY estlib.lib apgrfx.lib
 LIBRARY gdi.lib hal.lib bitgdi.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
 LIBRARY qikctl.lib
-library qikcore.lib bafl.lib eikcoctl.lib 
\ No newline at end of file
+library qikcore.lib bafl.lib eikcoctl.lib
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index 64300258d3..5d6ce01525 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -15,8 +15,8 @@
 ; along with this program; if not, write to the Free Software
 ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ;
-; $URL: 
-; $Id: 
+; $URL:$
+; $Id:$
 ;
 ;
 
@@ -69,4 +69,4 @@
 ""-"c:\shared\scummvm\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
\ No newline at end of file
+; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/platform/symbian/UIQ3/scummvm_loc.rss b/backends/platform/symbian/UIQ3/scummvm_loc.rss
index bd3bc5129f..201aacefa3 100644
--- a/backends/platform/symbian/UIQ3/scummvm_loc.rss
+++ b/backends/platform/symbian/UIQ3/scummvm_loc.rss
@@ -10,9 +10,9 @@ RESOURCE LOCALISABLE_APP_INFO
 			{
 			// The caption text is defined in the rls file
 			caption = "ScummVM";
-			// Icons are used to represent applications in the 
+			// Icons are used to represent applications in the
 			// application launcher and application title bar.
-			// The number_of_icons value identifies how many icons 
+			// The number_of_icons value identifies how many icons
 			// that exist in the icon_file.
 			number_of_icons = 3;
 			// Using the application icons.
@@ -20,39 +20,39 @@ RESOURCE LOCALISABLE_APP_INFO
 			}
 		};
 
-	view_list = 
-		{ 
-		VIEW_DATA 
-		{ 
-		uid = 0x10000001; 
-		screen_mode = 0; 
-		caption_and_icon = CAPTION_AND_ICON_INFO 
-		{ 	
-		}; 
-		}, 
-		VIEW_DATA 
-		{ 
+	view_list =
+		{
+		VIEW_DATA
+		{
+		uid = 0x10000001;
+		screen_mode = 0;
+		caption_and_icon = CAPTION_AND_ICON_INFO
+		{
+		};
+		},
+		VIEW_DATA
+		{
+		uid = 0x10000001;
+		screen_mode = EQikScreenModeLandscape;
+		caption_and_icon = CAPTION_AND_ICON_INFO
+		{
+		};
+		},
+		VIEW_DATA
+		{
 		uid = 0x10000001;
-		screen_mode = EQikScreenModeLandscape; 
-		caption_and_icon = CAPTION_AND_ICON_INFO 
-		{ 
-		}; 
-		}, 
-		VIEW_DATA 
-		{ 
-		uid = 0x10000001; 
-		screen_mode = EQikScreenModeSmallPortrait; 
-		caption_and_icon = CAPTION_AND_ICON_INFO 
-		{ 
-		}; 
+		screen_mode = EQikScreenModeSmallPortrait;
+		caption_and_icon = CAPTION_AND_ICON_INFO
+		{
+		};
 		},
-		VIEW_DATA 
-		{ 
-		uid = 0x10000001; 
-		screen_mode = EQikScreenModeSmallPortrait; 
-		caption_and_icon = CAPTION_AND_ICON_INFO 
-		{ 
-		}; 
+		VIEW_DATA
+		{
+		uid = 0x10000001;
+		screen_mode = EQikScreenModeSmallPortrait;
+		caption_and_icon = CAPTION_AND_ICON_INFO
+		{
+		};
 		}
 	   };
 	}
diff --git a/backends/platform/symbian/UIQ3/scummvm_reg.rss b/backends/platform/symbian/UIQ3/scummvm_reg.rss
index df99094b2e..1156694bd7 100644
--- a/backends/platform/symbian/UIQ3/scummvm_reg.rss
+++ b/backends/platform/symbian/UIQ3/scummvm_reg.rss
@@ -1,14 +1,14 @@
-// All registration files need to #include appinfo.rh. 
+// All registration files need to #include appinfo.rh.
 #include <AppInfo.rh>
 
-// All registration files must define UID2, which is always 
+// All registration files must define UID2, which is always
 // KUidAppRegistrationResourceFile, and UID3, which is the application's UID.
 UID2 KUidAppRegistrationResourceFile
 UID3 0xA0000657 // application UID
 
 // Registration file need to containo an APP_REGISTRATION_INFO resource that
-// minimally needs to provide the name of the application binary (using the 
-// app_file statement). 
+// minimally needs to provide the name of the application binary (using the
+// app_file statement).
 RESOURCE APP_REGISTRATION_INFO
 	{
 	app_file = "ScummVM"; // filename of application binary (minus extension)
diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in
index 2ba09b473b..13df4c2460 100644
--- a/backends/platform/symbian/mmp/scummvm_base.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in
@@ -36,7 +36,7 @@ ALWAYS_BUILD_AS_ARM
 //START_AUTO_MACROS_MASTER//
 
 	// empty base file, will be updated by Perl build scripts
-	
+
 	// list of possible MACROs: (will be replaced when generating scummvm_base.mmp)
 	//MACRO			USE_ZLIB			// LIB:zlib.lib
 	//MACRO			USE_MAD				// LIB:libmad.lib
@@ -69,7 +69,7 @@ USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
+SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include\tremor
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_igor.mmp.in b/backends/platform/symbian/mmp/scummvm_igor.mmp.in
index 8ae3d400df..fa9ea0b3f9 100644
--- a/backends/platform/symbian/mmp/scummvm_igor.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_igor.mmp.in
@@ -50,6 +50,6 @@ SOURCEPATH ..\..\..\..\engines\igor
 

 // *** Include paths

 

-USERINCLUDE     ..\..\..\..\engines 

+USERINCLUDE     ..\..\..\..\engines

 USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src

 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src

diff --git a/backends/platform/symbian/mmp/scummvm_lure.mmp.in b/backends/platform/symbian/mmp/scummvm_lure.mmp.in
index 29afe56182..5469c3e0af 100644
--- a/backends/platform/symbian/mmp/scummvm_lure.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_lure.mmp.in
@@ -50,6 +50,6 @@ SOURCEPATH ..\..\..\..\engines\lure
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines 
+USERINCLUDE     ..\..\..\..\engines
 USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
index 16ae2e763a..a079297364 100644
--- a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
@@ -66,6 +66,6 @@ USERINCLUDE     ..\..\..\..\engines ..\..\..\..\engines\scumm\smush ..\..\..\..\
 USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
+SYSTEMINCLUDE   \epoc32\include\libc
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/res/ScummVmAif.rss b/backends/platform/symbian/res/ScummVmAif.rss
index ad222e550b..a25b78552d 100644
--- a/backends/platform/symbian/res/ScummVmAif.rss
+++ b/backends/platform/symbian/res/ScummVmAif.rss
@@ -30,7 +30,7 @@ RESOURCE AIF_DATA
 	hidden=KAppNotHidden;
 	embeddability=KAppNotEmbeddable;
 	caption_list=
-		{ 
+		{
 		CAPTION { code=ELangEnglish;  caption="ScummVM"; },
 		CAPTION { code=ELangAmerican; caption="ScummVM"; },
 		CAPTION { code=ELangOther; caption="ScummVM"; }
diff --git a/backends/platform/symbian/res/scummvm.rss b/backends/platform/symbian/res/scummvm.rss
index 684e42f4e5..40a4aa4c11 100644
--- a/backends/platform/symbian/res/scummvm.rss
+++ b/backends/platform/symbian/res/scummvm.rss
@@ -26,10 +26,10 @@
 NAME SCUM
 
 // Include definitions of resource STRUCTS used by this
-// resource script 
+// resource script
 #include <eikon.rh>
 #include "..\src\Scummvm.hrh"
-// Include the standard Eikon resource ids 
+// Include the standard Eikon resource ids
 #include <eikon.rsg>
 
 
@@ -52,11 +52,11 @@ RESOURCE MENU_BAR r_scum_menubar                                         // ***
 	};
 }
 
-RESOURCE MENU_PANE r_scum_menu                                  // *** Submenu 
+RESOURCE MENU_PANE r_scum_menu                                  // *** Submenu
 {
 	items =
 	{
-	
+
 		MENU_ITEM{command = EEikCmdExit;txt = "Exit";}
     };
 }
diff --git a/backends/platform/symbian/src/ScummApp.cpp b/backends/platform/symbian/src/ScummApp.cpp
index 3c3c0dc065..cb08ccdd42 100644
--- a/backends/platform/symbian/src/ScummApp.cpp
+++ b/backends/platform/symbian/src/ScummApp.cpp
@@ -30,7 +30,7 @@
 #if defined (__WINS__) && !defined (__SERIES60_30__) && !defined (UIQ3)
 extern "C" int _chkstk(int /*a*/) {
 _asm {
-	push ecx 
+	push ecx
 	cmp eax,_PAGESIZE_
 	lea ecx,[esp] + 8
 	jb short lastpage
@@ -66,7 +66,7 @@ _asm {
 
 // this function is called automatically by the SymbianOS to deliver the new CApaApplication object
 #if !defined (UIQ3) && !defined (S60V3)
-EXPORT_C 
+EXPORT_C
 #endif
 CApaApplication* NewApplication() {
 	// Return pointer to newly created CQMApp
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp
index 008bf3ccb5..8fc35e9f8d 100644
--- a/backends/platform/symbian/src/SymbianActions.cpp
+++ b/backends/platform/symbian/src/SymbianActions.cpp
@@ -35,10 +35,10 @@ namespace GUI {
 
 // 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 @@ const Common::String actionNames[] = {
 	"Zone",
 	"Multi Function",
 	"Swap character",
-	"Skip text",	
-	"Pause", 
+	"Skip text",
+	"Pause",
 	"Fast mode",
 	"Quit",
 	"Debugger"
@@ -100,7 +100,7 @@ SymbianActions::SymbianActions()
 
 void SymbianActions::initInstanceMain(OSystem *mainSystem) {
 	Actions::initInstanceMain(mainSystem);
-	
+
 	// Mouse Up
 	_action_enabled[ACTION_UP] = true;
 
@@ -154,24 +154,24 @@ void SymbianActions::initInstanceGame() {
 		_action_enabled[ACTION_SAVE] = false;
 	else {
 		_action_enabled[ACTION_SAVE] = true;
-		
-		if (is_queen) {			
+
+		if (is_queen) {
 			_key_action[ACTION_SAVE].setKey(Common::ASCII_F5, Common::KEYCODE_F5); // F1 key for FOTAQ
-		} else if (is_sky) {		
-			_key_action[ACTION_SAVE].setKey(Common::ASCII_F5, Common::KEYCODE_F5); 
-		} else if (is_cine) {			
+		} else if (is_sky) {
+			_key_action[ACTION_SAVE].setKey(Common::ASCII_F5, Common::KEYCODE_F5);
+		} else if (is_cine) {
 			_key_action[ACTION_SAVE].setKey(Common::ASCII_F10, Common::KEYCODE_F10); // F10
-		} else if (is_agi) {		
+		} else if (is_agi) {
 			_key_action[ACTION_SAVE].setKey(Common::ASCII_ESCAPE, Common::KEYCODE_ESCAPE);
 		} else if (is_parallaction) {
 			_key_action[ACTION_SAVE].setKey('s', Common::KEYCODE_s);
-		} else {		
+		} else {
 			_key_action[ACTION_SAVE].setKey(Common::ASCII_F5, Common::KEYCODE_F5); // F5 key
 		}
 	}
 	// Quit
 	_action_enabled[ACTION_QUIT] = true;
-	
+
 	// Skip text
 	if (!is_cine && !is_parallaction)
 		_action_enabled[ACTION_SKIP_TEXT] = true;
@@ -184,7 +184,7 @@ void SymbianActions::initInstanceGame() {
 	// Enable fast mode
 	_action_enabled[ACTION_FASTMODE] = true;
 	_key_action[ACTION_FASTMODE].setKey('f', Common::KEYCODE_f, KMOD_CTRL);
-	
+
 	// Swap character
 	_action_enabled[ACTION_SWAPCHAR] = true;
 	_key_action[ACTION_SWAPCHAR].setKey('b'); // b
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index bca7b86a07..e76f6a93df 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -47,7 +47,7 @@ namespace Symbian {
 
 // Show a simple Symbian Info win with Msg & exit
 void FatalError(const char *msg) {
-	TPtrC8 msgPtr((const TUint8 *)msg); 
+	TPtrC8 msgPtr((const TUint8 *)msg);
 	TBuf<512> msg16Bit;
 	msg16Bit.Copy(msgPtr);
 #ifdef S60
@@ -60,7 +60,7 @@ void FatalError(const char *msg) {
 
 // make this easily available everywhere
 char* GetExecutablePath() {
-	return CSDLApp::GetExecutablePathCStr();	
+	return CSDLApp::GetExecutablePathCStr();
 }
 
 } // namespace Symbian {
@@ -89,12 +89,12 @@ bool OSystem_SDL_Symbian::hasFeature(Feature f) {
 }
 
 void OSystem_SDL_Symbian::setFeatureState(Feature f, bool enable) {
-	switch(f) {	
-		case kFeatureVirtualKeyboard:				
-			if (enable) {			
+	switch(f) {
+		case kFeatureVirtualKeyboard:
+			if (enable) {
 			}
 			else {
-			
+
 			}
 			break;
 		case kFeatureDisableKeyFiltering:
@@ -123,15 +123,15 @@ void OSystem_SDL_Symbian::initBackend() {
 #endif
 	ConfMan.setInt("joystick_num", 0); // Symbian OS  should have joystick_num set to 0 in the ini file , but uiq devices might refuse opening the joystick
 	ConfMan.flushToDisk();
-	
+
 	GUI::Actions::init();
 
 	OSystem_SDL::initBackend();
-	
+
 	// Initialize global key mapping for Smartphones
 	GUI::Actions* actions = GUI::Actions::Instance();
 
-	actions->initInstanceMain(this);	
+	actions->initInstanceMain(this);
 	actions->loadMapping();
 	initZones();
 }
@@ -157,7 +157,7 @@ bool OSystem_SDL_Symbian::setGraphicsMode(const char * /*name*/) {
 void OSystem_SDL_Symbian::quitWithErrorMsg(const char * /*aMsg*/) {
 
 	CEikonEnv::Static()->AlertWin(_L("quitWithErrorMsg()")) ;
-	
+
 	if (g_system)
 		g_system->quit();
 }
@@ -171,7 +171,7 @@ void OSystem_SDL_Symbian::quit() {
 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;
@@ -267,11 +267,11 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 		return false;
 
 	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;
 					_km.y_down_count = 1;
@@ -282,7 +282,7 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 				event.type = Common::EVENT_MOUSEMOVE;
 				fillMouseEvent(event, _km.x, _km.y);
 
-				return true;			
+				return true;
 
 			case GUI::ACTION_DOWN:
 				if (ev.type == SDL_KEYDOWN) {
@@ -295,7 +295,7 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 				event.type = Common::EVENT_MOUSEMOVE;
 				fillMouseEvent(event, _km.x, _km.y);
 
-				return true;	
+				return true;
 
 			case GUI::ACTION_LEFT:
 				if (ev.type == SDL_KEYDOWN) {
@@ -337,8 +337,8 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 
 			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
@@ -352,7 +352,7 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 							_currentZone = 0;
 						event.type = Common::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;
@@ -376,24 +376,24 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 					ev.key.keysym.scancode = 0;
 					ev.key.keysym.mod = (SDLMod) key.flags();
 
-					// Translate from SDL keymod event to Scummvm Key Mod Common::Event. 
+					// Translate from SDL keymod event to Scummvm Key Mod Common::Event.
 					// This codes is also present in GP32 backend and in SDL backend as a static function
-					// Perhaps it should be shared. 
-					if (key.flags() != 0) {									
+					// Perhaps it should be shared.
+					if (key.flags() != 0) {
 						event.kbd.flags = 0;
 
 						if (ev.key.keysym.mod & KMOD_SHIFT)
 							event.kbd.flags |= Common::KBD_SHIFT;
-						
+
 						if (ev.key.keysym.mod & KMOD_ALT)
 							event.kbd.flags |= Common::KBD_ALT;
-						
+
 						if (ev.key.keysym.mod & KMOD_CTRL)
 							event.kbd.flags |= Common::KBD_CTRL;
 					}
 
 					return false;
-				}			
+				}
 
 			case GUI::ACTION_QUIT:
 				{
@@ -447,20 +447,20 @@ FILE* 	symbian_fopen(const char* name, const char* mode) {
 		TInt modeLen = strlen(mode);
 
 		TPtrC8 namePtr((unsigned char*) name, strlen(name));
-		TFileName tempFileName;		
+		TFileName tempFileName;
 		tempFileName.Copy(namePtr);
-		
+
 		TInt fileMode = EFileRead;
-		
+
 		if (mode[0] == 'a')
 			fileMode = EFileWrite;
-		
+
 		if (!((modeLen > 1 && mode[1] == 'b') || (modeLen > 2 && mode[2] == 'b'))) {
 			fileMode |= EFileStreamText;
 		}
-		
+
 		if ((modeLen > 1 && mode[1] == '+') || (modeLen > 2 && mode[2] == '+')) {
-			fileMode = fileMode| EFileWrite;	
+			fileMode = fileMode| EFileWrite;
 		}
 
 		fileMode = fileMode| EFileShareAny;
@@ -474,13 +474,13 @@ FILE* 	symbian_fopen(const char* name, const char* mode) {
 				}
 			}
 			break;
-		case 'r': 
+		case 'r':
 			if (fileEntry->iFileHandle.Open(CEikonEnv::Static()->FsSession(), tempFileName, fileMode) != KErrNone) {
 				delete fileEntry;
 				fileEntry = NULL;
 			}
 			break;
-			
+
 		case 'w':
 			if (fileEntry->iFileHandle.Replace(CEikonEnv::Static()->FsSession(), tempFileName, fileMode) != KErrNone) {
 				delete fileEntry;
@@ -502,7 +502,7 @@ size_t symbian_fread(const void* ptr, size_t size, size_t numItems, FILE* handle
 	TPtr8 pointer( (unsigned char*) ptr, size*numItems);
 
 	((TSymbianFileEntry*)(handle))->iFileHandle.Read(pointer);
-	
+
 	return pointer.Length()/size;
 }
 
@@ -552,7 +552,7 @@ int symbian_fseek(FILE* handle, long int offset, int whence) {
 	case SEEK_END:
 		seekMode = ESeekEnd;
 		break;
-		
+
 	}
 
 	return ((TSymbianFileEntry*)(handle))->iFileHandle.Seek(seekMode, pos);
diff --git a/backends/platform/symbian/src/main_features.inl b/backends/platform/symbian/src/main_features.inl
index 66b0c4b200..8a44d0edf2 100644
--- a/backends/platform/symbian/src/main_features.inl
+++ b/backends/platform/symbian/src/main_features.inl
@@ -24,7 +24,7 @@
 	"Vibra "
 #endif
 	"\n"
-	
+
 // we want a list of supported engines visible in the program,
 // because we also release special builds with only one engine
 #ifndef DISABLE_SCUMM
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index 4299eb59ad..cfaafe9ece 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -57,7 +57,7 @@
 	#define SIGND(fp)	((fp.l.upper) & SIGNBIT)
 	#define HIDDEND_LL	((long long)1 << 52)
 	#define MANTD_LL(fp)	((fp.ll & (HIDDEND_LL-1)) | HIDDEND_LL)
-	
+
 	union double_long {
 	    double d;
 	    struct {
@@ -73,36 +73,36 @@
 	    register union double_long dl1;
 	    register int exp;
 	    register long long l;
-	
+
 	    dl1.d = a1;
-	
+
 	    if (!dl1.l.upper && !dl1.l.lower)
 			return (0);
-	
+
 	    exp = EXPD (dl1) - EXCESSD - 64;
 	    l = MANTD_LL(dl1);
-	
+
 	    if (exp > 0) {
 		l = (long long)1<<63;
 		if (!SIGND(dl1))
 		    l--;
 		return l;
 	    }
-	
+
 	    /* shift down until exp = 0 or l = 0 */
 	    if (exp < 0 && exp > -64 && l)
 			l >>= -exp;
 	    else
 			return (0);
-	
+
 	    return (SIGND (dl1) ? -l : l);
 	}
-	
+
 	/* 	okay, okay: I admit it: I absolutely have _NO_ idea why __fixdfdi does not get linked in by gcc from libgcc.a
 		because I know it's in there: I checked with `ar x _fixdfdi.o libgcc.a` and the symbol is in there, so I'm lost
 		and had to fix it this way. I tried all gcc and ld options I could find: no hope :( If someone can enlighten me:
 		feel free to let me know at sumthinwicked@users.sf.net! Much obliged.
-		PS1. I think for __fixunsdfdi they have made a circumvention by having to add STATICLIBRARY EGCC.LIB		
+		PS1. I think for __fixunsdfdi they have made a circumvention by having to add STATICLIBRARY EGCC.LIB
 		PS2. http://gcc.gnu.org/ml/gcc-bugs/2004-01/msg01596.html might have found out the same problem there
 	*/
 
@@ -117,7 +117,7 @@
 		return strlen(str);
 	}
 
-	int inline scumm_vsnprintf (char *str, unsigned long /*n*/, char const *fmt, va_list valist) {	
+	int inline scumm_vsnprintf (char *str, unsigned long /*n*/, char const *fmt, va_list valist) {
 		vsprintf(str, fmt, valist);
 		return strlen(str);
 	}