JediCodeFormat: Harmonize uses sections.

git-svn-id: trunk@63849 -
2025-12-04 01:07:15 +01:00 · 2020-08-31 07:10:19 +00:00 · 2020-08-31 07:10:19 +00:00 · 080e21106f
commit 080e21106f
parent 55553eded7
81 changed files with 169 additions and 222 deletions
--- a/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas
+++ b/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas
@ -1,4 +1,4 @@
-unit jcfuiconsts;
+unit JcfUIConsts;

 {$mode objfpc}{$H+}

--- a/components/jcf2/JcfGui/fMain.pas
+++ b/components/jcf2/JcfGui/fMain.pas
@ -35,7 +35,6 @@ unit fMain;
 interface

 uses
-  { delphi }
  SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, ComCtrls, Menus,
  ActnList, StdActns, ToolWin, ImgList, ShellAPI,
  { local }
--- a/components/jcf2/Parse/BuildParseTree.pas
+++ b/components/jcf2/Parse/BuildParseTree.pas
@ -40,17 +40,17 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} Contnrs,
-  { local }
+  Contnrs, SysUtils,
+  Forms,
+  // local
  ParseTreeNode,
  ParseTreeNodeType,
  ParseError,
  SourceToken,
  SourceTokenList,
  Tokens,
-  TokenUtils;
-
+  TokenUtils,
+  JcfStringUtils;

 type
  TBuildParseTree = class(TObject)
@ -288,12 +288,6 @@ type

 implementation

-uses
-  { delphi }
-  SysUtils, Forms,
-  { local }
-  JcfStringUtils;
-
 const
  UPDATE_INTERVAL = 512;

--- a/components/jcf2/Parse/ParseError.pas
+++ b/components/jcf2/Parse/ParseError.pas
@ -30,7 +30,6 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  {delphi }
  SysUtils,
  { local }
  SourceToken;
--- a/components/jcf2/Parse/ParseTreeNode.pas
+++ b/components/jcf2/Parse/ParseTreeNode.pas
@ -33,7 +33,6 @@ interface
  A node on the parse tree
 }
 uses
-  {delphi }
  Contnrs, Classes,
  { local }
  Tokens, ParseTreeNodeType, Nesting;
--- a/components/jcf2/Parse/PreProcessor/PreProcessorExpressionParser.pas
+++ b/components/jcf2/Parse/PreProcessor/PreProcessorExpressionParser.pas
@ -61,7 +61,6 @@ interface


 uses
-  { celphi }
  Classes, SysUtils,
  { local }
  PreProcessorExpressionTokens;
--- a/components/jcf2/Parse/PreProcessor/PreProcessorExpressionTokenise.pas
+++ b/components/jcf2/Parse/PreProcessor/PreProcessorExpressionTokenise.pas
@ -37,7 +37,9 @@ interface
 The tokens are defined in PreProcessorTokens
 Whitespace is discarded
 }
-uses PreProcessorExpressionTokens;
+uses
+  SysUtils,
+  PreProcessorExpressionTokens;

 type
  TPreProcessorExpressionTokeniser = class
@ -69,8 +71,6 @@ type
 implementation

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} SysUtils,
  { local }
  JcfStringUtils;

--- a/components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas
+++ b/components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas
@ -33,8 +33,8 @@ interface
 }

 uses
-  { delphi }
-  Classes,
+  Classes, SysUtils,
+  Forms,
  { local }
  Tokens, SourceTokenList, SourceToken;

@ -90,8 +90,6 @@ procedure RemoveConditionalCompilation(const pcTokens: TSourceTokenList);
 implementation

 uses
-  { delphi }
-  SysUtils, Forms,
  { local }
  PreProcessorExpressionTokenise, PreProcessorExpressionParser,
  ParseError, JcfSettings;
--- a/components/jcf2/Parse/SourceToken.pas
+++ b/components/jcf2/Parse/SourceToken.pas
@ -33,6 +33,7 @@ unit SourceToken;
 interface

 uses
+  SysUtils,
  { local }
  Tokens, ParseTreeNode;

@ -104,10 +105,6 @@ type

 implementation

-uses
-  { delphi }
-  SysUtils;
-
 {-------------------------------------------------------------------------------
 TSourceToken }

--- a/components/jcf2/Parse/SourceTokenList.pas
+++ b/components/jcf2/Parse/SourceTokenList.pas
@ -45,8 +45,7 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  { delphi }
-  Contnrs,
+  Contnrs, SysUtils,
  { local }
  SourceToken,
  Tokens;
@ -104,8 +103,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { local }
  JcfMiscFunctions;

--- a/components/jcf2/Parse/TokenUtils.pas
+++ b/components/jcf2/Parse/TokenUtils.pas
@ -36,7 +36,9 @@ See http://www.gnu.org/licenses/gpl.html

 interface

-uses ParseTreeNode, SourceToken, SettingsTypes;
+uses
+  SysUtils,
+  ParseTreeNode, SourceToken, SettingsTypes;

 { make a new return token }
 function NewReturn: TSourceToken;
@ -172,8 +174,6 @@ function HasAsmCaps(const pt: TSourceToken): boolean;
 implementation

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} SysUtils, 
  { local }
  JcfSettings,
  JcfStringUtils,
--- a/components/jcf2/Process/Align/AlignBase.pas
+++ b/components/jcf2/Process/Align/AlignBase.pas
@ -34,7 +34,9 @@ unit AlignBase;

 interface

-uses SwitchableVisitor, SourceToken, SourceTokenList;
+uses
+  SysUtils, Math,
+  SwitchableVisitor, SourceToken, SourceTokenList;

 type

@ -73,8 +75,6 @@ type
 implementation

 uses
-  { delphi }SysUtils, Math,
-  { jcl }
  { jcf } JcfSettings, TokenUtils, ParseTreeNodeType;

 { TAlignBase }
--- a/components/jcf2/Process/AllProcesses.pas
+++ b/components/jcf2/Process/AllProcesses.pas
@ -71,7 +71,6 @@ type
 implementation

 uses
-  { delphi }
  Forms, SysUtils,
  { local }
  JcfSettings, SetClarify, VisitSetXY,
--- a/components/jcf2/Process/Capitalisation/IdentifierCaps.pas
+++ b/components/jcf2/Process/Capitalisation/IdentifierCaps.pas
@ -32,7 +32,9 @@ See http://www.gnu.org/licenses/gpl.html

 interface

-uses SwitchableVisitor;
+uses
+  SysUtils,
+  SwitchableVisitor;

 type
  TIdentifierCaps = class(TSwitchableVisitor)
@ -54,8 +56,6 @@ type
 implementation

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} SysUtils,
  { local }
  SourceToken, Tokens, ParseTreeNodeType,
  JcfSettings, FormatFlags, TokenUtils;
--- a/components/jcf2/Process/Capitalisation/SpecificWordCaps.pas
+++ b/components/jcf2/Process/Capitalisation/SpecificWordCaps.pas
@ -32,7 +32,9 @@ See http://www.gnu.org/licenses/gpl.html

 interface

-uses SwitchableVisitor;
+uses
+  SysUtils,
+  SwitchableVisitor;

 type
  TSpecificWordCaps = class(TSwitchableVisitor)
@ -53,8 +55,6 @@ type
 implementation

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} SysUtils,
  { local }
  SourceToken, Tokens, ParseTreeNodeType, JcfSettings, FormatFlags;

--- a/components/jcf2/Process/Capitalisation/UnitNameCaps.pas
+++ b/components/jcf2/Process/Capitalisation/UnitNameCaps.pas
@ -32,7 +32,9 @@ See http://www.gnu.org/licenses/gpl.html

 interface

-uses SwitchableVisitor;
+uses
+  SysUtils,
+  SwitchableVisitor;

 type
  TUnitNameCaps = class(TSwitchableVisitor)
@ -53,8 +55,6 @@ type
 implementation

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} SysUtils,
  { local }
  SourceToken, Tokens, ParseTreeNodeType, JcfSettings, FormatFlags,
  TokenUtils;
--- a/components/jcf2/Process/FormatFlags.pas
+++ b/components/jcf2/Process/FormatFlags.pas
@ -34,6 +34,9 @@ See http://www.gnu.org/licenses/gpl.html

 interface

+uses
+  SysUtils;
+
 type

  TFormatFlag = (eAllFormat,
@ -74,8 +77,6 @@ const
 implementation

 uses
-  { delphi }
-  {$ifndef fpc}Windows,{$endif} SysUtils,
  { local }
  JcfStringUtils;

--- a/components/jcf2/Process/Indent/Indenter.pas
+++ b/components/jcf2/Process/Indent/Indenter.pas
@ -38,7 +38,9 @@ interface
  it sets the indent for the start of the line
 }

-uses SwitchableVisitor;
+uses
+  SysUtils,
+  SwitchableVisitor;

 type
  TIndenter = class(TSwitchableVisitor)
@ -51,8 +53,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { local }
  JcfStringUtils,
  SourceToken, Nesting, FormatFlags, JcfSettings, TokenUtils,
--- a/components/jcf2/Process/Info/BasicStats.pas
+++ b/components/jcf2/Process/Info/BasicStats.pas
@ -38,7 +38,9 @@ interface

 {(*}

-uses BaseVisitor;
+uses
+  SysUtils,
+  BaseVisitor;

 type
  TBasicStats = class(TBaseTreeNodeVisitor)
@ -69,8 +71,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { JCF  }
  JcfStringUtils,
  SourceToken, Tokens, ParseTreeNode, ParseTreeNodeType, TokenUtils,
--- a/components/jcf2/Process/Obfuscate/FixCase.pas
+++ b/components/jcf2/Process/Obfuscate/FixCase.pas
@ -33,7 +33,9 @@ interface
  Obfusccate - capitalisation
 }

-uses SwitchableVisitor;
+uses
+  SysUtils,
+  SwitchableVisitor;

 type
  TFixCase = class(TSwitchableVisitor)
@ -47,8 +49,6 @@ type
 implementation

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} SysUtils,
  { local }
  JcfStringUtils,
  Tokens, SourceToken, SettingsTypes,
--- a/components/jcf2/Process/Onceoffs/GlobalInclude.pas
+++ b/components/jcf2/Process/Onceoffs/GlobalInclude.pas
@ -33,7 +33,9 @@ unit GlobalInclude;

 interface

-uses BaseVisitor, SourceToken;
+uses
+  SysUtils,
+  BaseVisitor, SourceToken;

 type
  TGlobalInclude = class(TBaseTreeNodeVisitor)
@ -52,7 +54,6 @@ type
 implementation

 uses
-  { delphi }SysUtils,
  JclAnsiStrings,
  { local }Tokens, TokenUtils, JcfSettings,
  SettingsTypes, ParseTreeNodeType, SetClarify;
--- a/components/jcf2/Process/Onceoffs/MozComment.pas
+++ b/components/jcf2/Process/Onceoffs/MozComment.pas
@ -37,7 +37,9 @@ unit MozComment;

 interface

-uses BaseVisitor, SourceToken;
+uses
+  SysUtils,
+  BaseVisitor, SourceToken;

 type
  TMozComment = class(TBaseTreeNodeVisitor)
@ -56,8 +58,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { local }
  Tokens, TokenUtils, JcfSettings, JcfStringUtils,
  SettingsTypes, ParseTreeNodeType, SetClarify;
--- a/components/jcf2/Process/Returns/LongLineBreaker.pas
+++ b/components/jcf2/Process/Returns/LongLineBreaker.pas
@ -39,7 +39,9 @@ interface
  (before? after?) the line will be broken 
 }

-uses SwitchableVisitor, IntList, SourceTokenList;
+uses
+  SysUtils,
+  SwitchableVisitor, IntList, SourceTokenList;


 type
@ -62,8 +64,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { local }
  JcfStringUtils,
  SourceToken, FormatFlags, JcfSettings, SetReturns,
--- a/components/jcf2/Process/Returns/ReturnAfter.pas
+++ b/components/jcf2/Process/Returns/ReturnAfter.pas
@ -34,7 +34,9 @@ interface
 }


-uses SwitchableVisitor;
+uses
+  SysUtils,
+  SwitchableVisitor;

 type
  TReturnAfter = class(TSwitchableVisitor)
@ -51,8 +53,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { local }
  TokenUtils, SourceToken, Tokens,
  ParseTreeNodeType, ParseTreeNode, JcfSettings, FormatFlags, SettingsTypes;
--- a/components/jcf2/Process/Spacing/TabToSpace.pas
+++ b/components/jcf2/Process/Spacing/TabToSpace.pas
@ -32,7 +32,9 @@ interface
 { AFS 4 Jan 2002
  convert tabs to spaces }

-uses SwitchableVisitor;
+uses
+  SysUtils,
+  SwitchableVisitor;

 type
  TTabToSpace = class(TSwitchableVisitor)
@ -51,8 +53,6 @@ type
 implementation

 uses
-  { Delphi }
-  SysUtils,
  { local }
  JcfStringUtils,
  JcfSettings, SourceToken, Tokens, FormatFlags;
--- a/components/jcf2/Process/Transform/FindReplace.pas
+++ b/components/jcf2/Process/Transform/FindReplace.pas
@ -29,7 +29,9 @@ See http://www.gnu.org/licenses/gpl.html

 interface

-uses SwitchableVisitor;
+uses
+  SysUtils,
+  SwitchableVisitor;

 type
  TFindReplace = class(TSwitchableVisitor)
@ -49,8 +51,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { local }
  JcfSettings,
  SourceToken,
--- a/components/jcf2/Process/Transform/SortUses.pas
+++ b/components/jcf2/Process/Transform/SortUses.pas
@ -30,7 +30,9 @@ interface

 { unit to sort the uses clause }

-uses BaseVisitor, ParseTreeNode;
+uses
+  Contnrs, Classes,
+  BaseVisitor, ParseTreeNode;

 type
  TSortUses = class(TBaseTreeNodeVisitor)
@ -50,8 +52,6 @@ type
 implementation

 uses
-  { delphi }
-  Contnrs, Classes, 
  { local }
  ParseTreeNodeType, SourceToken, Tokens, JcfSettings,
  SetTransform, TokenUtils, SortUsesData;
--- a/components/jcf2/Process/Transform/SortUsesData.pas
+++ b/components/jcf2/Process/Transform/SortUsesData.pas
@ -29,8 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  { delphi }
-  Contnrs, Classes,
+  Contnrs, Classes, Math, SysUtils,
  { local }
  SourceToken, ParseTreeNode;

@ -95,8 +94,6 @@ function ReverseLengthNameSort(Item1, Item2: Pointer): integer;
 implementation

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} Math, SysUtils,
  {local }
  ParseTreeNodeType, Tokens, TokenUtils;

--- a/components/jcf2/Process/Transform/UsesClauseFindReplace.pas
+++ b/components/jcf2/Process/Transform/UsesClauseFindReplace.pas
@ -36,6 +36,7 @@ interface
 }

 uses
+  SysUtils,
  { local }
  SourceToken,
  SwitchableVisitor;
@ -61,8 +62,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { local }
  JcfSettings,
  Tokens,
--- a/components/jcf2/Process/Transform/UsesClauseInsert.pas
+++ b/components/jcf2/Process/Transform/UsesClauseInsert.pas
@ -36,8 +36,7 @@ interface
 }

 uses
-  { delphi }
-  Classes,
+  Classes, SysUtils,
  { local }
  SourceToken,
  SwitchableVisitor;
@ -65,8 +64,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { local }
  JcfSettings,
  Tokens,
--- a/components/jcf2/Process/Transform/UsesClauseRemove.pas
+++ b/components/jcf2/Process/Transform/UsesClauseRemove.pas
@ -36,6 +36,7 @@ interface
 }

 uses
+  SysUtils,
  { local }
  SourceToken,
  SwitchableVisitor;
@ -61,8 +62,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { local }
  JcfSettings,
  Tokens,
--- a/components/jcf2/Process/TreeWalker.pas
+++ b/components/jcf2/Process/TreeWalker.pas
@ -44,7 +44,9 @@ interface
  The first being generating the parse tree
 }

-uses ParseTreeNode, BaseVisitor;
+uses
+  SysUtils,
+  ParseTreeNode, BaseVisitor;

 type
  TTreeWalker = class(TObject)
@ -76,9 +78,6 @@ type

 implementation

-uses
-  { delphi } SysUtils;
-
 procedure TTreeWalker.InitialiseFlags;
 begin
  { read these once only for speed  }
--- a/components/jcf2/Process/VisitSetNesting.pas
+++ b/components/jcf2/Process/VisitSetNesting.pas
@ -32,8 +32,7 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  { delphi }
-  Contnrs,
+  Contnrs, SysUtils,
  { local }
  BaseVisitor, Nesting;

@ -60,7 +59,7 @@ type

 implementation

-uses SysUtils,
+uses
  ParseTreeNode, ParseTreeNodeType,
  Tokens, SourceToken;

--- a/components/jcf2/Process/Warnings/WarnAssignToFunctionName.pas
+++ b/components/jcf2/Process/Warnings/WarnAssignToFunctionName.pas
@ -47,7 +47,9 @@ interface
  end;
 }

-uses Warning;
+uses
+  SysUtils,
+  Warning;

 type

@ -64,8 +66,6 @@ type
 implementation

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} SysUtils,
  { local }
  ParseTreeNode, ParseTreeNodeType, SourceToken, Tokens, TokenUtils;

--- a/components/jcf2/Process/Warnings/WarnDestroy.pas
+++ b/components/jcf2/Process/Warnings/WarnDestroy.pas
@ -35,7 +35,9 @@ See http://www.gnu.org/licenses/gpl.html

 interface

-uses Warning;
+uses
+  SysUtils,
+  Warning;

 type

@ -47,8 +49,6 @@ type
 implementation

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} SysUtils,
  { local }
  SourceToken, ParseTreeNodeType, ParseTreeNode;

--- a/components/jcf2/Process/Warnings/WarnUnusedParam.pas
+++ b/components/jcf2/Process/Warnings/WarnUnusedParam.pas
@ -42,7 +42,9 @@ interface
 Should emit a warning that param b is not used.
 }

-uses Warning, ParseTreeNode;
+uses
+  SysUtils,
+  Warning, ParseTreeNode;

 type

@ -65,8 +67,6 @@ type
 implementation

 uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} SysUtils,
  { local }
  ParseTreeNodeType, SourceToken, TokenUtils, JCfSettings;

--- a/components/jcf2/ReadWrite/EditorConverter.pas
+++ b/components/jcf2/ReadWrite/EditorConverter.pas
@ -34,7 +34,7 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  Classes,
+  Classes, SysUtils, Math,
  {$ifdef fpc}
    { lazarus design time }
    SrcEditorIntf, LazUTF8,
@ -102,8 +102,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils, Math,
  { local }
  JcfLog, JcfRegistrySettings, JcfMiscFunctions;

--- a/components/jcf2/ReadWrite/FileConverter.pas
+++ b/components/jcf2/ReadWrite/FileConverter.pas
@ -30,9 +30,10 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  { delphi } Classes,
-  { local } Converter, 
-  ConvertTypes;
+  Classes, SysUtils,
+  Dialogs, Controls, Forms,
+  // local
+  Converter, ConvertTypes;

 { AFS 7 July 04
  rewrote this as a wrapper for the string->string converter
@ -112,8 +113,6 @@ type
 implementation

 uses
-  { delphi }
-  {$ifndef fpc}Windows, {$endif} SysUtils, Dialogs, Controls, Forms,
  { local }
  JcfStringUtils, JcfSystemUtils,
  JcfMiscFunctions, JcfLog,
--- a/components/jcf2/ReadWrite/FileReader.pas
+++ b/components/jcf2/ReadWrite/FileReader.pas
@ -48,7 +48,9 @@ See http://www.gnu.org/licenses/gpl.html

 interface

-uses CodeReader;
+uses
+  SysUtils,
+  CodeReader;

 type
  TFileReader = class(TCodeReader)
@ -70,7 +72,6 @@ type
 implementation

 uses
-  {delphi }SysUtils,
  JclAnsiStrings;

 { TFileReader }
--- a/components/jcf2/ReadWrite/StringsConverter.pas
+++ b/components/jcf2/ReadWrite/StringsConverter.pas
@ -30,8 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  { delphi }
-  Classes,
+  Classes, SysUtils,
  { local }
  Converter;

@ -60,8 +59,6 @@ type

 implementation

-uses SysUtils;
-
 constructor TStringsConverter.Create;
 begin
  inherited;
--- a/components/jcf2/ReadWrite/StringsReader.pas
+++ b/components/jcf2/ReadWrite/StringsReader.pas
@ -35,8 +35,9 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  { delphi }Classes,
-  { local }CodeReader;
+  Classes,
+  { local }
+  CodeReader;

 type
  TStringsReader = class(TCodeReader)
--- a/components/jcf2/ReadWrite/StringsWriter.pas
+++ b/components/jcf2/ReadWrite/StringsWriter.pas
@ -34,8 +34,9 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  { delphi }Classes,
-  { local }CodeWriter;
+  Classes,
+  { local }
+  CodeWriter;

 type
  TStringsWriter = class(TCodeWriter)
--- a/components/jcf2/Settings/JcfRegistrySettings.pas
+++ b/components/jcf2/Settings/JcfRegistrySettings.pas
@ -40,8 +40,8 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  { delphi }
-  Registry, Classes,
+  Registry, Classes, SysUtils,
+  Dialogs,
  { local }
  ConvertTypes;

@ -190,8 +190,6 @@ var
 implementation

 uses
-  { delphi }
-  {$ifndef fpc}Windows,{$endif} SysUtils, Dialogs,
  { jcf }
  JcfStringUtils, JcfSystemUtils, JcfMiscFunctions;

--- a/components/jcf2/Settings/JcfSettings.pas
+++ b/components/jcf2/Settings/JcfSettings.pas
@ -34,13 +34,19 @@ unit JcfSettings;
 interface

 uses
-  { local }
-  SetObfuscate, SetClarify,
-  SetIndent, SetSpaces, SetReturns,
-  SetComments, SetCaps, SetWordList,
-  SetAlign, SetReplace, SetUses, SetPreProcessor,
-  SettingsStream, SetTransform,  SetAsm,
-  JcfVersionConsts, IDEOptionsIntf, IDEOptEditorIntf;
+  {$IFNDEF FPC}Windows,{$ELSE}LazFileUtils, LazUTF8,{$ENDIF} SysUtils,
+  // LCL
+  Dialogs,
+  // BuildIntf
+  IDEOptionsIntf,
+  // IdeIntf
+  IDEOptEditorIntf,
+  // local
+  SetObfuscate, SetClarify, SetIndent, SetSpaces, SetReturns, SetComments,
+  SetCaps, SetWordList, SetAlign, SetReplace, SetUses, SetPreProcessor,
+  SettingsStream, SetTransform, SetAsm, JcfVersionConsts,
+  JcfStringUtils, JcfSetBase, JcfRegistrySettings, JcfUIConsts;
+

 type

@ -166,16 +172,8 @@ const
 const
  GUI_PAD = 3;

-implementation

-uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ELSE}LazFileUtils, LazUTF8,{$ENDIF} SysUtils, Dialogs,
-  { local }
-  JcfStringUtils,
-  JcfSetBase,
-  JcfRegistrySettings,
-  jcfuiconsts;
+implementation


 constructor TFormattingSettings.Create(const pbReadRegFile: boolean);
--- a/components/jcf2/Settings/SetAnyWordCaps.pas
+++ b/components/jcf2/Settings/SetAnyWordCaps.pas
@ -34,8 +34,10 @@ unit SetAnyWordCaps;
 interface

 uses
-    { delphi }Classes,
-    { local }JcfSetBase, SettingsStream;
+  Classes, SysUtils,
+  Dialogs,
+  { local }
+  JcfSetBase, SettingsStream;

 type

@ -62,9 +64,6 @@ type

 implementation

-uses
-    { delphi }SysUtils, Dialogs;
-
 const
  REG_ENABLED = 'Enabled';
  REG_WORDS   = 'Words';
--- a/components/jcf2/Settings/SetClarify.pas
+++ b/components/jcf2/Settings/SetClarify.pas
@ -33,7 +33,7 @@ unit SetClarify;
 interface

 uses
-  Classes,
+  Classes, SysUtils,
  JcfSetBase, SettingsStream;

 type
@ -71,8 +71,6 @@ type
 implementation

 uses
-  { Delphi }
-  SysUtils,
  { local }
  JcfStringUtils;

--- a/components/jcf2/Settings/SetPreProcessor.pas
+++ b/components/jcf2/Settings/SetPreProcessor.pas
@ -33,8 +33,7 @@ interface
 }

 uses
-  { delphi }
-  Classes,
+  Classes, SysUtils,
  { local }
  JcfSetBase, SettingsStream;

@ -66,8 +65,6 @@ type

 implementation

-uses SysUtils;
-
 const
  REG_ENABLED = 'Enabled';
  REG_DEFINED_SYMBOLS = 'DefinedSymbols';
--- a/components/jcf2/Settings/SetReplace.pas
+++ b/components/jcf2/Settings/SetReplace.pas
@ -34,8 +34,7 @@ unit SetReplace;
 interface

 uses
-  { delphi }
-  Classes,
+  Classes, SysUtils,
  { local }
  JcfSetBase, SettingsStream;

@ -70,8 +69,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { locals }
  JcfStringUtils;

--- a/components/jcf2/Settings/SetUses.pas
+++ b/components/jcf2/Settings/SetUses.pas
@ -38,8 +38,9 @@ unit SetUses;
 interface

 uses
-  { delphi }Classes,
-  { local }JcfSetBase, SettingsStream;
+  Classes, SysUtils,
+  { local }
+  JcfSetBase, SettingsStream;

 type

@ -78,8 +79,6 @@ type

 implementation

-uses SysUtils;
-
 const
  REG_REMOVE_ENABLED = 'RemoveEnabled';
  REG_INSERT_INTERFACE_ENABLED = 'InsertInterfaceEnabled';
--- a/components/jcf2/Settings/SetWordList.pas
+++ b/components/jcf2/Settings/SetWordList.pas
@ -35,8 +35,9 @@ unit SetWordList;
 interface

 uses
-    { delphi }Classes,
-    { local }JcfSetBase, SettingsStream;
+  Classes, SysUtils,
+  { local }
+  JcfSetBase, SettingsStream;

 type

@ -69,10 +70,6 @@ type

 implementation

-uses
-  { delphi }
-  {$IFNDEF FPC}Windows,{$ENDIF} SysUtils;
-
 const
  REG_ENABLED = 'Enabled';
  REG_WORDS   = 'Words';
--- a/components/jcf2/Settings/Streams/RegistrySettings.pas
+++ b/components/jcf2/Settings/Streams/RegistrySettings.pas
@ -38,8 +38,7 @@ interface
    this object serves as both the root and the section
  }
 uses
-  { delphi }
-  Registry, Classes,
+  Registry, Classes, SysUtils,
  { local }
  SettingsStream;

@ -95,8 +94,6 @@ type
 implementation

 uses
-  { delphi }
-  SysUtils,
  { local }
  JcfMiscFunctions,
  JcfStringUtils;
--- a/components/jcf2/Settings/Streams/SettingsStream.pas
+++ b/components/jcf2/Settings/Streams/SettingsStream.pas
@ -37,8 +37,7 @@ unit SettingsStream;
 interface

 uses
-  { delphi }
-  Classes;
+  Classes, SysUtils;

 type
  // abstract base class - interface
@ -154,8 +153,6 @@ type
 implementation

 uses
-  { delphi }
-  {$ifndef fpc}Windows,{$endif} SysUtils,
  { local}
  JcfStringUtils, JcfMiscFunctions;

--- a/components/jcf2/Ui/Settings/frAnyCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frAnyCapsSettings.pas
@ -58,7 +58,7 @@ implementation
 {$R *.lfm}

 uses 
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfrAnyCapsSettings.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frAsm.pas
+++ b/components/jcf2/Ui/Settings/frAsm.pas
@ -66,7 +66,7 @@ implementation

 uses
  { jcf }
-  JcfSettings, jcfuiconsts,
+  JcfSettings, JcfUIConsts,
  { local }
  SettingsTypes, SetAsm;

--- a/components/jcf2/Ui/Settings/frBlankLines.pas
+++ b/components/jcf2/Ui/Settings/frBlankLines.pas
@ -67,7 +67,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfBlankLines.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frClarify.pas
+++ b/components/jcf2/Ui/Settings/frClarify.pas
@ -58,7 +58,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, SetClarify, jcfuiconsts;
+  JcfSettings, SetClarify, JcfUIConsts;

 constructor TfClarify.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frClarifyAlign.pas
+++ b/components/jcf2/Ui/Settings/frClarifyAlign.pas
@ -76,7 +76,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfClarifyAlign.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frClarifyBlocks.pas
+++ b/components/jcf2/Ui/Settings/frClarifyBlocks.pas
@ -60,7 +60,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, SettingsTypes, jcfuiconsts;
+  JcfSettings, SettingsTypes, JcfUIConsts;

 procedure TfClarifyBlocks.FrameResize(Sender:TObject);
 begin
--- a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
+++ b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
@ -61,7 +61,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, SettingsTypes, jcfuiconsts;
+  JcfSettings, SettingsTypes, JcfUIConsts;

 procedure TfClarifyCaseBlocks.FrameResize(Sender:TObject);
 begin
--- a/components/jcf2/Ui/Settings/frClarifyIndent.pas
+++ b/components/jcf2/Ui/Settings/frClarifyIndent.pas
@ -72,7 +72,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfClarifyIndent.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas
+++ b/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas
@ -57,7 +57,7 @@ implementation
 {$R *.lfm}

 uses 
-  JcfSettings, SetReturns, jcfuiconsts;
+  JcfSettings, SetReturns, JcfUIConsts;


 constructor TfClarifyLongLineBreaker.Create(AOwner: TComponent);
--- a/components/jcf2/Ui/Settings/frClarifyReturns.pas
+++ b/components/jcf2/Ui/Settings/frClarifyReturns.pas
@ -65,7 +65,7 @@ implementation
 {$R *.lfm}

 uses
-  SettingsTypes, JcfSettings, jcfuiconsts;
+  SettingsTypes, JcfSettings, JcfUIConsts;

 procedure TfClarifyReturns.FrameResize(Sender:TObject);
 begin
--- a/components/jcf2/Ui/Settings/frClarifySpaces.pas
+++ b/components/jcf2/Ui/Settings/frClarifySpaces.pas
@ -96,7 +96,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, SettingsTypes, jcfuiconsts;
+  JcfSettings, SettingsTypes, JcfUIConsts;

 constructor TfClarifySpaces.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frComments.pas
+++ b/components/jcf2/Ui/Settings/frComments.pas
@ -55,7 +55,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfComments.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frCompilerDirectReturns.pas
+++ b/components/jcf2/Ui/Settings/frCompilerDirectReturns.pas
@ -62,7 +62,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, SettingsTypes, jcfuiconsts;
+  JcfSettings, SettingsTypes, JcfUIConsts;

 procedure TfCompilerDirectReturns.FrameResize(Sender:TObject);
 begin
--- a/components/jcf2/Ui/Settings/frFiles.pas
+++ b/components/jcf2/Ui/Settings/frFiles.pas
@ -31,7 +31,8 @@ interface

 uses
  SysUtils,
-  Controls, StdCtrls, Graphics, Dialogs,
+  Controls, StdCtrls, Graphics, Dialogs, LCLIntf,
+  LazFileUtils,
  IDEOptionsIntf, IDEOptEditorIntf;

 type
@ -64,7 +65,7 @@ implementation

 uses
  { local }
-  JcfFileUtils, JcfRegistrySettings, JcfSettings, jcfuiconsts, LazFileUtils, LCLIntf;
+  JcfFileUtils, JcfRegistrySettings, JcfSettings, JcfUIConsts;

 procedure TfFiles.ReadSettings(AOptions: TAbstractIDEOptions);
 var
--- a/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas
@ -58,7 +58,7 @@ implementation
 {$R *.lfm}

 uses 
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfIdentifierCapsSettings.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas
@ -58,7 +58,7 @@ implementation
 {$R *.lfm}

 uses 
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfNotIdentifierCapsSettings.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frObfuscateSettings.pas
+++ b/components/jcf2/Ui/Settings/frObfuscateSettings.pas
@ -59,7 +59,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, SettingsTypes, jcfuiconsts;
+  JcfSettings, SettingsTypes, JcfUIConsts;

 { TfObfuscateSettings }

--- a/components/jcf2/Ui/Settings/frPreProcessor.pas
+++ b/components/jcf2/Ui/Settings/frPreProcessor.pas
@ -61,7 +61,7 @@ implementation
 {$R *.lfm}

 uses 
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfPreProcessor.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frReplace.pas
+++ b/components/jcf2/Ui/Settings/frReplace.pas
@ -58,7 +58,7 @@ implementation
 {$R *.lfm}

 uses 
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 { TfReplace }

--- a/components/jcf2/Ui/Settings/frReservedCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frReservedCapsSettings.pas
@ -61,7 +61,7 @@ implementation
 {$R *.lfm}

 uses 
-  SettingsTypes, JcfSettings, jcfuiconsts;
+  SettingsTypes, JcfSettings, JcfUIConsts;

 constructor TfrReservedCapsSettings.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frTransform.pas
+++ b/components/jcf2/Ui/Settings/frTransform.pas
@ -63,7 +63,7 @@ implementation
 {$R *.lfm}

 uses 
-  SettingsTypes, JcfSettings, SetTransform, jcfuiconsts;
+  SettingsTypes, JcfSettings, SetTransform, JcfUIConsts;

 constructor TfTransform.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frUnitCaps.pas
+++ b/components/jcf2/Ui/Settings/frUnitCaps.pas
@ -56,7 +56,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfrUnitNameCaps.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frUses.pas
+++ b/components/jcf2/Ui/Settings/frUses.pas
@ -67,7 +67,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfUses.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/Settings/frWarnings.pas
+++ b/components/jcf2/Ui/Settings/frWarnings.pas
@ -60,7 +60,7 @@ implementation
 {$R *.lfm}

 uses
-  JcfSettings, jcfuiconsts;
+  JcfSettings, JcfUIConsts;

 constructor TfWarnings.Create(AOwner: TComponent);
 begin
--- a/components/jcf2/Ui/fAbout.pas
+++ b/components/jcf2/Ui/fAbout.pas
@ -30,7 +30,9 @@ unit fAbout;
 interface

 uses
-  Classes, Forms, Graphics, StdCtrls, Buttons, ExtCtrls, ButtonPanel, SysUtils;
+  Classes, SysUtils,
+  // LCL
+  Forms, Graphics, StdCtrls, ExtCtrls, ButtonPanel, LCLIntf;

 type

@ -65,9 +67,8 @@ implementation
 {$endif}

 uses
-  LCLIntf,
  { local }
-  JcfVersionConsts, JcfStringUtils, jcfuiconsts;
+  JcfVersionConsts, JcfStringUtils, JcfUIConsts;

 procedure ShowURL(const ps: string);
 begin
--- a/components/jcf2/Ui/fJcfErrorDisplay.pas
+++ b/components/jcf2/Ui/fJcfErrorDisplay.pas
@ -59,7 +59,7 @@ implementation

 uses
  { local }
-  ParseError, JcfStringUtils, JcfFontSetFunctions, jcfuiconsts;
+  ParseError, JcfStringUtils, JcfFontSetFunctions, JcfUIConsts;

 {$ifndef FPC}
  {$R *.dfm}
--- a/components/jcf2/Ui/fRegistrySettings.pas
+++ b/components/jcf2/Ui/fRegistrySettings.pas
@ -32,10 +32,10 @@ See http://www.gnu.org/licenses/gpl.html
 interface

 uses
-  { delphi }
-  SysUtils, Classes, Controls, Forms,
-  Dialogs, StdCtrls, Buttons, ExtCtrls, ComCtrls, ShellAPI,
-  { JVCL }
+  SysUtils, Classes, ShellAPI,
+  // LCL
+  Controls, Forms, Dialogs, StdCtrls, Buttons, ExtCtrls, ComCtrls,
+  // JVCL
  JvMemo, JvEdit, JvExStdCtrls, JvValidateEdit, JvBaseDlg, JvBrowseFolder;

 type
--- a/components/jcf2/Utils/JcfMiscFunctions.pas
+++ b/components/jcf2/Utils/JcfMiscFunctions.pas
@ -47,7 +47,12 @@ See http://www.gnu.org/licenses/gpl.html

 interface

-uses Classes;
+uses
+  Classes, SysUtils,
+  Forms,
+  // local
+  JcfStringUtils;
+

 function GetApplicationFolder: string;

@ -78,12 +83,6 @@ function FileIsReadOnly(const psFile: string): boolean;

 implementation

-uses
-  { delphi }
-  SysUtils, Forms,
-  { local }
-  JcfStringUtils;
-
 function GetApplicationFolder: string;
 begin
  Result := ExtractFilePath(Application.ExeName);
--- a/components/jcf2/Utils/JcfUnicodeFiles.pas
+++ b/components/jcf2/Utils/JcfUnicodeFiles.pas
@ -29,6 +29,9 @@ See http://www.gnu.org/licenses/gpl.html

 interface

+uses
+  Classes, SysUtils, Dialogs;
+
 type
  TFileContentType = (eUnknown, e8Bit, eUtf8,
    eUtf16LittleEndian, eUtf16BigEndian,
@ -45,10 +48,6 @@ procedure WriteTextFile(const psFileName: string; const psContents: String;

 implementation

-uses
-  { delphi }
-  Classes, SysUtils, Dialogs;
-
 const
  // byte order markers (BOM)
  // these are found at the start of the file