paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-22 05:09:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

ide, codetools, packager: use Classes.TGetStrProc instead of similar locally defined types by Alexander S. Klenin (issue #0015556)

Browse Source 
git-svn-id: trunk@23514 -
This commit is contained in:
paul 2010-01-21 02:24:16 +00:00
parent db8595b179
commit 040bb76815
5 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/codetools/codetoolmanager.pas
View File

@ -53,7 +53,6 @@ type
TCodeTool = TEventsCodeTool;
TDirectivesTool = TCompilerDirectivesTree;
TGetStringProc = procedure(const s: string) of object;
TOnBeforeApplyCTChanges = procedure(Manager: TCodeToolManager;
var Abort: boolean) of object;
TOnAfterApplyCTChanges = procedure(Manager: TCodeToolManager) of object;
@ -672,7 +671,7 @@ type
// functions for events in the object inspector
function GetCompatiblePublishedMethods(Code: TCodeBuffer;
const AClassName: string; TypeData: PTypeData;
Proc: TGetStringProc): boolean;
Proc: TGetStrProc): boolean;
function PublishedMethodExists(Code:TCodeBuffer; const AClassName,
AMethodName: string; TypeData: PTypeData;
out MethodIsCompatible, MethodIsPublished, IdentIsMethod: boolean
@ -3109,7 +3108,7 @@ begin
end;
function TCodeToolManager.GetCompatiblePublishedMethods(Code: TCodeBuffer;
const AClassName: string; TypeData: PTypeData; Proc: TGetStringProc): boolean;
const AClassName: string; TypeData: PTypeData; Proc: TGetStrProc): boolean;
begin
{$IFDEF CTDEBUG}
DebugLn('TCodeToolManager.GetCompatiblePublishedMethods A ',Code.Filename,' Classname=',AClassname);

10
components/codetools/eventcodetool.pas
View File

@ -49,8 +49,6 @@ uses
SourceChanger, FindDeclarationTool, ExtractProcTool;
type
TECTGetStringProc = procedure(const s: string) of object;
{ TEventsCodeTool }
TEventsCodeTool = class(TExtractProcTool)
@ -68,9 +66,9 @@ type
SourceChangeCache: TSourceChangeCache): boolean;
function GetCompatiblePublishedMethods(const UpperClassName: string;
TypeData: PTypeData; Proc: TECTGetStringProc): boolean;
TypeData: PTypeData; Proc: TGetStrProc): boolean;
function GetCompatiblePublishedMethods(ClassNode: TCodeTreeNode;
TypeData: PTypeData; Proc: TECTGetStringProc): boolean;
TypeData: PTypeData; Proc: TGetStrProc): boolean;
function PublishedMethodExists(const UpperClassName,
UpperMethodName: string; TypeData: PTypeData;
out MethodIsCompatible, MethodIsPublished, IdentIsMethod: boolean
@ -247,7 +245,7 @@ end;
function TEventsCodeTool.GetCompatiblePublishedMethods(
const UpperClassName: string; TypeData: PTypeData;
Proc: TECTGetStringProc): boolean;
Proc: TGetStrProc): boolean;
var ClassNode: TCodeTreeNode;
begin
Result:=false;
@ -271,7 +269,7 @@ end;
function TEventsCodeTool.GetCompatiblePublishedMethods(
ClassNode: TCodeTreeNode; TypeData: PTypeData;
Proc: TECTGetStringProc): boolean;
Proc: TGetStrProc): boolean;
var
Params: TFindDeclarationParams;
CompListSize: integer;

12
ide/main.pp
View File

@ -432,7 +432,7 @@ type
procedure OIOnUpdateRestricted(Sender: TObject);
function OnPropHookGetMethodName(const Method: TMethod;
PropOwner: TObject): String;
procedure OnPropHookGetMethods(TypeData: PTypeData; Proc:TGetStringProc);
procedure OnPropHookGetMethods(TypeData: PTypeData; Proc:TGetStrProc);
function OnPropHookMethodExists(const AMethodName: String;
TypeData: PTypeData;
var MethodIsCompatible, MethodIsPublished,
@ -457,7 +457,7 @@ type
procedure OnPropHookAddDependency(const AClass: TClass;
const AnUnitName: shortstring);
procedure OnPropHookGetComponentNames(TypeData: PTypeData;
Proc: TGetStringProc);
Proc: TGetStrProc);
function OnPropHookGetComponent(const ComponentPath: String): TComponent;
// designer events
@ -1606,9 +1606,9 @@ begin
{$ENDIF}
end;
procedure TMainIDE.OnPropHookGetMethods(TypeData:PTypeData;
Proc:TGetStringProc);
var ActiveSrcEdit: TSourceEditor;
procedure TMainIDE.OnPropHookGetMethods(TypeData: PTypeData; Proc: TGetStrProc);
var
ActiveSrcEdit: TSourceEditor;
ActiveUnitInfo: TUnitInfo;
begin
if not BeginCodeTool(ActiveSrcEdit,ActiveUnitInfo,[ctfSwitchToFormSource])
@ -15849,7 +15849,7 @@ begin
end;
procedure TMainIDE.OnPropHookGetComponentNames(TypeData: PTypeData;
Proc: TGetStringProc);
Proc: TGetStrProc);
begin
PkgBoss.IterateComponentNames(GlobalDesignHook.LookupRoot,TypeData,Proc);
end;

4
packager/basepkgmanager.pas
View File

@ -45,7 +45,7 @@ uses
MemCheck,
{$ENDIF}
TypInfo, Classes, SysUtils, Forms, FileUtil, LCLProc,
PropEdits, LazIDEIntf, PackageIntf, MenuIntf,
LazIDEIntf, PackageIntf, MenuIntf,
LazarusIDEStrConsts, EnvironmentOpts,
PackageDefs, PackageSystem, ComponentReg, CompilerOptions, Project;
@ -147,7 +147,7 @@ type
// components
function GetUsableComponentUnits(CurRoot: TPersistent): TFPList; virtual; abstract; // list of TUnitInfo
procedure IterateComponentNames(CurRoot: TPersistent; TypeData: PTypeData;
Proc: TGetStringProc); virtual; abstract;
Proc: TGetStrProc); virtual; abstract;
function FindUsableComponent(CurRoot: TPersistent;
const ComponentPath: string): TComponent; virtual; abstract;
function FindReferencedRootComponent(CurRoot: TPersistent;

4
packager/pkgmanager.pas
View File

@ -307,7 +307,7 @@ type
// components
function GetUsableComponentUnits(CurRoot: TPersistent): TFPList; override; // list of TUnitInfo
procedure IterateComponentNames(CurRoot: TPersistent; TypeData: PTypeData;
Proc: TGetStringProc); override;
Proc: TGetStrProc); override;
function FindUsableComponent(CurRoot: TPersistent;
const ComponentPath: string): TComponent; override;
function FindReferencedRootComponent(CurRoot: TPersistent;
@ -4053,7 +4053,7 @@ begin
end;
procedure TPkgManager.IterateComponentNames(CurRoot: TPersistent;
TypeData: PTypeData; Proc: TGetStringProc);
TypeData: PTypeData; Proc: TGetStrProc);
procedure CheckComponent(aRoot: TComponent);
var