From c6669262443cff016dc2b855d3f4a24337a5592c Mon Sep 17 00:00:00 2001 From: juha Date: Tue, 24 Mar 2015 17:50:33 +0000 Subject: [PATCH] JCF2: Cleanup based on compiler hints. git-svn-id: trunk@48477 - --- components/jcf2/Ui/Settings/frAnyCapsSettings.pas | 6 ++---- components/jcf2/Ui/Settings/frAsm.pas | 6 ++---- components/jcf2/Ui/Settings/frBlankLines.pas | 9 ++------- components/jcf2/Ui/Settings/frClarify.pas | 6 ++---- components/jcf2/Ui/Settings/frClarifyAlign.pas | 6 ++---- components/jcf2/Ui/Settings/frClarifyBlocks.pas | 5 ++--- components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas | 6 ++---- components/jcf2/Ui/Settings/frClarifyIndent.pas | 5 ++--- components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas | 5 ++--- components/jcf2/Ui/Settings/frClarifyReturns.pas | 6 ++---- components/jcf2/Ui/Settings/frClarifySpaces.pas | 6 ++---- components/jcf2/Ui/Settings/frComments.pas | 6 ++---- components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas | 5 ++--- .../jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas | 5 ++--- components/jcf2/Ui/Settings/frObfuscateSettings.pas | 6 ++---- components/jcf2/Ui/Settings/frReplace.pas | 6 ++---- components/jcf2/Ui/Settings/frReservedCapsSettings.pas | 6 ++---- components/jcf2/Ui/Settings/frTransform.pas | 5 ++--- components/jcf2/Ui/Settings/frUses.pas | 6 ++---- components/jcf2/Ui/Settings/frWarnings.pas | 6 ++---- components/jcf2/Ui/fAbout.pas | 6 ++---- components/jcf2/Utils/JcfFontSetFunctions.pas | 6 ++---- components/jcf2/Utils/JcfStringUtils.pas | 8 +++----- 23 files changed, 47 insertions(+), 90 deletions(-) diff --git a/components/jcf2/Ui/Settings/frAnyCapsSettings.pas b/components/jcf2/Ui/Settings/frAnyCapsSettings.pas index f19db6b344..bb5d530386 100644 --- a/components/jcf2/Ui/Settings/frAnyCapsSettings.pas +++ b/components/jcf2/Ui/Settings/frAnyCapsSettings.pas @@ -30,9 +30,7 @@ unit frAnyCapsSettings; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, - { local } + Classes, StdCtrls, IDEOptionsIntf; type @@ -60,7 +58,7 @@ implementation {$R *.lfm} uses - JcfHelp, JcfSettings, jcfuiconsts; + JcfSettings, jcfuiconsts; constructor TfrAnyCapsSettings.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frAsm.pas b/components/jcf2/Ui/Settings/frAsm.pas index 76b56d8c87..c4ea6bd57e 100644 --- a/components/jcf2/Ui/Settings/frAsm.pas +++ b/components/jcf2/Ui/Settings/frAsm.pas @@ -30,9 +30,7 @@ See http://www.gnu.org/licenses/gpl.html interface uses - Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, StdCtrls, ExtCtrls, Spin, - { local} + SysUtils, StdCtrls, ExtCtrls, Spin, IDEOptionsIntf; type @@ -68,7 +66,7 @@ implementation uses { jcf } - JcfHelp, JcfSettings, jcfuiconsts, + JcfSettings, jcfuiconsts, { local } Capitalisation, SettingsTypes, SetAsm; diff --git a/components/jcf2/Ui/Settings/frBlankLines.pas b/components/jcf2/Ui/Settings/frBlankLines.pas index 3f472deb9f..450cfee46f 100644 --- a/components/jcf2/Ui/Settings/frBlankLines.pas +++ b/components/jcf2/Ui/Settings/frBlankLines.pas @@ -29,9 +29,7 @@ unit frBlankLines; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, Spin, - { local} + Classes, Math, StdCtrls, Spin, IDEOptionsIntf; @@ -68,10 +66,7 @@ implementation {$R *.lfm} uses - { delphi } - Math, - { local } - JcfSettings, SetReturns, JcfHelp, jcfuiconsts; + JcfSettings, jcfuiconsts; constructor TfBlankLines.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frClarify.pas b/components/jcf2/Ui/Settings/frClarify.pas index 22c2540df4..446c1dc631 100644 --- a/components/jcf2/Ui/Settings/frClarify.pas +++ b/components/jcf2/Ui/Settings/frClarify.pas @@ -30,9 +30,7 @@ unit frClarify; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, ExtCtrls, - { local} + Classes, StdCtrls, ExtCtrls, IDEOptionsIntf; type @@ -59,7 +57,7 @@ implementation {$R *.lfm} uses - JcfSettings, JcfHelp, SetClarify, jcfuiconsts; + JcfSettings, SetClarify, jcfuiconsts; constructor TfClarify.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frClarifyAlign.pas b/components/jcf2/Ui/Settings/frClarifyAlign.pas index a81ad079b4..d5fc21ba7d 100644 --- a/components/jcf2/Ui/Settings/frClarifyAlign.pas +++ b/components/jcf2/Ui/Settings/frClarifyAlign.pas @@ -30,9 +30,7 @@ unit frClarifyAlign; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, Spin, - { local} + Classes, StdCtrls, Spin, IDEOptionsIntf; type @@ -78,7 +76,7 @@ implementation {$R *.lfm} uses - JcfSettings, JcfHelp, SetAlign, jcfuiconsts; + JcfSettings, jcfuiconsts; constructor TfClarifyAlign.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frClarifyBlocks.pas b/components/jcf2/Ui/Settings/frClarifyBlocks.pas index c6ee05f40e..7e879b9b20 100644 --- a/components/jcf2/Ui/Settings/frClarifyBlocks.pas +++ b/components/jcf2/Ui/Settings/frClarifyBlocks.pas @@ -30,8 +30,7 @@ unit frClarifyBlocks; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, ExtCtrls, + Classes, StdCtrls, ExtCtrls, IDEOptionsIntf; type @@ -61,7 +60,7 @@ implementation {$R *.lfm} uses - JcfSettings, SettingsTypes, JcfHelp, jcfuiconsts; + JcfSettings, SettingsTypes, jcfuiconsts; procedure TfClarifyBlocks.FrameResize(Sender:TObject); begin diff --git a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas index 47312bdb02..945a1bd262 100644 --- a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas +++ b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas @@ -30,9 +30,7 @@ unit frClarifyCaseBlocks; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, ExtCtrls, - { local} + Classes, StdCtrls, ExtCtrls, IDEOptionsIntf; type @@ -63,7 +61,7 @@ implementation {$R *.lfm} uses - JcfSettings, SettingsTypes, JcfHelp, jcfuiconsts; + JcfSettings, SettingsTypes, jcfuiconsts; procedure TfClarifyCaseBlocks.FrameResize(Sender:TObject); begin diff --git a/components/jcf2/Ui/Settings/frClarifyIndent.pas b/components/jcf2/Ui/Settings/frClarifyIndent.pas index dc73e19fc4..d14d12ee93 100644 --- a/components/jcf2/Ui/Settings/frClarifyIndent.pas +++ b/components/jcf2/Ui/Settings/frClarifyIndent.pas @@ -30,8 +30,7 @@ See http://www.gnu.org/licenses/gpl.html interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, Spin, + Classes, StdCtrls, Spin, IDEOptionsIntf; type @@ -73,7 +72,7 @@ implementation {$R *.lfm} uses - JcfHelp, JcfSettings, SetIndent, jcfuiconsts; + JcfSettings, jcfuiconsts; constructor TfClarifyIndent.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas b/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas index 5358ba68e1..f4702b5822 100644 --- a/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas +++ b/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas @@ -30,8 +30,7 @@ unit frClarifyLongLineBreaker; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, ExtCtrls, Spin, + Classes, StdCtrls, ExtCtrls, Spin, IDEOptionsIntf; type @@ -58,7 +57,7 @@ implementation {$R *.lfm} uses - JcfSettings, SetReturns, JcfHelp, jcfuiconsts; + JcfSettings, SetReturns, jcfuiconsts; constructor TfClarifyLongLineBreaker.Create(AOwner: TComponent); diff --git a/components/jcf2/Ui/Settings/frClarifyReturns.pas b/components/jcf2/Ui/Settings/frClarifyReturns.pas index 909db7da8b..92bf820bc0 100644 --- a/components/jcf2/Ui/Settings/frClarifyReturns.pas +++ b/components/jcf2/Ui/Settings/frClarifyReturns.pas @@ -30,9 +30,7 @@ unit frClarifyReturns; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, ExtCtrls, - { local} + Classes, StdCtrls, ExtCtrls, IDEOptionsIntf; type @@ -67,7 +65,7 @@ implementation {$R *.lfm} uses - SettingsTypes, JcfSettings, SetReturns, JcfHelp, jcfuiconsts; + SettingsTypes, JcfSettings, jcfuiconsts; procedure TfClarifyReturns.FrameResize(Sender:TObject); begin diff --git a/components/jcf2/Ui/Settings/frClarifySpaces.pas b/components/jcf2/Ui/Settings/frClarifySpaces.pas index ca4022f5d1..7b018240b6 100644 --- a/components/jcf2/Ui/Settings/frClarifySpaces.pas +++ b/components/jcf2/Ui/Settings/frClarifySpaces.pas @@ -30,9 +30,7 @@ unit frClarifySpaces; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, ExtCtrls, Spin, - { local} + Classes, StdCtrls, ExtCtrls, Spin, IDEOptionsIntf; type @@ -98,7 +96,7 @@ implementation {$R *.lfm} uses - JcfHelp, JcfSettings, SetSpaces, SettingsTypes, jcfuiconsts; + JcfSettings, SettingsTypes, jcfuiconsts; constructor TfClarifySpaces.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frComments.pas b/components/jcf2/Ui/Settings/frComments.pas index 9fca3db0ba..ae33bea9d2 100644 --- a/components/jcf2/Ui/Settings/frComments.pas +++ b/components/jcf2/Ui/Settings/frComments.pas @@ -30,9 +30,7 @@ See http://www.gnu.org/licenses/gpl.html interface uses - { delphi } - StdCtrls, Classes, Controls, Forms, - { local } + StdCtrls, Classes, IDEOptionsIntf; type @@ -57,7 +55,7 @@ implementation {$R *.lfm} uses - JcfHelp, JcfSettings, SetComments, jcfuiconsts; + JcfSettings, jcfuiconsts; constructor TfComments.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas b/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas index 4571a39b51..566c7625dc 100644 --- a/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas +++ b/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas @@ -30,8 +30,7 @@ unit frIdentifierCapsSettings; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, + Classes, StdCtrls, IDEOptionsIntf; type @@ -59,7 +58,7 @@ implementation {$R *.lfm} uses - JcfHelp, JcfSettings, jcfuiconsts; + JcfSettings, jcfuiconsts; constructor TfIdentifierCapsSettings.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas b/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas index 3f50ad285e..236e5f2ff4 100644 --- a/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas +++ b/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas @@ -30,8 +30,7 @@ unit frNotIdentifierCapsSettings; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, + Classes, StdCtrls, IDEOptionsIntf; type @@ -59,7 +58,7 @@ implementation {$R *.lfm} uses - JcfHelp, JcfSettings, jcfuiconsts; + JcfSettings, jcfuiconsts; constructor TfNotIdentifierCapsSettings.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frObfuscateSettings.pas b/components/jcf2/Ui/Settings/frObfuscateSettings.pas index 58c623becb..0cef7bd7b5 100644 --- a/components/jcf2/Ui/Settings/frObfuscateSettings.pas +++ b/components/jcf2/Ui/Settings/frObfuscateSettings.pas @@ -30,9 +30,7 @@ unit frObfuscateSettings; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, ExtCtrls, - { local } + Classes, StdCtrls, ExtCtrls, IDEOptionsIntf; type @@ -61,7 +59,7 @@ implementation {$R *.lfm} uses - JcfSettings, SettingsTypes, JcfHelp, SetObfuscate, jcfuiconsts; + JcfSettings, SettingsTypes, jcfuiconsts; { TfObfuscateSettings } diff --git a/components/jcf2/Ui/Settings/frReplace.pas b/components/jcf2/Ui/Settings/frReplace.pas index 6f95afa5ad..7be0220fe2 100644 --- a/components/jcf2/Ui/Settings/frReplace.pas +++ b/components/jcf2/Ui/Settings/frReplace.pas @@ -30,9 +30,7 @@ unit frReplace; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, - { local } + Classes, StdCtrls, IDEOptionsIntf; type @@ -60,7 +58,7 @@ implementation {$R *.lfm} uses - JcfHelp, JcfSettings, jcfuiconsts; + JcfSettings, jcfuiconsts; { TfReplace } diff --git a/components/jcf2/Ui/Settings/frReservedCapsSettings.pas b/components/jcf2/Ui/Settings/frReservedCapsSettings.pas index 59301ac404..7382daad9d 100644 --- a/components/jcf2/Ui/Settings/frReservedCapsSettings.pas +++ b/components/jcf2/Ui/Settings/frReservedCapsSettings.pas @@ -30,9 +30,7 @@ unit frReservedCapsSettings; interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, ExtCtrls, - { local } + Classes, StdCtrls, ExtCtrls, IDEOptionsIntf; type @@ -63,7 +61,7 @@ implementation {$R *.lfm} uses - SettingsTypes, JcfHelp, JcfSettings, jcfuiconsts; + SettingsTypes, JcfSettings, jcfuiconsts; constructor TfrReservedCapsSettings.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frTransform.pas b/components/jcf2/Ui/Settings/frTransform.pas index a9d071617e..406b806aa3 100644 --- a/components/jcf2/Ui/Settings/frTransform.pas +++ b/components/jcf2/Ui/Settings/frTransform.pas @@ -30,8 +30,7 @@ See http://www.gnu.org/licenses/gpl.html interface uses - Classes, Graphics, Controls, Forms, StdCtrls, ExtCtrls, - { local } + Classes, StdCtrls, ExtCtrls, IDEOptionsIntf; type @@ -64,7 +63,7 @@ implementation {$R *.lfm} uses - SettingsTypes, JcfSettings, JcfHelp, SetTransform, jcfuiconsts; + SettingsTypes, JcfSettings, SetTransform, jcfuiconsts; constructor TfTransform.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frUses.pas b/components/jcf2/Ui/Settings/frUses.pas index 5817d3b256..0100400fc5 100644 --- a/components/jcf2/Ui/Settings/frUses.pas +++ b/components/jcf2/Ui/Settings/frUses.pas @@ -30,9 +30,7 @@ See http://www.gnu.org/licenses/gpl.html interface uses - { delphi } - Classes, Controls, Forms, StdCtrls, - { local } + Classes, StdCtrls, IDEOptionsIntf; type @@ -69,7 +67,7 @@ implementation {$R *.lfm} uses - JcfHelp, JcfSettings, jcfuiconsts; + JcfSettings, jcfuiconsts; constructor TfUses.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/Settings/frWarnings.pas b/components/jcf2/Ui/Settings/frWarnings.pas index f0d6c4389b..63dd4bbf8f 100644 --- a/components/jcf2/Ui/Settings/frWarnings.pas +++ b/components/jcf2/Ui/Settings/frWarnings.pas @@ -30,9 +30,7 @@ See http://www.gnu.org/licenses/gpl.html interface uses - { delphi } - StdCtrls, Classes, Controls, Forms, - { local } + StdCtrls, Classes, IDEOptionsIntf; type @@ -62,7 +60,7 @@ implementation {$R *.lfm} uses - JcfHelp, JcfSettings, jcfuiconsts; + JcfSettings, jcfuiconsts; constructor TfWarnings.Create(AOwner: TComponent); begin diff --git a/components/jcf2/Ui/fAbout.pas b/components/jcf2/Ui/fAbout.pas index 5c0260db0e..78be870487 100644 --- a/components/jcf2/Ui/fAbout.pas +++ b/components/jcf2/Ui/fAbout.pas @@ -30,9 +30,7 @@ unit fAbout; interface uses - { delphi } - Classes, Forms, Graphics, Controls, StdCtrls, - Buttons, ExtCtrls, SysUtils; + Classes, Forms, Graphics, StdCtrls, Buttons, ExtCtrls, SysUtils; type TfrmAboutBox = class(TForm) @@ -71,7 +69,7 @@ uses LCLIntf, {$endif} { local } - JcfVersionConsts, JcfHelp, JcfFontSetFunctions, JcfStringUtils, jcfuiconsts; + JcfVersionConsts, JcfFontSetFunctions, JcfStringUtils, jcfuiconsts; {$ifdef fpc} procedure ShowURL(const ps: string); diff --git a/components/jcf2/Utils/JcfFontSetFunctions.pas b/components/jcf2/Utils/JcfFontSetFunctions.pas index 877db66d92..d3fd914a54 100644 --- a/components/jcf2/Utils/JcfFontSetFunctions.pas +++ b/components/jcf2/Utils/JcfFontSetFunctions.pas @@ -40,10 +40,8 @@ procedure SetObjectFontToSystemFont( implementation uses - { delphi } - StdCtrls, ComCtrls, Graphics, TypInfo, - { local } - JcfStringUtils, JcfSystemUtils; + StdCtrls, Graphics, TypInfo, + JcfSystemUtils; procedure SetCaptionFont(const AObjectFont: TFont); begin diff --git a/components/jcf2/Utils/JcfStringUtils.pas b/components/jcf2/Utils/JcfStringUtils.pas index 9ba5db7fd1..dd743491e2 100644 --- a/components/jcf2/Utils/JcfStringUtils.pas +++ b/components/jcf2/Utils/JcfStringUtils.pas @@ -160,14 +160,12 @@ implementation uses {$ifdef MSWINDOWS} - Windows, ShellApi + //Windows, ShellApi {$endif} {$ifdef Unix} - Unix + //Unix {$endif} -{$ifdef fpc} - , LCLIntf, fileutil -{$endif}; + LCLIntf, fileutil; {$IFNDEF DELPHI12} {$IFNDEF DELPHI14}