Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.

svn-id: r28966

1 files changed, 300 insertions, 126 deletions

diff --git a/dists/codeblocks/scummvm.layout b/dists/codeblocks/scummvm.layout
index 7b88105b61..ece2973f92 100644
--- a/dists/codeblocks/scummvm.layout
+++ b/dists/codeblocks/scummvm.layout
@@ -1,236 +1,359 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="default" />
-	<File name="..\..\backends\events\default\default-events.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1060" topLine="8" />
+	<File name="..\..\backends\events\default\default-events.cpp" open="0" top="0" tabpos="27">
+		<Cursor position="1203" topLine="16" />
 	</File>
-	<File name="..\..\backends\events\default\default-events.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="13" />
+	<File name="..\..\backends\events\default\default-events.h" open="0" top="0" tabpos="1">
+		<Cursor position="1271" topLine="17" />
 	</File>
-	<File name="..\..\backends\fs\windows\windows-fs.cpp" open="0" top="0" tabpos="3">
-		<Cursor position="1326" topLine="28" />
+	<File name="..\..\backends\fs\abstract-fs-factory.h" open="0" top="0" tabpos="0">
+		<Cursor position="2898" topLine="47" />
+	</File>
+	<File name="..\..\backends\fs\abstract-fs.h" open="0" top="0" tabpos="0">
+		<Cursor position="0" topLine="21" />
+	</File>
+	<File name="..\..\backends\midi\alsa.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1230" topLine="9" />
+	</File>
+	<File name="..\..\backends\midi\coreaudio.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1154" topLine="0" />
+	</File>
+	<File name="..\..\backends\midi\coremidi.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1152" topLine="0" />
+	</File>
+	<File name="..\..\backends\midi\morphos.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1350" topLine="12" />
+	</File>
+	<File name="..\..\backends\midi\seq.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1405" topLine="0" />
 	</File>
 	<File name="..\..\backends\midi\windows.cpp" open="0" top="0" tabpos="4">
-		<Cursor position="1606" topLine="24" />
+		<Cursor position="1226" topLine="18" />
+	</File>
+	<File name="..\..\backends\platform\null\null.cpp" open="1" top="0" tabpos="1">
+		<Cursor position="1136" topLine="9" />
+	</File>
+	<File name="..\..\backends\platform\sdl\events.cpp" open="0" top="0" tabpos="2">
+		<Cursor position="5816" topLine="195" />
 	</File>
-	<File name="..\..\backends\platform\sdl\events.cpp" open="0" top="0" tabpos="1">
-		<Cursor position="5716" topLine="196" />
+	<File name="..\..\backends\platform\sdl\graphics.cpp" open="0" top="0" tabpos="14">
+		<Cursor position="27910" topLine="1019" />
 	</File>
-	<File name="..\..\backends\platform\sdl\graphics.cpp" open="0" top="0" tabpos="1">
-		<Cursor position="27863" topLine="1022" />
+	<File name="..\..\backends\platform\sdl\main.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="3110" topLine="65" />
 	</File>
-	<File name="..\..\backends\platform\sdl\sdl-common.h" open="0" top="0" tabpos="0">
-		<Cursor position="7253" topLine="206" />
+	<File name="..\..\backends\platform\sdl\sdl-common.h" open="0" top="0" tabpos="3">
+		<Cursor position="11161" topLine="229" />
 	</File>
-	<File name="..\..\backends\platform\sdl\sdl.cpp" open="0" top="0" tabpos="6">
-		<Cursor position="3294" topLine="88" />
+	<File name="..\..\backends\platform\sdl\sdl.cpp" open="0" top="0" tabpos="7">
+		<Cursor position="7162" topLine="202" />
+	</File>
+	<File name="..\..\backends\saves\compressed\compressed-saves.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1163" topLine="14" />
 	</File>
 	<File name="..\..\backends\saves\default\default-saves.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1794" topLine="33" />
+		<Cursor position="1203" topLine="16" />
 	</File>
 	<File name="..\..\backends\saves\savefile.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1740" topLine="11" />
+		<Cursor position="1136" topLine="14" />
 	</File>
 	<File name="..\..\backends\timer\default\default-timer.cpp" open="0" top="0" tabpos="7">
-		<Cursor position="3304" topLine="82" />
+		<Cursor position="1154" topLine="13" />
 	</File>
 	<File name="..\..\base\commandLine.cpp" open="0" top="0" tabpos="14">
-		<Cursor position="13025" topLine="322" />
+		<Cursor position="1130" topLine="14" />
+	</File>
+	<File name="..\..\base\game.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="0" topLine="41" />
 	</File>
-	<File name="..\..\base\main.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="10180" topLine="267" />
+	<File name="..\..\base\main.cpp" open="0" top="0" tabpos="1">
+		<Cursor position="1506" topLine="22" />
 	</File>
 	<File name="..\..\base\main.h" open="0" top="0" tabpos="0">
 		<Cursor position="1074" topLine="0" />
 	</File>
-	<File name="..\..\base\plugins.cpp" open="1" top="0" tabpos="5">
-		<Cursor position="3400" topLine="86" />
+	<File name="..\..\base\plugins.cpp" open="0" top="0" tabpos="3">
+		<Cursor position="2915" topLine="80" />
 	</File>
-	<File name="..\..\base\plugins.h" open="0" top="0" tabpos="3">
-		<Cursor position="5991" topLine="151" />
+	<File name="..\..\base\plugins.h" open="0" top="0" tabpos="2">
+		<Cursor position="1575" topLine="59" />
 	</File>
 	<File name="..\..\base\version.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1734" topLine="13" />
+		<Cursor position="1124" topLine="14" />
 	</File>
 	<File name="..\..\common\advancedDetector.cpp" open="0" top="0" tabpos="16">
-		<Cursor position="4607" topLine="144" />
+		<Cursor position="1142" topLine="14" />
+	</File>
+	<File name="..\..\common\advancedDetector.h" open="0" top="0" tabpos="18">
+		<Cursor position="2709" topLine="66" />
 	</File>
-	<File name="..\..\common\array.h" open="0" top="0" tabpos="2">
-		<Cursor position="1882" topLine="45" />
+	<File name="..\..\common\array.h" open="0" top="0" tabpos="3">
+		<Cursor position="1170" topLine="6" />
 	</File>
 	<File name="..\..\common\config-file.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="4515" topLine="122" />
+		<Cursor position="1132" topLine="14" />
 	</File>
 	<File name="..\..\common\config-manager.cpp" open="0" top="0" tabpos="4">
-		<Cursor position="7266" topLine="205" />
+		<Cursor position="1268" topLine="20" />
 	</File>
 	<File name="..\..\common\config-manager.h" open="0" top="0" tabpos="0">
-		<Cursor position="1658" topLine="12" />
+		<Cursor position="2954" topLine="70" />
 	</File>
 	<File name="..\..\common\endian.h" open="0" top="0" tabpos="0">
-		<Cursor position="4129" topLine="122" />
+		<Cursor position="5451" topLine="152" />
 	</File>
 	<File name="..\..\common\file.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="15663" topLine="480" />
 	</File>
 	<File name="..\..\common\file.h" open="0" top="0" tabpos="13">
-		<Cursor position="1181" topLine="61" />
+		<Cursor position="1164" topLine="17" />
 	</File>
 	<File name="..\..\common\fs.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1071" topLine="8" />
+		<Cursor position="2325" topLine="66" />
 	</File>
 	<File name="..\..\common\func.h" open="0" top="0" tabpos="2">
-		<Cursor position="2306" topLine="40" />
+		<Cursor position="6966" topLine="226" />
 	</File>
 	<File name="..\..\common\hashmap.h" open="0" top="0" tabpos="0">
-		<Cursor position="30" topLine="120" />
+		<Cursor position="2567" topLine="45" />
 	</File>
 	<File name="..\..\common\list.h" open="0" top="0" tabpos="1">
-		<Cursor position="3592" topLine="128" />
+		<Cursor position="1773" topLine="20" />
 	</File>
 	<File name="..\..\common\md5.cpp" open="0" top="0" tabpos="20">
-		<Cursor position="1020" topLine="364" />
+		<Cursor position="1020" topLine="346" />
 	</File>
-	<File name="..\..\common\md5.h" open="0" top="0" tabpos="19">
+	<File name="..\..\common\md5.h" open="0" top="0" tabpos="2">
 		<Cursor position="0" topLine="0" />
 	</File>
 	<File name="..\..\common\mutex.cpp" open="0" top="0" tabpos="18">
-		<Cursor position="1316" topLine="24" />
+		<Cursor position="1122" topLine="14" />
 	</File>
 	<File name="..\..\common\mutex.h" open="0" top="0" tabpos="1">
 		<Cursor position="1704" topLine="21" />
 	</File>
 	<File name="..\..\common\rect.h" open="0" top="0" tabpos="0">
-		<Cursor position="3493" topLine="23" />
+		<Cursor position="3482" topLine="67" />
 	</File>
-	<File name="..\..\common\savefile.h" open="0" top="0" tabpos="1">
-		<Cursor position="1342" topLine="55" />
+	<File name="..\..\common\savefile.h" open="0" top="0" tabpos="4">
+		<Cursor position="1180" topLine="17" />
 	</File>
-	<File name="..\..\common\scummsys.h" open="0" top="0" tabpos="1">
-		<Cursor position="9437" topLine="352" />
+	<File name="..\..\common\scummsys.h" open="0" top="0" tabpos="6">
+		<Cursor position="0" topLine="0" />
 	</File>
 	<File name="..\..\common\singleton.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="39" />
-	</File>
-	<File name="..\..\common\stack.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="60" />
+		<Cursor position="0" topLine="4" />
 	</File>
-	<File name="..\..\common\stdafx.h" open="0" top="0" tabpos="1">
-		<Cursor position="27" topLine="0" />
+	<File name="..\..\common\stack.h" open="0" top="0" tabpos="4">
+		<Cursor position="2403" topLine="72" />
 	</File>
 	<File name="..\..\common\str.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="3740" topLine="78" />
+		<Cursor position="1118" topLine="13" />
 	</File>
-	<File name="..\..\common\str.h" open="0" top="0" tabpos="0">
-		<Cursor position="6115" topLine="165" />
+	<File name="..\..\common\str.h" open="0" top="0" tabpos="2">
+		<Cursor position="5060" topLine="135" />
 	</File>
 	<File name="..\..\common\stream.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1828" topLine="46" />
+		<Cursor position="1124" topLine="14" />
 	</File>
-	<File name="..\..\common\stream.h" open="0" top="0" tabpos="3">
-		<Cursor position="3529" topLine="125" />
+	<File name="..\..\common\stream.h" open="0" top="0" tabpos="5">
+		<Cursor position="1172" topLine="17" />
 	</File>
-	<File name="..\..\common\system.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1888" topLine="29" />
+	<File name="..\..\common\system.cpp" open="0" top="0" tabpos="6">
+		<Cursor position="1124" topLine="14" />
 	</File>
-	<File name="..\..\common\system.h" open="0" top="0" tabpos="2">
-		<Cursor position="27043" topLine="748" />
+	<File name="..\..\common\system.h" open="0" top="0" tabpos="4">
+		<Cursor position="18676" topLine="453" />
 	</File>
 	<File name="..\..\common\timer.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="10" />
+		<Cursor position="0" topLine="8" />
 	</File>
 	<File name="..\..\common\unzip.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="35606" topLine="1176" />
+		<Cursor position="1243" topLine="19" />
+	</File>
+	<File name="..\..\common\unzip.h" open="0" top="0" tabpos="0">
+		<Cursor position="2913" topLine="56" />
 	</File>
 	<File name="..\..\common\util.cpp" open="0" top="0" tabpos="3">
-		<Cursor position="11348" topLine="425" />
+		<Cursor position="1119" topLine="13" />
 	</File>
-	<File name="..\..\common\util.h" open="0" top="0" tabpos="2">
-		<Cursor position="3" topLine="126" />
+	<File name="..\..\common\util.h" open="0" top="0" tabpos="1">
+		<Cursor position="1184" topLine="16" />
 	</File>
-	<File name="..\..\engines\engine.cpp" open="0" top="0" tabpos="6">
-		<Cursor position="1299" topLine="6" />
+	<File name="..\..\engines\engine.cpp" open="0" top="0" tabpos="1">
+		<Cursor position="1274" topLine="20" />
 	</File>
 	<File name="..\..\graphics\dxa_player.cpp" open="0" top="0" tabpos="5">
-		<Cursor position="2699" topLine="98" />
+		<Cursor position="1131" topLine="14" />
 	</File>
 	<File name="..\..\graphics\font.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1610" topLine="46" />
+		<Cursor position="1122" topLine="13" />
 	</File>
 	<File name="..\..\graphics\font.h" open="0" top="0" tabpos="0">
-		<Cursor position="1274" topLine="20" />
+		<Cursor position="1677" topLine="25" />
 	</File>
 	<File name="..\..\graphics\fontman.h" open="0" top="0" tabpos="0">
-		<Cursor position="2503" topLine="36" />
+		<Cursor position="1182" topLine="16" />
 	</File>
-	<File name="..\..\graphics\ilbm.cpp" open="1" top="0" tabpos="3">
-		<Cursor position="9338" topLine="284" />
+	<File name="..\..\graphics\fonts\consolefont.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="55" topLine="0" />
 	</File>
-	<File name="..\..\graphics\ilbm.h" open="1" top="0" tabpos="2">
-		<Cursor position="1674" topLine="36" />
+	<File name="..\..\graphics\fonts\newfont.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="55" topLine="0" />
 	</File>
-	<File name="..\..\graphics\imagedec.cpp" open="1" top="0" tabpos="1">
+	<File name="..\..\graphics\fonts\newfont_big.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="55" topLine="0" />
+	</File>
+	<File name="..\..\graphics\fonts\scummfont.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1137" topLine="13" />
+	</File>
+	<File name="..\..\graphics\iff.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="3084" topLine="268" />
+	</File>
+	<File name="..\..\graphics\iff.h" open="0" top="0" tabpos="0">
+		<Cursor position="1923" topLine="47" />
+	</File>
+	<File name="..\..\graphics\imagedec.cpp" open="0" top="0" tabpos="1">
 		<Cursor position="3897" topLine="4" />
 	</File>
 	<File name="..\..\graphics\imagedec.h" open="0" top="0" tabpos="0">
-		<Cursor position="1720" topLine="11" />
+		<Cursor position="1186" topLine="16" />
 	</File>
 	<File name="..\..\graphics\imageman.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="1217" topLine="0" />
 	</File>
 	<File name="..\..\graphics\imageman.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="21" />
+		<Cursor position="1186" topLine="16" />
 	</File>
-	<File name="..\..\graphics\primitives.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1071" topLine="17" />
+	<File name="..\..\graphics\mpeg_player.cpp" open="1" top="0" tabpos="2">
+		<Cursor position="1136" topLine="9" />
 	</File>
-	<File name="..\..\graphics\primitives.h" open="0" top="0" tabpos="0">
-		<Cursor position="1194" topLine="0" />
+	<File name="..\..\graphics\primitives.cpp" open="0" top="0" tabpos="4">
+		<Cursor position="1134" topLine="13" />
+	</File>
+	<File name="..\..\graphics\primitives.h" open="0" top="0" tabpos="1">
+		<Cursor position="1089" topLine="0" />
 	</File>
 	<File name="..\..\graphics\scaler.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="33" />
+		<Cursor position="1178" topLine="16" />
+	</File>
+	<File name="..\..\graphics\scaler\intern.h" open="0" top="0" tabpos="0">
+		<Cursor position="1199" topLine="17" />
 	</File>
 	<File name="..\..\graphics\scaler\scale2x.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="17" />
+		<Cursor position="1329" topLine="23" />
 	</File>
 	<File name="..\..\graphics\scaler\scale2x.h" open="0" top="0" tabpos="0">
 		<Cursor position="0" topLine="16" />
 	</File>
-	<File name="..\..\graphics\surface.cpp" open="0" top="0" tabpos="4">
-		<Cursor position="2096" topLine="9" />
+	<File name="..\..\graphics\scaler\scale3x.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1329" topLine="23" />
+	</File>
+	<File name="..\..\graphics\scaler\scalebit.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1340" topLine="24" />
+	</File>
+	<File name="..\..\graphics\scaler\thumbnail.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1139" topLine="14" />
+	</File>
+	<File name="..\..\graphics\surface.cpp" open="0" top="0" tabpos="2">
+		<Cursor position="1128" topLine="13" />
+	</File>
+	<File name="..\..\graphics\surface.h" open="0" top="0" tabpos="7">
+		<Cursor position="1491" topLine="20" />
+	</File>
+	<File name="..\..\gui\Actions.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1123" topLine="14" />
+	</File>
+	<File name="..\..\gui\Actions.h" open="0" top="0" tabpos="0">
+		<Cursor position="1167" topLine="17" />
+	</File>
+	<File name="..\..\gui\EditTextWidget.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1137" topLine="13" />
+	</File>
+	<File name="..\..\gui\Key.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1115" topLine="14" />
+	</File>
+	<File name="..\..\gui\Key.h" open="0" top="0" tabpos="0">
+		<Cursor position="1151" topLine="17" />
+	</File>
+	<File name="..\..\gui\KeysDialog.cpp" open="1" top="1" tabpos="3">
+		<Cursor position="1264" topLine="9" />
 	</File>
-	<File name="..\..\graphics\surface.h" open="0" top="0" tabpos="3">
-		<Cursor position="2124" topLine="19" />
+	<File name="..\..\gui\KeysDialog.h" open="0" top="0" tabpos="0">
+		<Cursor position="1421" topLine="6" />
+	</File>
+	<File name="..\..\gui\ListWidget.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1129" topLine="13" />
 	</File>
 	<File name="..\..\gui\ListWidget.h" open="0" top="0" tabpos="0">
 		<Cursor position="1693" topLine="25" />
 	</File>
-	<File name="..\..\gui\PopUpWidget.cpp" open="0" top="0" tabpos="7">
-		<Cursor position="9213" topLine="325" />
+	<File name="..\..\gui\PopUpWidget.cpp" open="0" top="0" tabpos="16">
+		<Cursor position="1131" topLine="13" />
+	</File>
+	<File name="..\..\gui\ScrollBarWidget.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1139" topLine="13" />
+	</File>
+	<File name="..\..\gui\TabWidget.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1127" topLine="13" />
 	</File>
 	<File name="..\..\gui\ThemeModern.cpp" open="0" top="0" tabpos="8">
 		<Cursor position="1928" topLine="22" />
 	</File>
+	<File name="..\..\gui\about.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1119" topLine="13" />
+	</File>
+	<File name="..\..\gui\browser.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1123" topLine="13" />
+	</File>
+	<File name="..\..\gui\chooser.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1123" topLine="13" />
+	</File>
+	<File name="..\..\gui\console.cpp" open="0" top="0" tabpos="3">
+		<Cursor position="1123" topLine="13" />
+	</File>
 	<File name="..\..\gui\debugger.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="5444" topLine="160" />
+		<Cursor position="1123" topLine="14" />
 	</File>
 	<File name="..\..\gui\dialog.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="2732" topLine="48" />
+		<Cursor position="1121" topLine="13" />
 	</File>
 	<File name="..\..\gui\dialog.h" open="0" top="0" tabpos="0">
 		<Cursor position="1177" topLine="12" />
 	</File>
+	<File name="..\..\gui\editable.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1125" topLine="13" />
+	</File>
+	<File name="..\..\gui\eval.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1117" topLine="14" />
+	</File>
+	<File name="..\..\gui\eval.h" open="0" top="0" tabpos="0">
+		<Cursor position="1155" topLine="17" />
+	</File>
+	<File name="..\..\gui\launcher.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1123" topLine="13" />
+	</File>
 	<File name="..\..\gui\massadd.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="5313" topLine="146" />
+		<Cursor position="1121" topLine="13" />
+	</File>
+	<File name="..\..\gui\message.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1123" topLine="13" />
 	</File>
 	<File name="..\..\gui\message.h" open="0" top="0" tabpos="0">
 		<Cursor position="1307" topLine="13" />
 	</File>
+	<File name="..\..\gui\newgui.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1121" topLine="13" />
+	</File>
+	<File name="..\..\gui\object.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1121" topLine="3" />
+	</File>
 	<File name="..\..\gui\object.h" open="0" top="0" tabpos="4">
 		<Cursor position="2088" topLine="33" />
 	</File>
 	<File name="..\..\gui\options.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="20232" topLine="622" />
+		<Cursor position="1125" topLine="13" />
 	</File>
 	<File name="..\..\gui\theme-config.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="2171" topLine="30" />
@@ -239,82 +362,130 @@
 		<Cursor position="1060" topLine="18" />
 	</File>
 	<File name="..\..\gui\theme.h" open="0" top="0" tabpos="0">
-		<Cursor position="8342" topLine="197" />
+		<Cursor position="1153" topLine="16" />
 	</File>
 	<File name="..\..\gui\themebrowser.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="4920" topLine="152" />
+		<Cursor position="988" topLine="13" />
+	</File>
+	<File name="..\..\gui\widget.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1121" topLine="13" />
 	</File>
 	<File name="..\..\gui\widget.h" open="0" top="0" tabpos="0">
-		<Cursor position="5090" topLine="21" />
+		<Cursor position="7947" topLine="222" />
+	</File>
+	<File name="..\..\sound\adpcm.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1119" topLine="14" />
+	</File>
+	<File name="..\..\sound\adpcm.h" open="0" top="0" tabpos="0">
+		<Cursor position="1165" topLine="5" />
+	</File>
+	<File name="..\..\sound\aiff.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1386" topLine="22" />
+	</File>
+	<File name="..\..\sound\audiocd.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1123" topLine="14" />
 	</File>
 	<File name="..\..\sound\audiocd.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="44" />
+		<Cursor position="1173" topLine="17" />
+	</File>
+	<File name="..\..\sound\audiostream.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1134" topLine="14" />
 	</File>
 	<File name="..\..\sound\audiostream.h" open="0" top="0" tabpos="0">
-		<Cursor position="4511" topLine="87" />
+		<Cursor position="1189" topLine="17" />
 	</File>
 	<File name="..\..\sound\flac.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="4" />
+		<Cursor position="1161" topLine="17" />
+	</File>
+	<File name="..\..\sound\fmopl.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1233" topLine="16" />
 	</File>
 	<File name="..\..\sound\fmopl.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="117" />
+		<Cursor position="1154" topLine="0" />
 	</File>
 	<File name="..\..\sound\mididrv.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="164" />
+		<Cursor position="1119" topLine="14" />
 	</File>
 	<File name="..\..\sound\mididrv.h" open="0" top="0" tabpos="1">
 		<Cursor position="4230" topLine="136" />
 	</File>
 	<File name="..\..\sound\midiparser.cpp" open="0" top="0" tabpos="3">
-		<Cursor position="4149" topLine="130" />
+		<Cursor position="1131" topLine="14" />
 	</File>
 	<File name="..\..\sound\midiparser.h" open="0" top="0" tabpos="2">
 		<Cursor position="0" topLine="325" />
 	</File>
+	<File name="..\..\sound\midiparser_smf.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1139" topLine="14" />
+	</File>
 	<File name="..\..\sound\midiparser_xmidi.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="4826" topLine="133" />
+		<Cursor position="1143" topLine="14" />
 	</File>
 	<File name="..\..\sound\mixer.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1483" topLine="50" />
+		<Cursor position="2725" topLine="101" />
 	</File>
-	<File name="..\..\sound\mixer.h" open="0" top="0" tabpos="0">
-		<Cursor position="3013" topLine="69" />
+	<File name="..\..\sound\mixer.h" open="0" top="0" tabpos="8">
+		<Cursor position="1165" topLine="17" />
 	</File>
 	<File name="..\..\sound\mods\infogrames.h" open="0" top="0" tabpos="0">
-		<Cursor position="1484" topLine="52" />
+		<Cursor position="1968" topLine="16" />
 	</File>
 	<File name="..\..\sound\mods\module.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="114" />
+		<Cursor position="1125" topLine="14" />
 	</File>
 	<File name="..\..\sound\mods\module.h" open="0" top="0" tabpos="0">
 		<Cursor position="0" topLine="29" />
 	</File>
-	<File name="..\..\sound\mods\paula.cpp" open="0" top="0" tabpos="9">
-		<Cursor position="3086" topLine="115" />
+	<File name="..\..\sound\mods\paula.cpp" open="0" top="0" tabpos="3">
+		<Cursor position="1240" topLine="11" />
 	</File>
-	<File name="..\..\sound\mods\paula.h" open="0" top="0" tabpos="8">
-		<Cursor position="1360" topLine="37" />
+	<File name="..\..\sound\mods\paula.h" open="0" top="0" tabpos="2">
+		<Cursor position="2545" topLine="46" />
 	</File>
-	<File name="..\..\sound\mods\protracker.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="11471" topLine="410" />
+	<File name="..\..\sound\mods\protracker.cpp" open="0" top="0" tabpos="1">
+		<Cursor position="1131" topLine="14" />
 	</File>
 	<File name="..\..\sound\mods\protracker.h" open="0" top="0" tabpos="0">
-		<Cursor position="1136" topLine="0" />
+		<Cursor position="1197" topLine="8" />
 	</File>
 	<File name="..\..\sound\mods\rjp1.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="6647" topLine="201" />
+		<Cursor position="1124" topLine="14" />
+	</File>
+	<File name="..\..\sound\mods\soundfx.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1130" topLine="12" />
 	</File>
 	<File name="..\..\sound\mp3.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="3255" topLine="69" />
 	</File>
 	<File name="..\..\sound\mp3.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="4" />
+		<Cursor position="1157" topLine="17" />
+	</File>
+	<File name="..\..\sound\mpu401.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1123" topLine="13" />
 	</File>
 	<File name="..\..\sound\mpu401.h" open="0" top="0" tabpos="0">
-		<Cursor position="1260" topLine="41" />
+		<Cursor position="1169" topLine="17" />
+	</File>
+	<File name="..\..\sound\null.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1119" topLine="0" />
 	</File>
 	<File name="..\..\sound\rate.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="5797" topLine="175" />
+		<Cursor position="1489" topLine="22" />
+	</File>
+	<File name="..\..\sound\rate.h" open="0" top="0" tabpos="0">
+		<Cursor position="1246" topLine="35" />
+	</File>
+	<File name="..\..\sound\softsynth\emumidi.h" open="0" top="0" tabpos="0">
+		<Cursor position="1131" topLine="13" />
+	</File>
+	<File name="..\..\sound\softsynth\fluidsynth.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1198" topLine="18" />
+	</File>
+	<File name="..\..\sound\softsynth\mt32.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1129" topLine="13" />
+	</File>
+	<File name="..\..\sound\softsynth\mt32\freeverb.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1257" topLine="20" />
 	</File>
 	<File name="..\..\sound\softsynth\mt32\freeverb.h" open="0" top="0" tabpos="0">
 		<Cursor position="4321" topLine="133" />
@@ -325,16 +496,19 @@
 	<File name="..\..\sound\softsynth\mt32\structures.h" open="0" top="0" tabpos="0">
 		<Cursor position="1781" topLine="16" />
 	</File>
+	<File name="..\..\sound\voc.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1117" topLine="14" />
+	</File>
 	<File name="..\..\sound\voc.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="37" />
+		<Cursor position="1157" topLine="17" />
 	</File>
 	<File name="..\..\sound\vorbis.h" open="0" top="0" tabpos="0">
-		<Cursor position="0" topLine="4" />
+		<Cursor position="1169" topLine="17" />
 	</File>
 	<File name="..\..\sound\wave.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="4722" topLine="86" />
+		<Cursor position="1119" topLine="14" />
 	</File>
 	<File name="..\..\sound\wave.h" open="0" top="0" tabpos="0">
-		<Cursor position="1159" topLine="6" />
+		<Cursor position="1161" topLine="15" />
 	</File>
 </CodeBlocks_layout_file>