IDE: checked compiler warnings, clean up

git-svn-id: trunk@48218 -
This commit is contained in:
mattias 2015-03-10 14:51:21 +00:00
parent 6ccd736c5c
commit f3f0866921
44 changed files with 214 additions and 244 deletions

View File

@ -73,11 +73,11 @@ type
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure FormResize(Sender: TObject); procedure FormResize(Sender: TObject);
procedure pbAsmClick(Sender: TObject); procedure pbAsmClick(Sender: TObject);
procedure pbAsmMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure pbAsmMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; {%H-}X, Y: Integer);
procedure pbAsmMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); procedure pbAsmMouseMove(Sender: TObject; {%H-}Shift: TShiftState; {%H-}X, Y: Integer);
procedure pbAsmMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, procedure pbAsmMouseUp(Sender: TObject; {%H-}Button: TMouseButton; {%H-}Shift: TShiftState; {%H-}X,
Y: Integer); {%H-}Y: Integer);
procedure pbAsmMouseWheel(Sender: TObject; Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean); procedure pbAsmMouseWheel(Sender: TObject; Shift: TShiftState; WheelDelta: Integer; {%H-}MousePos: TPoint; var Handled: Boolean);
procedure pbAsmPaint(Sender: TObject); procedure pbAsmPaint(Sender: TObject);
procedure sbHorizontalChange(Sender: TObject); procedure sbHorizontalChange(Sender: TObject);
procedure sbVerticalChange(Sender: TObject); procedure sbVerticalChange(Sender: TObject);
@ -117,8 +117,8 @@ type
FImgSourceLine: Integer; FImgSourceLine: Integer;
FImgNoSourceLine: Integer; FImgNoSourceLine: Integer;
procedure BreakPointChanged(const ASender: TIDEBreakPoints; procedure BreakPointChanged(const {%H-}ASender: TIDEBreakPoints;
const ABreakpoint: TIDEBreakPoint); const {%H-}ABreakpoint: TIDEBreakPoint);
function GetBreakpointFor(AnAsmDlgLineEntry: TAsmDlgLineEntry): TIDEBreakPoint; function GetBreakpointFor(AnAsmDlgLineEntry: TAsmDlgLineEntry): TIDEBreakPoint;
procedure CheckImageIndexFor(var AnAsmDlgLineEntry: TAsmDlgLineEntry); procedure CheckImageIndexFor(var AnAsmDlgLineEntry: TAsmDlgLineEntry);
procedure DoDebuggerDestroyed(Sender: TObject); procedure DoDebuggerDestroyed(Sender: TObject);
@ -408,6 +408,7 @@ procedure TAssemblerDlg.actStepOverInstrExecute(Sender: TObject);
var var
Handled: Boolean; Handled: Boolean;
begin begin
Handled:=false;
if Assigned(OnProcessCommand) if Assigned(OnProcessCommand)
then OnProcessCommand(Self, ecStepOverInstr, Handled); then OnProcessCommand(Self, ecStepOverInstr, Handled);
end; end;
@ -450,6 +451,7 @@ procedure TAssemblerDlg.actStepIntoInstrExecute(Sender: TObject);
var var
Handled: Boolean; Handled: Boolean;
begin begin
Handled:=false;
if Assigned(OnProcessCommand) if Assigned(OnProcessCommand)
then OnProcessCommand(Self, ecStepIntoInstr, Handled); then OnProcessCommand(Self, ecStepIntoInstr, Handled);
end; end;
@ -839,6 +841,7 @@ procedure TAssemblerDlg.DoEditorOptsChanged(Sender: TObject; Restore: boolean);
var var
TM: TTextMetric; TM: TTextMetric;
begin begin
if Restore then exit;
pbAsm.Font.Size := EditorOpts.EditorFontSize; pbAsm.Font.Size := EditorOpts.EditorFontSize;
pbAsm.Font.Name := EditorOpts.EditorFont; pbAsm.Font.Name := EditorOpts.EditorFont;
if EditorOpts.DisableAntialiasing then if EditorOpts.DisableAntialiasing then
@ -846,7 +849,7 @@ begin
else else
pbAsm.Font.Quality := fqDefault; pbAsm.Font.Quality := fqDefault;
GetTextMetrics(pbAsm.Canvas.Handle, TM); GetTextMetrics(pbAsm.Canvas.Handle, TM{%H-});
FCharWidth := TM.tmMaxCharWidth; // EditorOpts.ExtraCharSpacing + FCharWidth := TM.tmMaxCharWidth; // EditorOpts.ExtraCharSpacing +
sbHorizontal.SmallChange := FCHarWidth; sbHorizontal.SmallChange := FCHarWidth;

View File

@ -114,7 +114,7 @@ type
procedure BreakpointsDlgCREATE(Sender: TObject); procedure BreakpointsDlgCREATE(Sender: TObject);
procedure lvBreakPointsClick(Sender: TObject); procedure lvBreakPointsClick(Sender: TObject);
procedure lvBreakPointsDBLCLICK(Sender: TObject); procedure lvBreakPointsDBLCLICK(Sender: TObject);
procedure lvBreakPointsSelectItem(Sender: TObject; Item: TListItem; Selected: Boolean); procedure lvBreakPointsSelectItem(Sender: TObject; {%H-}Item: TListItem; {%H-}Selected: Boolean);
procedure mnuPopupPopup(Sender: TObject); procedure mnuPopupPopup(Sender: TObject);
procedure popDeleteAllSameSourceCLICK(Sender: TObject); procedure popDeleteAllSameSourceCLICK(Sender: TObject);
procedure popDisableAllSameSourceCLICK(Sender: TObject); procedure popDisableAllSameSourceCLICK(Sender: TObject);
@ -129,11 +129,11 @@ type
FBaseDirectory: string; FBaseDirectory: string;
FStates: TBreakPointsDlgStates; FStates: TBreakPointsDlgStates;
FLockActionUpdate: Integer; FLockActionUpdate: Integer;
procedure BreakPointAdd(const ASender: TIDEBreakPoints; procedure BreakPointAdd(const {%H-}ASender: TIDEBreakPoints;
const ABreakpoint: TIDEBreakPoint); const ABreakpoint: TIDEBreakPoint);
procedure BreakPointUpdate(const ASender: TIDEBreakPoints; procedure BreakPointUpdate(const ASender: TIDEBreakPoints;
const ABreakpoint: TIDEBreakPoint); const ABreakpoint: TIDEBreakPoint);
procedure BreakPointRemove(const ASender: TIDEBreakPoints; procedure BreakPointRemove(const {%H-}ASender: TIDEBreakPoints;
const ABreakpoint: TIDEBreakPoint); const ABreakpoint: TIDEBreakPoint);
procedure SetBaseDirectory(const AValue: string); procedure SetBaseDirectory(const AValue: string);
procedure popSetGroupItemClick(Sender: TObject); procedure popSetGroupItemClick(Sender: TObject);

View File

@ -54,10 +54,10 @@ type
rgWatchScope: TPanel; rgWatchScope: TPanel;
procedure btnHelpClick(Sender: TObject); procedure btnHelpClick(Sender: TObject);
procedure btnOKClick(Sender: TObject); procedure btnOKClick(Sender: TObject);
procedure BreakPointRemove(const ASender: TIDEBreakPoints; procedure BreakPointRemove(const {%H-}ASender: TIDEBreakPoints;
const ABreakpoint: TIDEBreakPoint);
procedure BreakPointUpdate(const ASender: TIDEBreakPoints;
const ABreakpoint: TIDEBreakPoint); const ABreakpoint: TIDEBreakPoint);
procedure BreakPointUpdate(const {%H-}ASender: TIDEBreakPoints;
const {%H-}ABreakpoint: TIDEBreakPoint);
procedure chkDisableGroupsChange(Sender: TObject); procedure chkDisableGroupsChange(Sender: TObject);
procedure chkEnableGroupsChange(Sender: TObject); procedure chkEnableGroupsChange(Sender: TObject);
procedure chkEvalExpressionChange(Sender: TObject); procedure chkEvalExpressionChange(Sender: TObject);

View File

@ -128,7 +128,7 @@ type
function GetSelectedThreads(Snap: TSnapshot): TIdeThreads; function GetSelectedThreads(Snap: TSnapshot): TIdeThreads;
function GetSelectedCallstack: TIdeCallStack; function GetSelectedCallstack: TIdeCallStack;
procedure DoBreakPointsChanged; override; procedure DoBreakPointsChanged; override;
procedure BreakPointChanged(const ASender: TIDEBreakPoints; const ABreakpoint: TIDEBreakPoint); procedure BreakPointChanged(const ASender: TIDEBreakPoints; const {%H-}ABreakpoint: TIDEBreakPoint);
procedure CallStackChanged(Sender: TObject); procedure CallStackChanged(Sender: TObject);
procedure CallStackCurrent(Sender: TObject); procedure CallStackCurrent(Sender: TObject);
function ColSizeGetter(AColId: Integer; var ASize: Integer): Boolean; function ColSizeGetter(AColId: Integer; var ASize: Integer): Boolean;

View File

@ -24,12 +24,12 @@ type
procedure btnRefreshClick(Sender: TObject); procedure btnRefreshClick(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure lvProcessesChange(Sender: TObject; Item: TListItem; procedure lvProcessesChange(Sender: TObject; Item: TListItem;
Change: TItemChange); {%H-}Change: TItemChange);
procedure lvProcessesColumnClick(Sender: TObject; Column: TListColumn); procedure lvProcessesColumnClick(Sender: TObject; Column: TListColumn);
procedure lvProcessesData(Sender: TObject; Item: TListItem); procedure lvProcessesData(Sender: TObject; Item: TListItem);
procedure lvProcessesDblClick(Sender: TObject); procedure lvProcessesDblClick(Sender: TObject);
procedure lvProcessesKeyDown(Sender: TObject; var Key: Word; procedure lvProcessesKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState); {%H-}Shift: TShiftState);
private private
FPidString: string; FPidString: string;
FList: TRunningProcessInfoList; FList: TRunningProcessInfoList;

View File

@ -65,7 +65,7 @@ type
procedure EditCopy1Update(Sender: TObject); procedure EditCopy1Update(Sender: TObject);
procedure tvFilteredEventsAdvancedCustomDrawItem(Sender: TCustomTreeView; procedure tvFilteredEventsAdvancedCustomDrawItem(Sender: TCustomTreeView;
Node: TTreeNode; State: TCustomDrawState; Stage: TCustomDrawStage; Node: TTreeNode; State: TCustomDrawState; Stage: TCustomDrawStage;
var PaintImages, DefaultDraw: Boolean); var {%H-}PaintImages, DefaultDraw: Boolean);
private private
function GetFilter: TDBGEventCategories; function GetFilter: TDBGEventCategories;
private private

View File

@ -506,6 +506,7 @@ begin
if Assigned(OnProcessCommand) and (Command <> ecNone) and if Assigned(OnProcessCommand) and (Command <> ecNone) and
(Command <> ecContextHelp) and(Command <> ecEditContextHelp) (Command <> ecContextHelp) and(Command <> ecEditContextHelp)
then begin then begin
Handled:=false;
OnProcessCommand(Self,Command,Handled); OnProcessCommand(Self,Command,Handled);
Key := 0; Key := 0;
end; end;

View File

@ -69,14 +69,14 @@ type
tbModify: TToolButton; tbModify: TToolButton;
tbEvaluate: TToolButton; tbEvaluate: TToolButton;
procedure cmbNewValueKeyDown(Sender: TObject; var Key: Word; procedure cmbNewValueKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState); {%H-}Shift: TShiftState);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure cmbExpressionChange(Sender: TObject); procedure cmbExpressionChange(Sender: TObject);
procedure cmbExpressionKeyDown(Sender: TObject; var Key: Word; procedure cmbExpressionKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState); {%H-}Shift: TShiftState);
procedure MenuItem1Click(Sender: TObject); procedure MenuItem1Click(Sender: TObject);
procedure MenuItem2Click(Sender: TObject); procedure MenuItem2Click(Sender: TObject);
procedure MenuItem3Click(Sender: TObject); procedure MenuItem3Click(Sender: TObject);
@ -154,6 +154,7 @@ begin
Opts := []; Opts := [];
if chkTypeCast.Checked then if chkTypeCast.Checked then
Opts := [defClassAutoCast]; Opts := [defClassAutoCast];
R:='';
if DebugBoss.Evaluate(S, R, DBGType, Opts) if DebugBoss.Evaluate(S, R, DBGType, Opts)
then begin then begin
if cmbExpression.Items.IndexOf(S) = -1 if cmbExpression.Items.IndexOf(S) = -1
@ -263,6 +264,7 @@ begin
then cmbNewValue.Items.Insert(0, V); then cmbNewValue.Items.Insert(0, V);
DBGType:=nil; DBGType:=nil;
R:='';
if not DebugBoss.Evaluate(S, R, DBGType) then Exit; if not DebugBoss.Evaluate(S, R, DBGType) then Exit;
FreeAndNil(DBGType); FreeAndNil(DBGType);
if fHistDirection<>EHDNone then if fHistDirection<>EHDNone then

View File

@ -50,8 +50,8 @@ type
procedure chkUseEventLogColorsChange(Sender: TObject); procedure chkUseEventLogColorsChange(Sender: TObject);
procedure ColorTreeAdvancedCustomDrawItem(Sender: TCustomTreeView; procedure ColorTreeAdvancedCustomDrawItem(Sender: TCustomTreeView;
Node: TTreeNode; State: TCustomDrawState; Stage: TCustomDrawStage; Node: TTreeNode; State: TCustomDrawState; Stage: TCustomDrawStage;
var PaintImages, DefaultDraw: Boolean); var {%H-}PaintImages, DefaultDraw: Boolean);
procedure ColorTreeChange(Sender: TObject; Node: TTreeNode); procedure ColorTreeChange(Sender: TObject; {%H-}Node: TTreeNode);
procedure ColorTreeClick(Sender: TObject); procedure ColorTreeClick(Sender: TObject);
procedure ForegroundColorBoxChange(Sender: TObject); procedure ForegroundColorBoxChange(Sender: TObject);
private private
@ -60,9 +60,9 @@ type
procedure UpdateSelectedColor; procedure UpdateSelectedColor;
public public
function GetTitle: String; override; function GetTitle: String; override;
procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; procedure Setup({%H-}ADialog: TAbstractOptionsEditorDialog); override;
procedure ReadSettings(AOptions: TAbstractIDEOptions); override; procedure ReadSettings({%H-}AOptions: TAbstractIDEOptions); override;
procedure WriteSettings(AOptions: TAbstractIDEOptions); override; procedure WriteSettings({%H-}AOptions: TAbstractIDEOptions); override;
class function SupportedOptionsClass: TAbstractIDEOptionsClass; override; class function SupportedOptionsClass: TAbstractIDEOptionsClass; override;
end; end;

View File

@ -31,7 +31,7 @@ type
ToolButton4: TToolButton; ToolButton4: TToolButton;
tbImport: TToolButton; tbImport: TToolButton;
procedure lvHistoryDblClick(Sender: TObject); procedure lvHistoryDblClick(Sender: TObject);
procedure lvHistorySelectItem(Sender: TObject; Item: TListItem; Selected: Boolean); procedure lvHistorySelectItem(Sender: TObject; {%H-}Item: TListItem; {%H-}Selected: Boolean);
procedure tbClearClick(Sender: TObject); procedure tbClearClick(Sender: TObject);
procedure tbHistClick(Sender: TObject); procedure tbHistClick(Sender: TObject);
procedure tbHistorySelectedClick(Sender: TObject); procedure tbHistorySelectedClick(Sender: TObject);

View File

@ -38,10 +38,6 @@ type
{ TOIDBGGrid } { TOIDBGGrid }
TOIDBGGrid=class(TOIPropertyGrid) TOIDBGGrid=class(TOIPropertyGrid)
private
protected
procedure BuildPropertyList(OnlyIfNeeded: boolean=false);
public
end; end;
{ TIDEInspectDlg } { TIDEInspectDlg }
@ -67,13 +63,13 @@ type
procedure btnForwardClick(Sender: TObject); procedure btnForwardClick(Sender: TObject);
procedure btnUseInstanceClick(Sender: TObject); procedure btnUseInstanceClick(Sender: TObject);
procedure EdInspectEditingDone(Sender: TObject); procedure EdInspectEditingDone(Sender: TObject);
procedure EdInspectKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure EdInspectKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure FormKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure DataGridDoubleClick(Sender: TObject); procedure DataGridDoubleClick(Sender: TObject);
procedure DataGridMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, procedure DataGridMouseDown(Sender: TObject; Button: TMouseButton; {%H-}Shift: TShiftState; {%H-}X,
Y: Integer); {%H-}Y: Integer);
private private
//FDataGridHook, //FDataGridHook,
//FPropertiesGridHook, //FPropertiesGridHook,
@ -224,6 +220,7 @@ begin
if btnUseInstance.Down then if btnUseInstance.Down then
include(TestOpts, defClassAutoCast); include(TestOpts, defClassAutoCast);
TestDBGInfo := nil; TestDBGInfo := nil;
TestHumanReadable:='';
if DebugBoss.Evaluate('(' + FExpression + ')^', TestHumanReadable, TestDBGInfo, TestOpts) and if DebugBoss.Evaluate('(' + FExpression + ')^', TestHumanReadable, TestDBGInfo, TestOpts) and
assigned(TestDBGInfo) assigned(TestDBGInfo)
then then
@ -502,7 +499,7 @@ begin
TypeName, 2, length(FDBGInfo.TypeName))]) TypeName, 2, length(FDBGInfo.TypeName))])
else FGridData.Cells[2,1]:=FDBGInfo.TypeName; else FGridData.Cells[2,1]:=FDBGInfo.TypeName;
{$PUSH}{$RANGECHECKS OFF} {$PUSH}{$RANGECHECKS OFF}
FGridData.Cells[3,1]:=format('$%x',[PtrUInt(FDBGInfo.Value.AsPointer)]); FGridData.Cells[3,1]:=format('$%x',[{%H-}PtrUInt(FDBGInfo.Value.AsPointer)]);
{$POP} {$POP}
//FGridData.AutoSizeColumn(2); //FGridData.AutoSizeColumn(2);
end; end;
@ -740,30 +737,8 @@ begin
end; end;
constructor TIDEInspectDlg.Create(AOwner: TComponent); constructor TIDEInspectDlg.Create(AOwner: TComponent);
function NewGrid(AName: String; AParent: TWinControl; AHook: TPropertyEditorHook): TOIDBGGrid;
begin
Result := TOIDBGGrid.Create(Self);
with Result do
begin
Name := AName;
Parent := AParent;
Visible := True;
Align := alClient;
end;
end;
begin begin
inherited Create(AOwner); inherited Create(AOwner);
//FDBGInfo := nil;
//FDataGridHook := TPropertyEditorHook.Create;
//FDataGrid := NewGrid('DataGrid', DataPage, FDataGridHook);
//
//FPropertiesGridHook := TPropertyEditorHook.Create;
//FPropertiesGrid := NewGrid('PropertiesGrid', PropertiesPage, FPropertiesGridHook);
//
//FMethodsGridHook := TPropertyEditorHook.Create;
//FMethodsGrid := NewGrid('MethodsGrid', MethodsPage, FMethodsGridHook);
FUpdateLock := False; FUpdateLock := False;
FUpdateNeeded := False; FUpdateNeeded := False;
@ -914,13 +889,6 @@ begin
UpdateData; UpdateData;
end; end;
{ TOIDBGGrid }
procedure TOIDBGGrid.BuildPropertyList(OnlyIfNeeded: boolean);
begin
end;
initialization initialization
InspectDlgWindowCreator := IDEWindowCreators.Add(DebugDialogNames[ddtInspect]); InspectDlgWindowCreator := IDEWindowCreators.Add(DebugDialogNames[ddtInspect]);

View File

@ -49,7 +49,7 @@ type
private private
FProcess: TProcess; FProcess: TProcess;
procedure ProcessDestroyed(Sender: TObject); procedure ProcessDestroyed(Sender: TObject);
function ProcessEnvironment(const AVariable: String; const ASet: Boolean): Boolean; function ProcessEnvironment(const {%H-}AVariable: String; const {%H-}ASet: Boolean): Boolean;
function ProcessRun: Boolean; function ProcessRun: Boolean;
function ProcessStop: Boolean; function ProcessStop: Boolean;
protected protected

View File

@ -78,7 +78,7 @@ type
procedure actCopyValueExecute(Sender: TObject); procedure actCopyValueExecute(Sender: TObject);
procedure actPowerExecute(Sender: TObject); procedure actPowerExecute(Sender: TObject);
procedure DispDefaultClick(Sender: TObject); procedure DispDefaultClick(Sender: TObject);
procedure lvRegistersSelectItem(Sender: TObject; Item: TListItem; Selected: Boolean); procedure lvRegistersSelectItem(Sender: TObject; Item: TListItem; {%H-}Selected: Boolean);
procedure ToolButtonDispTypeClick(Sender: TObject); procedure ToolButtonDispTypeClick(Sender: TObject);
function GetCurrentRegisters: TRegisters; function GetCurrentRegisters: TRegisters;
private private

View File

@ -121,7 +121,7 @@ type
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure lvWatchesDblClick(Sender: TObject); procedure lvWatchesDblClick(Sender: TObject);
procedure lvWatchesSelectItem(Sender: TObject; AItem: TListItem; Selected: Boolean); procedure lvWatchesSelectItem(Sender: TObject; {%H-}AItem: TListItem; {%H-}Selected: Boolean);
procedure popAddClick(Sender: TObject); procedure popAddClick(Sender: TObject);
procedure popPropertiesClick(Sender: TObject); procedure popPropertiesClick(Sender: TObject);
procedure popEnabledClick(Sender: TObject); procedure popEnabledClick(Sender: TObject);
@ -142,9 +142,9 @@ type
function GetThreadId: Integer; function GetThreadId: Integer;
function GetSelectedThreads(Snap: TSnapshot): TIdeThreads; function GetSelectedThreads(Snap: TSnapshot): TIdeThreads;
function GetStackframe: Integer; function GetStackframe: Integer;
procedure WatchAdd(const ASender: TIdeWatches; const AWatch: TIdeWatch); procedure WatchAdd(const {%H-}ASender: TIdeWatches; const AWatch: TIdeWatch);
procedure WatchUpdate(const ASender: TIdeWatches; const AWatch: TIdeWatch); procedure WatchUpdate(const ASender: TIdeWatches; const AWatch: TIdeWatch);
procedure WatchRemove(const ASender: TIdeWatches; const AWatch: TIdeWatch); procedure WatchRemove(const {%H-}ASender: TIdeWatches; const AWatch: TIdeWatch);
procedure UpdateInspectPane; procedure UpdateInspectPane;
procedure UpdateItem(const AItem: TListItem; const AWatch: TIdeWatch); procedure UpdateItem(const AItem: TListItem; const AWatch: TIdeWatch);

View File

@ -36,7 +36,7 @@ interface
uses uses
Classes, SysUtils, LCLProc, Forms, Controls, Menus, Graphics, GraphType, Classes, SysUtils, LCLProc, Forms, Controls, Menus, Graphics, GraphType,
Buttons, StdCtrls, ExtCtrls, ComponentEditors, LazConf, ComCtrls, Arrow, Buttons, StdCtrls, ExtCtrls, ComponentEditors, LazConf, Arrow,
ButtonPanel, Laz2_XMLCfg, LazFileUtils, LazarusIDEStrConsts, PropEdits, ButtonPanel, Laz2_XMLCfg, LazFileUtils, LazarusIDEStrConsts, PropEdits,
IDEProcs; IDEProcs;
@ -146,10 +146,10 @@ type
// Event handling // Event handling
procedure MenuItemMouseDown(Sender: TObject; Button: TMouseButton; procedure MenuItemMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
procedure MenuItemDblClick(Sender: TObject); procedure MenuItemDblClick(Sender: TObject);
procedure MenuItemDragDrop(Sender, Source: TObject; X, Y: Integer); procedure MenuItemDragDrop(Sender, {%H-}Source: TObject; X, Y: Integer);
procedure MenuItemDragOver(Sender, Source: TObject; X, Y: Integer; State: TDragState; procedure MenuItemDragOver(Sender, Source: TObject; {%H-}X, {%H-}Y: Integer; {%H-}State: TDragState;
var Accept: Boolean); var Accept: Boolean);
procedure AddNewItemBeforeClick(Sender: TObject); procedure AddNewItemBeforeClick(Sender: TObject);
procedure AddNewItemAfterClick(Sender: TObject); procedure AddNewItemAfterClick(Sender: TObject);
@ -198,8 +198,6 @@ const
DESIGNER_MENU_ITEM_HEIGHT=20; DESIGNER_MENU_ITEM_HEIGHT=20;
DESIGNER_MENU_ITEM_SPACE=30; DESIGNER_MENU_ITEM_SPACE=30;
MIN_DESIGNER_MENU_ITEM_WIDTH=100; MIN_DESIGNER_MENU_ITEM_WIDTH=100;
DESIGNER_MENU_ITEM_PANEL_HEIGHT=22;
MIN_SUB_MENU_PANEL_WIDTH=100;
POSITION_LEFT=10; POSITION_LEFT=10;
POSITION_TOP=10; POSITION_TOP=10;
NUMBER_OF_DEFAULT_TEMPLATES = 3; NUMBER_OF_DEFAULT_TEMPLATES = 3;

View File

@ -50,7 +50,7 @@ type
Panel: TPanel; Panel: TPanel;
Panel_MenuList:TPanel; Panel_MenuList:TPanel;
Splitter_BoxPanel:TSplitter; Splitter_BoxPanel:TSplitter;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure List_menusClick(Sender: TObject); procedure List_menusClick(Sender: TObject);
@ -59,7 +59,7 @@ type
FMenu: TMenu; FMenu: TMenu;
FDesigner: TComponentEditorDesigner; FDesigner: TComponentEditorDesigner;
procedure OnPersistentDeleting(APersistent: TPersistent); procedure OnPersistentDeleting(APersistent: TPersistent);
procedure OnPersistentAdded(APersistent: TPersistent; Select: boolean); procedure OnPersistentAdded(APersistent: TPersistent; {%H-}Select: boolean);
procedure UpdateListOfMenus; procedure UpdateListOfMenus;
public public
procedure SetMenu(NewMenu: TMenu); procedure SetMenu(NewMenu: TMenu);

View File

@ -63,10 +63,10 @@ type
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure StringGridKeyPress(Sender: TObject; var Key: char); procedure StringGridKeyPress(Sender: TObject; var Key: char);
procedure StringGridMouseDown(Sender: TObject; Button: TMouseButton; procedure StringGridMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); {%H-}Shift: TShiftState; X, Y: Integer);
procedure StringGrid1MouseMove(Sender: TObject; Shift: TShiftState; X, procedure StringGrid1MouseMove(Sender: TObject; {%H-}Shift: TShiftState; X,
Y: Integer); Y: Integer);
procedure StringGrid2MouseMove(Sender: TObject; Shift: TShiftState; X, procedure StringGrid2MouseMove(Sender: TObject; {%H-}Shift: TShiftState; X,
Y: Integer); Y: Integer);
private private
FOnInsertCharacter: TOnInsertCharacterEvent; FOnInsertCharacter: TOnInsertCharacterEvent;

View File

@ -59,7 +59,7 @@ type
{ TCodeContextFrm } { TCodeContextFrm }
TCodeContextFrm = class(THintWindow) TCodeContextFrm = class(THintWindow)
procedure ApplicationIdle(Sender: TObject; var Done: Boolean); procedure ApplicationIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure CopyAllBtnClick(Sender: TObject); procedure CopyAllBtnClick(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
@ -80,7 +80,7 @@ type
procedure ClearMarksInHints; procedure ClearMarksInHints;
function GetHints(Index: integer): TCodeContextItem; function GetHints(Index: integer): TCodeContextItem;
procedure MarkCurrentParameterInHints(ParameterIndex: integer); // 0 based procedure MarkCurrentParameterInHints(ParameterIndex: integer); // 0 based
procedure CalculateHintsBounds(const CodeContexts: TCodeContextInfo); procedure CalculateHintsBounds;
procedure DrawHints(var MaxWidth, MaxHeight: Integer; Draw: boolean); procedure DrawHints(var MaxWidth, MaxHeight: Integer; Draw: boolean);
procedure CompleteParameters(DeclCode: string); procedure CompleteParameters(DeclCode: string);
procedure ClearHints; procedure ClearHints;
@ -262,7 +262,7 @@ begin
end; end;
CreateHints(CodeContexts); CreateHints(CodeContexts);
CalculateHintsBounds(CodeContexts); CalculateHintsBounds;
end; end;
procedure TCodeContextFrm.UpdateHints; procedure TCodeContextFrm.UpdateHints;
@ -673,8 +673,7 @@ begin
Invalidate; Invalidate;
end; end;
procedure TCodeContextFrm.CalculateHintsBounds(const procedure TCodeContextFrm.CalculateHintsBounds;
CodeContexts: TCodeContextInfo);
var var
DrawWidth: LongInt; DrawWidth: LongInt;
SrcEdit: TSourceEditorInterface; SrcEdit: TSourceEditorInterface;

View File

@ -34,7 +34,7 @@ uses
Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, LCLProc, Forms, Controls, Graphics, Dialogs,
BasicCodeTools, CodeToolManager, BasicCodeTools, CodeToolManager,
SynEditAutoComplete, SynPluginTemplateEdit, SynPluginSyncronizedEditBase, SynEdit, SynEditAutoComplete, SynPluginTemplateEdit, SynPluginSyncronizedEditBase, SynEdit,
MacroIntf, LazIDEIntf, SrcEditorIntf, LazUTF8; LazIDEIntf, SrcEditorIntf, LazUTF8;
type type
TCodeMacroPromptDlg = class(TForm) TCodeMacroPromptDlg = class(TForm)
@ -86,7 +86,7 @@ type
function GetDestTemplate: String; override; function GetDestTemplate: String; override;
function SubstituteMacro(const MacroName, MacroParameter: string; function SubstituteMacro(const MacroName, MacroParameter: string;
var MacroValue: string): boolean; out MacroValue: string): boolean;
function SubstituteMacros(var Template: String): boolean; function SubstituteMacros(var Template: String): boolean;
public public
constructor Create(TheTemplate: String); constructor Create(TheTemplate: String);
@ -106,7 +106,7 @@ type
end; end;
function ExecuteCodeTemplate(SrcEdit: TSourceEditorInterface; function ExecuteCodeTemplate(SrcEdit: TSourceEditorInterface;
const TemplateName, TemplateValue, TemplateComment, const TemplateName, TemplateValue, {%H-}TemplateComment,
EndOfTokenChr: string; Attributes: TStrings; EndOfTokenChr: string; Attributes: TStrings;
IndentToTokenStart: boolean): boolean; IndentToTokenStart: boolean): boolean;
@ -169,14 +169,15 @@ begin
Result := FDestTemplate; Result := FDestTemplate;
end; end;
function TLazTemplateParser.SubstituteMacro(const MacroName, MacroParameter: string; function TLazTemplateParser.SubstituteMacro(const MacroName,
var MacroValue: string): boolean; MacroParameter: string; out MacroValue: string): boolean;
var var
Macro: TIDECodeMacro; Macro: TIDECodeMacro;
NewValue: String; NewValue: String;
ErrMsg: string; ErrMsg: string;
begin begin
Result := false; Result := false;
MacroValue:='';
Macro := IDECodeMacros.FindByName(MacroName); Macro := IDECodeMacros.FindByName(MacroName);
//debugln('SubstituteMacro A ',MacroName,' ',dbgs(Macro<>nil),' ',MacroParameter); //debugln('SubstituteMacro A ',MacroName,' ',dbgs(Macro<>nil),' ',MacroParameter);
if Macro <> nil then begin if Macro <> nil then begin

View File

@ -46,9 +46,9 @@ type
DescriptionMemo: TMemo; DescriptionMemo: TMemo;
MacrosGroupBox: TGroupBox; MacrosGroupBox: TGroupBox;
DescriptionGroupBox: TGroupBox; DescriptionGroupBox: TGroupBox;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure MacrosListBoxSelectionChange(Sender: TObject; User: boolean); procedure MacrosListBoxSelectionChange(Sender: TObject; {%H-}User: boolean);
private private
FSelected: TIDECodeMacro; FSelected: TIDECodeMacro;
procedure FillMacrosListbox; procedure FillMacrosListbox;

View File

@ -37,10 +37,10 @@ uses
// synedit // synedit
SynEdit, SynHighlighterPas, SynEditAutoComplete, SynRegExpr, SynEdit, SynHighlighterPas, SynEditAutoComplete, SynRegExpr,
// codetools // codetools
CodeToolManager, CodeAtom, CodeCache, KeywordFuncLists, BasicCodeTools, CodeToolManager, CodeCache, KeywordFuncLists, BasicCodeTools,
PascalParserTool, PascalParserTool,
// IDEIntf // IDEIntf
IDECommands, TextTools, SrcEditorIntf, MenuIntf, IDEWindowIntf, LazIDEIntf, IDECommands, SrcEditorIntf, MenuIntf, IDEWindowIntf, LazIDEIntf,
IDEHelpIntf, IDEDialogs, IDEHelpIntf, IDEDialogs,
// IDE // IDE
IDEProcs, InputHistory, LazarusIDEStrConsts, EditorOptions, CodeMacroSelect, IDEProcs, InputHistory, LazarusIDEStrConsts, EditorOptions, CodeMacroSelect,
@ -93,7 +93,7 @@ type
procedure DeleteButtonClick(Sender: TObject); procedure DeleteButtonClick(Sender: TObject);
procedure RenameButtonClick(Sender: TObject); procedure RenameButtonClick(Sender: TObject);
procedure FilenameButtonClick(Sender: TObject); procedure FilenameButtonClick(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure HelpButtonClick(Sender: TObject); procedure HelpButtonClick(Sender: TObject);
procedure InsertMacroButtonClick(Sender: TObject); procedure InsertMacroButtonClick(Sender: TObject);
@ -102,7 +102,7 @@ type
procedure OnCutMenuItem(Sender: TObject); procedure OnCutMenuItem(Sender: TObject);
procedure OnInsertMacroMenuItem(Sender: TObject); procedure OnInsertMacroMenuItem(Sender: TObject);
procedure OnPasteMenuItem(Sender: TObject); procedure OnPasteMenuItem(Sender: TObject);
procedure TemplateListBoxSelectionChange(Sender: TObject; User: boolean); procedure TemplateListBoxSelectionChange(Sender: TObject; {%H-}User: boolean);
procedure UseMacrosCheckBoxChange(Sender: TObject); procedure UseMacrosCheckBoxChange(Sender: TObject);
private private
SynAutoComplete: TSynEditAutoComplete; SynAutoComplete: TSynEditAutoComplete;
@ -159,46 +159,46 @@ function EditCodeTemplate(ASynAutoComplete: TSynEditAutoComplete;
procedure CreateStandardCodeMacros; procedure CreateStandardCodeMacros;
// standard code macros // standard code macros
function CodeMacroUpper(const Parameter: string; InteractiveValue: TPersistent; function CodeMacroUpper(const Parameter: string; {%H-}InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface; {%H-}SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean; var Value, {%H-}ErrorMsg: string): boolean;
function CodeMacroLower(const Parameter: string; InteractiveValue: TPersistent; function CodeMacroLower(const Parameter: string; {%H-}InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface; {%H-}SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean; var Value, {%H-}ErrorMsg: string): boolean;
function CodeMacroPaste(const Parameter: string; InteractiveValue: TPersistent; function CodeMacroPaste(const {%H-}Parameter: string; {%H-}InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface; {%H-}SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean; var Value, {%H-}ErrorMsg: string): boolean;
function CodeMacroProcedureHead(const Parameter: string; function CodeMacroProcedureHead(const Parameter: string;
{%H-}InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean;
function CodeMacroProcedureName(const {%H-}Parameter: string;
InteractiveValue: TPersistent; InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface; SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean; var Value, ErrorMsg: string): boolean;
function CodeMacroProcedureName(const Parameter: string; function CodeMacroDate(const Parameter: string; {%H-}InteractiveValue: TPersistent;
InteractiveValue: TPersistent; {%H-}SrcEdit: TSourceEditorInterface;
var Value, {%H-}ErrorMsg: string): boolean;
function CodeMacroTime(const Parameter: string; {%H-}InteractiveValue: TPersistent;
{%H-}SrcEdit: TSourceEditorInterface;
var Value, {%H-}ErrorMsg: string): boolean;
function CodeMacroDateTime(const Parameter: string; {%H-}InteractiveValue: TPersistent;
{%H-}SrcEdit: TSourceEditorInterface;
var Value, {%H-}ErrorMsg: string): boolean;
function CodeMacroAddMissingEnd(const {%H-}Parameter: string;
{%H-}InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface; SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean; var Value, {%H-}ErrorMsg: string): boolean;
function CodeMacroDate(const Parameter: string; InteractiveValue: TPersistent; function CodeMacroOfAll(const {%H-}Parameter: string; {%H-}InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean;
function CodeMacroTime(const Parameter: string; InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean;
function CodeMacroDateTime(const Parameter: string; InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean;
function CodeMacroAddMissingEnd(const Parameter: string;
InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean;
function CodeMacroOfAll(const Parameter: string; InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface; SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean; var Value, ErrorMsg: string): boolean;
function CodeMacroPrevWord(const Parameter: string; function CodeMacroPrevWord(const Parameter: string;
InteractiveValue: TPersistent; {%H-}InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface; SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean; var Value, {%H-}ErrorMsg: string): boolean;
function CodeMacroWordAtCursor(const Parameter: string; InteractiveValue: TPersistent; function CodeMacroWordAtCursor(const {%H-}Parameter: string; {%H-}InteractiveValue: TPersistent;
SrcEdit: TSourceEditorInterface; SrcEdit: TSourceEditorInterface;
var Value, ErrorMsg: string): boolean; var Value, {%H-}ErrorMsg: string): boolean;
const const
CodeTemplatesMenuRootName = 'CodeTemplates'; CodeTemplatesMenuRootName = 'CodeTemplates';
@ -640,8 +640,8 @@ begin
end; end;
function CodeMacroEditParam(const Parameter: string; function CodeMacroEditParam(const Parameter: string;
InteractiveValue: TPersistent; SrcEdit: TSourceEditorInterface; var Value, {%H-}InteractiveValue: TPersistent; {%H-}SrcEdit: TSourceEditorInterface; var Value,
ErrorMsg: string; TemplateParser: TIDETemplateParser): boolean; {%H-}ErrorMsg: string; TemplateParser: TIDETemplateParser): boolean;
var var
p: TLazTemplateParser; p: TLazTemplateParser;
temp: TStringList; temp: TStringList;
@ -1074,7 +1074,7 @@ begin
FillCodeTemplateListBox; FillCodeTemplateListBox;
Index := SynAutoComplete.Completions.IndexOf(Token); Index := SynAutoComplete.Completions.IndexOf(Token);
if Index >= 0 if Index >= 0
then Index := TemplateListBox.Items.IndexOfObject(TObject(Pointer(Index))); then Index := TemplateListBox.Items.IndexOfObject(TObject({%H-}Pointer(Index)));
if Index >= 0 if Index >= 0
then TemplateListBox.ItemIndex:=Index; then TemplateListBox.ItemIndex:=Index;
@ -1197,7 +1197,7 @@ begin
// Add the index in SynAutoComplete as Object, since both indexes won't // Add the index in SynAutoComplete as Object, since both indexes won't
// be in sync after sorting // be in sync after sorting
sl.AddObject(SynAutoComplete.Completions[a] sl.AddObject(SynAutoComplete.Completions[a]
+' - "'+SynAutoComplete.CompletionComments[a]+'"', TObject(Pointer(a))); +' - "'+SynAutoComplete.CompletionComments[a]+'"', TObject({%H-}Pointer(a)));
end; end;
sl.Sort; sl.Sort;
TemplateListBox.Items.Assign(sl); TemplateListBox.Items.Assign(sl);

View File

@ -77,7 +77,7 @@ type
procedure TreeFilterEdAfterFilter(Sender: TObject); procedure TreeFilterEdAfterFilter(Sender: TObject);
procedure PageControlChange(Sender: TObject); procedure PageControlChange(Sender: TObject);
procedure TreeKeyPress(Sender: TObject; var Key: char); procedure TreeKeyPress(Sender: TObject; var Key: char);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure FormKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
private private
PrevPageIndex: Integer; PrevPageIndex: Integer;
PrevChangeStamp: Integer; PrevChangeStamp: Integer;

View File

@ -144,12 +144,12 @@ type
procedure SetPageControl(const AValue: TPageControl); procedure SetPageControl(const AValue: TPageControl);
procedure SelectionToolClick(Sender: TObject); procedure SelectionToolClick(Sender: TObject);
procedure ComponentBtnMouseDown(Sender: TObject; Button: TMouseButton; procedure ComponentBtnMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
procedure ComponentBtnMouseUp(Sender: TObject; Button: TMouseButton; procedure ComponentBtnMouseUp(Sender: TObject; {%H-}Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
procedure ComponentBtnDblClick(Sender: TObject); procedure ComponentBtnDblClick(Sender: TObject);
procedure OnPageMouseWheel(Sender: TObject; Shift: TShiftState; procedure OnPageMouseWheel(Sender: TObject; {%H-}Shift: TShiftState;
WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean); WheelDelta: Integer; {%H-}MousePos: TPoint; var Handled: Boolean);
procedure CreatePopupMenu; procedure CreatePopupMenu;
procedure UnselectAllButtons; procedure UnselectAllButtons;
function GetUnregisteredIcon: TCustomBitmap; function GetUnregisteredIcon: TCustomBitmap;

View File

@ -11,7 +11,7 @@ interface
uses uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
strutils, ExtCtrls, Buttons, MainBar; ExtCtrls, Buttons, MainBar;
type type

View File

@ -85,12 +85,12 @@ type
procedure ListBoxClick(Sender: TObject); procedure ListBoxClick(Sender: TObject);
procedure ListBoxDblClick(Sender: TObject); procedure ListBoxDblClick(Sender: TObject);
procedure RemoveBtnClick(Sender: TObject); procedure RemoveBtnClick(Sender: TObject);
procedure ListBoxKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure ListBoxKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
private private
StoredChoice, StoredFirst, StoredSecond: string; StoredChoice, StoredFirst, StoredSecond: string;
FS: string; FS: string;
function SplitActiveRow(var aFirst, aSecond: string): Boolean; function SplitActiveRow(out aFirst, aSecond: string): Boolean;
procedure DeleteSelected; procedure DeleteSelected;
procedure UpdateButtons; procedure UpdateButtons;
function IsChanged: Boolean; function IsChanged: Boolean;
@ -277,7 +277,7 @@ begin
ListBoxClick(Nil); ListBoxClick(Nil);
end; end;
function TCondForm.SplitActiveRow(var aFirst, aSecond: string): Boolean; function TCondForm.SplitActiveRow(out aFirst, aSecond: string): Boolean;
var var
i: integer; i: integer;
Line: string; Line: string;

View File

@ -30,7 +30,7 @@ type
FKeyBinding: TEditorMacroKeyBinding; FKeyBinding: TEditorMacroKeyBinding;
procedure DoMacroRecorderState(Sender: TObject); procedure DoMacroRecorderState(Sender: TObject);
procedure DoMacroRecorderUserCommand(aSender: TCustomSynMacroRecorder; procedure DoMacroRecorderUserCommand({%H-}aSender: TCustomSynMacroRecorder;
aCmd: TSynEditorCommand; var aEvent: TSynMacroEvent); aCmd: TSynEditorCommand; var aEvent: TSynMacroEvent);
protected protected
function GetMacroName: String; override; function GetMacroName: String; override;
@ -204,7 +204,7 @@ type
procedure btnSetKeysClick(Sender: TObject); procedure btnSetKeysClick(Sender: TObject);
procedure FormActivate(Sender: TObject); procedure FormActivate(Sender: TObject);
procedure HelpButtonClick(Sender: TObject); procedure HelpButtonClick(Sender: TObject);
procedure lbRecordedViewSelectItem(Sender: TObject; Item: TListItem; Selected: Boolean); procedure lbRecordedViewSelectItem(Sender: TObject; {%H-}Item: TListItem; {%H-}Selected: Boolean);
procedure mnExportClick(Sender: TObject); procedure mnExportClick(Sender: TObject);
procedure mnImportClick(Sender: TObject); procedure mnImportClick(Sender: TObject);
procedure tbIDEClick(Sender: TObject); procedure tbIDEClick(Sender: TObject);

View File

@ -163,8 +163,6 @@ procedure EncloseTextSelection(const Template: string; Source: TStrings;
SelectionStart, SelectionEnd: TPoint; SelectionStart, SelectionEnd: TPoint;
Indent: integer; Indent: integer;
var NewSelection: string; var NewCursor: TPoint); var NewSelection: string; var NewCursor: TPoint);
const
TemplateBaseIndent = 2;
var var
TemplateLen: Integer; TemplateLen: Integer;
TemplatePos: Integer; TemplatePos: Integer;

View File

@ -46,7 +46,7 @@ type
TextToFindLabel: TLabel; TextToFindLabel: TLabel;
WhereRadioGroup: TRadioGroup; WhereRadioGroup: TRadioGroup;
procedure DirectoriesBrowseClick(Sender: TObject); procedure DirectoriesBrowseClick(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure HelpButtonClick(Sender: TObject); procedure HelpButtonClick(Sender: TObject);
procedure OKButtonClick(Sender : TObject); procedure OKButtonClick(Sender : TObject);

View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LCLProc, Forms, Controls, Graphics, StdCtrls, Classes, SysUtils, LCLProc, Forms, Controls, Graphics, StdCtrls,
CodeToolManager, CodeCache, BasicCodeTools, IdentCompletionTool, CodeTree, CodeToolManager, CodeCache, IdentCompletionTool, CodeTree,
CodeAtom, CodeAtom,
IDEHelpIntf, SrcEditorIntf, SrcEditHintFrm, CodeHelp; IDEHelpIntf, SrcEditorIntf, SrcEditHintFrm, CodeHelp;
@ -49,7 +49,7 @@ type
FTextControl: TLabel; FTextControl: TLabel;
procedure SetHintValid(const AValue: boolean); procedure SetHintValid(const AValue: boolean);
procedure SetWaitingForIdle(const AValue: boolean); procedure SetWaitingForIdle(const AValue: boolean);
procedure ApplicationIdle(Sender: TObject; var Done: Boolean); procedure ApplicationIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure DoUpdateHint; procedure DoUpdateHint;
procedure UpdateHintControl; procedure UpdateHintControl;
public public

View File

@ -32,7 +32,7 @@ interface
uses uses
Classes, SysUtils, Classes, SysUtils,
// packages // packages
LCLMemManager, LResources, Forms, CodeCache, CodeToolManager, LResources, Forms, CodeCache, CodeToolManager,
// IDEIntf // IDEIntf
UnitResources, SrcEditorIntf, LazFileCache, LazFileUtils, AvgLvlTree, UnitResources, SrcEditorIntf, LazFileCache, LazFileUtils, AvgLvlTree,
// IDE // IDE

View File

@ -55,19 +55,18 @@ uses
{$IFDEF IDE_MEM_CHECK} {$IFDEF IDE_MEM_CHECK}
MemCheck, MemCheck,
{$ENDIF} {$ENDIF}
Math, Classes, LCLType, LCLProc, LCLIntf, StdCtrls, Buttons, Menus, ComCtrls, Math, Classes, LCLType, LCLProc, LCLIntf, Buttons, Menus,
SysUtils, types, Controls, Graphics, ExtCtrls, Dialogs, FileUtil, Forms, SysUtils, types, Controls, Graphics, ExtCtrls, Dialogs, FileUtil, Forms,
CodeToolManager, CodeCache, AVL_Tree, SynEditKeyCmds, PackageIntf, CodeToolManager, AVL_Tree, SynEditKeyCmds, PackageIntf,
// IDEIntf // IDEIntf
IDEImagesIntf, SrcEditorIntf, LazIDEIntf, MenuIntf, IDEImagesIntf, SrcEditorIntf, LazIDEIntf, MenuIntf,
IDECommands, IDEMsgIntf, IDEWindowIntf, IDECommands, IDEWindowIntf,
// IDE // IDE
LazConf, LazarusIDEStrConsts, ProjectDefs, Project, PublishModule, LazConf, LazarusIDEStrConsts, ProjectDefs, Project,
BuildLazDialog, Compiler, ComponentReg, etMessagesWnd, TransferMacros, ObjectInspector, PropEdits,
TransferMacros, ObjectInspector, PropEdits, IDEDefs,
EnvironmentOpts, EditorOptions, CompilerOptions, KeyMapping, IDEProcs, EnvironmentOpts, EditorOptions, CompilerOptions, KeyMapping, IDEProcs,
Debugger, IDEOptionDefs, CodeToolsDefines, Splash, Designer, Debugger, IDEOptionDefs, Splash, Designer,
SourceEditor, BuildManager, FindInFilesDlg, SourceEditor, FindInFilesDlg,
MainBar, MainIntf, SourceSynEditor, PseudoTerminalDlg; MainBar, MainIntf, SourceSynEditor, PseudoTerminalDlg;
type type

View File

@ -37,7 +37,7 @@ uses
// synedit, codetools // synedit, codetools
SynRegExpr, SourceLog, KeywordFuncLists, BasicCodeTools, SynRegExpr, SourceLog, KeywordFuncLists, BasicCodeTools,
// IDEIntf // IDEIntf
IDEWindowIntf, LazIDEIntf, SrcEditorIntf, IDEDialogs, MainIntf, IDEWindowIntf, LazIDEIntf, SrcEditorIntf, IDEDialogs,
// ide // ide
LazarusIDEStrConsts, InputHistory, IDEProcs, SearchResultView, Project; LazarusIDEStrConsts, InputHistory, IDEProcs, SearchResultView, Project;
@ -54,7 +54,7 @@ type
lblProgress: TLABEL; lblProgress: TLABEL;
lblSearchText: TLABEL; lblSearchText: TLABEL;
Panel2: TPANEL; Panel2: TPANEL;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure OnAddMatch(const Filename: string; const StartPos, EndPos: TPoint; procedure OnAddMatch(const Filename: string; const StartPos, EndPos: TPoint;
const Lines: string); const Lines: string);

View File

@ -148,25 +148,25 @@ type
procedure ClosePageButtonClick(Sender: TObject); procedure ClosePageButtonClick(Sender: TObject);
procedure Form1Create(Sender: TObject); procedure Form1Create(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure FormKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure mniCopyAllClick(Sender: TObject); procedure mniCopyAllClick(Sender: TObject);
procedure mniCopyItemClick(Sender: TObject); procedure mniCopyItemClick(Sender: TObject);
procedure mniCopySelectedClick(Sender: TObject); procedure mniCopySelectedClick(Sender: TObject);
procedure mniExpandAllClick(Sender: TObject); procedure mniExpandAllClick(Sender: TObject);
procedure mniCollapseAllClick(Sender: TObject); procedure mniCollapseAllClick(Sender: TObject);
procedure ResultsNoteBookMouseDown(Sender: TObject; Button: TMouseButton; procedure ResultsNoteBookMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); {%H-}Shift: TShiftState; X, Y: Integer);
procedure TreeViewKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure TreeViewKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure ResultsNoteBookClosetabclicked(Sender: TObject); procedure ResultsNoteBookClosetabclicked(Sender: TObject);
procedure SearchAgainButtonClick(Sender: TObject); procedure SearchAgainButtonClick(Sender: TObject);
procedure TreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView; procedure TreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView;
Node: TTreeNode; State: TCustomDrawState; Stage: TCustomDrawStage; Node: TTreeNode; State: TCustomDrawState; Stage: TCustomDrawStage;
var PaintImages, DefaultDraw: Boolean); var {%H-}PaintImages, {%H-}DefaultDraw: Boolean);
procedure LazTVShowHint(Sender: TObject; HintInfo: PHintInfo); procedure LazTVShowHint(Sender: TObject; {%H-}HintInfo: PHintInfo);
procedure LazTVMousemove(Sender: TObject; Shift: TShiftState; procedure LazTVMousemove(Sender: TObject; {%H-}Shift: TShiftState;
X, Y: Integer); X, Y: Integer);
Procedure LazTVMouseWheel(Sender: TObject; Shift: TShiftState; Procedure LazTVMouseWheel(Sender: TObject; Shift: TShiftState;
WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean); {%H-}WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
procedure TreeViewKeyPress(Sender: TObject; var Key: char); procedure TreeViewKeyPress(Sender: TObject; var Key: char);
procedure ResultsNoteBookPageChanged (Sender: TObject ); procedure ResultsNoteBookPageChanged (Sender: TObject );
procedure SearchInListChange(Sender: TObject ); procedure SearchInListChange(Sender: TObject );

View File

@ -62,7 +62,7 @@ type
DomainRadioGroup: TRadioGroup; DomainRadioGroup: TRadioGroup;
procedure DirectionRadioGroupClick(Sender: TObject); procedure DirectionRadioGroupClick(Sender: TObject);
procedure DomainRadioGroupClick(Sender: TObject); procedure DomainRadioGroupClick(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure OptionsCheckGroupItemClick(Sender: TObject; Index: integer); procedure OptionsCheckGroupItemClick(Sender: TObject; Index: integer);
private private

View File

@ -54,14 +54,14 @@ uses
SynEditLines, SynEditStrConst, SynEditTypes, SynEdit, SynRegExpr, SynEditLines, SynEditStrConst, SynEditTypes, SynEdit, SynRegExpr,
SynEditHighlighter, SynEditAutoComplete, SynEditKeyCmds, SynCompletion, SynEditHighlighter, SynEditAutoComplete, SynEditKeyCmds, SynCompletion,
SynEditMiscClasses, SynEditMarkupHighAll, SynEditMarks, SynEditMiscClasses, SynEditMarkupHighAll, SynEditMarks,
SynBeautifier, LazSynEditText, SynBeautifier,
SynPluginSyncronizedEditBase, SourceSynEditor, SynMacroRecorder, SynPluginSyncronizedEditBase, SourceSynEditor,
SynExportHTML, SynHighlighterPas, SynEditMarkup, SynEditMarkupIfDef, SynExportHTML, SynHighlighterPas, SynEditMarkup, SynEditMarkupIfDef,
// Intf // Intf
SrcEditorIntf, MenuIntf, LazIDEIntf, PackageIntf, IDEHelpIntf, IDEImagesIntf, SrcEditorIntf, MenuIntf, LazIDEIntf, PackageIntf, IDEHelpIntf, IDEImagesIntf,
IDEWindowIntf, ProjectIntf, MacroDefIntf, IDEWindowIntf, ProjectIntf, MacroDefIntf,
// IDE units // IDE units
IDECmdLine, IDEDialogs, LazarusIDEStrConsts, IDECommands, CompOptsIntf, IDECmdLine, IDEDialogs, LazarusIDEStrConsts, IDECommands,
EditorOptions, EnvironmentOpts, WordCompletion, FindReplaceDialog, IDEProcs, EditorOptions, EnvironmentOpts, WordCompletion, FindReplaceDialog, IDEProcs,
IDEOptionDefs, IDEHelpManager, MacroPromptDlg, TransferMacros, IDEOptionDefs, IDEHelpManager, MacroPromptDlg, TransferMacros,
CodeContextForm, SrcEditHintFrm, etMessagesWnd, etSrcEditMarks, InputHistory, CodeContextForm, SrcEditHintFrm, etMessagesWnd, etSrcEditMarks, InputHistory,
@ -252,7 +252,7 @@ type
procedure EditorMouseWheel(Sender: TObject; Shift: TShiftState; procedure EditorMouseWheel(Sender: TObject; Shift: TShiftState;
WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean); WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
procedure EditorKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure EditorKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure EditorStatusChanged(Sender: TObject; Changes: TSynStatusChanges); procedure EditorStatusChanged(Sender: TObject; {%H-}Changes: TSynStatusChanges);
procedure EditorPaste(Sender: TObject; var AText: String; procedure EditorPaste(Sender: TObject; var AText: String;
var AMode: TSynSelectionMode; ALogStartPos: TPoint; var AMode: TSynSelectionMode; ALogStartPos: TPoint;
var AnAction: TSynCopyPasteAction); var AnAction: TSynCopyPasteAction);
@ -261,9 +261,9 @@ type
procedure EditorEnter(Sender: TObject); procedure EditorEnter(Sender: TObject);
procedure EditorActivateSyncro(Sender: TObject); procedure EditorActivateSyncro(Sender: TObject);
procedure EditorDeactivateSyncro(Sender: TObject); procedure EditorDeactivateSyncro(Sender: TObject);
procedure EditorChangeUpdating(ASender: TObject; AnUpdating: Boolean); procedure EditorChangeUpdating({%H-}ASender: TObject; AnUpdating: Boolean);
function EditorHandleMouseAction(AnAction: TSynEditMouseAction; function EditorHandleMouseAction(AnAction: TSynEditMouseAction;
var AnInfo: TSynEditMouseActionInfo): Boolean; var {%H-}AnInfo: TSynEditMouseActionInfo): Boolean;
function GetCodeBuffer: TCodeBuffer; function GetCodeBuffer: TCodeBuffer;
function GetExecutionLine: integer; function GetExecutionLine: integer;
function GetHasExecutionMarks: Boolean; function GetHasExecutionMarks: Boolean;
@ -292,7 +292,7 @@ type
procedure UpdateIfDefNodeStates(Force: Boolean = False); procedure UpdateIfDefNodeStates(Force: Boolean = False);
protected protected
procedure ProcessCommand(Sender: TObject; procedure ProcessCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer); var Command: TSynEditorCommand; var AChar: TUTF8Char; {%H-}Data: pointer);
procedure ProcessUserCommand(Sender: TObject; procedure ProcessUserCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer); var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer);
procedure UserCommandProcessed(Sender: TObject; procedure UserCommandProcessed(Sender: TObject;
@ -306,8 +306,8 @@ type
procedure FocusEditor;// called by TSourceNotebook when the Notebook page procedure FocusEditor;// called by TSourceNotebook when the Notebook page
// changes so the editor is focused // changes so the editor is focused
procedure OnGutterClick(Sender: TObject; X, Y, Line: integer; procedure OnGutterClick(Sender: TObject; {%H-}X, {%H-}Y, Line: integer;
mark: TSynEditMark); {%H-}Mark: TSynEditMark);
procedure OnEditorSpecialLineColor(Sender: TObject; Line: integer; procedure OnEditorSpecialLineColor(Sender: TObject; Line: integer;
var Special: boolean; Markup: TSynSelectedColor); var Special: boolean; Markup: TSynSelectedColor);
function RefreshEditorSettings: Boolean; function RefreshEditorSettings: Boolean;
@ -474,10 +474,10 @@ type
procedure CheckActiveWindow; procedure CheckActiveWindow;
// debugging // debugging
procedure DoRequestExecutionMarks(Data: PtrInt); procedure DoRequestExecutionMarks({%H-}Data: PtrInt);
procedure FillExecutionMarks; procedure FillExecutionMarks;
procedure ClearExecutionMarks; procedure ClearExecutionMarks;
procedure LineInfoNotificationChange(const ASender: TObject; const ASource: String); procedure LineInfoNotificationChange(const {%H-}ASender: TObject; const ASource: String);
function SourceToDebugLine(aLinePos: Integer): Integer; function SourceToDebugLine(aLinePos: Integer): Integer;
function DebugToSourceLine(aLinePos: Integer): Integer; function DebugToSourceLine(aLinePos: Integer): Integer;
@ -575,8 +575,8 @@ type
procedure EncodingClicked(Sender: TObject); procedure EncodingClicked(Sender: TObject);
procedure ExtractProcMenuItemClick(Sender: TObject); procedure ExtractProcMenuItemClick(Sender: TObject);
procedure FindOverloadsMenuItemClick(Sender: TObject); procedure FindOverloadsMenuItemClick(Sender: TObject);
procedure FormMouseUp(Sender: TObject; Button: TMouseButton; procedure FormMouseUp(Sender: TObject; {%H-}Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
procedure HighlighterClicked(Sender: TObject); procedure HighlighterClicked(Sender: TObject);
procedure InsertCharacter(const C: TUTF8Char); procedure InsertCharacter(const C: TUTF8Char);
procedure InvertAssignmentMenuItemClick(Sender: TObject); procedure InvertAssignmentMenuItemClick(Sender: TObject);
@ -600,7 +600,7 @@ type
procedure SrcPopUpMenuPopup(Sender: TObject); procedure SrcPopUpMenuPopup(Sender: TObject);
procedure StatusBarClick(Sender: TObject); procedure StatusBarClick(Sender: TObject);
procedure StatusBarDblClick(Sender: TObject); procedure StatusBarDblClick(Sender: TObject);
procedure StatusBarDrawPanel(AStatusBar: TStatusBar; APanel: TStatusPanel; procedure StatusBarDrawPanel({%H-}AStatusBar: TStatusBar; APanel: TStatusPanel;
const ARect: TRect); const ARect: TRect);
procedure TabPopUpMenuPopup(Sender: TObject); procedure TabPopUpMenuPopup(Sender: TObject);
private private
@ -689,20 +689,20 @@ type
function GetActiveCompletionPlugin: TSourceEditorCompletionPlugin; override; function GetActiveCompletionPlugin: TSourceEditorCompletionPlugin; override;
function GetCompletionPlugins(Index: integer): TSourceEditorCompletionPlugin; override; function GetCompletionPlugins(Index: integer): TSourceEditorCompletionPlugin; override;
procedure EditorMouseMove(Sender: TObject; Shift: TShiftstate; procedure EditorMouseMove(Sender: TObject; {%H-}Shift: TShiftstate;
X,Y: Integer); {%H-}X,{%H-}Y: Integer);
procedure EditorMouseDown(Sender: TObject; Button: TMouseButton; procedure EditorMouseDown(Sender: TObject; {%H-}Button: TMouseButton;
Shift: TShiftstate; X,Y: Integer); {%H-}Shift: TShiftstate; {%H-}X,{%H-}Y: Integer);
function EditorGetIndent(Sender: TObject; Editor: TObject; function EditorGetIndent(Sender: TObject; Editor: TObject;
LogCaret, OldLogCaret: TPoint; FirstLinePos, LastLinePos: Integer; LogCaret, OldLogCaret: TPoint; FirstLinePos, LastLinePos: Integer;
Reason: TSynEditorCommand; Reason: TSynEditorCommand;
SetIndentProc: TSynBeautifierSetIndentProc): Boolean; SetIndentProc: TSynBeautifierSetIndentProc): Boolean;
procedure EditorKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure EditorKeyDown(Sender: TObject; var {%H-}Key: Word; {%H-}Shift: TShiftState);
procedure EditorMouseWheel(Sender: TObject; Shift: TShiftState; procedure EditorMouseWheel(Sender: TObject; {%H-}Shift: TShiftState;
WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean); {%H-}WheelDelta: Integer; {%H-}MousePos: TPoint; var {%H-}Handled: Boolean);
procedure NotebookMouseDown(Sender: TObject; Button: TMouseButton; procedure NotebookMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X,Y: Integer); {%H-}Shift: TShiftState; X,Y: Integer);
procedure NotebookDragTabMove(Sender, Source: TObject; procedure NotebookDragTabMove(Sender, Source: TObject;
OldIndex, NewIndex: Integer; CopyDrag: Boolean; OldIndex, NewIndex: Integer; CopyDrag: Boolean;
var Done: Boolean); var Done: Boolean);
@ -710,8 +710,8 @@ type
OldIndex, NewIndex: Integer; CopyDrag: Boolean; OldIndex, NewIndex: Integer; CopyDrag: Boolean;
var Accept: Boolean); var Accept: Boolean);
procedure NotebookDragOver(Sender, Source: TObject; procedure NotebookDragOver(Sender, Source: TObject;
X,Y: Integer; State: TDragState; var Accept: Boolean); {%H-}X,{%H-}Y: Integer; State: TDragState; var Accept: Boolean);
procedure NotebookEndDrag(Sender, Target: TObject; X,Y: Integer); procedure NotebookEndDrag(Sender, {%H-}Target: TObject; {%H-}X,{%H-}Y: Integer);
procedure OnApplicationDeactivate(Sender: TObject); procedure OnApplicationDeactivate(Sender: TObject);
procedure ShowSynEditHint(const MousePos: TPoint); procedure ShowSynEditHint(const MousePos: TPoint);
@ -731,10 +731,10 @@ type
procedure MoveEditorNextWindow(Backward: Boolean = False; Copy: Boolean = False); procedure MoveEditorNextWindow(Backward: Boolean = False; Copy: Boolean = False);
procedure CopyEditor(OldPageIndex, NewWindowIndex, NewPageIndex: integer; Focus: Boolean = False); procedure CopyEditor(OldPageIndex, NewWindowIndex, NewPageIndex: integer; Focus: Boolean = False);
procedure ProcessParentCommand(Sender: TObject; procedure ProcessParentCommand(Sender: TObject;
var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer; var Command: TSynEditorCommand; var {%H-}AChar: TUTF8Char; {%H-}Data: pointer;
var Handled: boolean); var Handled: boolean);
procedure ParentCommandProcessed(Sender: TObject; procedure ParentCommandProcessed(Sender: TObject;
var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer; var Command: TSynEditorCommand; var {%H-}AChar: TUTF8Char; {%H-}Data: pointer;
var Handled: boolean); var Handled: boolean);
function GetActiveEditor: TSourceEditorInterface; override; function GetActiveEditor: TSourceEditorInterface; override;
@ -852,7 +852,7 @@ type
function GetActiveSourceWindow: TSourceEditorWindowInterface; override; function GetActiveSourceWindow: TSourceEditorWindowInterface; override;
procedure SetActiveSourceWindow(const AValue: TSourceEditorWindowInterface); override; procedure SetActiveSourceWindow(const AValue: TSourceEditorWindowInterface); override;
function GetSourceWindows(Index: integer): TSourceEditorWindowInterface; override; function GetSourceWindows(Index: integer): TSourceEditorWindowInterface; override;
procedure DoWindowFocused(AWindow: TSourceNotebook); // Includes Focus to ChildControl (aka Activated) procedure DoWindowFocused({%H-}AWindow: TSourceNotebook); // Includes Focus to ChildControl (aka Activated)
function GetActiveEditor: TSourceEditorInterface; override; function GetActiveEditor: TSourceEditorInterface; override;
procedure SetActiveEditor(const AValue: TSourceEditorInterface); override; procedure SetActiveEditor(const AValue: TSourceEditorInterface); override;
procedure DoActiveEditorChanged; procedure DoActiveEditorChanged;
@ -1015,21 +1015,21 @@ type
procedure BookMarkPrevClicked(Sender: TObject); procedure BookMarkPrevClicked(Sender: TObject);
protected protected
// macros // macros
function MacroFuncCol(const s:string; const Data: PtrInt; function MacroFuncCol(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
function MacroFuncRow(const s:string; const Data: PtrInt; function MacroFuncRow(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
function MacroFuncEdFile(const s:string; const Data: PtrInt; function MacroFuncEdFile(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
function MacroFuncCurToken(const s:string; const Data: PtrInt; function MacroFuncCurToken(const {%H-}s:string; const {%H-}Data: PtrInt;
var {%H-}Abort: boolean): string;
function MacroFuncConfirm(const s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var Abort: boolean): string;
function MacroFuncConfirm(const s:string; const Data: PtrInt; function MacroFuncPrompt(const s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string;
function MacroFuncPrompt(const s:string; const Data: PtrInt;
var Abort: boolean): string; var Abort: boolean): string;
function MacroFuncSave(const s:string; const Data: PtrInt; function MacroFuncSave(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var Abort: boolean): string;
function MacroFuncSaveAll(const s:string; const Data: PtrInt; function MacroFuncSaveAll(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var Abort: boolean): string;
public public
procedure InitMacros(AMacroList: TTransferMacroList); procedure InitMacros(AMacroList: TTransferMacroList);
@ -1037,7 +1037,7 @@ type
function FindUniquePageName(FileName:string; IgnoreEditor: TSourceEditor):string; function FindUniquePageName(FileName:string; IgnoreEditor: TSourceEditor):string;
function SomethingModified(Verbose: boolean = false): boolean; function SomethingModified(Verbose: boolean = false): boolean;
procedure OnIdle(Sender: TObject; var Done: Boolean); procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure OnUserInput(Sender: TObject; Msg: Cardinal); procedure OnUserInput(Sender: TObject; Msg: Cardinal);
procedure LockAllEditorsInSourceChangeCache; procedure LockAllEditorsInSourceChangeCache;
procedure UnlockAllEditorsInSourceChangeCache; procedure UnlockAllEditorsInSourceChangeCache;
@ -1071,7 +1071,7 @@ type
procedure OnWordCompletionGetSource(var Source: TStrings; SourceIndex: integer); procedure OnWordCompletionGetSource(var Source: TStrings; SourceIndex: integer);
procedure OnSourceCompletionTimer(Sender: TObject); procedure OnSourceCompletionTimer(Sender: TObject);
// marks // marks
procedure OnSourceMarksAction(AMark: TSourceMark; AAction: TMarksAction); procedure OnSourceMarksAction(AMark: TSourceMark; {%H-}AAction: TMarksAction);
procedure OnSourceMarksGetSynEdit(Sender: TObject; aFilename: string; procedure OnSourceMarksGetSynEdit(Sender: TObject; aFilename: string;
var aSynEdit: TSynEdit); var aSynEdit: TSynEdit);
property CodeTemplateModul: TSynEditAutoComplete property CodeTemplateModul: TSynEditAutoComplete
@ -4105,7 +4105,7 @@ begin
end; end;
procedure TSourceEditor.OnGutterClick(Sender: TObject; X, Y, Line: integer; procedure TSourceEditor.OnGutterClick(Sender: TObject; X, Y, Line: integer;
mark: TSynEditMark); Mark: TSynEditMark);
var var
Marks: PSourceMark; Marks: PSourceMark;
i, MarkCount: Integer; i, MarkCount: Integer;
@ -4115,7 +4115,7 @@ var
Mrk: TSourceMark; Mrk: TSourceMark;
begin begin
// create or delete breakpoint // create or delete breakpoint
// find breakpoint mark at line // find breakpoint Mark at line
Marks := nil; Marks := nil;
Ctrl := SYNEDIT_LINK_MODIFIER in GetKeyShiftState; Ctrl := SYNEDIT_LINK_MODIFIER in GetKeyShiftState;
try try
@ -6658,7 +6658,7 @@ begin
Layout:=IDEWindowCreators.SimpleLayoutStorage.ItemByForm(Self); Layout:=IDEWindowCreators.SimpleLayoutStorage.ItemByForm(Self);
if Layout<>nil then if Layout<>nil then
Layout.Form:=nil; Layout.Form:=nil;
Name := Name + '___' + IntToStr(PtrUInt(Pointer(Self))); Name := Name + '___' + IntToStr({%H-}PtrUInt(Pointer(Self)));
CloseAction := caFree; CloseAction := caFree;
end end
else begin else begin

View File

@ -41,7 +41,7 @@ uses
CodeAtom, CodeCache, SourceChanger, CustomCodeTool, CodeToolManager, CodeAtom, CodeCache, SourceChanger, CustomCodeTool, CodeToolManager,
PascalParserTool, KeywordFuncLists, FileProcs, IdentCompletionTool, PascalParserTool, KeywordFuncLists, FileProcs, IdentCompletionTool,
PascalReaderTool, SourceLog, PascalReaderTool, SourceLog,
LazIDEIntf, TextTools, IDETextConverter, DialogProcs, MainIntf, EditorOptions, LazIDEIntf, TextTools, IDETextConverter, DialogProcs, EditorOptions,
IDEImagesIntf, CodeToolsOptions; IDEImagesIntf, CodeToolsOptions;
type type
@ -51,17 +51,17 @@ type
TLazTextConverterToolClasses = class(TTextConverterToolClasses) TLazTextConverterToolClasses = class(TTextConverterToolClasses)
public public
function GetTempFilename: string; override; function GetTempFilename: string; override;
function SupportsType(aTextType: TTextConverterType): boolean; override; function SupportsType({%H-}aTextType: TTextConverterType): boolean; override;
function LoadFromFile(Converter: TIDETextConverter; const AFilename: string; function LoadFromFile(Converter: TIDETextConverter; const AFilename: string;
UpdateFromDisk, Revert: Boolean): Boolean; override; UpdateFromDisk, Revert: Boolean): Boolean; override;
function SaveCodeBufferToFile(Converter: TIDETextConverter; function SaveCodeBufferToFile(Converter: TIDETextConverter;
const AFilename: string): Boolean; override; const AFilename: string): Boolean; override;
function GetCodeBufferSource(Converter: TIDETextConverter; function GetCodeBufferSource(Converter: TIDETextConverter;
out Source: string): boolean; override; out Source: string): boolean; override;
function CreateCodeBuffer(Converter: TIDETextConverter; function CreateCodeBuffer({%H-}Converter: TIDETextConverter;
const Filename, NewSource: string; const Filename, NewSource: string;
out CodeBuffer: Pointer): boolean; override; out CodeBuffer: Pointer): boolean; override;
function LoadCodeBufferFromFile(Converter: TIDETextConverter; function LoadCodeBufferFromFile({%H-}Converter: TIDETextConverter;
const Filename: string; const Filename: string;
UpdateFromDisk, Revert: Boolean; UpdateFromDisk, Revert: Boolean;
out CodeBuffer: Pointer): boolean; override; out CodeBuffer: Pointer): boolean; override;
@ -86,7 +86,7 @@ type
// completion form and functions // completion form and functions
function PaintCompletionItem(const AKey: string; ACanvas: TCanvas; function PaintCompletionItem(const AKey: string; ACanvas: TCanvas;
X, Y, MaxX: integer; ItemSelected: boolean; Index: integer; X, Y, MaxX: integer; ItemSelected: boolean; Index: integer;
aCompletion : TSynCompletion; CurrentCompletionType: TCompletionType; {%H-}aCompletion : TSynCompletion; CurrentCompletionType: TCompletionType;
Highlighter: TSrcIDEHighlighter; MeasureOnly: Boolean = False): TPoint; Highlighter: TSrcIDEHighlighter; MeasureOnly: Boolean = False): TPoint;
function GetIdentCompletionValue(aCompletion : TSynCompletion; function GetIdentCompletionValue(aCompletion : TSynCompletion;

View File

@ -46,7 +46,7 @@ type
protected protected
procedure SetControl(const AValue: TWinControl); virtual; procedure SetControl(const AValue: TWinControl); virtual;
public public
procedure GetPreferredSize(var PreferredWidth, PreferredHeight: integer); virtual; procedure GetPreferredSize(out PreferredWidth, PreferredHeight: integer); virtual;
procedure UpdateHint; virtual; procedure UpdateHint; virtual;
property Control: TWinControl read FControl write SetControl; property Control: TWinControl read FControl write SetControl;
end; end;
@ -55,7 +55,7 @@ type
TSrcEditHintWindow = class(THintWindow) TSrcEditHintWindow = class(THintWindow)
IdleTimer1: TIdleTimer; IdleTimer1: TIdleTimer;
procedure ApplicationIdle(Sender: TObject; var Done: Boolean); procedure ApplicationIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@ -349,7 +349,7 @@ begin
FControl:=AValue; FControl:=AValue;
end; end;
procedure TCodeHintProvider.GetPreferredSize(var PreferredWidth, procedure TCodeHintProvider.GetPreferredSize(out PreferredWidth,
PreferredHeight: integer); PreferredHeight: integer);
begin begin

View File

@ -61,7 +61,7 @@ type
PackagesComboBox: TComboBox; PackagesComboBox: TComboBox;
ShowAllCheckBox: TCheckBox; ShowAllCheckBox: TCheckBox;
procedure AddFileToAPackageDlgClose(Sender: TObject; procedure AddFileToAPackageDlgClose(Sender: TObject;
var CloseAction: TCloseAction); var {%H-}CloseAction: TCloseAction);
procedure HelpButtonClick(Sender: TObject); procedure HelpButtonClick(Sender: TObject);
procedure OkButtonClick(Sender: TObject); procedure OkButtonClick(Sender: TObject);
procedure PackagesGroupBoxResize(Sender: TObject); procedure PackagesGroupBoxResize(Sender: TObject);

View File

@ -40,7 +40,7 @@ interface
uses uses
Classes, SysUtils, Forms, Controls, Buttons, LResources, StdCtrls, ComCtrls, Classes, SysUtils, Forms, Controls, Buttons, LResources, StdCtrls, ComCtrls,
FileCtrl, Dialogs, Dialogs,
IDEWindowIntf, LazarusIDEStrConsts, Project, PackageDefs, PackageSystem; IDEWindowIntf, LazarusIDEStrConsts, Project, PackageDefs, PackageSystem;
type type
@ -51,7 +51,7 @@ type
NoteLabel: TLabel; NoteLabel: TLabel;
DependencyListView: TListView; DependencyListView: TListView;
procedure BrokenDependenciesDialogClose(Sender: TObject; procedure BrokenDependenciesDialogClose(Sender: TObject;
var CloseAction: TCloseAction); var {%H-}CloseAction: TCloseAction);
procedure BrokenDependenciesDialogResize(Sender: TObject); procedure BrokenDependenciesDialogResize(Sender: TObject);
private private
fButtons: TFPList; // list of TBitBtn fButtons: TFPList; // list of TBitBtn

View File

@ -43,7 +43,7 @@ uses
LazFileUtils, TreeFilterEdit, PackageIntf, IDEImagesIntf, IDEHelpIntf, LazFileUtils, TreeFilterEdit, PackageIntf, IDEImagesIntf, IDEHelpIntf,
IDEDialogs, IDEWindowIntf, LazarusIDEStrConsts, EnvironmentOpts, InputHistory, IDEDialogs, IDEWindowIntf, LazarusIDEStrConsts, EnvironmentOpts, InputHistory,
LazConf, IDEProcs, PackageDefs, PackageSystem, PackageLinks, LazConf, IDEProcs, PackageDefs, PackageSystem, PackageLinks,
IDEContextHelpEdit, LPKCache; LPKCache;
type type
TOnCheckInstallPackageList = TOnCheckInstallPackageList =
@ -73,16 +73,16 @@ type
InstalledFilterEdit: TTreeFilterEdit; InstalledFilterEdit: TTreeFilterEdit;
UninstallButton: TBitBtn; UninstallButton: TBitBtn;
procedure AddToInstallButtonClick(Sender: TObject); procedure AddToInstallButtonClick(Sender: TObject);
function FilterEditGetImageIndex(Str: String; Data: TObject; function FilterEditGetImageIndex({%H-}Str: String; {%H-}Data: TObject;
var AIsEnabled: Boolean): Integer; var {%H-}AIsEnabled: Boolean): Integer;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure InstallTreeViewKeyPress(Sender: TObject; var Key: char); procedure InstallTreeViewKeyPress(Sender: TObject; var Key: char);
procedure LPKParsingTimerTimer(Sender: TObject); procedure LPKParsingTimerTimer(Sender: TObject);
procedure OnAllLPKParsed(Sender: TObject); procedure OnAllLPKParsed(Sender: TObject);
procedure OnIdle(Sender: TObject; var Done: Boolean); procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure TreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView; procedure TreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView;
Node: TTreeNode; State: TCustomDrawState; Stage: TCustomDrawStage; Node: TTreeNode; {%H-}State: TCustomDrawState; Stage: TCustomDrawStage;
var PaintImages, DefaultDraw: Boolean); var PaintImages, {%H-}DefaultDraw: Boolean);
procedure AvailableTreeViewDblClick(Sender: TObject); procedure AvailableTreeViewDblClick(Sender: TObject);
procedure AvailableTreeViewKeyPress(Sender: TObject; var Key: char); procedure AvailableTreeViewKeyPress(Sender: TObject; var Key: char);
procedure AvailableTreeViewSelectionChanged(Sender: TObject); procedure AvailableTreeViewSelectionChanged(Sender: TObject);

View File

@ -60,7 +60,7 @@ uses
ProjectIntf, CompOptsIntf, IDEWindowIntf, LazIDEIntf, IDEImagesIntf, ProjectIntf, CompOptsIntf, IDEWindowIntf, LazIDEIntf, IDEImagesIntf,
IDEMsgIntf, IDEExternToolIntf, IDEMsgIntf, IDEExternToolIntf,
// IDE // IDE
LazarusIDEStrConsts, CompilerOptions, EnvironmentOpts, IDEProcs, DialogProcs, CompilerOptions, EnvironmentOpts, IDEProcs, DialogProcs,
TransferMacros, LazConf, IDECmdLine, PackageDefs, PackageSystem, InputHistory; TransferMacros, LazConf, IDECmdLine, PackageDefs, PackageSystem, InputHistory;
type type
@ -112,12 +112,12 @@ type
IDEDialogLayoutStorage1: TIDEDialogLayoutStorage; IDEDialogLayoutStorage1: TIDEDialogLayoutStorage;
ImageList1: TImageList; ImageList1: TImageList;
procedure ConflictsTreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView; procedure ConflictsTreeViewAdvancedCustomDrawItem(Sender: TCustomTreeView;
Node: TTreeNode; State: TCustomDrawState; Stage: TCustomDrawStage; Node: TTreeNode; {%H-}State: TCustomDrawState; Stage: TCustomDrawStage;
var PaintImages, DefaultDraw: Boolean); var {%H-}PaintImages, {%H-}DefaultDraw: Boolean);
procedure ConflictsTreeViewMouseDown(Sender: TObject; Button: TMouseButton; procedure ConflictsTreeViewMouseDown(Sender: TObject; {%H-}Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); {%H-}Shift: TShiftState; X, Y: Integer);
procedure DeleteSelectedFilesButtonClick(Sender: TObject); procedure DeleteSelectedFilesButtonClick(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure OkButtonClick(Sender: TObject); procedure OkButtonClick(Sender: TObject);
private private

View File

@ -45,12 +45,12 @@ type
PkgListView: TListView; PkgListView: TListView;
HintMemo: TMemo; HintMemo: TMemo;
Splitter1: TSplitter; Splitter1: TSplitter;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure HelpButtonClick(Sender: TObject); procedure HelpButtonClick(Sender: TObject);
procedure OpenButtonClick(Sender: TObject); procedure OpenButtonClick(Sender: TObject);
procedure PkgListViewDblClick(Sender: TObject); procedure PkgListViewDblClick(Sender: TObject);
procedure PkgListViewSelectItem(Sender: TObject; Item: TListItem; Selected: Boolean); procedure PkgListViewSelectItem(Sender: TObject; {%H-}Item: TListItem; {%H-}Selected: Boolean);
private private
public public
Package: TLazPackage; Package: TLazPackage;

View File

@ -37,8 +37,8 @@ unit PkgGraphExplorer;
interface interface
uses uses
Classes, SysUtils, Math, LCLProc, Forms, Controls, Buttons, ComCtrls, Classes, SysUtils, LCLProc, Forms, Controls, Buttons, ComCtrls,
StdCtrls, Menus, Dialogs, Graphics, FileCtrl, LCLType, ExtCtrls, StdCtrls, Menus, Dialogs, Graphics, LCLType, ExtCtrls,
AVL_Tree, contnrs, AVL_Tree, contnrs,
IDECommands, PackageIntf, IDEImagesIntf, LazIDEIntf, IDECommands, PackageIntf, IDEImagesIntf, LazIDEIntf,
LvlGraphCtrl, LvlGraphCtrl,
@ -70,7 +70,7 @@ type
procedure PkgGraphExplorerShow(Sender: TObject); procedure PkgGraphExplorerShow(Sender: TObject);
procedure PkgPopupMenuPopup(Sender: TObject); procedure PkgPopupMenuPopup(Sender: TObject);
procedure InfoMemoKeyDown(Sender: TObject; var Key: Word; procedure InfoMemoKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState); {%H-}Shift: TShiftState);
procedure PkgTreeViewDblClick(Sender: TObject); procedure PkgTreeViewDblClick(Sender: TObject);
procedure PkgTreeViewExpanding(Sender: TObject; Node: TTreeNode; procedure PkgTreeViewExpanding(Sender: TObject; Node: TTreeNode;
var AllowExpansion: Boolean); var AllowExpansion: Boolean);
@ -108,9 +108,9 @@ type
procedure UpdateTree; procedure UpdateTree;
procedure UpdateLvlGraph; procedure UpdateLvlGraph;
procedure UpdateInfo; procedure UpdateInfo;
procedure UpdatePackageName(Pkg: TLazPackage; const OldName: string); procedure UpdatePackageName({%H-}Pkg: TLazPackage; const {%H-}OldName: string);
procedure UpdatePackageID(Pkg: TLazPackage); procedure UpdatePackageID({%H-}Pkg: TLazPackage);
procedure UpdatePackageAdded(Pkg: TLazPackage); procedure UpdatePackageAdded({%H-}Pkg: TLazPackage);
procedure SelectPackage(Pkg: TLazPackage); procedure SelectPackage(Pkg: TLazPackage);
function FindLvlGraphNodeWithText(const s: string): TLvlGraphNode; function FindLvlGraphNodeWithText(const s: string): TLvlGraphNode;
procedure ShowPath(PathList: TFPList); procedure ShowPath(PathList: TFPList);

View File

@ -468,7 +468,8 @@ end;
procedure TPkgManager.IDEComponentPaletteEndUpdate(Sender: TObject; procedure TPkgManager.IDEComponentPaletteEndUpdate(Sender: TObject;
PaletteChanged: boolean); PaletteChanged: boolean);
begin begin
UpdateVisibleComponentPalette; if PaletteChanged then
UpdateVisibleComponentPalette;
end; end;
procedure TPkgManager.IDEComponentPaletteOpenPackage(Sender: TObject); procedure TPkgManager.IDEComponentPaletteOpenPackage(Sender: TObject);