From ffa67e0ff406587d1f1c2adb3d4abbe7dc4a4182 Mon Sep 17 00:00:00 2001 From: juha Date: Fri, 7 Apr 2017 19:02:11 +0000 Subject: [PATCH] Fix compilation of Codetools examples and wiki test project. Clean uses sections. git-svn-id: trunk@54563 - --- .../codetools/examples/addfpprofcalls.lpi | 2 +- .../codetools/examples/addfpprofcalls.lpr | 8 ++- components/codetools/examples/addmethod.lpi | 2 +- components/codetools/examples/addmethod.lpr | 6 +- .../codetools/examples/addmethodassign.lpi | 2 +- .../codetools/examples/addmethodassign.lpr | 6 +- components/codetools/examples/addwith.lpi | 2 +- components/codetools/examples/addwith.lpr | 6 +- components/codetools/examples/autoindent.lpi | 2 +- components/codetools/examples/autoindent.pas | 6 +- .../codetools/examples/changeparamlist.lpi | 2 +- .../codetools/examples/changeparamlist.lpr | 6 +- .../codetools/examples/codecompletion.lpi | 2 +- .../codetools/examples/codecompletion.lpr | 2 +- .../codetools/examples/completeblock.lpi | 2 +- .../codetools/examples/completeblock.pas | 6 +- .../codetools/examples/finddeclaration.lpi | 10 +-- .../examples/findusedunitreferences.lpi | 3 +- .../examples/findusedunitreferences.lpr | 6 +- .../codetools/examples/fixfilenames.lpi | 2 +- .../codetools/examples/fixfilenames.pas | 6 +- components/codetools/examples/getcontext.lpi | 2 +- components/codetools/examples/getcontext.lpr | 6 +- .../codetools/examples/getexpandedoperand.lpi | 2 +- .../codetools/examples/getexpandedoperand.pas | 6 +- components/codetools/examples/h2pastest.lpi | 2 +- components/codetools/examples/h2pastest.lpr | 6 +- .../examples/identifiercompletion.lpi | 5 +- .../examples/identifiercompletion.lpr | 9 ++- .../examples/listinterfaceclasses.lpi | 2 +- .../examples/listinterfaceclasses.pas | 6 +- .../codetools/examples/methodjumping.lpi | 2 +- .../codetools/examples/methodjumping.pas | 6 +- components/codetools/examples/parsefpcmsg.lpi | 2 +- .../examples/retypepublishedvars.lpi | 2 +- .../examples/retypepublishedvars.lpr | 6 +- .../examples/scanfpcerrormsgfiles.lpi | 5 +- .../examples/scanfpcerrormsgfiles.lpr | 6 +- .../codetools/examples/sourcecloser.lpi | 5 +- .../codetools/examples/sourcecloser.lpr | 7 ++- .../examples/testfpcsrcunitrules.lpi | 4 +- .../examples/testfpcsrcunitrules.lpr | 21 ++++--- .../codetools/examples/unitdicttest.lpi | 2 +- .../codetools/examples/unitdicttest.lpr | 12 ++-- components/codetools/examples/usedbyunits.lpi | 5 +- components/codetools/examples/usedbyunits.lpr | 7 ++- .../codetools/ide/codyidentifiersdlg.pas | 4 +- components/codetools/pascalparsertool.pas | 2 +- components/wiki/test/wikihelpmanager.pas | 10 ++- components/wiki/test/wikisearchdemo.lpi | 15 +---- components/wiki/test/wikisearchdemo.res | Bin 138696 -> 138932 bytes components/wiki/test/wikisearchmain.lfm | 58 +++++++++--------- components/wiki/test/wikisearchmain.pas | 18 ++++-- converter/convcodetool.pas | 2 +- converter/missingpropertiesdlg.pas | 2 +- converter/replacenamesunit.pas | 7 +-- ide/codehelp.pas | 2 +- ide/emptymethodsdlg.pas | 17 +++-- ide/etfpcmsgparser.pas | 2 +- ide/etmakemsgparser.pas | 2 +- ide/exttools.pas | 2 +- ide/makeresstrdlg.pas | 14 +++-- 62 files changed, 228 insertions(+), 156 deletions(-) diff --git a/components/codetools/examples/addfpprofcalls.lpi b/components/codetools/examples/addfpprofcalls.lpi index d033d3e06e..6b8c8b99c1 100644 --- a/components/codetools/examples/addfpprofcalls.lpi +++ b/components/codetools/examples/addfpprofcalls.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/addfpprofcalls.lpr b/components/codetools/examples/addfpprofcalls.lpr index 553241bcbd..9c5de891aa 100644 --- a/components/codetools/examples/addfpprofcalls.lpr +++ b/components/codetools/examples/addfpprofcalls.lpr @@ -31,8 +31,12 @@ program addfpprofcalls; {$mode objfpc}{$H+} uses - SysUtils, CodeCache, CodeToolManager, CodeAtom, BasicCodeTools, SourceChanger, - CodeTree, CodeToolsStructs, PascalParserTool; + SysUtils, + // LazUtils + LazFileUtils, LazUTF8, AvgLvlTree, + // CodeTools + CodeCache, CodeToolManager, CodeAtom, BasicCodeTools, SourceChanger, + CodeTree, PascalParserTool; type TMode = (mList,mAdd,mRemove); diff --git a/components/codetools/examples/addmethod.lpi b/components/codetools/examples/addmethod.lpi index 9cd61511e6..b512ea5945 100644 --- a/components/codetools/examples/addmethod.lpi +++ b/components/codetools/examples/addmethod.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/addmethod.lpr b/components/codetools/examples/addmethod.lpr index abfa9940f0..9808a177e8 100644 --- a/components/codetools/examples/addmethod.lpr +++ b/components/codetools/examples/addmethod.lpr @@ -28,7 +28,11 @@ program AddMethod; {$mode objfpc}{$H+} uses - SysUtils, CodeCache, CodeToolManager, CodeCompletionTool, SimpleUnit1; + SysUtils, + // LazUtils + LazFileUtils, + // CodeTools + CodeCache, CodeToolManager, CodeCompletionTool, SimpleUnit1; type TMyMethodType = function(Sender: TObject; AValue: integer): string of object; diff --git a/components/codetools/examples/addmethodassign.lpi b/components/codetools/examples/addmethodassign.lpi index 186f355c10..d8025882c6 100644 --- a/components/codetools/examples/addmethodassign.lpi +++ b/components/codetools/examples/addmethodassign.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/addmethodassign.lpr b/components/codetools/examples/addmethodassign.lpr index 985a395533..6de42ce85c 100644 --- a/components/codetools/examples/addmethodassign.lpr +++ b/components/codetools/examples/addmethodassign.lpr @@ -28,7 +28,11 @@ program AddMethodAssign; {$mode objfpc}{$H+} uses - Classes, SysUtils, AVL_Tree, CodeCache, CodeToolManager, FileProcs, + Classes, SysUtils, + // LazUtils + Laz_AVL_Tree, + // CodeTools + CodeCache, CodeToolManager, FileProcs, BasicCodeTools, CodeTree, FindDeclarationTool, AssignExample1; const diff --git a/components/codetools/examples/addwith.lpi b/components/codetools/examples/addwith.lpi index eb26b02d72..97e0200159 100644 --- a/components/codetools/examples/addwith.lpi +++ b/components/codetools/examples/addwith.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/addwith.lpr b/components/codetools/examples/addwith.lpr index b446384574..21c346b50f 100644 --- a/components/codetools/examples/addwith.lpr +++ b/components/codetools/examples/addwith.lpr @@ -28,7 +28,11 @@ program addwith; {$mode objfpc}{$H+} uses - Classes, SysUtils, CodeCache, CodeToolManager; + Classes, SysUtils, + // LazUtils + LazUTF8, + // CodeTools + CodeCache, CodeToolManager; const ConfigFilename = 'codetools.config'; diff --git a/components/codetools/examples/autoindent.lpi b/components/codetools/examples/autoindent.lpi index efd327d434..129aef6ecb 100644 --- a/components/codetools/examples/autoindent.lpi +++ b/components/codetools/examples/autoindent.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/autoindent.pas b/components/codetools/examples/autoindent.pas index e87f97ce47..14d21c0213 100644 --- a/components/codetools/examples/autoindent.pas +++ b/components/codetools/examples/autoindent.pas @@ -28,7 +28,11 @@ program AutoIndent; {$mode objfpc}{$H+} uses - SysUtils, CodeToolManager, CodeCache, CodeBeautifier; + SysUtils, + // LazUtils + LazUTF8, LazFileUtils, + // CodeTools + CodeToolManager, CodeCache, CodeBeautifier; var Code: TCodeBuffer; diff --git a/components/codetools/examples/changeparamlist.lpi b/components/codetools/examples/changeparamlist.lpi index 4ca05e5f99..3443190950 100644 --- a/components/codetools/examples/changeparamlist.lpi +++ b/components/codetools/examples/changeparamlist.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/changeparamlist.lpr b/components/codetools/examples/changeparamlist.lpr index 7431e75b80..5790cfd31e 100644 --- a/components/codetools/examples/changeparamlist.lpr +++ b/components/codetools/examples/changeparamlist.lpr @@ -29,8 +29,10 @@ program changeparamlist; {$mode objfpc}{$H+} uses - Classes, SysUtils, contnrs, CodeCache, CodeToolManager, FileProcs, AVL_Tree, CodeAtom, - SourceChanger, CodeTree, FindDeclarationTool, CTUnitGraph, ChangeDeclarationTool, + Classes, SysUtils, contnrs, Laz_AVL_Tree, + // CodeTools + CodeCache, CodeToolManager, FileProcs, CodeAtom, CodeTree, SourceChanger, + FindDeclarationTool, CTUnitGraph, ChangeDeclarationTool, ChangeParamList1; const diff --git a/components/codetools/examples/codecompletion.lpi b/components/codetools/examples/codecompletion.lpi index 3eb2ef36ec..ff9bbb78c5 100644 --- a/components/codetools/examples/codecompletion.lpi +++ b/components/codetools/examples/codecompletion.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/codecompletion.lpr b/components/codetools/examples/codecompletion.lpr index 9b0fa81f99..19d170c728 100644 --- a/components/codetools/examples/codecompletion.lpr +++ b/components/codetools/examples/codecompletion.lpr @@ -70,7 +70,7 @@ begin raise Exception.Create('loading failed '+Filename); // complete code - if CodeToolBoss.CompleteCode(Code,X,Y,TopLine,NewCode,NewX,NewY,NewTopLine) + if CodeToolBoss.CompleteCode(Code,X,Y,TopLine,NewCode,NewX,NewY,NewTopLine,false) then begin writeln('Code completed: ',NewCode.Filename,' Line=',NewY,' Column=',NewX); writeln(Code.Source); diff --git a/components/codetools/examples/completeblock.lpi b/components/codetools/examples/completeblock.lpi index 8e94208540..ab1fd689de 100644 --- a/components/codetools/examples/completeblock.lpi +++ b/components/codetools/examples/completeblock.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/completeblock.pas b/components/codetools/examples/completeblock.pas index f1e9fa5d1f..8b5366e422 100644 --- a/components/codetools/examples/completeblock.pas +++ b/components/codetools/examples/completeblock.pas @@ -28,7 +28,11 @@ program CompleteBlock; {$mode objfpc}{$H+} uses - Classes, SysUtils, DefineTemplates, CodeToolManager, CodeCache; + Classes, SysUtils, + // LazUtils + LazUTF8, LazFileUtils, + // CodeTool + DefineTemplates, CodeToolManager, CodeCache; var Code: TCodeBuffer; diff --git a/components/codetools/examples/finddeclaration.lpi b/components/codetools/examples/finddeclaration.lpi index c02a49606d..7964b20b8d 100644 --- a/components/codetools/examples/finddeclaration.lpi +++ b/components/codetools/examples/finddeclaration.lpi @@ -1,7 +1,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -45,13 +45,9 @@ - - - - - + diff --git a/components/codetools/examples/findusedunitreferences.lpi b/components/codetools/examples/findusedunitreferences.lpi index e2ff92c943..d4d229dd97 100644 --- a/components/codetools/examples/findusedunitreferences.lpi +++ b/components/codetools/examples/findusedunitreferences.lpi @@ -1,7 +1,7 @@ - + @@ -33,6 +33,7 @@ + diff --git a/components/codetools/examples/findusedunitreferences.lpr b/components/codetools/examples/findusedunitreferences.lpr index 0b0f9ca0e4..2364c9e1ff 100644 --- a/components/codetools/examples/findusedunitreferences.lpr +++ b/components/codetools/examples/findusedunitreferences.lpr @@ -35,7 +35,11 @@ program FindUsedUnitReferences; {$mode objfpc}{$H+} uses - Classes, SysUtils, CodeCache, CodeToolManager, + Classes, SysUtils, + // LazUtils + LazFileUtils, + // CodeTools + CodeCache, CodeToolManager, usedunitrefs1; const diff --git a/components/codetools/examples/fixfilenames.lpi b/components/codetools/examples/fixfilenames.lpi index 12936cf345..59498949df 100644 --- a/components/codetools/examples/fixfilenames.lpi +++ b/components/codetools/examples/fixfilenames.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/fixfilenames.pas b/components/codetools/examples/fixfilenames.pas index f0d73d75d6..7abc67e9f0 100644 --- a/components/codetools/examples/fixfilenames.pas +++ b/components/codetools/examples/fixfilenames.pas @@ -29,7 +29,11 @@ program FixFilenames; {$mode objfpc}{$H+} uses - Classes, SysUtils, CodeToolsStructs, CodeToolManager, CodeCache; + Classes, SysUtils, + // LazUtils + LazFileUtils, LazUTF8, AvgLvlTree, + // CodeTools + CodeToolManager, CodeCache; const ConfigFilename = 'codetools.config'; diff --git a/components/codetools/examples/getcontext.lpi b/components/codetools/examples/getcontext.lpi index b34081c9ec..4e1cdb6f60 100644 --- a/components/codetools/examples/getcontext.lpi +++ b/components/codetools/examples/getcontext.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/getcontext.lpr b/components/codetools/examples/getcontext.lpr index 6786966698..bda7a387b9 100644 --- a/components/codetools/examples/getcontext.lpr +++ b/components/codetools/examples/getcontext.lpr @@ -3,7 +3,11 @@ program GetContext; {$mode objfpc}{$H+} uses - SysUtils, CodeCache, CodeToolManager, IdentCompletionTool, FindDeclarationTool; + SysUtils, + // LazUtils + LazFileUtils, + // CodeTools + CodeCache, CodeToolManager, IdentCompletionTool, FindDeclarationTool; const ConfigFilename = 'codetools.config'; diff --git a/components/codetools/examples/getexpandedoperand.lpi b/components/codetools/examples/getexpandedoperand.lpi index 943ae8244e..d5cddcef84 100644 --- a/components/codetools/examples/getexpandedoperand.lpi +++ b/components/codetools/examples/getexpandedoperand.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/getexpandedoperand.pas b/components/codetools/examples/getexpandedoperand.pas index 2f14933da1..2b937df223 100644 --- a/components/codetools/examples/getexpandedoperand.pas +++ b/components/codetools/examples/getexpandedoperand.pas @@ -29,7 +29,11 @@ program getexpandedoperand; {$mode objfpc}{$H+} uses - SysUtils, CodeCache, CodeToolManager, + SysUtils, + // LazUtils + LazFileUtils, + // CodeTools + CodeCache, CodeToolManager, SimpleUnit1, getterexample1; const diff --git a/components/codetools/examples/h2pastest.lpi b/components/codetools/examples/h2pastest.lpi index 359c689b85..d045c063d5 100644 --- a/components/codetools/examples/h2pastest.lpi +++ b/components/codetools/examples/h2pastest.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/h2pastest.lpr b/components/codetools/examples/h2pastest.lpr index 88ed36a1cd..0fe00010eb 100644 --- a/components/codetools/examples/h2pastest.lpr +++ b/components/codetools/examples/h2pastest.lpr @@ -31,7 +31,11 @@ program H2PasTest; {$mode objfpc}{$H+} uses - Classes, SysUtils, CodeCache, CodeToolManager, CCodeParserTool, FileProcs, + Classes, SysUtils, + // LazUtils + LazFileUtils, + // CodeTools + CodeCache, CodeToolManager, CCodeParserTool, FileProcs, H2PasTool; const diff --git a/components/codetools/examples/identifiercompletion.lpi b/components/codetools/examples/identifiercompletion.lpi index 162fc6630f..57c5fd81f3 100644 --- a/components/codetools/examples/identifiercompletion.lpi +++ b/components/codetools/examples/identifiercompletion.lpi @@ -1,7 +1,7 @@ - + @@ -10,9 +10,6 @@ - - - diff --git a/components/codetools/examples/identifiercompletion.lpr b/components/codetools/examples/identifiercompletion.lpr index 4648f4672c..a91594531e 100644 --- a/components/codetools/examples/identifiercompletion.lpr +++ b/components/codetools/examples/identifiercompletion.lpr @@ -28,7 +28,11 @@ program IdentifierCompletion; {$mode objfpc}{$H+} uses - SysUtils, CodeCache, CodeToolManager; + SysUtils, + // LazUtils + LazFileUtils, + // CodeTools + CodeCache, CodeToolManager; const ConfigFilename = 'codetools.config'; @@ -50,8 +54,7 @@ begin CodeToolBoss.SimpleInit(ConfigFilename); - // optional: ProjectDir and TestPascalFile exists only to easily test some - // things. + // optional: ProjectDir and TestPascalFile exists only to easily test some things. Filename:=TrimFilename(SetDirSeparators(GetCurrentDir+'/scanexamples/identcomplexample.pas')); X:=20; Y:=11; diff --git a/components/codetools/examples/listinterfaceclasses.lpi b/components/codetools/examples/listinterfaceclasses.lpi index 9353cb54b5..4d401e5d56 100644 --- a/components/codetools/examples/listinterfaceclasses.lpi +++ b/components/codetools/examples/listinterfaceclasses.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/listinterfaceclasses.pas b/components/codetools/examples/listinterfaceclasses.pas index 6c2216e350..e4c378aea7 100644 --- a/components/codetools/examples/listinterfaceclasses.pas +++ b/components/codetools/examples/listinterfaceclasses.pas @@ -28,7 +28,11 @@ program ListInterfaceClasses; {$mode objfpc}{$H+} uses - SysUtils, CodeToolManager, CodeCache, CodeTree; + SysUtils, + // LazUtils + LazFileUtils, + // CodeTools + CodeToolManager, CodeCache, CodeTree; var ExpandedFilename: String; diff --git a/components/codetools/examples/methodjumping.lpi b/components/codetools/examples/methodjumping.lpi index 8cc8004d2d..2907f9d57e 100644 --- a/components/codetools/examples/methodjumping.lpi +++ b/components/codetools/examples/methodjumping.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/methodjumping.pas b/components/codetools/examples/methodjumping.pas index f69d8a8994..f1c16d11fe 100644 --- a/components/codetools/examples/methodjumping.pas +++ b/components/codetools/examples/methodjumping.pas @@ -28,7 +28,11 @@ program MethodJumping; {$mode objfpc}{$H+} uses - SysUtils, CodeToolManager, CodeCache; + SysUtils, + // LazUtils + LazFileUtils, + // CodeTools + CodeToolManager, CodeCache; var ExpandedFilename: String; diff --git a/components/codetools/examples/parsefpcmsg.lpi b/components/codetools/examples/parsefpcmsg.lpi index 7f924bb75f..db74a6b0ff 100644 --- a/components/codetools/examples/parsefpcmsg.lpi +++ b/components/codetools/examples/parsefpcmsg.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/retypepublishedvars.lpi b/components/codetools/examples/retypepublishedvars.lpi index 954b63e103..2c5b2a3450 100644 --- a/components/codetools/examples/retypepublishedvars.lpi +++ b/components/codetools/examples/retypepublishedvars.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/retypepublishedvars.lpr b/components/codetools/examples/retypepublishedvars.lpr index 5b422a8749..7d05bb82f1 100644 --- a/components/codetools/examples/retypepublishedvars.lpr +++ b/components/codetools/examples/retypepublishedvars.lpr @@ -28,7 +28,11 @@ program retypepublishedvars; {$mode objfpc}{$H+} uses - SysUtils, CodeCache, CodeToolManager, CodeToolsStructs; + SysUtils, + // LazUtils + AvgLvlTree, + // CodeTools + CodeCache, CodeToolManager, CodeToolsStructs; const ConfigFilename = 'codetools.config'; diff --git a/components/codetools/examples/scanfpcerrormsgfiles.lpi b/components/codetools/examples/scanfpcerrormsgfiles.lpi index 57bf092134..f4e6faf005 100644 --- a/components/codetools/examples/scanfpcerrormsgfiles.lpi +++ b/components/codetools/examples/scanfpcerrormsgfiles.lpi @@ -1,7 +1,7 @@ - + @@ -18,9 +18,6 @@ - - - diff --git a/components/codetools/examples/scanfpcerrormsgfiles.lpr b/components/codetools/examples/scanfpcerrormsgfiles.lpr index e208884837..fa294a5a3e 100644 --- a/components/codetools/examples/scanfpcerrormsgfiles.lpr +++ b/components/codetools/examples/scanfpcerrormsgfiles.lpr @@ -10,7 +10,11 @@ program scanfpcerrormsgfiles; {$mode objfpc}{$H+} uses - sysutils, CodeToolsFPCMsgs, CodeToolsStructs, LazFileUtils; + sysutils, + // LazUtils + LazFileUtils, AvgLvlTree, + // CodeTools + CodeToolsFPCMsgs, CodeToolsStructs; procedure WriteUsage; begin diff --git a/components/codetools/examples/sourcecloser.lpi b/components/codetools/examples/sourcecloser.lpi index b82e8ab9c2..1250b38d72 100644 --- a/components/codetools/examples/sourcecloser.lpi +++ b/components/codetools/examples/sourcecloser.lpi @@ -1,7 +1,7 @@ - + @@ -15,9 +15,6 @@ - - - diff --git a/components/codetools/examples/sourcecloser.lpr b/components/codetools/examples/sourcecloser.lpr index d915f4b958..49e606ae75 100644 --- a/components/codetools/examples/sourcecloser.lpr +++ b/components/codetools/examples/sourcecloser.lpr @@ -33,9 +33,12 @@ program sourcecloser; {$mode objfpc}{$H+} uses - Classes, SysUtils, AvgLvlTree, LazLogger, LazFileUtils, Laz2_XMLCfg, LazUTF8, + Classes, SysUtils, CustApp, + // LazUtils + AvgLvlTree, LazLogger, LazFileUtils, Laz2_XMLCfg, LazUTF8, + // CodeTools FileProcs, BasicCodeTools, CodeToolManager, CodeCache, SourceChanger, - CodeTree, DefineTemplates, CustApp; + CodeTree, DefineTemplates; type diff --git a/components/codetools/examples/testfpcsrcunitrules.lpi b/components/codetools/examples/testfpcsrcunitrules.lpi index 062bb76f15..376ecfadf3 100644 --- a/components/codetools/examples/testfpcsrcunitrules.lpi +++ b/components/codetools/examples/testfpcsrcunitrules.lpi @@ -1,7 +1,7 @@ - + @@ -18,7 +18,6 @@ - @@ -44,6 +43,7 @@ + diff --git a/components/codetools/examples/testfpcsrcunitrules.lpr b/components/codetools/examples/testfpcsrcunitrules.lpr index 3b2185fe8c..0260591ef6 100644 --- a/components/codetools/examples/testfpcsrcunitrules.lpr +++ b/components/codetools/examples/testfpcsrcunitrules.lpr @@ -28,8 +28,11 @@ program TestFPCSrcUnitRules; {$mode objfpc}{$H+} uses - Classes, SysUtils, CustApp, AVL_Tree, CodeToolManager, DefineTemplates, - CodeToolsConfig, FileProcs, CodeToolsStructs, LazFileUtils; + Classes, SysUtils, CustApp, Laz_AVL_Tree, + // LazUtils + LazFileUtils, AvgLvlTree, + // CodeTools + FileProcs, CodeToolManager, DefineTemplates, CodeToolsConfig; const ConfigFilename = 'codetools.config'; @@ -241,7 +244,7 @@ var IsPPU: Boolean; SourceFiles: TStringList; Units: TStringToStringTree; - Item: PStringToStringTreeItem; + Item: PStringToStringItem; Node: TAVLTreeNode; begin SearchPaths:=ConfigCache.UnitPaths; @@ -282,7 +285,7 @@ begin Node:=Units.Tree.FindLowest; i:=0; while Node<>nil do begin - Item:=PStringToStringTreeItem(Node.Data); + Item:=PStringToStringItem(Node.Data); Filename:=Item^.Value; if System.Pos(';',Filename)>0 then begin // duplicate units @@ -302,7 +305,7 @@ procedure TTestFPCSourceUnitRules.WriteMissingPPUSources( var UnitToSrc: TStringToStringTree; Node: TAVLTreeNode; - Item: PStringToStringTreeItem; + Item: PStringToStringItem; ConfigCache: TFPCTargetConfigCache; aUnitName: String; Cnt: Integer; @@ -319,7 +322,7 @@ begin Cnt:=0; Node:=ConfigCache.Units.Tree.FindLowest; while Node<>nil do begin - Item:=PStringToStringTreeItem(Node.Data); + Item:=PStringToStringItem(Node.Data); aUnitName:=Item^.Name; Filename:=Item^.Value; if CompareFileExt(Filename,'ppu',false)=0 then begin @@ -353,7 +356,7 @@ var SrcDuplicates: TStringToStringTree; Node: TAVLTreeNode; Cnt: Integer; - Item: PStringToStringTreeItem; + Item: PStringToStringItem; aUnitName: String; Files: String; Units: TStringToStringTree; @@ -368,7 +371,7 @@ begin Cnt:=0; Node:=SrcDuplicates.Tree.FindLowest; while Node<>nil do begin - Item:=PStringToStringTreeItem(Node.Data); + Item:=PStringToStringItem(Node.Data); aUnitName:=Item^.Name; Files:=Item^.Value; PPUFile:=Units[aUnitName]; @@ -386,7 +389,7 @@ begin Cnt:=0; Node:=SrcDuplicates.Tree.FindLowest; while Node<>nil do begin - Item:=PStringToStringTreeItem(Node.Data); + Item:=PStringToStringItem(Node.Data); aUnitName:=Item^.Name; Files:=Item^.Value; if (Units=nil) or (Units[aUnitName]='') then begin diff --git a/components/codetools/examples/unitdicttest.lpi b/components/codetools/examples/unitdicttest.lpi index f1ef3ba820..1b451db2c0 100644 --- a/components/codetools/examples/unitdicttest.lpi +++ b/components/codetools/examples/unitdicttest.lpi @@ -1,7 +1,7 @@ - + diff --git a/components/codetools/examples/unitdicttest.lpr b/components/codetools/examples/unitdicttest.lpr index 258ee3a16e..221f86809a 100644 --- a/components/codetools/examples/unitdicttest.lpr +++ b/components/codetools/examples/unitdicttest.lpr @@ -28,8 +28,12 @@ program unitdicttest; {$mode objfpc}{$H+} uses - SysUtils, AVL_Tree, CodeToolManager, FileProcs, - DefineTemplates, unitdictionary, CodeToolsStructs, LazFileUtils; + SysUtils, Laz_AVL_Tree, + // LazUtils + LazFileUtils, AvgLvlTree, + // CodeTools + CodeToolManager, FileProcs, + DefineTemplates, unitdictionary, CodeToolsStructs; const ConfigFilename = 'codetools.config'; @@ -40,7 +44,7 @@ var UnitSet: TFPCUnitSetCache; CfgCache: TFPCTargetConfigCache; AVLNode: TAVLTreeNode; - Item: PStringToStringTreeItem; + Item: PStringToStringItem; Directory: String; D2: TUnitDictionary; begin @@ -53,7 +57,7 @@ begin AVLNode:=CfgCache.Units.Tree.FindLowest; Directory:=AppendPathDelim(UnitSet.FPCSourceDirectory)+'packages'; while AVLNode<>nil do begin - Item:=PStringToStringTreeItem(AVLNode.Data); + Item:=PStringToStringItem(AVLNode.Data); FileName:=UnitSet.GetUnitSrcFile(Item^.Name,false); //writeln('UnitName=',Item^.Name,' Source=',Filename); if FilenameIsPascalUnit(Filename) diff --git a/components/codetools/examples/usedbyunits.lpi b/components/codetools/examples/usedbyunits.lpi index 0ad7ae2af4..2db0927dd9 100644 --- a/components/codetools/examples/usedbyunits.lpi +++ b/components/codetools/examples/usedbyunits.lpi @@ -1,7 +1,7 @@ - + @@ -11,9 +11,6 @@ <UseAppBundle Value="False"/> </General> - <VersionInfo> - <StringTable ProductVersion=""/> - </VersionInfo> <BuildModes Count="1"> <Item1 Name="default" Default="True"/> </BuildModes> diff --git a/components/codetools/examples/usedbyunits.lpr b/components/codetools/examples/usedbyunits.lpr index 59de36233d..23de64a5ca 100644 --- a/components/codetools/examples/usedbyunits.lpr +++ b/components/codetools/examples/usedbyunits.lpr @@ -28,8 +28,11 @@ program UsedByUnits; {$mode objfpc}{$H+} uses - SysUtils, AVL_Tree, FileProcs, CTUnitGraph, CodeToolManager, - LazFileUtils, LazFileCache; + SysUtils, Laz_AVL_Tree, + // LazUtils + LazFileUtils, LazFileCache, + // CodeTools + FileProcs, CTUnitGraph, CodeToolManager; const ConfigFilename = 'codetools.config'; diff --git a/components/codetools/ide/codyidentifiersdlg.pas b/components/codetools/ide/codyidentifiersdlg.pas index 25f9e7050c..87c0b02e92 100644 --- a/components/codetools/ide/codyidentifiersdlg.pas +++ b/components/codetools/ide/codyidentifiersdlg.pas @@ -45,8 +45,8 @@ uses PackageIntf, LazIDEIntf, SrcEditorIntf, ProjectIntf, CompOptsIntf, IDEDialogs, IDEMsgIntf, IDEExternToolIntf, // Codetools - CodeCache, BasicCodeTools, CustomCodeTool, CodeToolManager, UnitDictionary, CodeTree, - LinkScanner, DefineTemplates, CodeToolsStructs, FindDeclarationTool, + CodeCache, BasicCodeTools, CustomCodeTool, CodeToolManager, UnitDictionary, + CodeTree, LinkScanner, DefineTemplates, FindDeclarationTool, CodyStrConsts, CodyUtils, CodyOpts, FileProcs, // LazUtils LazFileUtils, LazFileCache, AvgLvlTree; diff --git a/components/codetools/pascalparsertool.pas b/components/codetools/pascalparsertool.pas index ae393a4efd..8efcf029bc 100644 --- a/components/codetools/pascalparsertool.pas +++ b/components/codetools/pascalparsertool.pas @@ -45,7 +45,7 @@ uses Classes, SysUtils, // Codetools FileProcs, CodeToolsStrConsts, CodeTree, CodeAtom, ExprEval, - MultiKeyWordListTool, KeywordFuncLists, CodeToolsStructs, LinkScanner, CodeCache; + MultiKeyWordListTool, KeywordFuncLists, LinkScanner, CodeCache; type TProcHeadAttribute = ( diff --git a/components/wiki/test/wikihelpmanager.pas b/components/wiki/test/wikihelpmanager.pas index 50d066d81c..59495e1f52 100644 --- a/components/wiki/test/wikihelpmanager.pas +++ b/components/wiki/test/wikihelpmanager.pas @@ -27,8 +27,14 @@ unit WikiHelpManager; interface uses - Classes, SysUtils, math, LazFileUtils, LazLogger, LazDbgLog, LazUTF8, - laz2_DOM, CodeToolsStructs, BasicCodeTools, KeywordFuncLists, MTProcs, + Classes, SysUtils, math, + // LazUtils + LazFileUtils, LazLogger, LazDbgLog, LazUTF8, laz2_DOM, AvgLvlTree, + // CodeTools + BasicCodeTools, KeywordFuncLists, + // + MTProcs, + // Wiki Wiki2HTMLConvert, Wiki2XHTMLConvert, WikiFormat, WikiParser; type diff --git a/components/wiki/test/wikisearchdemo.lpi b/components/wiki/test/wikisearchdemo.lpi index 17c2b7e119..82c4ea4057 100644 --- a/components/wiki/test/wikisearchdemo.lpi +++ b/components/wiki/test/wikisearchdemo.lpi @@ -1,7 +1,7 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="9"/> + <Version Value="10"/> <General> <SessionStorage Value="InIDEConfig"/> <MainUnit Value="0"/> @@ -13,9 +13,6 @@ <i18n> <EnableI18N LFM="False"/> </i18n> - <VersionInfo> - <StringTable ProductVersion=""/> - </VersionInfo> <BuildModes Count="1"> <Item1 Name="Default" Default="True"/> </BuildModes> @@ -51,12 +48,12 @@ <Unit0> <Filename Value="wikisearchdemo.lpr"/> <IsPartOfProject Value="True"/> - <UnitName Value="wikisearchdemo"/> </Unit0> <Unit1> <Filename Value="wikisearchmain.pas"/> <IsPartOfProject Value="True"/> <ComponentName Value="WikiSearchDemoForm"/> + <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> <UnitName Value="WikiSearchMain"/> </Unit1> @@ -90,12 +87,6 @@ </Win32> </Options> </Linking> - <Other> - <CompilerMessages> - <MsgFileName Value=""/> - </CompilerMessages> - <CompilerPath Value="$(CompPath)"/> - </Other> </CompilerOptions> <Debugging> <Exceptions Count="3"> diff --git a/components/wiki/test/wikisearchdemo.res b/components/wiki/test/wikisearchdemo.res index e994dfa65a96d79259e5ee4940a4dbaf7a725d38..877868cb4251927ab961b2295948c0d753ecb7cd 100644 GIT binary patch delta 266 zcmX@Hn`6sfjtL4(mTVK1{<Aw46!<0PrcTyiwAq}=D8(YLV3Sy!TV`yPSWu9YnVeXX znV+Xnk(-lOYy}pdoX9LQc^(sQJw#P`W?o8ud2w)RNl9j2dND+$tx`rwNr9EVesOX} zYHnh&UT$V`QGRiLT8UnAey)D7ucy9|fq|)hII3nPJ6<jY1qGXwf=tKq#G+I?x5S*{ xR2zLbA0%y~53$%3&1R5Zm>iPRfx;ls;?&%voJu=}=04W;K32x<eXLAY5&(ygTG0Ri delta 62 zcmdn8m*d24jtL4(eykIf{<BBsmlin|6in7&v|&}qNG(d;oWdx@!fm6USX`W%o0L;& S*IdQcUd6_^y^4*=N&*0^ixe~f diff --git a/components/wiki/test/wikisearchmain.lfm b/components/wiki/test/wikisearchmain.lfm index 28ec875bf9..ceb4b84269 100644 --- a/components/wiki/test/wikisearchmain.lfm +++ b/components/wiki/test/wikisearchmain.lfm @@ -9,7 +9,7 @@ object WikiSearchDemoForm: TWikiSearchDemoForm OnCreate = FormCreate OnDestroy = FormDestroy Position = poScreenCenter - LCLVersion = '0.9.31' + LCLVersion = '1.7' object PagePanel: TPanel Left = 325 Height = 501 @@ -38,6 +38,10 @@ object WikiSearchDemoForm: TWikiSearchDemoForm PrintSettings.MarginTop = 0.5 PrintSettings.MarginRight = 0.5 PrintSettings.MarginBottom = 0.5 + PrintSettings.Preview.Left = 480 + PrintSettings.Preview.Top = 270 + PrintSettings.Preview.Width = 1440 + PrintSettings.Preview.Height = 810 TabOrder = 0 WantTabs = False OnHotClick = IpHtmlPanelHotClick @@ -63,8 +67,8 @@ object WikiSearchDemoForm: TWikiSearchDemoForm end object SearchSepToolButton: TToolButton Left = 24 + Height = 22 Top = 2 - Width = 5 Caption = 'SearchSepToolButton' Style = tbsDivider end @@ -106,8 +110,8 @@ object WikiSearchDemoForm: TWikiSearchDemoForm AnchorSideTop.Control = OptionsButton AnchorSideTop.Side = asrBottom Left = 1 - Height = 431 - Top = 69 + Height = 433 + Top = 67 Width = 318 Align = alBottom Anchors = [akTop, akLeft, akRight, akBottom] @@ -119,6 +123,10 @@ object WikiSearchDemoForm: TWikiSearchDemoForm PrintSettings.MarginTop = 0.5 PrintSettings.MarginRight = 0.5 PrintSettings.MarginBottom = 0.5 + PrintSettings.Preview.Left = 480 + PrintSettings.Preview.Top = 270 + PrintSettings.Preview.Width = 1440 + PrintSettings.Preview.Height = 810 TabOrder = 0 WantTabs = False OnHotClick = IpHtmlPanelHotClick @@ -128,10 +136,10 @@ object WikiSearchDemoForm: TWikiSearchDemoForm AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = SearchPanel AnchorSideRight.Control = HideSearchButton - Left = 82 - Height = 24 + Left = 87 + Height = 28 Top = 7 - Width = 114 + Width = 97 Anchors = [akTop, akLeft, akRight] BorderSpacing.Around = 6 OnChange = SearchEditChange @@ -145,9 +153,9 @@ object WikiSearchDemoForm: TWikiSearchDemoForm AnchorSideTop.Control = SearchEdit AnchorSideTop.Side = asrCenter Left = 7 - Height = 15 - Top = 12 - Width = 69 + Height = 14 + Top = 14 + Width = 74 BorderSpacing.Around = 6 Caption = 'SearchLabel' ParentColor = False @@ -158,9 +166,9 @@ object WikiSearchDemoForm: TWikiSearchDemoForm AnchorSideTop.Side = asrCenter AnchorSideRight.Side = asrBottom Left = 7 - Height = 15 - Top = 43 - Width = 79 + Height = 14 + Top = 42 + Width = 85 BorderSpacing.Around = 6 Caption = 'ProgressLabel' ParentColor = False @@ -170,10 +178,10 @@ object WikiSearchDemoForm: TWikiSearchDemoForm AnchorSideTop.Side = asrCenter AnchorSideRight.Control = SearchPanel AnchorSideRight.Side = asrBottom - Left = 202 - Height = 26 - Top = 6 - Width = 111 + Left = 190 + Height = 24 + Top = 9 + Width = 123 Anchors = [akTop, akRight] AutoSize = True BorderSpacing.Around = 6 @@ -185,10 +193,10 @@ object WikiSearchDemoForm: TWikiSearchDemoForm AnchorSideLeft.Control = SearchPanel AnchorSideRight.Control = SearchPanel AnchorSideRight.Side = asrBottom - Left = 222 - Height = 26 + Left = 213 + Height = 24 Top = 37 - Width = 91 + Width = 100 Anchors = [akTop, akRight] AutoSize = True BorderSpacing.Around = 6 @@ -205,16 +213,6 @@ object WikiSearchDemoForm: TWikiSearchDemoForm object SynHTMLSyn1: TSynHTMLSyn DefaultFilter = 'HTML Document (*.htm,*.html)|*.htm;*.html' Enabled = False - AndAttri.FrameEdges = sfeAround - ASPAttri.FrameEdges = sfeAround - CommentAttri.FrameEdges = sfeAround - IdentifierAttri.FrameEdges = sfeAround - KeyAttri.FrameEdges = sfeAround - SpaceAttri.FrameEdges = sfeAround - SymbolAttri.FrameEdges = sfeAround - TextAttri.FrameEdges = sfeAround - UndefKeyAttri.FrameEdges = sfeAround - ValueAttri.FrameEdges = sfeAround left = 411 top = 139 end diff --git a/components/wiki/test/wikisearchmain.pas b/components/wiki/test/wikisearchmain.pas index 40e00ff5e9..a5a91e8623 100644 --- a/components/wiki/test/wikisearchmain.pas +++ b/components/wiki/test/wikisearchmain.pas @@ -25,11 +25,19 @@ unit WikiSearchMain; interface uses - Classes, SysUtils, math, FileUtil, LazLogger, LazUTF8, LazFileUtils, laz2_DOM, - Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls, ComCtrls, LCLIntf, - Menus, IpHtml, Ipfilebroker, IpMsg, CodeToolManager, CodeCache, SynEdit, - SynHighlighterHTML, SynEditHighlighter, WikiHelpManager, WikiSearchOptions, - WikiParser, WikiFormat; + Classes, SysUtils, math, + // LCL + Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls, ComCtrls, LCLIntf, Menus, + // LazUtils + LazLogger, LazUTF8, LazFileUtils, laz2_DOM, + // CodeTools + CodeToolManager, CodeCache, + // SynEdit + SynEdit, SynHighlighterHTML, SynEditHighlighter, + // TurboPower_IPro + IpHtml, Ipfilebroker, + // Wiki + WikiHelpManager, WikiSearchOptions, WikiParser, WikiFormat; type diff --git a/converter/convcodetool.pas b/converter/convcodetool.pas index d9a13bfa1d..cd7ee21fa0 100644 --- a/converter/convcodetool.pas +++ b/converter/convcodetool.pas @@ -37,7 +37,7 @@ uses Forms, Controls, // CodeTools CodeToolManager, CodeTree, CodeAtom, FileProcs, KeywordFuncLists, BasicCodeTools, - LinkScanner, CodeCache, SourceChanger, CodeToolsStructs, + LinkScanner, CodeCache, SourceChanger, // LazUtils LazFileUtils, AvgLvlTree, // IdeIntf diff --git a/converter/missingpropertiesdlg.pas b/converter/missingpropertiesdlg.pas index d1100aa56a..c85f372220 100644 --- a/converter/missingpropertiesdlg.pas +++ b/converter/missingpropertiesdlg.pas @@ -40,7 +40,7 @@ uses // components SynHighlighterLFM, SynEdit, SynEditMiscClasses, // codetools - CodeCache, CodeToolManager, CodeToolsStructs, CodeCompletionTool, LFMTrees, + CodeCache, CodeToolManager, CodeCompletionTool, LFMTrees, // IdeIntf IDEExternToolIntf, ComponentReg, // IDE diff --git a/converter/replacenamesunit.pas b/converter/replacenamesunit.pas index 622e14f7ae..4702b54577 100644 --- a/converter/replacenamesunit.pas +++ b/converter/replacenamesunit.pas @@ -7,12 +7,9 @@ interface uses Classes, SysUtils, RegExpr, // LCL - LResources, Forms, Controls, Graphics, Dialogs, - Grids, Buttons, ExtCtrls, Menus, ButtonPanel, - // Codetools - CodeToolsStructs, + Forms, Controls, Dialogs, Grids, Menus, ButtonPanel, // LazUtils - FileUtil, AvgLvlTree, + AvgLvlTree, // IDE, converter LazarusIDEStrConsts, ConverterTypes; diff --git a/ide/codehelp.pas b/ide/codehelp.pas index bc6ff7ad9e..d4f78b9b36 100644 --- a/ide/codehelp.pas +++ b/ide/codehelp.pas @@ -46,7 +46,7 @@ uses // CodeTools CodeAtom, CodeTree, CodeToolManager, FindDeclarationTool, BasicCodeTools, KeywordFuncLists, PascalParserTool, CodeCache, CacheCodeTools, CustomCodeTool, - FileProcs, DefineTemplates, CodeToolsStructs, + FileProcs, DefineTemplates, // LazUtils AvgLvlTree, FileUtil, LazFileUtils, LazUTF8, LazFileCache, Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite, diff --git a/ide/emptymethodsdlg.pas b/ide/emptymethodsdlg.pas index 31b9aa0e89..6312c81353 100644 --- a/ide/emptymethodsdlg.pas +++ b/ide/emptymethodsdlg.pas @@ -32,12 +32,17 @@ unit EmptyMethodsDlg; interface uses - Classes, SysUtils, TypInfo, LCLProc, Forms, Controls, Graphics, - Dialogs, ExtCtrls, StdCtrls, ButtonPanel, SynEdit, SynHighlighterPas, - CodeToolsStructs, CodeCache, CodeToolManager, PascalParserTool, - CodeTree, - SrcEditorIntf, LazIDEIntf, PropEdits, IDEDialogs, CustomFormEditor, JitForms, - Project, LazarusIDEStrConsts, EditorOptions; + Classes, SysUtils, TypInfo, + // LCL + LCLProc, Forms, Controls, Dialogs, StdCtrls, ButtonPanel, + // SynEdit + SynEdit, SynHighlighterPas, + // CodeTools + CodeToolsStructs, CodeCache, CodeToolManager, PascalParserTool, CodeTree, + // IdeIntf + SrcEditorIntf, LazIDEIntf, PropEdits, IDEDialogs, + // IDE + CustomFormEditor, JitForms, Project, LazarusIDEStrConsts, EditorOptions; type diff --git a/ide/etfpcmsgparser.pas b/ide/etfpcmsgparser.pas index b34a98ad6f..4336f7f4b2 100644 --- a/ide/etfpcmsgparser.pas +++ b/ide/etfpcmsgparser.pas @@ -35,7 +35,7 @@ uses // RTL Classes, SysUtils, strutils, math, // CodeTools - KeywordFuncLists, CodeToolsFPCMsgs, {CodeToolsStructs,} CodeCache, FileProcs, + KeywordFuncLists, CodeToolsFPCMsgs, CodeCache, FileProcs, CodeToolManager, DirectoryCacher, BasicCodeTools, DefineTemplates, SourceLog, // LazUtils LConvEncoding, LazUTF8, FileUtil, LazFileUtils, AvgLvlTree, diff --git a/ide/etmakemsgparser.pas b/ide/etmakemsgparser.pas index 11e8760210..89a3c651dc 100644 --- a/ide/etmakemsgparser.pas +++ b/ide/etmakemsgparser.pas @@ -33,7 +33,7 @@ uses // RTL Classes, SysUtils, // CodeTools - CodeToolsStructs, KeywordFuncLists, + KeywordFuncLists, // LazUtils FileUtil, LazFileUtils, AvgLvlTree, // IDEIntf diff --git a/ide/exttools.pas b/ide/exttools.pas index 926821048d..07b3ad6ac8 100644 --- a/ide/exttools.pas +++ b/ide/exttools.pas @@ -42,7 +42,7 @@ uses LCLProc, {$ENDIF} // CodeTools - FileProcs, //CodeToolsStructs, + FileProcs, // LazUtils FileUtil, AvgLvlTree, LazFileUtils, UTF8Process, LazUTF8, // IDEIntf diff --git a/ide/makeresstrdlg.pas b/ide/makeresstrdlg.pas index fc6e887552..0312f223b3 100644 --- a/ide/makeresstrdlg.pas +++ b/ide/makeresstrdlg.pas @@ -39,13 +39,17 @@ unit MakeResStrDlg; interface uses - Classes, SysUtils, LCLProc, Forms, Controls, Buttons, StdCtrls, - Dialogs, ExtCtrls, ButtonPanel, IDEWindowIntf, + Classes, SysUtils, + // LCL + LCLProc, Forms, Controls, StdCtrls, Dialogs, ExtCtrls, ButtonPanel, + // SynEdit SynHighlighterPas, SynEdit, + // CodeTools CodeToolManager, CodeToolsStructs, CodeCache, - IDEHelpIntf, IDEDialogs, - LazarusIDEStrConsts, - EditorOptions, InputHistory, MiscOptions, IDEProcs; + // IdeIntf + IDEWindowIntf, IDEHelpIntf, IDEDialogs, + // IDE + LazarusIDEStrConsts, EditorOptions, InputHistory, MiscOptions, IDEProcs; type