From 9f4cf4d5380844f6ba0eb6e91254160f05dc4428 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 17 Feb 2012 19:54:00 +0000
Subject: [PATCH] jcf.lpr: fixed compilation

git-svn-id: trunk@35434 -
---
 components/jcf2/CommandLine/Lazarus/JCF.lpr |    7 +-
 components/jcf2/CommandLine/Lazarus/jcf.lpi | 1073 +++++--------------
 2 files changed, 274 insertions(+), 806 deletions(-)

diff --git a/components/jcf2/CommandLine/Lazarus/JCF.lpr b/components/jcf2/CommandLine/Lazarus/JCF.lpr
index 3bcd427bad..479e98df73 100644
--- a/components/jcf2/CommandLine/Lazarus/JCF.lpr
+++ b/components/jcf2/CommandLine/Lazarus/JCF.lpr
@@ -1,6 +1,5 @@
 program JCF;
 
-{$APPTYPE CONSOLE}
 {(*}
 (*------------------------------------------------------------------------------
  Delphi Code formatter source code 
@@ -36,7 +35,7 @@ uses
   SysUtils,
   FileCtrl,
   JcfStringUtils in '..\..\Utils\JcfStringUtils.pas',
-  //JcfFileUtils in '..\..\Utils\JcfFileUtils.pas',
+  JcfFileUtils in '..\..\Utils\JcfFileUtils.pas',
   JcfSystemUtils in '..\..\Utils\JcfSystemUtils.pas',
   Converter in '..\..\ReadWrite\Converter.pas',
   FileConverter in '..\..\ReadWrite\FileConverter.pas',
@@ -51,7 +50,7 @@ uses
   VisitSetXY in '..\..\Process\VisitSetXY.pas',
   BaseVisitor in '..\..\Process\BaseVisitor.pas',
   JcfMiscFunctions in '..\..\Utils\JcfMiscFunctions.pas',
-  FileUtils in '..\..\Utils\FileUtils.pas',
+  //FileUtils in '..\..\Utils\FileUtils.pas',
   JcfLog in '..\..\Utils\JcfLog.pas',
   fShowParseTree in '..\..\Parse\UI\fShowParseTree.pas' {frmShowParseTree},
   SetUses in '..\..\Settings\SetUses.pas',
@@ -81,7 +80,7 @@ uses
   WarnDestroy in '..\..\Process\Warnings\WarnDestroy.pas',
   WarnEmptyBlock in '..\..\Process\Warnings\WarnEmptyBlock.pas',
   Warning in '..\..\Process\Warnings\Warning.pas',
-  JcfVersionConsts in '..\..\JcfVersionConsts.pas',
+  JcfVersionConsts in '..\..\JcfVersionConsts.pas', jcfidelazarus,
   JcfRegistrySettings in '..\..\Settings\JcfRegistrySettings.pas',
   TokenUtils in '..\..\Parse\TokenUtils.pas',
   NoSpaceBefore in '..\..\Process\Spacing\NoSpaceBefore.pas',
diff --git a/components/jcf2/CommandLine/Lazarus/jcf.lpi b/components/jcf2/CommandLine/Lazarus/jcf.lpi
index 67c09ceeea..55daa1631e 100644
--- a/components/jcf2/CommandLine/Lazarus/jcf.lpi
+++ b/components/jcf2/CommandLine/Lazarus/jcf.lpi
@@ -1,20 +1,23 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
       </Flags>
+      <SessionStorage Value="InIDEConfig"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <UseAppBundle Value="False"/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
       <Language Value=""/>
       <CharSet Value=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -30,1208 +33,674 @@
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
-        <PackageName Value="LCL"/>
+        <PackageName Value="jcfidelazarus"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="137">
+    <Units Count="129">
       <Unit0>
         <Filename Value="JCF.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="33" Y="84"/>
-        <TopLine Value="67"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="94"/>
-        <Bookmarks Count="2">
-          <Item0 X="54" Y="38" ID="1"/>
-          <Item1 X="17" Y="157" ID="2"/>
-        </Bookmarks>
-        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
-        <Filename Value="../../laz_svn/0.9.25/fpc_bad_test/test.pp"/>
-        <UnitName Value="test"/>
-        <CursorPos X="17" Y="6"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="5"/>
-      </Unit1>
-      <Unit2>
-        <Filename Value="../Include/JcfGlobal.inc"/>
-        <CursorPos X="1" Y="4"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="7"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="../Settings/JcfRegistrySettings.pas"/>
-        <UnitName Value="JcfRegistrySettings"/>
-        <CursorPos X="41" Y="251"/>
-        <TopLine Value="230"/>
-        <UsageCount Value="7"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="../ReadWrite/ConvertTypes.pas"/>
-        <UnitName Value="ConvertTypes"/>
-        <CursorPos X="78" Y="67"/>
-        <TopLine Value="47"/>
-        <UsageCount Value="7"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="../Utils/FileUtils.pas"/>
-        <UnitName Value="FileUtils"/>
-        <CursorPos X="1" Y="63"/>
-        <TopLine Value="57"/>
-        <UsageCount Value="7"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="../Ui/fJcfErrorDisplay.pas"/>
-        <ComponentName Value="ExceptionDialog"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="fJcfErrorDisplay"/>
-        <CursorPos X="44" Y="64"/>
-        <TopLine Value="49"/>
-        <UsageCount Value="7"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="../Parse/UI/fShowParseTree.pas"/>
-        <ComponentName Value="frmShowParseTree"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="fShowParseTree"/>
-        <CursorPos X="99" Y="296"/>
-        <TopLine Value="282"/>
-        <UsageCount Value="6"/>
-      </Unit7>
-      <Unit8>
         <Filename Value="../../Parse/Tokens.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Tokens"/>
-        <CursorPos X="6" Y="420"/>
-        <TopLine Value="418"/>
-        <UsageCount Value="39"/>
-      </Unit8>
-      <Unit9>
+      </Unit1>
+      <Unit2>
         <Filename Value="../../Utils/JcfUnicode.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfUnicode"/>
-        <CursorPos X="38" Y="143"/>
-        <TopLine Value="126"/>
-        <UsageCount Value="39"/>
-      </Unit9>
-      <Unit10>
+      </Unit2>
+      <Unit3>
         <Filename Value="../../Utils/JcfMiscFunctions.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfMiscFunctions"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="7"/>
-        <UsageCount Value="40"/>
-        <Loaded Value="True"/>
-      </Unit10>
-      <Unit11>
+      </Unit3>
+      <Unit4>
         <Filename Value="../../Parse/BuildTokenList.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="BuildTokenList"/>
-        <CursorPos X="26" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit11>
-      <Unit12>
+      </Unit4>
+      <Unit5>
         <Filename Value="../../Settings/JcfRegistrySettings.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JCFRegistrySettings"/>
-        <CursorPos X="22" Y="245"/>
-        <TopLine Value="226"/>
-        <UsageCount Value="40"/>
-      </Unit12>
-      <Unit13>
+      </Unit5>
+      <Unit6>
         <Filename Value="../../Utils/JcfUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfUtils"/>
-        <CursorPos X="36" Y="507"/>
-        <TopLine Value="489"/>
-        <UsageCount Value="40"/>
-        <Bookmarks Count="1">
-          <Item0 X="1" Y="103" ID="1"/>
-        </Bookmarks>
-      </Unit13>
-      <Unit14>
+      </Unit6>
+      <Unit7>
         <Filename Value="../../Settings/SettingsTypes.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SettingsTypes"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit14>
-      <Unit15>
+      </Unit7>
+      <Unit8>
         <Filename Value="../../Parse/TokenUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TokenUtils"/>
-        <CursorPos X="38" Y="182"/>
-        <TopLine Value="165"/>
-        <UsageCount Value="40"/>
-      </Unit15>
-      <Unit16>
+      </Unit8>
+      <Unit9>
         <Filename Value="../../Settings/Streams/SettingsStream.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SettingsStream"/>
-        <CursorPos X="46" Y="103"/>
-        <TopLine Value="103"/>
-        <UsageCount Value="40"/>
-      </Unit16>
-      <Unit17>
+      </Unit9>
+      <Unit10>
         <Filename Value="../../Settings/SetClarify.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetClarify"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit17>
-      <Unit18>
+      </Unit10>
+      <Unit11>
         <Filename Value="../../Settings/SetReplace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetReplace"/>
-        <CursorPos X="68" Y="146"/>
-        <TopLine Value="121"/>
-        <UsageCount Value="40"/>
-      </Unit18>
-      <Unit19>
+      </Unit11>
+      <Unit12>
         <Filename Value="../../JcfVersionConsts.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfVersionConsts"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit19>
-      <Unit20>
+      </Unit12>
+      <Unit13>
         <Filename Value="../../Settings/JcfSettings.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfSettings"/>
-        <CursorPos X="19" Y="43"/>
-        <TopLine Value="25"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="40"/>
-        <Loaded Value="True"/>
-      </Unit20>
-      <Unit21>
+      </Unit13>
+      <Unit14>
         <Filename Value="../../Parse/AsmKeywords.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AsmKeywords"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit21>
-      <Unit22>
+      </Unit14>
+      <Unit15>
         <Filename Value="../../Parse/BuildParseTree.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="BuildParseTree"/>
-        <CursorPos X="3" Y="44"/>
-        <TopLine Value="27"/>
-        <UsageCount Value="40"/>
-      </Unit22>
-      <Unit23>
+      </Unit15>
+      <Unit16>
         <Filename Value="../../Process/BaseVisitor.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="BaseVisitor"/>
-        <CursorPos X="67" Y="94"/>
-        <TopLine Value="79"/>
-        <UsageCount Value="40"/>
-      </Unit23>
-      <Unit24>
+      </Unit16>
+      <Unit17>
         <Filename Value="../../ReadWrite/Converter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Converter"/>
-        <CursorPos X="15" Y="7"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit24>
-      <Unit25>
+      </Unit17>
+      <Unit18>
         <Filename Value="../../Utils/JcfFontSetFunctions.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfFontSetFunctions"/>
-        <CursorPos X="47" Y="90"/>
-        <TopLine Value="74"/>
-        <UsageCount Value="39"/>
-      </Unit25>
-      <Unit26>
+      </Unit18>
+      <Unit19>
         <Filename Value="../../Parse/UI/fShowParseTree.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="frmShowParseTree"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="fShowParseTree"/>
-        <CursorPos X="17" Y="94"/>
-        <TopLine Value="77"/>
-        <UsageCount Value="40"/>
-      </Unit26>
-      <Unit27>
+      </Unit19>
+      <Unit20>
         <Filename Value="../../Process/VisitSetXY.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="VisitSetXY"/>
-        <CursorPos X="80" Y="10"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit27>
-      <Unit28>
+      </Unit20>
+      <Unit21>
         <Filename Value="../../Process/FormatFlags.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="FormatFlags"/>
-        <CursorPos X="40" Y="21"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="6"/>
-        <UsageCount Value="39"/>
-        <Loaded Value="True"/>
-      </Unit28>
-      <Unit29>
+      </Unit21>
+      <Unit22>
         <Filename Value="../../Process/Obfuscate/FixCase.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="FixCase"/>
-        <CursorPos X="11" Y="51"/>
-        <TopLine Value="34"/>
-        <UsageCount Value="40"/>
-      </Unit29>
-      <Unit30>
+      </Unit22>
+      <Unit23>
         <Filename Value="../../Process/Obfuscate/RemoveComment.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveComment"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit30>
-      <Unit31>
+      </Unit23>
+      <Unit24>
         <Filename Value="../../Process/Obfuscate/RemoveUnneededWhiteSpace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveUnneededWhiteSpace"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit31>
-      <Unit32>
+      </Unit24>
+      <Unit25>
         <Filename Value="../../Process/Obfuscate/RemoveReturn.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveReturn"/>
-        <CursorPos X="6" Y="46"/>
-        <TopLine Value="29"/>
-        <UsageCount Value="40"/>
-      </Unit32>
-      <Unit33>
+      </Unit25>
+      <Unit26>
         <Filename Value="../../Process/Obfuscate/RebreakLines.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RebreakLines"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit33>
-      <Unit34>
+      </Unit26>
+      <Unit27>
         <Filename Value="../../Process/RemoveEmptyComment.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveEmptyComment"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit34>
-      <Unit35>
+      </Unit27>
+      <Unit28>
         <Filename Value="../../Process/Capitalisation/IdentifierCaps.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="IdentifierCaps"/>
-        <CursorPos X="42" Y="118"/>
-        <TopLine Value="118"/>
-        <UsageCount Value="39"/>
-      </Unit35>
-      <Unit36>
+      </Unit28>
+      <Unit29>
         <Filename Value="../../Process/Capitalisation/Capitalisation.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Capitalisation"/>
-        <CursorPos X="37" Y="56"/>
-        <TopLine Value="39"/>
-        <UsageCount Value="49"/>
-      </Unit36>
-      <Unit37>
+      </Unit29>
+      <Unit30>
         <Filename Value="../../Process/Returns/ReturnChars.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ReturnChars"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="49"/>
-      </Unit37>
-      <Unit38>
+      </Unit30>
+      <Unit31>
         <Filename Value="../../Process/Returns/BlockStyles.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="BlockStyles"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="49"/>
-      </Unit38>
-      <Unit39>
+      </Unit31>
+      <Unit32>
         <Filename Value="../../Process/Spacing/TabToSpace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TabToSpace"/>
-        <CursorPos X="1" Y="56"/>
-        <TopLine Value="37"/>
-        <UsageCount Value="49"/>
-      </Unit39>
-      <Unit40>
+      </Unit32>
+      <Unit33>
         <Filename Value="../../Process/Spacing/SpaceToTab.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SpaceToTab"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="49"/>
-      </Unit40>
-      <Unit41>
+      </Unit33>
+      <Unit34>
         <Filename Value="../../Process/Spacing/MaxSpaces.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="MaxSpaces"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="49"/>
-      </Unit41>
-      <Unit42>
+      </Unit34>
+      <Unit35>
         <Filename Value="../../Process/Spacing/SingleSpaceBefore.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SingleSpaceBefore"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="50"/>
-      </Unit42>
-      <Unit43>
+      </Unit35>
+      <Unit36>
         <Filename Value="../../Process/Spacing/SingleSpaceAfter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SingleSpaceAfter"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="50"/>
-      </Unit43>
-      <Unit44>
+      </Unit36>
+      <Unit37>
         <Filename Value="../../Process/Spacing/SpaceBeforeColon.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SpaceBeforeColon"/>
-        <CursorPos X="39" Y="17"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="49"/>
-      </Unit44>
-      <Unit45>
+      </Unit37>
+      <Unit38>
         <Filename Value="../../Process/Indent/Indenter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Indenter"/>
-        <CursorPos X="43" Y="59"/>
-        <TopLine Value="42"/>
-        <UsageCount Value="49"/>
-      </Unit45>
-      <Unit46>
+      </Unit38>
+      <Unit39>
         <Filename Value="../../Process/Returns/LongLineBreaker.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="LongLineBreaker"/>
-        <CursorPos X="48" Y="703"/>
-        <TopLine Value="681"/>
-        <UsageCount Value="49"/>
-        <Bookmarks Count="1">
-          <Item0 X="26" Y="699" ID="1"/>
-        </Bookmarks>
-      </Unit46>
-      <Unit47>
+      </Unit39>
+      <Unit40>
         <Filename Value="../../Process/Info/BasicStats.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="BasicStats"/>
-        <CursorPos X="59" Y="223"/>
-        <TopLine Value="198"/>
-        <UsageCount Value="49"/>
-      </Unit47>
-      <Unit48>
+      </Unit40>
+      <Unit41>
         <Filename Value="../../Parse/PreProcessor/PreProcessorExpressionTokens.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PreProcessorExpressionTokens"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="49"/>
-      </Unit48>
-      <Unit49>
+      </Unit41>
+      <Unit42>
         <Filename Value="../../Parse/PreProcessor/PreProcessorExpressionTokenise.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PreProcessorExpressionTokenise"/>
-        <CursorPos X="11" Y="73"/>
-        <TopLine Value="56"/>
-        <UsageCount Value="49"/>
-      </Unit49>
-      <Unit50>
+      </Unit42>
+      <Unit43>
         <Filename Value="../../ReadWrite/FileConverter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="FileConverter"/>
-        <CursorPos X="37" Y="120"/>
-        <TopLine Value="103"/>
-        <UsageCount Value="50"/>
-      </Unit50>
-      <Unit51>
+      </Unit43>
+      <Unit44>
         <Filename Value="../../Utils/JcfUnicodeFiles.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfUnicodeFiles"/>
-        <CursorPos X="26" Y="92"/>
-        <TopLine Value="75"/>
-        <UsageCount Value="49"/>
-      </Unit51>
-      <Unit52>
+      </Unit44>
+      <Unit45>
         <Filename Value="../../Ui/fJcfErrorDisplay.pas"/>
+        <IsPartOfProject Value="True"/>
         <ComponentName Value="ExceptionDialog"/>
         <HasResources Value="True"/>
-        <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="fJcfErrorDisplay"/>
-        <CursorPos X="17" Y="62"/>
-        <TopLine Value="38"/>
-        <UsageCount Value="49"/>
-      </Unit52>
-      <Unit53>
+      </Unit45>
+      <Unit46>
         <Filename Value="../CommandLineConstants.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="CommandLineConstants"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="48"/>
-      </Unit53>
-      <Unit54>
+      </Unit46>
+      <Unit47>
         <Filename Value="../StatusMessageReceiver.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="StatusMessageReceiver"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="48"/>
-      </Unit54>
-      <Unit55>
+      </Unit47>
+      <Unit48>
         <Filename Value="../CommandLineReturnCode.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="CommandLineReturnCode"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="48"/>
-      </Unit55>
-      <Unit56>
+      </Unit48>
+      <Unit49>
         <Filename Value="../../ReadWrite/ConvertTypes.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ConvertTypes"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit56>
-      <Unit57>
+      </Unit49>
+      <Unit50>
         <Filename Value="../../Parse/ParseError.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ParseError"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit57>
-      <Unit58>
+      </Unit50>
+      <Unit51>
         <Filename Value="../../Parse/ParseTreeNode.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ParseTreeNode"/>
-        <CursorPos X="46" Y="21"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit58>
-      <Unit59>
+      </Unit51>
+      <Unit52>
         <Filename Value="../../Parse/ParseTreeNodeType.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ParseTreeNodeType"/>
-        <CursorPos X="37" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit59>
-      <Unit60>
+      </Unit52>
+      <Unit53>
         <Filename Value="../../Parse/SourceToken.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SourceToken"/>
-        <CursorPos X="13" Y="69"/>
-        <TopLine Value="52"/>
-        <UsageCount Value="40"/>
-      </Unit60>
-      <Unit61>
+      </Unit53>
+      <Unit54>
         <Filename Value="../../Parse/SourceTokenList.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SourceTokenList"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit61>
-      <Unit62>
+      </Unit54>
+      <Unit55>
         <Filename Value="../../Utils/FileUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="FileUtils"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit62>
-      <Unit63>
+      </Unit55>
+      <Unit56>
         <Filename Value="../../Utils/JcfLog.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JCFLog"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit63>
-      <Unit64>
+      </Unit56>
+      <Unit57>
         <Filename Value="../../Settings/SetUses.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetUses"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit64>
-      <Unit65>
+      </Unit57>
+      <Unit58>
         <Filename Value="../../Settings/JcfSetBase.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfSetBase"/>
-        <CursorPos X="66" Y="38"/>
-        <TopLine Value="34"/>
-        <UsageCount Value="40"/>
-      </Unit65>
-      <Unit66>
+      </Unit58>
+      <Unit59>
         <Filename Value="../../Settings/SetAlign.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetAlign"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit66>
-      <Unit67>
+      </Unit59>
+      <Unit60>
         <Filename Value="../../Settings/SetCaps.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetCaps"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit67>
-      <Unit68>
+      </Unit60>
+      <Unit61>
         <Filename Value="../../Settings/SetFile.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetFile"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit68>
-      <Unit69>
+      </Unit61>
+      <Unit62>
         <Filename Value="../../Settings/SetIndent.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetIndent"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit69>
-      <Unit70>
+      </Unit62>
+      <Unit63>
         <Filename Value="../../Settings/SetObfuscate.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetObfuscate"/>
-        <CursorPos X="99" Y="2"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit70>
-      <Unit71>
+      </Unit63>
+      <Unit64>
         <Filename Value="../../Process/Warnings/WarnUnusedParam.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnUnusedParam"/>
-        <CursorPos X="12" Y="69"/>
-        <TopLine Value="52"/>
-        <UsageCount Value="39"/>
-      </Unit71>
-      <Unit72>
+      </Unit64>
+      <Unit65>
         <Filename Value="../../Process/Warnings/WarnDestroy.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnDestroy"/>
-        <CursorPos X="12" Y="51"/>
-        <TopLine Value="34"/>
-        <UsageCount Value="40"/>
-      </Unit72>
-      <Unit73>
+      </Unit65>
+      <Unit66>
         <Filename Value="../../Process/Warnings/WarnAssignToFunctionName.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnAssignToFunctionName"/>
-        <CursorPos X="68" Y="70"/>
-        <TopLine Value="54"/>
-        <UsageCount Value="40"/>
-      </Unit73>
-      <Unit74>
+      </Unit66>
+      <Unit67>
         <Filename Value="../../Process/Capitalisation/UnitNameCaps.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UnitNameCaps"/>
-        <CursorPos X="40" Y="105"/>
-        <TopLine Value="105"/>
-        <UsageCount Value="39"/>
-      </Unit74>
-      <Unit75>
+      </Unit67>
+      <Unit68>
         <Filename Value="../../Process/Transform/SortUsesData.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SortUsesData"/>
-        <CursorPos X="17" Y="99"/>
-        <TopLine Value="82"/>
-        <UsageCount Value="39"/>
-      </Unit75>
-      <Unit76>
+      </Unit68>
+      <Unit69>
         <Filename Value="../../Process/Capitalisation/SpecificWordCaps.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SpecificWordCaps"/>
-        <CursorPos X="44" Y="113"/>
-        <TopLine Value="113"/>
-        <UsageCount Value="39"/>
-      </Unit76>
-      <Unit77>
+      </Unit69>
+      <Unit70>
         <Filename Value="../../Settings/SetWordList.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetWordList"/>
-        <CursorPos X="11" Y="74"/>
-        <TopLine Value="57"/>
-        <UsageCount Value="39"/>
-      </Unit77>
-      <Unit78>
+      </Unit70>
+      <Unit71>
         <Filename Value="../../Settings/SetPreProcessor.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetPreprocessor"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit78>
-      <Unit79>
+      </Unit71>
+      <Unit72>
         <Filename Value="../../Utils/JcfHelp.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfHelp"/>
-        <CursorPos X="52" Y="75"/>
-        <TopLine Value="58"/>
-        <UsageCount Value="39"/>
-      </Unit79>
-      <Unit80>
+      </Unit72>
+      <Unit73>
         <Filename Value="../../Settings/SetReturns.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetReturns"/>
-        <CursorPos X="3" Y="167"/>
-        <TopLine Value="150"/>
-        <UsageCount Value="40"/>
-      </Unit80>
-      <Unit81>
+      </Unit73>
+      <Unit74>
         <Filename Value="../../Settings/SetSpaces.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetSpaces"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit81>
-      <Unit82>
+      </Unit74>
+      <Unit75>
         <Filename Value="../../Settings/Streams/RegistrySettings.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RegistrySettings"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit82>
-      <Unit83>
+      </Unit75>
+      <Unit76>
         <Filename Value="../../Process/Obfuscate/ReduceWhiteSpace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ReduceWhiteSpace"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit83>
-      <Unit84>
+      </Unit76>
+      <Unit77>
         <Filename Value="../../Process/Obfuscate/RemoveConsecutiveWhiteSpace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveConsecutiveWhiteSpace"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit84>
-      <Unit85>
+      </Unit77>
+      <Unit78>
         <Filename Value="../../Process/Warnings/WarnRealType.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnRealType"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit85>
-      <Unit86>
+      </Unit78>
+      <Unit79>
         <Filename Value="../../Process/Warnings/WarnCaseNoElse.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnCaseNoElse"/>
-        <CursorPos X="35" Y="60"/>
-        <TopLine Value="43"/>
-        <UsageCount Value="40"/>
-      </Unit86>
-      <Unit87>
+      </Unit79>
+      <Unit80>
         <Filename Value="../../Process/Warnings/WarnEmptyBlock.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnEmptyBlock"/>
-        <CursorPos X="38" Y="51"/>
-        <TopLine Value="34"/>
-        <UsageCount Value="40"/>
-      </Unit87>
-      <Unit88>
+      </Unit80>
+      <Unit81>
         <Filename Value="../../Process/Warnings/Warning.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Warning"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit88>
-      <Unit89>
+      </Unit81>
+      <Unit82>
         <Filename Value="../../Process/Spacing/NoSpaceBefore.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="NoSpaceBefore"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit89>
-      <Unit90>
+      </Unit82>
+      <Unit83>
         <Filename Value="../../Process/Spacing/NoSpaceAfter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="NoSpaceAfter"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit90>
-      <Unit91>
+      </Unit83>
+      <Unit84>
         <Filename Value="../../Process/Returns/ReturnAfter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ReturnAfter"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit91>
-      <Unit92>
+      </Unit84>
+      <Unit85>
         <Filename Value="../../Process/Nesting.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Nesting"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="40"/>
-      </Unit92>
-      <Unit93>
+      </Unit85>
+      <Unit86>
         <Filename Value="../../Process/VisitSetNesting.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="VisitSetNesting"/>
-        <CursorPos X="44" Y="87"/>
-        <TopLine Value="87"/>
-        <UsageCount Value="40"/>
-      </Unit93>
-      <Unit94>
+      </Unit86>
+      <Unit87>
         <Filename Value="../../Process/Returns/ReturnBefore.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ReturnBefore"/>
-        <CursorPos X="3" Y="62"/>
-        <TopLine Value="45"/>
-        <UsageCount Value="40"/>
-      </Unit94>
-      <Unit95>
+      </Unit87>
+      <Unit88>
         <Filename Value="../../Process/Returns/NoReturnAfter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="NoReturnAfter"/>
-        <CursorPos X="80" Y="6"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit95>
-      <Unit96>
+      </Unit88>
+      <Unit89>
         <Filename Value="../../Process/Returns/NoReturnBefore.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="NoReturnBefore"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit96>
-      <Unit97>
+      </Unit89>
+      <Unit90>
         <Filename Value="../../Process/AllProcesses.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AllProcesses"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit97>
-      <Unit98>
+      </Unit90>
+      <Unit91>
         <Filename Value="../../Process/Obfuscate/RemoveBlankLine.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveBlankLine"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit98>
-      <Unit99>
+      </Unit91>
+      <Unit92>
         <Filename Value="../../Process/SwitchableVisitor.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SwitchableVisitor"/>
-        <CursorPos X="30" Y="91"/>
-        <TopLine Value="74"/>
-        <UsageCount Value="39"/>
-      </Unit99>
-      <Unit100>
+      </Unit92>
+      <Unit93>
         <Filename Value="../../Process/Returns/PropertyOnOneLine.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PropertyOnOneLine"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit100>
-      <Unit101>
+      </Unit93>
+      <Unit94>
         <Filename Value="../../Process/VisitStripEmptySpace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="VisitStripEmptySpace"/>
-        <CursorPos X="1" Y="46"/>
-        <TopLine Value="28"/>
-        <UsageCount Value="39"/>
-      </Unit101>
-      <Unit102>
+      </Unit94>
+      <Unit95>
         <Filename Value="../../Process/Returns/RemoveBlankLinesAfterProcHeader.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveBlankLinesAfterProcHeader"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit102>
-      <Unit103>
+      </Unit95>
+      <Unit96>
         <Filename Value="../../Process/Returns/RemoveBlankLinesInVars.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveBlankLinesInVars"/>
-        <CursorPos X="57" Y="14"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit103>
-      <Unit104>
+      </Unit96>
+      <Unit97>
         <Filename Value="../../Process/Returns/RemoveReturnsBeforeEnd.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveReturnsBeforeEnd"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit104>
-      <Unit105>
+      </Unit97>
+      <Unit98>
         <Filename Value="../../Process/Returns/RemoveReturnsAfterBegin.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveReturnsAfterBegin"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit105>
-      <Unit106>
+      </Unit98>
+      <Unit99>
         <Filename Value="../../Utils/IntList.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="IntList"/>
-        <CursorPos X="37" Y="133"/>
-        <TopLine Value="115"/>
-        <UsageCount Value="39"/>
-      </Unit106>
-      <Unit107>
+      </Unit99>
+      <Unit100>
         <Filename Value="../../Process/Align/AlignConst.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignConst"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit107>
-      <Unit108>
+      </Unit100>
+      <Unit101>
         <Filename Value="../../Process/Align/AlignBase.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignBase"/>
-        <CursorPos X="34" Y="78"/>
-        <TopLine Value="61"/>
-        <UsageCount Value="39"/>
-      </Unit108>
-      <Unit109>
+      </Unit101>
+      <Unit102>
         <Filename Value="../../Process/Align/AlignAssign.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignAssign"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit109>
-      <Unit110>
+      </Unit102>
+      <Unit103>
         <Filename Value="../../Process/Align/AlignVars.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignVars"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit110>
-      <Unit111>
+      </Unit103>
+      <Unit104>
         <Filename Value="../../Process/Align/AlignTypedef.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignTypedef"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit111>
-      <Unit112>
+      </Unit104>
+      <Unit105>
         <Filename Value="../../Process/Align/AlignComment.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignComment"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit112>
-      <Unit113>
+      </Unit105>
+      <Unit106>
         <Filename Value="../../Parse/PreProcessor/PreProcessorExpressionParser.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PreProcessorExpressionParser"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit113>
-      <Unit114>
+      </Unit106>
+      <Unit107>
         <Filename Value="../../Process/Spacing/RemoveSpaceAtLineEnd.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveSpaceAtLineEnd"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit114>
-      <Unit115>
+      </Unit107>
+      <Unit108>
         <Filename Value="../../Process/Transform/FindReplace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="FindReplace"/>
-        <CursorPos X="39" Y="74"/>
-        <TopLine Value="68"/>
-        <UsageCount Value="39"/>
-      </Unit115>
-      <Unit116>
+      </Unit108>
+      <Unit109>
         <Filename Value="../../Process/Returns/ReturnsAfterFinalEnd.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ReturnsAfterFinalEnd"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit116>
-      <Unit117>
+      </Unit109>
+      <Unit110>
         <Filename Value="../../Parse/PreProcessor/PreProcessorParseTree.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PreProcessorParseTree"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit117>
-      <Unit118>
+      </Unit110>
+      <Unit111>
         <Filename Value="../../Process/Returns/RemoveConsecutiveReturns.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveConsecutiveReturns"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit118>
-      <Unit119>
+      </Unit111>
+      <Unit112>
         <Filename Value="../../Process/Transform/UsesClauseFindReplace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UsesClauseFindReplace"/>
-        <CursorPos X="49" Y="158"/>
-        <TopLine Value="136"/>
-        <UsageCount Value="39"/>
-      </Unit119>
-      <Unit120>
+      </Unit112>
+      <Unit113>
         <Filename Value="../../Process/Transform/UsesClauseInsert.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UsesClauseInsert"/>
-        <CursorPos X="44" Y="151"/>
-        <TopLine Value="151"/>
-        <UsageCount Value="39"/>
-      </Unit120>
-      <Unit121>
+      </Unit113>
+      <Unit114>
         <Filename Value="../../Process/Transform/UsesClauseRemove.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UsesClauseRemove"/>
-        <CursorPos X="44" Y="149"/>
-        <TopLine Value="127"/>
-        <UsageCount Value="39"/>
-      </Unit121>
-      <Unit122>
+      </Unit114>
+      <Unit115>
         <Filename Value="../../Settings/SetComments.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetComments"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit122>
-      <Unit123>
+      </Unit115>
+      <Unit116>
         <Filename Value="../../Process/TreeWalker.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TreeWalker"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit123>
-      <Unit124>
+      </Unit116>
+      <Unit117>
         <Filename Value="../../Process/Transform/AddBlockEndSemicolon.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AddBlockEndSemicolon"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit124>
-      <Unit125>
+      </Unit117>
+      <Unit118>
         <Filename Value="../../Process/Transform/AddBeginEnd.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AddBeginEnd"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit125>
-      <Unit126>
+      </Unit118>
+      <Unit119>
         <Filename Value="../../Settings/SetTransform.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetTransform"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit126>
-      <Unit127>
+      </Unit119>
+      <Unit120>
         <Filename Value="../../Process/Align/AlignField.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignField"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit127>
-      <Unit128>
+      </Unit120>
+      <Unit121>
         <Filename Value="../../Process/Transform/SortUses.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SortUses"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit128>
-      <Unit129>
+      </Unit121>
+      <Unit122>
         <Filename Value="../../Settings/SetAsm.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetAsm"/>
-        <CursorPos X="1" Y="43"/>
-        <TopLine Value="25"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="39"/>
-        <Loaded Value="True"/>
-      </Unit129>
-      <Unit130>
+      </Unit122>
+      <Unit123>
         <Filename Value="../../Process/Returns/RemoveReturnsAfter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveReturnsAfter"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit130>
-      <Unit131>
+      </Unit123>
+      <Unit124>
         <Filename Value="../../Process/Indent/IndentAsmParam.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="IndentAsmParam"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="39"/>
-      </Unit131>
-      <Unit132>
+      </Unit124>
+      <Unit125>
         <Filename Value="../../Utils/JcfStringUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfStringUtils"/>
-        <CursorPos X="21" Y="26"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="5"/>
-        <UsageCount Value="29"/>
-        <Loaded Value="True"/>
-      </Unit132>
-      <Unit133>
-        <Filename Value="../../Parse/UI/fShowParseTree.lrs"/>
-        <CursorPos X="17" Y="3"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="10"/>
-      </Unit133>
-      <Unit134>
+      </Unit125>
+      <Unit126>
         <Filename Value="../../Process/Spacing/MoveSpaceToBeforeColon.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="MoveSpaceToBeforeColon"/>
-        <CursorPos X="28" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="25"/>
-      </Unit134>
-      <Unit135>
+      </Unit126>
+      <Unit127>
         <Filename Value="../../Utils/JcfFileUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfFileUtils"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="20"/>
-        <Loaded Value="True"/>
-      </Unit135>
-      <Unit136>
+      </Unit127>
+      <Unit128>
         <Filename Value="../../Utils/JcfSystemUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfSystemUtils"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="20"/>
-        <Loaded Value="True"/>
-      </Unit136>
+      </Unit128>
     </Units>
-    <JumpHistory Count="15" HistoryIndex="14">
-      <Position1>
-        <Filename Value="../../Process/FormatFlags.pas"/>
-        <Caret Line="214" Column="39" TopLine="194"/>
-      </Position1>
-      <Position2>
-        <Filename Value="../../Process/FormatFlags.pas"/>
-        <Caret Line="83" Column="45" TopLine="63"/>
-      </Position2>
-      <Position3>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="172" Column="11" TopLine="164"/>
-      </Position3>
-      <Position4>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="20" Column="1" TopLine="19"/>
-      </Position4>
-      <Position5>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="99" Column="12" TopLine="80"/>
-      </Position5>
-      <Position6>
-        <Filename Value="../../Process/FormatFlags.pas"/>
-        <Caret Line="80" Column="7" TopLine="55"/>
-      </Position6>
-      <Position7>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="88" Column="9" TopLine="80"/>
-      </Position7>
-      <Position8>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position8>
-      <Position9>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="38" Column="10" TopLine="1"/>
-      </Position9>
-      <Position10>
-        <Filename Value="../../Utils/JcfMiscFunctions.pas"/>
-        <Caret Line="241" Column="50" TopLine="222"/>
-      </Position10>
-      <Position11>
-        <Filename Value="../../Settings/SetAsm.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position11>
-      <Position12>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="166" Column="3" TopLine="146"/>
-      </Position12>
-      <Position13>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position13>
-      <Position14>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="14" Column="73" TopLine="1"/>
-      </Position14>
-      <Position15>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="24" Column="36" TopLine="1"/>
-      </Position15>
-    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <SearchPaths>
-      <IncludeFiles Value="../../Include/"/>
-      <OtherUnitFiles Value="../../Output/Lazarus/"/>
+      <IncludeFiles Value="../../Include"/>
+      <OtherUnitFiles Value="../../Output/Lazarus"/>
       <UnitOutputDirectory Value="../../Output/Lazarus"/>
-      <SrcPath Value="../../Include/"/>
+      <SrcPath Value="../../Include"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <CStyleOperator Value="False"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <Other>