paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 11:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: clean up

Browse Source 
git-svn-id: trunk@48198 -
This commit is contained in:
mattias 2015-03-10 12:02:19 +00:00
parent 4c9a755b3e
commit f69dd2379e
24 changed files with 92 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/codetools/pascalreadertool.pas
View File

@ -228,7 +228,7 @@ type
// module sections
function ExtractSourceName: string;
function GetSourceNamePos(var NamePos: TAtomPosition): boolean;
function GetSourceNamePos(out NamePos: TAtomPosition): boolean;
function GetSourceName(DoBuildTree: boolean = true): string;
function GetSourceType: TCodeTreeNodeDesc;
function PositionInSourceName(CleanPos: integer): boolean;
@ -2408,7 +2408,8 @@ begin
Result:='';
end;
function TPascalReaderTool.GetSourceNamePos(var NamePos: TAtomPosition): boolean;
function TPascalReaderTool.GetSourceNamePos(out NamePos: TAtomPosition
): boolean;
begin
Result:=false;
NamePos.StartPos:=-1;

3
components/synedit/syneditpointclasses.pas
View File

@ -540,8 +540,9 @@ type
procedure UpdateDisplay;
procedure ShowCaret;
procedure HideCaret;
property Handle: HWND read GetHandle;
property HandleAllocated: Boolean read GetHandleAllocated;
protected
property Handle: HWND read GetHandle;
public
constructor Create(AHandleOwner: TWinControl);
constructor Create(AHandleOwner: TWinControl; APainterClass: TSynEditScreenCaretPainterClass);

2
ide/abstractsmethodsdlg.pas
View File

@ -35,7 +35,7 @@ interface
uses
Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs,
CheckLst, StdCtrls, ExtCtrls, Buttons,
CodeAtom, CodeTree, PascalParserTool, CodeCache, CodeToolManager,
CodeTree, PascalParserTool, CodeCache, CodeToolManager,
LazIDEIntf, SrcEditorIntf, IDEDialogs,
LazarusIDEStrConsts;

10
ide/addtoprojectdlg.pas
View File

@ -34,7 +34,7 @@ unit AddToProjectDlg;
interface
uses
Classes, SysUtils, Math, LCLProc, Forms, Controls, Buttons,
Classes, SysUtils, LCLProc, Forms, Controls, Buttons,
ComCtrls, StdCtrls, ExtCtrls, Menus, Dialogs, Graphics, FileUtil, ButtonPanel,
AVL_Tree,
IDEWindowIntf, PackageIntf, IDEDialogs,
@ -80,14 +80,14 @@ type
// add files page
FilesListView: TListView;
procedure AddFileButtonClick(Sender: TObject);
procedure AddFileListViewSelectItem(Sender: TObject; Item: TListItem;
procedure AddFileListViewSelectItem(Sender: TObject; {%H-}Item: TListItem;
Selected: Boolean);
procedure AddToProjectDialogClose(Sender: TObject;
var CloseAction: TCloseAction);
var {%H-}CloseAction: TCloseAction);
procedure DependPkgNameComboBoxChange(Sender: TObject);
procedure FilesDirButtonClick(Sender: TObject);
procedure FilesListViewSelectItem(Sender: TObject; Item: TListItem;
Selected: Boolean);
procedure FilesListViewSelectItem(Sender: TObject; {%H-}Item: TListItem;
{%H-}Selected: Boolean);
procedure NewDependButtonClick(Sender: TObject);
procedure FilesAddButtonClick(Sender: TObject);
procedure FilesDeleteButtonClick(Sender: TObject);

6
ide/buildprojectdlg.pas
View File

@ -36,7 +36,7 @@ uses
IDEDialogs, IDEImagesIntf, PackageIntf,
// IDE
PackageDefs, PackageSystem, InputHistory, LazarusIDEStrConsts, Project,
DialogProcs, IDEProcs;
IDEProcs;
type
TBuildProjectDialogItem = class
@ -64,7 +64,7 @@ type
procedure DeleteButtonClick(Sender: TObject);
procedure FilesTreeViewMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure FormResize(Sender: TObject);
@ -78,7 +78,7 @@ type
ImageIndexFile: Integer;
FIdleConnected: boolean;
procedure SetIdleConnected(const AValue: boolean);
procedure OnIdle(Sender: TObject; var Done: Boolean);
procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
private
FProject: TProject;
FUpdateNeeded: boolean;

10
ide/codebrowser.pas
View File

@ -54,11 +54,11 @@ uses
CodeIndex, StdCodeTools, SourceLog, CustomCodeTool,
// IDEIntf
IDEWindowIntf, SrcEditorIntf, IDEMsgIntf, IDEDialogs, LazConfigStorage,
IDEHelpIntf, PackageIntf, TextTools, IDECommands, LazIDEIntf,
IDEHelpIntf, PackageIntf, IDECommands, LazIDEIntf,
IDEExternToolIntf,
// IDE
Project, DialogProcs, PackageSystem, PackageDefs, LazarusIDEStrConsts,
IDEOptionDefs, etFPCMsgParser, BasePkgManager, AddToProjectDlg,
IDEOptionDefs, etFPCMsgParser, BasePkgManager,
EnvironmentOpts;
@ -217,14 +217,14 @@ type
UnitFilterBeginsSpeedButton: TSpeedButton;
UnitFilterContainsSpeedButton: TSpeedButton;
UnitFilterEdit: TEdit;
procedure BrowseTreeViewMouseMove(Sender: TObject; Shift: TShiftState; X,
Y: Integer);
procedure BrowseTreeViewMouseMove(Sender: TObject; {%H-}Shift: TShiftState; {%H-}X,
{%H-}Y: Integer);
procedure FormDeactivate(Sender: TObject);
procedure UseIdentifierInCurUnitMenuItemClick(Sender: TObject);
procedure UsePkgInCurUnitMenuItemClick(Sender: TObject);
procedure UsePkgInProjectMenuItemClick(Sender: TObject);
procedure UseUnitInCurUnitMenuItemClick(Sender: TObject);
procedure BrowseTreeViewMouseDown(Sender: TOBject; Button: TMouseButton;
procedure BrowseTreeViewMouseDown(Sender: TOBject; {%H-}Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure BrowseTreeViewShowHint(Sender: TObject; HintInfo: PHintInfo);
procedure CollapseAllPackagesMenuItemClick(Sender: TObject);

4
ide/codehelp.pas
View File

@ -45,7 +45,7 @@ uses
// codetools
CodeAtom, CodeTree, CodeToolManager, FindDeclarationTool, BasicCodeTools,
KeywordFuncLists, PascalParserTool, CodeCache, CacheCodeTools, CustomCodeTool,
FileProcs, CTXMLFixFragment, DefineTemplates, CodeToolsStructs,
FileProcs, DefineTemplates, CodeToolsStructs,
// synedit
SynHighlighterPas,
// IDEIntf
@ -236,7 +236,7 @@ type
FSrcToDocMap: TAvgLvlTree; // tree of TCHSourceToFPDocFile sorted for SourceFilename
FDeclarationCache: TDeclarationInheritanceCache;
procedure AddHandler(HandlerType: TCodeHelpManagerHandler;
const AMethod: TMethod; AsLast: boolean = false);
const AMethod: TMethod; {%H-}AsLast: boolean = false);
procedure RemoveHandler(HandlerType: TCodeHelpManagerHandler;
const AMethod: TMethod);
procedure FreeHandlers;

6
ide/etmessageframe.pas
View File

@ -33,11 +33,11 @@ interface
uses
Math, strutils, Classes, SysUtils, UTF8Process, FileProcs, LazFileCache,
LazUTF8Classes, LazFileUtils, LazUTF8, AvgLvlTree, LazConfigStorage, SynEdit,
LazUTF8Classes, LazFileUtils, LazUTF8, AvgLvlTree, SynEdit,
SynEditMarks, LResources, Forms, Buttons, ExtCtrls, Controls, LMessages,
LCLType, Graphics, LCLIntf, Themes, ImgList, GraphType, Menus, Clipbrd,
Dialogs, StdCtrls, IDEExternToolIntf, IDEImagesIntf, MenuIntf, PackageIntf,
IDECommands, SrcEditorIntf, IDEDialogs, ProjectIntf, CompOptsIntf,
IDECommands, IDEDialogs, ProjectIntf, CompOptsIntf,
LazarusIDEStrConsts, EnvironmentOpts, HelpFPCMessages, etSrcEditMarks,
etQuickFixes, ExtTools, IDEOptionDefs, CompilerOptions;
@ -340,7 +340,7 @@ type
procedure SearchEditEnter(Sender: TObject);
procedure SearchEditExit(Sender: TObject);
procedure SearchEditKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
{%H-}Shift: TShiftState);
procedure SearchNextSpeedButtonClick(Sender: TObject);
procedure SearchPrevSpeedButtonClick(Sender: TObject);
procedure ShowIDMenuItemClick(Sender: TObject);

7
ide/etmessageswnd.pas
View File

@ -30,9 +30,9 @@ unit etMessagesWnd;
interface
uses
Classes, SysUtils, FileUtil, LazConfigStorage, IDEMsgIntf, IDEImagesIntf,
IDEExternToolIntf, LazIDEIntf, SrcEditorIntf, BaseIDEIntf, SynEditMarks,
Forms, Controls, Graphics, Dialogs, LCLProc, etMessageFrame, etSrcEditMarks,
Classes, SysUtils, FileUtil, IDEMsgIntf, IDEImagesIntf,
IDEExternToolIntf, LazIDEIntf, SynEditMarks,
Forms, Controls, Graphics, Dialogs, LCLProc, etMessageFrame,
etQuickFixes, LazarusIDEStrConsts;
type
@ -220,6 +220,7 @@ function TMessagesView.CreateView(aCaptionPrefix: string): TExtToolView;
var
i: Integer;
begin
Result:=nil;
if TryCaption(aCaptionPrefix,Result) then exit;
if (aCaptionPrefix<>'') and (aCaptionPrefix[length(aCaptionPrefix)] in ['0'..'9'])
then

14
ide/etquickfixes.pas
View File

@ -71,7 +71,7 @@ type
public
function IsApplicable(Msg: TMessageLine; out Identifier: string): boolean;
procedure CreateMenuItems(Fixes: TMsgQuickFixes); override;
procedure QuickFix(Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
procedure QuickFix({%H-}Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
end;
{ TQuickFixLocalVariableNotUsed_Remove }
@ -80,7 +80,7 @@ type
public
function IsApplicable(Msg: TMessageLine; out Identifier: string): boolean;
procedure CreateMenuItems(Fixes: TMsgQuickFixes); override;
procedure QuickFix(Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
procedure QuickFix({%H-}Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
end;
{ TQuickFixLocalVarNotInitialized_AddAssignment }
@ -89,7 +89,7 @@ type
public
function IsApplicable(Msg: TMessageLine; out Identifier: string): boolean;
procedure CreateMenuItems(Fixes: TMsgQuickFixes); override;
procedure QuickFix(Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
procedure QuickFix({%H-}Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
end;
{ TQuickFixUnitNotFound_Remove }
@ -99,7 +99,7 @@ type
function IsApplicable(Msg: TMessageLine;
out MissingUnitName, UsedByUnit: string): boolean;
procedure CreateMenuItems(Fixes: TMsgQuickFixes); override;
procedure QuickFix(Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
procedure QuickFix({%H-}Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
end;
{ TQuickFixClassWithAbstractMethods
@ -110,7 +110,7 @@ type
public
function IsApplicable(Msg: TMessageLine; out aClassName: string): boolean;
procedure CreateMenuItems(Fixes: TMsgQuickFixes); override;
procedure QuickFix(Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
procedure QuickFix({%H-}Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
end;
{ TQuickFixSrcPathOfPkgContains_OpenPkg
@ -122,7 +122,7 @@ type
public
function IsApplicable(Msg: TMessageLine; out PkgName: string): boolean;
procedure CreateMenuItems(Fixes: TMsgQuickFixes); override;
procedure QuickFix(Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
procedure QuickFix({%H-}Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
end;
{ TQuickFix_HideWithIDEDirective - hide with IDE directive %H- }
@ -141,7 +141,7 @@ type
function IsApplicable(Msg: TMessageLine; out ToolData: TIDEExternalToolData;
out IDETool: TObject): boolean;
procedure CreateMenuItems(Fixes: TMsgQuickFixes); override;
procedure QuickFix(Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
procedure QuickFix({%H-}Fixes: TMsgQuickFixes; Msg: TMessageLine); override;
end;
{ TIDEQuickFixes }

6
ide/helpoptions.pas
View File

@ -36,9 +36,9 @@ interface
uses
Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs,
FileUtil, Laz2_XMLCfg, LazFileCache, StdCtrls, Buttons, ExtCtrls,
IDEContextHelpEdit, EnvironmentOpts, ButtonPanel, ObjectInspector,
LazHelpIntf, IDEWindowIntf, IDEDialogs, IDEOptionsIntf, MacroIntf, LazConf,
FileUtil, Laz2_XMLCfg, LazFileCache, Buttons, ExtCtrls,
EnvironmentOpts, ObjectInspector,
LazHelpIntf, IDEWindowIntf, IDEOptionsIntf, MacroIntf, LazConf,
LazarusIDEStrConsts, IDEProcs, IDEOptionDefs;
type

8
ide/idefpdocfilesearch.pas
View File

@ -6,8 +6,8 @@ interface
uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
ButtonPanel, Buttons, ComCtrls, ExtCtrls, LCLType,
LazarusIDEStrConsts, PackageSystem, PackageDefs;
Buttons, ComCtrls, ExtCtrls, LCLType,
PackageSystem, PackageDefs;
type
@ -22,8 +22,8 @@ type
SearchTextLabel: TLabel;
Splitter1: TSplitter;
procedure FormCreate(Sender: TObject);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure OnIdle(Sender: TObject; var Done: Boolean);
procedure FormKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
private
FIdleConnected: boolean;
procedure SetIdleConnected(AValue: boolean);

2
ide/ideguicmdline.pas
View File

@ -41,7 +41,7 @@ interface
uses
Classes, SysUtils, math, FileUtil, lazutf8classes, LazConf, LCLProc,
LazarusIDEStrConsts, IDECmdLine;
IDECmdLine;
procedure ParseGuiCmdLineParams(var SkipAutoLoadingLastProject,
StartedByStartLazarus,

14
ide/idehelpmanager.pas
View File

@ -37,19 +37,19 @@ uses
Buttons, StdCtrls, Dialogs, ExtCtrls, FileProcs, Graphics, ButtonPanel,
LConvEncoding, lazutf8classes,
// CodeTools
BasicCodeTools, CodeToolManager, CodeAtom, CodeCache, CustomCodeTool, CodeTree,
BasicCodeTools, CodeToolManager, CodeCache, CustomCodeTool, CodeTree,
PascalParserTool, FindDeclarationTool,
// IDEIntf
PropEdits, ObjectInspector, FormEditingIntf, ProjectIntf, TextTools,
PropEdits, ObjectInspector, ProjectIntf, TextTools,
IDEDialogs, LazHelpIntf, LazHelpHTML, HelpFPDoc, MacroIntf, IDEWindowIntf,
IDEMsgIntf, PackageIntf, LazIDEIntf, HelpIntfs, IDEHelpIntf,
IDEExternToolIntf,
// IDE
LazarusIDEStrConsts, TransferMacros, DialogProcs, IDEOptionDefs,
ObjInspExt, EnvironmentOpts, AboutFrm, Project, MainBar, etMessagesWnd,
ObjInspExt, EnvironmentOpts, AboutFrm, Project, MainBar,
IDEFPDocFileSearch, PackageDefs, PackageSystem,
HelpOptions, MainIntf, LazConf, HelpFPCMessages, CodeHelp,
IDEContextHelpEdit, IDEWindowHelp, CodeBrowser;
IDEWindowHelp, CodeBrowser;
type
@ -214,7 +214,7 @@ type
procedure ShowHelpForObjectInspector(Sender: TObject); override;
procedure ShowHelpForIDEControl(Sender: TControl); override;
function CreateHint(aHintWindow: THintWindow; ScreenPos: TPoint;
const BaseURL: string; var TheHint: string; out HintWinRect: TRect): boolean;
const {%H-}BaseURL: string; var TheHint: string; out HintWinRect: TRect): boolean;
override; deprecated 'Use THintWindowManager class instead';
function GetHintForSourcePosition(const ExpandedFilename: string;
const CodePos: TPoint; out BaseURL, HTMLHint: string;
@ -251,7 +251,7 @@ type
BtnPanel: TButtonPanel;
NodesGroupBox: TGroupBox;
NodesListBox: TListBox;
procedure HelpSelectorDialogClose(Sender: TObject; var CloseAction: TCloseAction);
procedure HelpSelectorDialogClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure NodesListBoxDblClick(Sender: TObject);
private
FNodes: THelpNodeQueryList;
@ -801,6 +801,7 @@ begin
if ElementName='' then break;
ContextList.Add(pihcType,ElementName);
until false;
ErrMsg:='TLazIDEHTMLProvider.OpenFPDoc ShowHelpForPascalContexts';
ShowHelpForPascalContexts(Filename,Point(1,1),PascalHelpContextLists,ErrMsg);
finally
if PascalHelpContextLists<>nil then begin
@ -1619,6 +1620,7 @@ begin
if FindDeclarationOfOIProperty(AnInspector,nil,Code,Caret,NewTopLine) then
begin
if NewTopLine=0 then ;
ErrMsg:='TIDEHelpManager.ShowHelpForObjectInspector ShowHelpForSourcePosition';
ShowHelpForSourcePosition(Code.Filename,Caret,ErrMsg);
end;
end else begin

2
ide/newprojectdlg.pp
View File

@ -48,7 +48,7 @@ type
Splitter1: TSplitter;
procedure HelpButtonClick(Sender: TObject);
procedure ListBoxDblClick(Sender: TObject);
procedure ListBoxSelectionChange(Sender: TObject; User: boolean);
procedure ListBoxSelectionChange(Sender: TObject; {%H-}User: boolean);
private
FProjectDescriptor: TProjectDescriptor;
procedure FillHelpLabel;

15
ide/projectinspector.pas
View File

@ -57,7 +57,7 @@ interface
uses
Classes, SysUtils, LCLProc, LCLType, Forms, Controls, Buttons, ComCtrls,
Menus, Dialogs, FileUtil, LazFileCache, ExtCtrls, Graphics,
CodeToolManager, CodeCache, TreeFilterEdit,
CodeToolManager, TreeFilterEdit,
// IDEIntf
IDEHelpIntf, IDECommands, IDEDialogs, IDEImagesIntf, LazIDEIntf, ProjectIntf,
PackageIntf,
@ -108,13 +108,13 @@ type
procedure FormDropFiles(Sender: TObject; const FileNames: array of String);
procedure ItemsPopupMenuPopup(Sender: TObject);
procedure ItemsTreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView;
Node: TTreeNode; State: TCustomDrawState; Stage: TCustomDrawStage;
var PaintImages, DefaultDraw: Boolean);
Node: TTreeNode; {%H-}State: TCustomDrawState; Stage: TCustomDrawStage;
var {%H-}PaintImages, {%H-}DefaultDraw: Boolean);
procedure ItemsTreeViewDblClick(Sender: TObject);
procedure ItemsTreeViewDragDrop(Sender, Source: TObject; X, Y: Integer);
procedure ItemsTreeViewDragOver(Sender, Source: TObject; X, Y: Integer;
State: TDragState; var Accept: Boolean);
procedure ItemsTreeViewKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure ItemsTreeViewKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure ItemsTreeViewSelectionChanged(Sender: TObject);
procedure MoveDependencyUpClick(Sender: TObject);
procedure MoveDependencyDownClick(Sender: TObject);
@ -170,13 +170,13 @@ type
procedure SetShowDirectoryHierarchy(const AValue: boolean);
procedure SetSortAlphabetically(const AValue: boolean);
procedure SetupComponents;
function OnTreeViewGetImageIndex(Str: String; Data: TObject; var AIsEnabled: Boolean): Integer;
function OnTreeViewGetImageIndex({%H-}Str: String; Data: TObject; var {%H-}AIsEnabled: Boolean): Integer;
procedure OnProjectBeginUpdate(Sender: TObject);
procedure OnProjectEndUpdate(Sender: TObject; ProjectChanged: boolean);
procedure EnableI18NForSelectedLFM(TheEnable: boolean);
protected
procedure KeyUp(var Key: Word; Shift: TShiftState); override;
procedure IdleHandler(Sender: TObject; var Done: Boolean);
procedure IdleHandler(Sender: TObject; var {%H-}Done: Boolean);
public
constructor Create(TheOwner: TComponent); override;
destructor Destroy; override;
@ -1101,7 +1101,8 @@ end;
procedure TProjectInspectorForm.OnProjectEndUpdate(Sender: TObject;
ProjectChanged: boolean);
begin
UpdateAll;
if ProjectChanged then
UpdateAll;
EndUpdate;
end;

2
ide/publishprojectdlg.pas
View File

@ -73,7 +73,7 @@ type
procedure BrowseDestDirBitBtnCLICK(Sender: TObject);
procedure DestDirGroupBoxRESIZE(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject);
procedure HelpButtonClick(Sender: TObject);
procedure OkButtonCLICK(Sender: TObject);

2
ide/qfinitlocalvardlg.pas
View File

@ -34,7 +34,7 @@ interface
uses
Classes, SysUtils, Math, contnrs, LazLogger,
Forms, Controls, Graphics, Dialogs, ButtonPanel, ExtCtrls, StdCtrls,
Forms, Controls, Graphics, Dialogs, ButtonPanel, ExtCtrls,
CodeToolManager, CodeCache, StdCodeTools,
LazIDEIntf, IDEDialogs,
LazarusIDEStrConsts;

2
lcl/dialogs.pp
View File

@ -638,7 +638,7 @@ begin
if (Flags and MB_OK) = MB_OK then
Buttons := [mbOK]
else
Buttons := [mbOK];
{%H-}Buttons := [mbOK];
if (Flags and MB_ICONINFORMATION) = MB_ICONINFORMATION then

2
packager/adddirtopkgdlg.pas
View File

@ -52,7 +52,7 @@ type
procedure ButtonPanel1CancelClick(Sender: TObject);
procedure ButtonPanel1OkClick(Sender: TObject);
procedure DirButtonClick(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
private

15
packager/addtopackagedlg.pas
View File

@ -76,7 +76,7 @@ type
end;
TOnGetUnitRegisterInfo = procedure(Sender: TObject; const AFilename: string;
var TheUnitName: string; var HasRegisterProc: boolean) of object;
out TheUnitName: string; out HasRegisterProc: boolean) of object;
{ TAddToPackageDlg }
@ -121,7 +121,7 @@ type
FilesListView: TListView;
NewFileBtnPanel: TPanel;
AddFilesBtnPanel: TPanel;
procedure AddToPackageDlgClose(Sender: TObject; var CloseAction: TCloseAction);
procedure AddToPackageDlgClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure AddToPackageDlgKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure AncestorComboBoxChange(Sender: TObject);
procedure AncestorComboBoxCloseUp(Sender: TObject);
@ -137,7 +137,7 @@ type
procedure FilesAddButtonClick(Sender: TObject);
procedure FilesDeleteButtonClick(Sender: TObject);
procedure FilesDirButtonClick(Sender: TObject);
procedure FilesListViewSelectItem(Sender: TObject; Item: TListItem; Selected: Boolean);
procedure FilesListViewSelectItem(Sender: TObject; {%H-}Item: TListItem; {%H-}Selected: Boolean);
procedure FilesShortenButtonClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
@ -192,7 +192,7 @@ type
property ActivatePage: TAddToPkgType read GetActivatePage write SetActivatePage;
end;
function ShowAddToPackageDlg(Pkg: TLazPackage; var Params: TAddToPkgResult;
function ShowAddToPackageDlg(Pkg: TLazPackage; out Params: TAddToPkgResult;
OnGetIDEFileInfo: TGetIDEFileStateEvent;
OnGetUnitRegisterInfo: TOnGetUnitRegisterInfo;
var Page: TAddToPkgType): TModalResult;
@ -210,13 +210,14 @@ implementation
{$R *.lfm}
function ShowAddToPackageDlg(Pkg: TLazPackage; var Params: TAddToPkgResult;
function ShowAddToPackageDlg(Pkg: TLazPackage; out Params: TAddToPkgResult;
OnGetIDEFileInfo: TGetIDEFileStateEvent;
OnGetUnitRegisterInfo: TOnGetUnitRegisterInfo;
var Page: TAddToPkgType): TModalResult;
OnGetUnitRegisterInfo: TOnGetUnitRegisterInfo; var Page: TAddToPkgType
): TModalResult;
var
AddDlg: TAddToPackageDlg;
begin
Params:=nil;
AddDlg:=TAddToPackageDlg.Create(nil);
AddDlg.OnGetIDEFileInfo:=OnGetIDEFileInfo;
AddDlg.OnGetUnitRegisterInfo:=OnGetUnitRegisterInfo;

6
packager/cleanpkgdeps.pas
View File

@ -32,8 +32,8 @@ unit CleanPkgDeps;
interface
uses
Classes, SysUtils, contnrs, FileUtil, AvgLvlTree, LazLogger, LvlGraphCtrl,
Forms, Controls, Graphics, Dialogs, ButtonPanel, ComCtrls, ExtCtrls, StdCtrls,
Classes, SysUtils, contnrs, FileUtil, AvgLvlTree, LazLogger,
Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, StdCtrls,
Buttons, LazarusIDEStrConsts, Project, PackageDefs, IDEImagesIntf;
const
@ -64,7 +64,7 @@ type
procedure SelectAllBitBtnClick(Sender: TObject);
procedure SelectNoneBitBtnClick(Sender: TObject);
procedure TransitivityTreeViewMouseDown(Sender: TObject;
Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
{%H-}Button: TMouseButton; {%H-}Shift: TShiftState; X, Y: Integer);
private
function GetTVNodeChecked(TVNode: TTreeNode): boolean;
procedure SetTVNodeChecked(TVNode: TTreeNode; AValue: boolean);

20
packager/packageeditor.pas
View File

@ -37,11 +37,11 @@ uses
LCLType, LCLProc, Menus, Dialogs, FileUtil, LazFileCache, ExtCtrls,
contnrs,
// IDEIntf CodeTools
CodeToolManager, CodeCache, CodeTree,
CodeToolManager, CodeCache,
TreeFilterEdit,
IDEImagesIntf, MenuIntf, LazIDEIntf, ProjectIntf, CodeToolsStructs,
FormEditingIntf, PackageIntf, IDEHelpIntf, IDEOptionsIntf, SrcEditorIntf,
IDEMsgIntf, IDEExternToolIntf,
FormEditingIntf, PackageIntf, IDEHelpIntf, IDEOptionsIntf,
IDEExternToolIntf,
// IDE
IDEDialogs, IDEProcs, LazarusIDEStrConsts, IDEDefs, CompilerOptions,
ComponentReg, UnitResources, EnvironmentOpts, DialogProcs, InputHistory,
@ -244,8 +244,8 @@ type
procedure FormDropFiles(Sender: TObject; const FileNames: array of String);
procedure ItemsPopupMenuPopup(Sender: TObject);
procedure ItemsTreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView;
Node: TTreeNode; State: TCustomDrawState; Stage: TCustomDrawStage;
var PaintImages, DefaultDraw: Boolean);
Node: TTreeNode; {%H-}State: TCustomDrawState; Stage: TCustomDrawStage;
var {%H-}PaintImages, {%H-}DefaultDraw: Boolean);
procedure ItemsTreeViewDragDrop(Sender, Source: TObject; X, Y: Integer);
procedure ItemsTreeViewDragOver(Sender, Source: TObject; X, Y: Integer;
State: TDragState; var Accept: Boolean);
@ -260,15 +260,15 @@ type
procedure MinVersionEditChange(Sender: TObject);
procedure MoveDownBtnClick(Sender: TObject);
procedure MoveUpBtnClick(Sender: TObject);
procedure OnIdle(Sender: TObject; var Done: Boolean);
procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure OpenFileMenuItemClick(Sender: TObject);
procedure OptionsBitBtnClick(Sender: TObject);
procedure PackageEditorFormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure PackageEditorFormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure PackageEditorFormCloseQuery(Sender: TObject; var CanClose: boolean);
procedure PublishClick(Sender: TObject);
procedure ReAddMenuItemClick(Sender: TObject);
procedure RegisteredListBoxDrawItem(Control: TWinControl; Index: Integer;
ARect: TRect; State: TOwnerDrawState);
procedure RegisteredListBoxDrawItem({%H-}Control: TWinControl; Index: Integer;
ARect: TRect; {%H-}State: TOwnerDrawState);
procedure RemoveBitBtnClick(Sender: TObject);
procedure RevertClick(Sender: TObject);
procedure SaveAsClick(Sender: TObject);
@ -311,7 +311,7 @@ type
procedure SetShowDirectoryHierarchy(const AValue: boolean);
procedure SetSortAlphabetically(const AValue: boolean);
procedure SetupComponents;
function OnTreeViewGetImageIndex(Str: String; Data: TObject; var AIsEnabled: Boolean): Integer;
function OnTreeViewGetImageIndex({%H-}Str: String; Data: TObject; var {%H-}AIsEnabled: Boolean): Integer;
procedure UpdateNodeImage(TVNode: TTreeNode; NodeData: TPENodeData);
procedure UpdatePending;
function CanUpdate(Flag: TPEFlag; Immediately: boolean): boolean;

13
packager/pkgmanager.pas
View File

@ -114,8 +114,8 @@ type
procedure OnBeforeReadPackage(Sender: TObject);
procedure OnPackageEditorFreeEditor(APackage: TLazPackage);
procedure OnPackageEditorGetUnitRegisterInfo(Sender: TObject;
const AFilename: string; var TheUnitName: string;
var HasRegisterProc: boolean);
const AFilename: string; out TheUnitName: string;
out HasRegisterProc: boolean);
function PackageGraphCheckInterPkgFiles(IDEObject: TObject;
PkgList: TFPList; out FilesChanged: boolean): boolean;
@ -187,7 +187,7 @@ type
const Directory: string;
ShowAbort: boolean): TModalResult;
function DoGetUnitRegisterInfo(const AFilename: string;
var TheUnitName: string; var HasRegisterProc: boolean;
out TheUnitName: string; out HasRegisterProc: boolean;
IgnoreErrors: boolean): TModalResult;
procedure SaveAutoInstallDependencies;
procedure LoadStaticCustomPackages;
@ -925,7 +925,8 @@ begin
end;
procedure TPkgManager.OnPackageEditorGetUnitRegisterInfo(Sender: TObject;
const AFilename: string; var TheUnitName: string; var HasRegisterProc: boolean);
const AFilename: string; out TheUnitName: string; out HasRegisterProc: boolean
);
begin
DoGetUnitRegisterInfo(AFilename,TheUnitName,HasRegisterProc,true);
end;
@ -1482,8 +1483,8 @@ begin
Result:=mrOk;
end;
function TPkgManager.DoGetUnitRegisterInfo(const AFilename: string;
var TheUnitName: string; var HasRegisterProc: boolean; IgnoreErrors: boolean
function TPkgManager.DoGetUnitRegisterInfo(const AFilename: string; out
TheUnitName: string; out HasRegisterProc: boolean; IgnoreErrors: boolean
): TModalResult;
function ErrorsHandled: boolean;