Fix compilation of Codetools examples and wiki test project. Clean uses sections.

git-svn-id: trunk@54563 -
This commit is contained in:
juha 2017-04-07 19:02:11 +00:00
parent 5ba142cc42
commit ffa67e0ff4
62 changed files with 228 additions and 156 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>

View File

@ -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);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>

View File

@ -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;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>

View File

@ -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

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>

View File

@ -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';

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasUsesSectionForAllUnits Value="False"/>

View File

@ -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;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>

View File

@ -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

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>

View File

@ -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);

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasUsesSectionForAllUnits Value="False"/>

View File

@ -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;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>
@ -29,7 +29,7 @@
<PackageName Value="CodeTools"/>
</Item1>
</RequiredPackages>
<Units Count="5">
<Units Count="4">
<Unit0>
<Filename Value="finddeclaration.lpr"/>
<IsPartOfProject Value="True"/>
@ -45,13 +45,9 @@
<UnitName Value="OverloadedFunction"/>
</Unit2>
<Unit3>
<Filename Value="../../../../../amat/test/test.inc"/>
<IsPartOfProject Value="True"/>
</Unit3>
<Unit4>
<Filename Value="scanexamples/commentsidentifiers.pas"/>
<IsPartOfProject Value="True"/>
</Unit4>
</Unit3>
</Units>
</ProjectOptions>
<CompilerOptions>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>
@ -33,6 +33,7 @@
<Unit0>
<Filename Value="findusedunitreferences.lpr"/>
<IsPartOfProject Value="True"/>
<UnitName Value="FindUsedUnitReferences"/>
</Unit0>
<Unit1>
<Filename Value="scanexamples/simpleunit1.pas"/>

View File

@ -35,7 +35,11 @@ program FindUsedUnitReferences;
{$mode objfpc}{$H+}
uses
Classes, SysUtils, CodeCache, CodeToolManager,
Classes, SysUtils,
// LazUtils
LazFileUtils,
// CodeTools
CodeCache, CodeToolManager,
usedunitrefs1;
const

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasUsesSectionForAllUnits Value="False"/>

View File

@ -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';

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>

View File

@ -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';

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>

View File

@ -29,7 +29,11 @@ program getexpandedoperand;
{$mode objfpc}{$H+}
uses
SysUtils, CodeCache, CodeToolManager,
SysUtils,
// LazUtils
LazFileUtils,
// CodeTools
CodeCache, CodeToolManager,
SimpleUnit1, getterexample1;
const

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>

View File

@ -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

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>
@ -10,9 +10,6 @@
<MainUnit Value="0"/>
<UseAppBundle Value="False"/>
</General>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="default" Default="True"/>
</BuildModes>

View File

@ -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;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>

View File

@ -28,7 +28,11 @@ program ListInterfaceClasses;
{$mode objfpc}{$H+}
uses
SysUtils, CodeToolManager, CodeCache, CodeTree;
SysUtils,
// LazUtils
LazFileUtils,
// CodeTools
CodeToolManager, CodeCache, CodeTree;
var
ExpandedFilename: String;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>

View File

@ -28,7 +28,11 @@ program MethodJumping;
{$mode objfpc}{$H+}
uses
SysUtils, CodeToolManager, CodeCache;
SysUtils,
// LazUtils
LazFileUtils,
// CodeTools
CodeToolManager, CodeCache;
var
ExpandedFilename: String;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasUsesSectionForAllUnits Value="False"/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>

View File

@ -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';

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<SaveClosedFiles Value="False"/>
@ -18,9 +18,6 @@
<i18n>
<EnableI18N LFM="False"/>
</i18n>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="Default" Default="True"/>
</BuildModes>

View File

@ -10,7 +10,11 @@ program scanfpcerrormsgfiles;
{$mode objfpc}{$H+}
uses
sysutils, CodeToolsFPCMsgs, CodeToolsStructs, LazFileUtils;
sysutils,
// LazUtils
LazFileUtils, AvgLvlTree,
// CodeTools
CodeToolsFPCMsgs, CodeToolsStructs;
procedure WriteUsage;
begin

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>
@ -15,9 +15,6 @@
<i18n>
<EnableI18N LFM="False"/>
</i18n>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="Default" Default="True"/>
</BuildModes>

View File

@ -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

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>
@ -18,7 +18,6 @@
<VersionInfo>
<Language Value=""/>
<CharSet Value=""/>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="default" Default="True"/>
@ -44,6 +43,7 @@
<Unit0>
<Filename Value="testfpcsrcunitrules.lpr"/>
<IsPartOfProject Value="True"/>
<UnitName Value="TestFPCSrcUnitRules"/>
</Unit0>
</Units>
</ProjectOptions>

View File

@ -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

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<MainUnitHasCreateFormStatements Value="False"/>

View File

@ -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)

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<Version Value="10"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>
@ -11,9 +11,6 @@
<Title Value="usedbyunits"/>
<UseAppBundle Value="False"/>
</General>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="default" Default="True"/>
</BuildModes>

View File

@ -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';

View File

@ -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;

View File

@ -45,7 +45,7 @@ uses
Classes, SysUtils,
// Codetools
FileProcs, CodeToolsStrConsts, CodeTree, CodeAtom, ExprEval,
MultiKeyWordListTool, KeywordFuncLists, CodeToolsStructs, LinkScanner, CodeCache;
MultiKeyWordListTool, KeywordFuncLists, LinkScanner, CodeCache;
type
TProcHeadAttribute = (

View File

@ -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

View File

@ -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">

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -40,7 +40,7 @@ uses
// components
SynHighlighterLFM, SynEdit, SynEditMiscClasses,
// codetools
CodeCache, CodeToolManager, CodeToolsStructs, CodeCompletionTool, LFMTrees,
CodeCache, CodeToolManager, CodeCompletionTool, LFMTrees,
// IdeIntf
IDEExternToolIntf, ComponentReg,
// IDE

View File

@ -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;

View File

@ -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,

View File

@ -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

View File

@ -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,

View File

@ -33,7 +33,7 @@ uses
// RTL
Classes, SysUtils,
// CodeTools
CodeToolsStructs, KeywordFuncLists,
KeywordFuncLists,
// LazUtils
FileUtil, LazFileUtils, AvgLvlTree,
// IDEIntf

View File

@ -42,7 +42,7 @@ uses
LCLProc,
{$ENDIF}
// CodeTools
FileProcs, //CodeToolsStructs,
FileProcs,
// LazUtils
FileUtil, AvgLvlTree, LazFileUtils, UTF8Process, LazUTF8,
// IDEIntf

View File

@ -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