From 243682df334e5088fa43b45daa344adf425b97ee Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 12 Jun 2009 06:49:14 +0000 Subject: [PATCH] IDEIntf: changed some var to out git-svn-id: trunk@20589 - --- ide/idedefs.pas | 2 +- ide/main.pp | 23 +++++++++++++++++------ ide/mainbase.pas | 16 ++++++++-------- ide/mainintf.pas | 10 +++++----- ide/sourceeditor.pp | 26 +++++++++++++++++--------- 5 files changed, 48 insertions(+), 29 deletions(-) diff --git a/ide/idedefs.pas b/ide/idedefs.pas index c69c879e9e..93befcc363 100644 --- a/ide/idedefs.pas +++ b/ide/idedefs.pas @@ -53,7 +53,7 @@ type TIDEFileStateFlags = set of TIDEFileStateFlag; TGetIDEFileStateEvent = procedure(Sender: TObject; const Filename: string; - NeededFlags: TIDEFileStateFlags; var ResultFlags: TIDEFileStateFlags) + NeededFlags: TIDEFileStateFlags; out ResultFlags: TIDEFileStateFlags) of object; implementation diff --git a/ide/main.pp b/ide/main.pp index e12f3ebf48..d9d539a098 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -362,6 +362,9 @@ type Button: TMouseButton; Shift: TShiftstate; X, Y: Integer); procedure OnSrcNoteBookMouseLink( 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 OnSrcNotebookEditorVisibleChanged(Sender: TObject); procedure OnSrcNotebookEditorChanged(Sender: TObject); @@ -785,8 +788,8 @@ type DirectiveList: TStrings): TModalResult; // useful information methods - procedure GetCurrentUnit(var ActiveSourceEditor: TSourceEditor; - var ActiveUnitInfo: TUnitInfo); override; + procedure GetCurrentUnit(out ActiveSourceEditor: TSourceEditor; + out ActiveUnitInfo: TUnitInfo); override; procedure GetUnitWithPageIndex(PageIndex: integer; var ActiveSourceEditor: TSourceEditor; var ActiveUnitInfo: TUnitInfo); override; procedure GetDesignerUnit(ADesigner: TDesigner; @@ -917,7 +920,7 @@ type const MacroName: string; var s: string; const Data: PtrInt; var Handled, Abort: boolean); procedure GetIDEFileState(Sender: TObject; const AFilename: string; - NeededFlags: TIDEFileStateFlags; var ResultFlags: TIDEFileStateFlags); override; + NeededFlags: TIDEFileStateFlags; out ResultFlags: TIDEFileStateFlags); override; // search results function DoJumpToSearchResult(FocusEditor: boolean): boolean; @@ -1820,6 +1823,7 @@ begin SourceNotebook.OnCloseClicked := @OnSrcNotebookFileClose; SourceNotebook.OnClickLink := @OnSrcNoteBookClickLink; SourceNotebook.OnMouseLink := @OnSrcNoteBookMouseLink; + SourceNotebook.OnGetDesiredIndent := @OnSrcNoteBookGetDesiredIndent; SourceNotebook.OnCurrentCodeBufferChanged:=@OnSrcNotebookCurCodeBufferChanged; SourceNotebook.OnDeleteLastJumpPoint := @OnSrcNotebookDeleteLastJumPoint; SourceNotebook.OnEditorVisibleChanged := @OnSrcNotebookEditorVisibleChanged; @@ -10609,8 +10613,8 @@ end; //----------------------------------------------------------------------------- -procedure TMainIDE.GetCurrentUnit(var ActiveSourceEditor:TSourceEditor; - var ActiveUnitInfo:TUnitInfo); +procedure TMainIDE.GetCurrentUnit(out ActiveSourceEditor:TSourceEditor; + out ActiveUnitInfo:TUnitInfo); begin if SourceNoteBook.NoteBook=nil then begin ActiveSourceEditor:=nil; @@ -11173,7 +11177,7 @@ begin end; procedure TMainIDE.GetIDEFileState(Sender: TObject; const AFilename: string; - NeededFlags: TIDEFileStateFlags; var ResultFlags: TIDEFileStateFlags); + NeededFlags: TIDEFileStateFlags; out ResultFlags: TIDEFileStateFlags); var AnUnitInfo: TUnitInfo; begin @@ -13985,6 +13989,13 @@ begin ActiveUnitInfo.Source,X,Y,NewSource,NewX,NewY,NewTopLine); 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, NewPageIndex: integer); begin diff --git a/ide/mainbase.pas b/ide/mainbase.pas index 6d5574980f..08332b7d0e 100644 --- a/ide/mainbase.pas +++ b/ide/mainbase.pas @@ -135,13 +135,13 @@ type function GetMainBar: TComponent; override; procedure GetUnitInfoForDesigner(ADesigner: TIDesigner; - var ActiveSourceEditor: TSourceEditorInterface; - var ActiveUnitInfo: TUnitInfo); override; + out ActiveSourceEditor: TSourceEditorInterface; + out ActiveUnitInfo: TUnitInfo); override; - procedure GetCurrentUnitInfo(var ActiveSourceEditor: TSourceEditorInterface; - var ActiveUnitInfo: TUnitInfo); override; - procedure GetCurrentUnit(var ActiveSourceEditor: TSourceEditor; - var ActiveUnitInfo: TUnitInfo); virtual; abstract; + procedure GetCurrentUnitInfo(out ActiveSourceEditor: TSourceEditorInterface; + out ActiveUnitInfo: TUnitInfo); override; + procedure GetCurrentUnit(out ActiveSourceEditor: TSourceEditor; + out ActiveUnitInfo: TUnitInfo); virtual; abstract; procedure GetUnitWithPageIndex(PageIndex: integer; var ActiveSourceEditor: TSourceEditor; var ActiveUnitInfo: TUnitInfo); virtual; abstract; procedure GetDesignerUnit(ADesigner: TDesigner; @@ -258,7 +258,7 @@ begin end; procedure TMainIDEBase.GetUnitInfoForDesigner(ADesigner: TIDesigner; - var ActiveSourceEditor: TSourceEditorInterface; var ActiveUnitInfo: TUnitInfo + out ActiveSourceEditor: TSourceEditorInterface; out ActiveUnitInfo: TUnitInfo ); var SrcEdit: TSourceEditor; @@ -272,7 +272,7 @@ begin end; procedure TMainIDEBase.GetCurrentUnitInfo( - var ActiveSourceEditor: TSourceEditorInterface; var ActiveUnitInfo: TUnitInfo + out ActiveSourceEditor: TSourceEditorInterface; out ActiveUnitInfo: TUnitInfo ); var ASrcEdit: TSourceEditor; diff --git a/ide/mainintf.pas b/ide/mainintf.pas index cc7f10312f..56854268a8 100644 --- a/ide/mainintf.pas +++ b/ide/mainintf.pas @@ -134,17 +134,17 @@ type procedure HideIDE; virtual; abstract; procedure UnhideIDE; virtual; abstract; - procedure GetCurrentUnitInfo(var ActiveSourceEditor: TSourceEditorInterface; - var ActiveUnitInfo: TUnitInfo); virtual; abstract; + procedure GetCurrentUnitInfo(out ActiveSourceEditor: TSourceEditorInterface; + out ActiveUnitInfo: TUnitInfo); virtual; abstract; procedure GetUnitInfoForDesigner(ADesigner: TIDesigner; - var ActiveSourceEditor: TSourceEditorInterface; - var ActiveUnitInfo: TUnitInfo); virtual; abstract; + out ActiveSourceEditor: TSourceEditorInterface; + out ActiveUnitInfo: TUnitInfo); virtual; abstract; procedure DoCommand(EditorCommand: integer); virtual; abstract; procedure GetIDEFileState(Sender: TObject; const AFilename: string; NeededFlags: TIDEFileStateFlags; - var ResultFlags: TIDEFileStateFlags); virtual; abstract; + out ResultFlags: TIDEFileStateFlags); virtual; abstract; function DoInitProjectRun: TModalResult; virtual; abstract; function DoOpenMacroFile(Sender: TObject; diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp index 4c04c90fe5..abcb92e728 100644 --- a/ide/sourceeditor.pp +++ b/ide/sourceeditor.pp @@ -105,6 +105,12 @@ type TSourceEditor is the class that controls access for the 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 = class(TSourceEditorInterface) @@ -117,7 +123,7 @@ type FCodeTemplates: TSynEditAutoComplete; FHasExecutionMarks: Boolean; FMarksRequested: Boolean; - FOnGetDesiredIndent: TSynBeautifierGetIndentEvent; + FOnGetDesiredIndent: TOnGetIndentEvent; FPageName: string; FCodeBuffer: TCodeBuffer; @@ -386,7 +392,7 @@ type property OnMouseLink: TSynMouseLinkEvent read FOnMouseLink write FOnMouseLink; property OnMouseWheel: TMouseWheelEvent read FOnMouseWheel write FOnMouseWheel; property OnKeyDown: TKeyEvent read FOnKeyDown write FOnKeyDown; - property OnGetDesiredIndent: TSynBeautifierGetIndentEvent + property OnGetDesiredIndent: TOnGetIndentEvent read FOnGetDesiredIndent write FOnGetDesiredIndent; property Owner: TComponent read FAOwner; property PageName: string read FPageName write SetPageName; @@ -538,7 +544,7 @@ type FActiveEditKeyBGColor: TColor; FActiveEditSymbolFGColor: TColor; FActiveEditSymbolBGColor: TColor; - FOnGetDesiredIndent: TSynBeautifierGetIndentEvent; + FOnGetDesiredIndent: TOnGetIndentEvent; // PopupMenu procedure BuildPopupMenu; @@ -602,7 +608,8 @@ type Shift: TShiftstate; X,Y: Integer); procedure EditorMouseLink( 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); procedure EditorKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure EditorMouseWheel(Sender: TObject; Shift: TShiftState; @@ -789,7 +796,7 @@ type read FOnCloseClicked write FOnCloseClicked; property OnClickLink: TMouseEvent read FOnClickLink write FOnClickLink; property OnMouseLink: TSynMouseLinkEvent read FOnMouseLink write FOnMouseLink; - property OnGetDesiredIndent: TSynBeautifierGetIndentEvent + property OnGetDesiredIndent: TOnGetIndentEvent read FOnGetDesiredIndent write FOnGetDesiredIndent; property OnDeleteLastJumpPoint: TNotifyEvent read FOnDeleteLastJumpPoint write FOnDeleteLastJumpPoint; @@ -3008,7 +3015,7 @@ procedure TSourceEditor.EditorGetIndent(Sender: TObject; LogCaret: TPoint; Line: Integer; var Indent, BasedLine: Integer; var ReplaceIndent: Boolean); begin if Assigned(OnGetDesiredIndent) then - OnGetDesiredIndent(Sender, LogCaret, Line, Indent, BasedLine, ReplaceIndent); + OnGetDesiredIndent(Sender, Self, LogCaret, Line, Indent, BasedLine, ReplaceIndent); end; Function TSourceEditor.GetCaretPosFromCursorPos(const CursorPos: TPoint): TPoint; @@ -6692,11 +6699,12 @@ begin OnMouseLink(Sender, X, Y, AllowMouseLink); end; -procedure TSourceNotebook.EditorGetIndent(Sender: TObject; LogCaret: TPoint; Line: Integer; - var Indent, BasedLine: Integer; var ReplaceIndent: Boolean); +procedure TSourceNotebook.EditorGetIndent(Sender: TObject; + SrcEditor: TSourceEditor; LogCaret: TPoint; Line: Integer; var Indent, + BasedLine: Integer; var ReplaceIndent: Boolean); begin if Assigned(OnGetDesiredIndent) then - OnGetDesiredIndent(Sender, LogCaret, Line, Indent, BasedLine, ReplaceIndent); + OnGetDesiredIndent(Sender, SrcEditor, LogCaret, Line, Indent, BasedLine, ReplaceIndent); end; Procedure TSourceNotebook.HintTimer(sender: TObject);