From 679614a73b521e926469432c2b5ef3e2e543d8a9 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 10 Mar 2015 15:22:25 +0000 Subject: [PATCH] IDE: checked compiler warnings, clean up git-svn-id: trunk@48226 - --- ide/encloseselectiondlg.pas | 15 ++++++++------- ide/sourceeditor.pp | 18 +++++++++++------- ide/sourcemarks.pas | 8 ++++---- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/ide/encloseselectiondlg.pas b/ide/encloseselectiondlg.pas index e3a5a5b4f5..b3dd317cf7 100644 --- a/ide/encloseselectiondlg.pas +++ b/ide/encloseselectiondlg.pas @@ -67,11 +67,11 @@ function ShowEncloseSelectionDialog(var TheType: TEncloseSelectionType function EncloseSelectionTypeDescription(TheType: TEncloseSelectionType ): string; procedure GetEncloseSelectionParams(TheType: TEncloseSelectionType; - var Template: string); + out Template: string); procedure EncloseTextSelection(const Template: string; Source: TStrings; SelectionStart, SelectionEnd: TPoint; Indent: integer; - var NewSelection: string; var NewCursor: TPoint); + out NewSelection: string; out NewCursor: TPoint); implementation @@ -106,8 +106,8 @@ begin TheDialog.Free; end; -procedure GetEncloseSelectionParams(TheType: TEncloseSelectionType; - var Template: string); +procedure GetEncloseSelectionParams(TheType: TEncloseSelectionType; out + Template: string); begin case TheType of estTryFinally: @@ -160,9 +160,8 @@ begin end; procedure EncloseTextSelection(const Template: string; Source: TStrings; - SelectionStart, SelectionEnd: TPoint; - Indent: integer; - var NewSelection: string; var NewCursor: TPoint); + SelectionStart, SelectionEnd: TPoint; Indent: integer; out + NewSelection: string; out NewCursor: TPoint); var TemplateLen: Integer; TemplatePos: Integer; @@ -334,6 +333,8 @@ var begin //debugln(['EncloseTextSelection A ',SelectionStart.X,',',SelectionStart.Y,'-',SelectionEnd.X,',',SelectionEnd.Y,' indent=',Indent,' Template="',Template,'"']); + NewSelection:=''; + NewCursor:=Point(0,0); CutLastLineBreak:=true; if (SelectionEnd.X=1) and (SelectionEnd.Y>SelectionStart.Y) then begin CutLastLineBreak:=false; diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp index 05510088f4..29ae1cf686 100644 --- a/ide/sourceeditor.pp +++ b/ide/sourceeditor.pp @@ -703,10 +703,10 @@ type procedure NotebookMouseDown(Sender: TObject; Button: TMouseButton; {%H-}Shift: TShiftState; X,Y: Integer); - procedure NotebookDragTabMove(Sender, Source: TObject; + procedure NotebookDragDropEx(Sender, Source: TObject; OldIndex, NewIndex: Integer; CopyDrag: Boolean; var Done: Boolean); - procedure NotebookCanDragTabMove(Sender, Source: TObject; + procedure NotebookDragOverEx(Sender, Source: TObject; OldIndex, NewIndex: Integer; CopyDrag: Boolean; var Accept: Boolean); procedure NotebookDragOver(Sender, Source: TObject; @@ -5788,8 +5788,8 @@ Begin OnCloseTabClicked := @CloseTabClicked; OnMouseDown:=@NotebookMouseDown; TabDragMode := dmAutomatic; - OnTabDragOverEx := @NotebookCanDragTabMove; - OnTabDragDropEx := @NotebookDragTabMove; + OnTabDragOverEx := @NotebookDragOverEx; + OnTabDragDropEx := @NotebookDragDropEx; OnTabDragOver := @NotebookDragOver; OnTabEndDrag := @NotebookEndDrag; ShowHint:=true; @@ -6261,6 +6261,7 @@ begin i := 0; while i < Manager.SourceEditorCount do begin se:=Manager.SourceEditors[i]; + BookMarkX:=0; BookMarkY:=0; if se.EditorComponent.GetBookMark(BookMarkID,BookMarkX,BookMarkY) then begin MarkDesc:=MarkDesc+': '+se.PageName+' ('+IntToStr(BookMarkY)+','+IntToStr(BookMarkX)+')'; @@ -7875,7 +7876,7 @@ begin end; end; -procedure TSourceNotebook.NotebookDragTabMove(Sender, Source: TObject; OldIndex, +procedure TSourceNotebook.NotebookDragDropEx(Sender, Source: TObject; OldIndex, NewIndex: Integer; CopyDrag: Boolean; var Done: Boolean); function SourceIndex: Integer; begin @@ -7907,7 +7908,7 @@ begin Done := True; end; -procedure TSourceNotebook.NotebookCanDragTabMove(Sender, Source: TObject; +procedure TSourceNotebook.NotebookDragOverEx(Sender, Source: TObject; OldIndex, NewIndex: Integer; CopyDrag: Boolean; var Accept: Boolean); function SourceIndex: Integer; @@ -7938,6 +7939,7 @@ end; procedure TSourceNotebook.NotebookDragOver(Sender, Source: TObject; X, Y: Integer; State: TDragState; var Accept: Boolean); begin + if Accept=true then ; // set by NotebookDragOverEx FUpdateTabAndPageTimer.Enabled := False; if State = dsDragLeave then FUpdateTabAndPageTimer.Enabled := True @@ -10040,6 +10042,7 @@ end; procedure TSourceEditorManager.OnCodeTemplateTokenNotFound(Sender: TObject; AToken: string; AnEditor: TCustomSynEdit; var Index: integer); begin + if Index=0 then ; //debugln('TSourceNotebook.OnCodeTemplateTokenNotFound ',AToken,',',AnEditor.ReadOnly,',',DefaultCompletionForm.CurrentCompletionType=ctNone); if (AnEditor.ReadOnly=false) and (DefaultCompletionForm.CurrentCompletionType=ctNone) @@ -10047,7 +10050,8 @@ begin DefaultCompletionForm.CurrentCompletionType:=ctTemplateCompletion; DefaultCompletionForm.Editor:=AnEditor; DefaultCompletionForm.Execute - (AToken, GetScreenRectForToken(AnEditor, AnEditor.CaretX-length(AToken), AnEditor.CaretY, AnEditor.CaretX-1)); + (AToken, GetScreenRectForToken(AnEditor, AnEditor.CaretX-length(AToken), + AnEditor.CaretY, AnEditor.CaretX-1)); end; end; diff --git a/ide/sourcemarks.pas b/ide/sourcemarks.pas index 5c93bf3917..ee7d9a5fbf 100644 --- a/ide/sourcemarks.pas +++ b/ide/sourcemarks.pas @@ -223,7 +223,7 @@ type function FindBreakPointMark(ASrcEdit: TSourceEditorBase; ALine: integer): TSourceMark; procedure GetMarksForLine(ASrcEdit: TSourceEditorBase; ALine: integer; - var Marks: PSourceMark; var MarkCount: integer); + out Marks: PSourceMark; out MarkCount: integer); public property ImgList: TImageList read FImgList write FImgList; property Items[Index: integer]: TSourceMark read GetItems; default; @@ -753,7 +753,7 @@ begin end; procedure TSourceMarks.GetMarksForLine(ASrcEdit: TSourceEditorBase; - ALine: integer; var Marks: PSourceMark; var MarkCount: integer); + ALine: integer; out Marks: PSourceMark; out MarkCount: integer); var i, Capacity: integer; AVLNode: TAVLTreeNode; @@ -762,13 +762,13 @@ var HasChange: Boolean; SrcEditorID: TSourceEditorSharedValuesBase; begin + MarkCount := 0; + Marks := nil; SrcEditorID := ASrcEdit.GetSharedValues; if SrcEditorID = nil then exit; Capacity := 0; - MarkCount := 0; - Marks := nil; EditorIDAndLine.EditorID := SrcEditorID; EditorIDAndLine.Line := ALine; AVLNode := FindFirstMarkNode(EditorIDAndLine.EditorID, ALine);