paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-29 05:02:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDEIntf: changed some var to out

Browse Source 
git-svn-id: trunk@20589 -
This commit is contained in:
mattias 2009-06-12 06:49:14 +00:00
parent 65291945c8
commit 243682df33
5 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/idedefs.pas
View File

@ -53,7 +53,7 @@ type
TIDEFileStateFlags = set of TIDEFileStateFlag; TIDEFileStateFlags = set of TIDEFileStateFlag;
TGetIDEFileStateEvent = procedure(Sender: TObject; const Filename: string; TGetIDEFileStateEvent = procedure(Sender: TObject; const Filename: string;
NeededFlags: TIDEFileStateFlags; var ResultFlags: TIDEFileStateFlags) NeededFlags: TIDEFileStateFlags; out ResultFlags: TIDEFileStateFlags)
of object; of object;
implementation implementation

23
ide/main.pp
View File

@ -362,6 +362,9 @@ type
Button: TMouseButton; Shift: TShiftstate; X, Y: Integer); Button: TMouseButton; Shift: TShiftstate; X, Y: Integer);
procedure OnSrcNoteBookMouseLink( procedure OnSrcNoteBookMouseLink(
Sender: TObject; X, Y: Integer; var AllowMouseLink: Boolean); Sender: TObject; X, Y: Integer; var AllowMouseLink: Boolean);
procedure OnSrcNoteBookGetDesiredIndent(Sender: TObject; SrcEditor: TSourceEditor;
LogCaret: TPoint; Line: Integer; var Indent, BasedLine: Integer;
var ReplaceIndent: Boolean);
procedure OnSrcNotebookDeleteLastJumPoint(Sender: TObject); procedure OnSrcNotebookDeleteLastJumPoint(Sender: TObject);
procedure OnSrcNotebookEditorVisibleChanged(Sender: TObject); procedure OnSrcNotebookEditorVisibleChanged(Sender: TObject);
procedure OnSrcNotebookEditorChanged(Sender: TObject); procedure OnSrcNotebookEditorChanged(Sender: TObject);
@ -785,8 +788,8 @@ type
DirectiveList: TStrings): TModalResult; DirectiveList: TStrings): TModalResult;
// useful information methods // useful information methods
procedure GetCurrentUnit(var ActiveSourceEditor: TSourceEditor; procedure GetCurrentUnit(out ActiveSourceEditor: TSourceEditor;
var ActiveUnitInfo: TUnitInfo); override; out ActiveUnitInfo: TUnitInfo); override;
procedure GetUnitWithPageIndex(PageIndex: integer; procedure GetUnitWithPageIndex(PageIndex: integer;
var ActiveSourceEditor: TSourceEditor; var ActiveUnitInfo: TUnitInfo); override; var ActiveSourceEditor: TSourceEditor; var ActiveUnitInfo: TUnitInfo); override;
procedure GetDesignerUnit(ADesigner: TDesigner; procedure GetDesignerUnit(ADesigner: TDesigner;
@ -917,7 +920,7 @@ type
const MacroName: string; var s: string; const MacroName: string; var s: string;
const Data: PtrInt; var Handled, Abort: boolean); const Data: PtrInt; var Handled, Abort: boolean);
procedure GetIDEFileState(Sender: TObject; const AFilename: string; procedure GetIDEFileState(Sender: TObject; const AFilename: string;
NeededFlags: TIDEFileStateFlags; var ResultFlags: TIDEFileStateFlags); override; NeededFlags: TIDEFileStateFlags; out ResultFlags: TIDEFileStateFlags); override;
// search results // search results
function DoJumpToSearchResult(FocusEditor: boolean): boolean; function DoJumpToSearchResult(FocusEditor: boolean): boolean;
@ -1820,6 +1823,7 @@ begin
SourceNotebook.OnCloseClicked := @OnSrcNotebookFileClose; SourceNotebook.OnCloseClicked := @OnSrcNotebookFileClose;
SourceNotebook.OnClickLink := @OnSrcNoteBookClickLink; SourceNotebook.OnClickLink := @OnSrcNoteBookClickLink;
SourceNotebook.OnMouseLink := @OnSrcNoteBookMouseLink; SourceNotebook.OnMouseLink := @OnSrcNoteBookMouseLink;
SourceNotebook.OnGetDesiredIndent := @OnSrcNoteBookGetDesiredIndent;
SourceNotebook.OnCurrentCodeBufferChanged:=@OnSrcNotebookCurCodeBufferChanged; SourceNotebook.OnCurrentCodeBufferChanged:=@OnSrcNotebookCurCodeBufferChanged;
SourceNotebook.OnDeleteLastJumpPoint := @OnSrcNotebookDeleteLastJumPoint; SourceNotebook.OnDeleteLastJumpPoint := @OnSrcNotebookDeleteLastJumPoint;
SourceNotebook.OnEditorVisibleChanged := @OnSrcNotebookEditorVisibleChanged; SourceNotebook.OnEditorVisibleChanged := @OnSrcNotebookEditorVisibleChanged;
@ -10609,8 +10613,8 @@ end;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
procedure TMainIDE.GetCurrentUnit(var ActiveSourceEditor:TSourceEditor; procedure TMainIDE.GetCurrentUnit(out ActiveSourceEditor:TSourceEditor;
var ActiveUnitInfo:TUnitInfo); out ActiveUnitInfo:TUnitInfo);
begin begin
if SourceNoteBook.NoteBook=nil then begin if SourceNoteBook.NoteBook=nil then begin
ActiveSourceEditor:=nil; ActiveSourceEditor:=nil;
@ -11173,7 +11177,7 @@ begin
end; end;
procedure TMainIDE.GetIDEFileState(Sender: TObject; const AFilename: string; procedure TMainIDE.GetIDEFileState(Sender: TObject; const AFilename: string;
NeededFlags: TIDEFileStateFlags; var ResultFlags: TIDEFileStateFlags); NeededFlags: TIDEFileStateFlags; out ResultFlags: TIDEFileStateFlags);
var var
AnUnitInfo: TUnitInfo; AnUnitInfo: TUnitInfo;
begin begin
@ -13985,6 +13989,13 @@ begin
ActiveUnitInfo.Source,X,Y,NewSource,NewX,NewY,NewTopLine); ActiveUnitInfo.Source,X,Y,NewSource,NewX,NewY,NewTopLine);
end; end;
procedure TMainIDE.OnSrcNoteBookGetDesiredIndent(Sender: TObject;
SrcEditor: TSourceEditor; LogCaret: TPoint; Line: Integer; var Indent,
BasedLine: Integer; var ReplaceIndent: Boolean);
begin
// ToDo
end;
procedure TMainIDE.OnSrcNotebookMovingPage(Sender: TObject; OldPageIndex, procedure TMainIDE.OnSrcNotebookMovingPage(Sender: TObject; OldPageIndex,
NewPageIndex: integer); NewPageIndex: integer);
begin begin

16
ide/mainbase.pas
View File

@ -135,13 +135,13 @@ type
function GetMainBar: TComponent; override; function GetMainBar: TComponent; override;
procedure GetUnitInfoForDesigner(ADesigner: TIDesigner; procedure GetUnitInfoForDesigner(ADesigner: TIDesigner;
var ActiveSourceEditor: TSourceEditorInterface; out ActiveSourceEditor: TSourceEditorInterface;
var ActiveUnitInfo: TUnitInfo); override; out ActiveUnitInfo: TUnitInfo); override;
procedure GetCurrentUnitInfo(var ActiveSourceEditor: TSourceEditorInterface; procedure GetCurrentUnitInfo(out ActiveSourceEditor: TSourceEditorInterface;
var ActiveUnitInfo: TUnitInfo); override; out ActiveUnitInfo: TUnitInfo); override;
procedure GetCurrentUnit(var ActiveSourceEditor: TSourceEditor; procedure GetCurrentUnit(out ActiveSourceEditor: TSourceEditor;
var ActiveUnitInfo: TUnitInfo); virtual; abstract; out ActiveUnitInfo: TUnitInfo); virtual; abstract;
procedure GetUnitWithPageIndex(PageIndex: integer; procedure GetUnitWithPageIndex(PageIndex: integer;
var ActiveSourceEditor: TSourceEditor; var ActiveUnitInfo: TUnitInfo); virtual; abstract; var ActiveSourceEditor: TSourceEditor; var ActiveUnitInfo: TUnitInfo); virtual; abstract;
procedure GetDesignerUnit(ADesigner: TDesigner; procedure GetDesignerUnit(ADesigner: TDesigner;
@ -258,7 +258,7 @@ begin
end; end;
procedure TMainIDEBase.GetUnitInfoForDesigner(ADesigner: TIDesigner; procedure TMainIDEBase.GetUnitInfoForDesigner(ADesigner: TIDesigner;
var ActiveSourceEditor: TSourceEditorInterface; var ActiveUnitInfo: TUnitInfo out ActiveSourceEditor: TSourceEditorInterface; out ActiveUnitInfo: TUnitInfo
); );
var var
SrcEdit: TSourceEditor; SrcEdit: TSourceEditor;
@ -272,7 +272,7 @@ begin
end; end;
procedure TMainIDEBase.GetCurrentUnitInfo( procedure TMainIDEBase.GetCurrentUnitInfo(
var ActiveSourceEditor: TSourceEditorInterface; var ActiveUnitInfo: TUnitInfo out ActiveSourceEditor: TSourceEditorInterface; out ActiveUnitInfo: TUnitInfo
); );
var var
ASrcEdit: TSourceEditor; ASrcEdit: TSourceEditor;

10
ide/mainintf.pas
View File

@ -134,17 +134,17 @@ type
procedure HideIDE; virtual; abstract; procedure HideIDE; virtual; abstract;
procedure UnhideIDE; virtual; abstract; procedure UnhideIDE; virtual; abstract;
procedure GetCurrentUnitInfo(var ActiveSourceEditor: TSourceEditorInterface; procedure GetCurrentUnitInfo(out ActiveSourceEditor: TSourceEditorInterface;
var ActiveUnitInfo: TUnitInfo); virtual; abstract; out ActiveUnitInfo: TUnitInfo); virtual; abstract;
procedure GetUnitInfoForDesigner(ADesigner: TIDesigner; procedure GetUnitInfoForDesigner(ADesigner: TIDesigner;
var ActiveSourceEditor: TSourceEditorInterface; out ActiveSourceEditor: TSourceEditorInterface;
var ActiveUnitInfo: TUnitInfo); virtual; abstract; out ActiveUnitInfo: TUnitInfo); virtual; abstract;
procedure DoCommand(EditorCommand: integer); virtual; abstract; procedure DoCommand(EditorCommand: integer); virtual; abstract;
procedure GetIDEFileState(Sender: TObject; const AFilename: string; procedure GetIDEFileState(Sender: TObject; const AFilename: string;
NeededFlags: TIDEFileStateFlags; NeededFlags: TIDEFileStateFlags;
var ResultFlags: TIDEFileStateFlags); virtual; abstract; out ResultFlags: TIDEFileStateFlags); virtual; abstract;
function DoInitProjectRun: TModalResult; virtual; abstract; function DoInitProjectRun: TModalResult; virtual; abstract;
function DoOpenMacroFile(Sender: TObject; function DoOpenMacroFile(Sender: TObject;

26
ide/sourceeditor.pp
View File

@ -105,6 +105,12 @@ type
TSourceEditor is the class that controls access for the Editor. TSourceEditor is the class that controls access for the Editor.
---- TSource Editor ---} ---- TSource Editor ---}
TSourceEditor = class;
TOnGetIndentEvent = procedure(Sender: TObject; SrcEditor: TSourceEditor;
LogCaret: TPoint; Line: Integer;
var Indent, BasedLine: Integer; var ReplaceIndent: Boolean) of object;
{ TSourceEditor } { TSourceEditor }
TSourceEditor = class(TSourceEditorInterface) TSourceEditor = class(TSourceEditorInterface)
@ -117,7 +123,7 @@ type
FCodeTemplates: TSynEditAutoComplete; FCodeTemplates: TSynEditAutoComplete;
FHasExecutionMarks: Boolean; FHasExecutionMarks: Boolean;
FMarksRequested: Boolean; FMarksRequested: Boolean;
FOnGetDesiredIndent: TSynBeautifierGetIndentEvent; FOnGetDesiredIndent: TOnGetIndentEvent;
FPageName: string; FPageName: string;
FCodeBuffer: TCodeBuffer; FCodeBuffer: TCodeBuffer;
@ -386,7 +392,7 @@ type
property OnMouseLink: TSynMouseLinkEvent read FOnMouseLink write FOnMouseLink; property OnMouseLink: TSynMouseLinkEvent read FOnMouseLink write FOnMouseLink;
property OnMouseWheel: TMouseWheelEvent read FOnMouseWheel write FOnMouseWheel; property OnMouseWheel: TMouseWheelEvent read FOnMouseWheel write FOnMouseWheel;
property OnKeyDown: TKeyEvent read FOnKeyDown write FOnKeyDown; property OnKeyDown: TKeyEvent read FOnKeyDown write FOnKeyDown;
property OnGetDesiredIndent: TSynBeautifierGetIndentEvent property OnGetDesiredIndent: TOnGetIndentEvent
read FOnGetDesiredIndent write FOnGetDesiredIndent; read FOnGetDesiredIndent write FOnGetDesiredIndent;
property Owner: TComponent read FAOwner; property Owner: TComponent read FAOwner;
property PageName: string read FPageName write SetPageName; property PageName: string read FPageName write SetPageName;
@ -538,7 +544,7 @@ type
FActiveEditKeyBGColor: TColor; FActiveEditKeyBGColor: TColor;
FActiveEditSymbolFGColor: TColor; FActiveEditSymbolFGColor: TColor;
FActiveEditSymbolBGColor: TColor; FActiveEditSymbolBGColor: TColor;
FOnGetDesiredIndent: TSynBeautifierGetIndentEvent; FOnGetDesiredIndent: TOnGetIndentEvent;
// PopupMenu // PopupMenu
procedure BuildPopupMenu; procedure BuildPopupMenu;
@ -602,7 +608,8 @@ type
Shift: TShiftstate; X,Y: Integer); Shift: TShiftstate; X,Y: Integer);
procedure EditorMouseLink( procedure EditorMouseLink(
Sender: TObject; X,Y: Integer; var AllowMouseLink: Boolean); Sender: TObject; X,Y: Integer; var AllowMouseLink: Boolean);
procedure EditorGetIndent(Sender: TObject; LogCaret: TPoint; Line: Integer; procedure EditorGetIndent(Sender: TObject; SrcEditor: TSourceEditor;
LogCaret: TPoint; Line: Integer;
var Indent, BasedLine: Integer; var ReplaceIndent: Boolean); var Indent, BasedLine: Integer; var ReplaceIndent: Boolean);
procedure EditorKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure EditorKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure EditorMouseWheel(Sender: TObject; Shift: TShiftState; procedure EditorMouseWheel(Sender: TObject; Shift: TShiftState;
@ -789,7 +796,7 @@ type
read FOnCloseClicked write FOnCloseClicked; read FOnCloseClicked write FOnCloseClicked;
property OnClickLink: TMouseEvent read FOnClickLink write FOnClickLink; property OnClickLink: TMouseEvent read FOnClickLink write FOnClickLink;
property OnMouseLink: TSynMouseLinkEvent read FOnMouseLink write FOnMouseLink; property OnMouseLink: TSynMouseLinkEvent read FOnMouseLink write FOnMouseLink;
property OnGetDesiredIndent: TSynBeautifierGetIndentEvent property OnGetDesiredIndent: TOnGetIndentEvent
read FOnGetDesiredIndent write FOnGetDesiredIndent; read FOnGetDesiredIndent write FOnGetDesiredIndent;
property OnDeleteLastJumpPoint: TNotifyEvent property OnDeleteLastJumpPoint: TNotifyEvent
read FOnDeleteLastJumpPoint write FOnDeleteLastJumpPoint; read FOnDeleteLastJumpPoint write FOnDeleteLastJumpPoint;
@ -3008,7 +3015,7 @@ procedure TSourceEditor.EditorGetIndent(Sender: TObject; LogCaret: TPoint;
Line: Integer; var Indent, BasedLine: Integer; var ReplaceIndent: Boolean); Line: Integer; var Indent, BasedLine: Integer; var ReplaceIndent: Boolean);
begin begin
if Assigned(OnGetDesiredIndent) then if Assigned(OnGetDesiredIndent) then
OnGetDesiredIndent(Sender, LogCaret, Line, Indent, BasedLine, ReplaceIndent); OnGetDesiredIndent(Sender, Self, LogCaret, Line, Indent, BasedLine, ReplaceIndent);
end; end;
Function TSourceEditor.GetCaretPosFromCursorPos(const CursorPos: TPoint): TPoint; Function TSourceEditor.GetCaretPosFromCursorPos(const CursorPos: TPoint): TPoint;
@ -6692,11 +6699,12 @@ begin
OnMouseLink(Sender, X, Y, AllowMouseLink); OnMouseLink(Sender, X, Y, AllowMouseLink);
end; end;
procedure TSourceNotebook.EditorGetIndent(Sender: TObject; LogCaret: TPoint; Line: Integer; procedure TSourceNotebook.EditorGetIndent(Sender: TObject;
var Indent, BasedLine: Integer; var ReplaceIndent: Boolean); SrcEditor: TSourceEditor; LogCaret: TPoint; Line: Integer; var Indent,
BasedLine: Integer; var ReplaceIndent: Boolean);
begin begin
if Assigned(OnGetDesiredIndent) then if Assigned(OnGetDesiredIndent) then
OnGetDesiredIndent(Sender, LogCaret, Line, Indent, BasedLine, ReplaceIndent); OnGetDesiredIndent(Sender, SrcEditor, LogCaret, Line, Indent, BasedLine, ReplaceIndent);
end; end;
Procedure TSourceNotebook.HintTimer(sender: TObject); Procedure TSourceNotebook.HintTimer(sender: TObject);