From 80a51806914ad300a1a4781d8e8d47896dc42c75 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 1 Apr 2011 22:17:51 +0000 Subject: [PATCH] SynEdit: removed deprecated methods git-svn-id: trunk@30121 - --- components/synedit/synedit.pp | 34 --------- components/synedit/synedithighlighter.pp | 4 +- components/synedit/syneditlines.pas | 17 ----- components/synedit/syneditmarks.pp | 90 ----------------------- components/synedit/test/testbookmarks.pas | 33 ++++----- 5 files changed, 18 insertions(+), 160 deletions(-) diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp index 5240aa1e3e..590bbdfe6d 100644 --- a/components/synedit/synedit.pp +++ b/components/synedit/synedit.pp @@ -348,7 +348,6 @@ type FInternalBlockSelection: TSynEditSelection; FOnChangeUpdating: TChangeUpdatingEvent; FMouseSelectionMode: TSynSelectionMode; - fCtrlMouseActive: boolean; // deprecated since 0.9.29 fMarkupManager : TSynEditMarkupManager; fMarkupHighAll : TSynEditMarkupHighlightAll; fMarkupHighCaret : TSynEditMarkupHighlightAllCaret; @@ -463,14 +462,11 @@ type function GetChangeStamp: int64; function GetDefSelectionMode: TSynSelectionMode; function GetFoldState: String; - function GetGutterWidth: Integer; deprecated; // deprecated in 0.9.29 (08/2010) function GetModified: Boolean; function GetPaintLockOwner: TSynEditBase; function GetPlugin(Index: Integer): TSynEditPlugin; function GetTextBetweenPoints(aStartPoint, aEndPoint: TPoint): String; - function GetDividerDrawLevel: Integer; deprecated; procedure SetDefSelectionMode(const AValue: TSynSelectionMode); - procedure SetDividerDrawLevel(const AValue: Integer); deprecated; procedure SetFoldState(const AValue: String); procedure SetMouseActions(const AValue: TSynEditMouseActions); procedure SetMouseSelActions(const AValue: TSynEditMouseActions); @@ -841,7 +837,6 @@ type procedure SelectAll; Procedure SetHighlightSearch(const ASearch: String; AOptions: TSynSearchOptions); procedure SelectToBrace; - procedure SetSelWord; deprecated; procedure SelectWord; procedure SelectLine(WithLeadSpaces: Boolean = True); procedure SelectParagraph; @@ -872,14 +867,10 @@ type property Color default clWhite; property Beautifier: TSynCustomBeautifier read fBeautifier write SetBeautifier; {$IFDEF SYN_LAZARUS} - property CtrlMouseActive: boolean read fCtrlMouseActive; deprecated; // deprecated in 0.9.29 - {$ENDIF} - {$IFDEF SYN_LAZARUS} property SelStart: Integer read GetSelStart write SetSelStart; property SelEnd: Integer read GetSelEnd write SetSelEnd; property UseIncrementalColor : Boolean write SetUseIncrementalColor; {$ENDIF} - property GutterWidth: Integer read GetGutterWidth; deprecated; // deprecated in 0.9.29 (08/2010) property Highlighter: TSynCustomHighlighter read fHighlighter write SetHighlighter; property LeftChar: Integer read fLeftChar write SetLeftChar; @@ -972,9 +963,6 @@ type read GetDefSelectionMode write SetDefSelectionMode default smNormal; property SelectionMode: TSynSelectionMode read GetSelectionMode write SetSelectionMode default smNormal; - // See Highlighter for new methods - property CFDividerDrawLevel: Integer - read GetDividerDrawLevel write SetDividerDrawLevel; deprecated; property TabWidth: integer read fTabWidth write SetTabWidth default 8; property WantTabs: boolean read fWantTabs write SetWantTabs default FALSE; property OnChange: TNotifyEvent read FOnChange write FOnChange; @@ -1412,11 +1400,6 @@ begin Result := FFoldedLinesView.GetFoldDescription(0, 0, -1, -1, True); end; -function TCustomSynEdit.GetGutterWidth: Integer; -begin - Result := FLeftGutter.Width; -end; - function TCustomSynEdit.GetModified: Boolean; begin Result := TSynEditStringList(FLines).Modified; @@ -1440,11 +1423,6 @@ begin Result := FInternalBlockSelection.SelText; end; -function TCustomSynEdit.GetDividerDrawLevel: Integer; -begin - Result := fHighlighter.DrawDividerLevel; -end; - procedure TCustomSynEdit.SetDefSelectionMode(const AValue: TSynSelectionMode); begin FBlockSelection.SelectionMode := AValue; // Includes active @@ -4115,11 +4093,6 @@ begin FindMatchingBracket(CaretXY,true,true,true,false); end; -procedure TCustomSynEdit.SetSelWord; -begin - SelectWord; -end; - procedure TCustomSynEdit.SelectWord; begin SetWordBlock(LogicalCaretXY); @@ -5256,13 +5229,6 @@ begin end; end; -procedure TCustomSynEdit.SetDividerDrawLevel(const AValue: Integer); -begin - if assigned(fHighlighter) then - fHighlighter.DrawDividerLevel := AValue; - Invalidate; -end; - procedure TCustomSynEdit.SetFoldState(const AValue: String); begin if assigned(fHighlighter) then begin diff --git a/components/synedit/synedithighlighter.pp b/components/synedit/synedithighlighter.pp index d4d691b871..efcc2e05c0 100644 --- a/components/synedit/synedithighlighter.pp +++ b/components/synedit/synedithighlighter.pp @@ -241,7 +241,7 @@ type fWordBreakChars: TSynIdentChars; FIsScanning: Boolean; function GetKnownRanges(Index: Integer): TSynHighlighterRangeList; - procedure SetDrawDividerLevel(const AValue: Integer); + procedure SetDrawDividerLevel(const AValue: Integer); deprecated; procedure SetEnabled(const Value: boolean); //DDH 2001-10-23 protected FAttributeChangeNeedScan: Boolean; @@ -312,7 +312,7 @@ type property DrawDivider[Index: integer]: TSynDividerDrawConfigSetting read GetDrawDivider; - property DrawDividerLevel: Integer read FDrawDividerLevel write SetDrawDividerLevel; + property DrawDividerLevel: Integer read FDrawDividerLevel write SetDrawDividerLevel; deprecated; public property CurrentLines: TSynEditStringsBase read FCurrentLines write SetCurrentLines; diff --git a/components/synedit/syneditlines.pas b/components/synedit/syneditlines.pas index af18eb6fa2..fb1e98bc2a 100644 --- a/components/synedit/syneditlines.pas +++ b/components/synedit/syneditlines.pas @@ -57,9 +57,7 @@ type FLineEndType: TSynLinesFileLineEndType; FTextBuffer: TSynEditStringList; FOnSaved: TSavedNotification; - function GetDosFileFormat: boolean; function GetTextChangeStamp: int64; - procedure SetDosFileFormat(const AValue: boolean); protected function Get(Index: integer): string; override; function GetCapacity: integer; @@ -81,8 +79,6 @@ type procedure Assign(Source: TPersistent); override; procedure LoadFromFile(const FileName: string); override; procedure SaveToFile(const FileName: string); override; - property DosFileFormat: boolean read GetDosFileFormat write SetDosFileFormat; - deprecated {$IFDEF VER2_5}'use FileLineEndType and FileWriteLineEndType / to be removed'{$ENDIF}; property FileLineEndType: TSynLinesFileLineEndType read FFileLineEndType; property FileWriteLineEndType: TSynLinesFileLineEndType read FFileWriteLineEndType write FFileWriteLineEndType; @@ -317,19 +313,6 @@ begin Result:=FTextBuffer.TextChangeStamp; end; -function TSynEditLines.GetDosFileFormat: boolean; -begin - Result := FLineEndType = sfleCrLf; -end; - -procedure TSynEditLines.SetDosFileFormat(const AValue: boolean); -begin - if AValue then - FLineEndType := sfleCrLf - else - FLineEndType := sfleSystem; -end; - function TSynEditLines.Get(Index: integer): string; begin Result := FTextBuffer[Index]; diff --git a/components/synedit/syneditmarks.pp b/components/synedit/syneditmarks.pp index a476f2aa6f..9a8f7ce370 100644 --- a/components/synedit/syneditmarks.pp +++ b/components/synedit/syneditmarks.pp @@ -7,11 +7,6 @@ interface uses Classes, Controls, SysUtils, math, SynEditMiscClasses, SynEditTextBase, LCLProc; -const -// Max number of book/gutter marks returned from GetEditMarksForLine - that -// really should be enough. - maxMarks = 16;// deprecated; - type TSynEditMark = class; @@ -44,8 +39,6 @@ type end; - TSynEditMarks = array[1..maxMarks] of TSynEditMark deprecated; - { TSynEditMark } TSynEditMark = class @@ -252,18 +245,11 @@ type function Add(Item: TSynEditMark): Integer; - procedure Insert(Index: Integer; Item: TSynEditMark); deprecated {$IFDEF VER2_5}'List is always sorted, use ADD / to be removed after 0.9.30'{$ENDIF}; procedure Delete(Index: Integer); function Remove(Item: TSynEditMark): Integer; function IndexOf(Item: TSynEditMark): Integer; function Count: Integer; - function First: TSynEditMark; deprecated {$IFDEF VER2_5}'to be removed after 0.9.30'{$ENDIF}; - function Last: TSynEditMark; deprecated {$IFDEF VER2_5}'to be removed after 0.9.30'{$ENDIF}; - procedure Place(Mark: TSynEditMark); deprecated {$IFDEF VER2_5}'use add instead / to be removed after 0.9.30'{$ENDIF}; - - procedure GetMarksForLine(line: integer; BookmarksFirst: Boolean; var Marks: TSynEditMarks); - deprecated {$IFDEF VER2_5}'use property Line'{$ENDIF}; procedure ClearLine(line: integer); procedure RegisterChangeHandler(Handler: TSynEditMarkChangeEvent; Filter: TSynEditMarkChangeReasons); @@ -319,31 +305,6 @@ begin Result := Mark2.Column - Mark1.Column; end; -procedure SortMarks(var Marks: TSynEditMarks; Compare: TListSortCompare); -var - i, j, LastMark: Integer; - P: Pointer; -begin - for i := Low(Marks) to High(Marks) do - if Marks[i] = nil then - begin - LastMark := i - 1; - break; - end; - // insert sort is the best for our items count - for i := Low(Marks) + 1 to LastMark do - begin - P := Marks[i]; - j := i - 1; - while (j >= Low(Marks)) and (Compare(P, Marks[j]) < 1) do - begin - Marks[j + 1] := Marks[j]; - j := j - 1; - end; - Marks[j + 1] := TSynEditMark(P); - end; -end; - { TSynEditMark } procedure TSynEditMark.SetPriority(const AValue: integer); @@ -1054,35 +1015,6 @@ end; //Returns up to maxMarks book/gutter marks for a chosen line. -procedure TSynEditMarkList.GetMarksForLine(line: integer; BookmarksFirst: Boolean; - var marks: TSynEditMarks); -var - cnt: integer; - i: integer; - l: TSynEditMarkLine; -begin - FillChar(marks, SizeOf(marks), 0); - cnt := 0; - l := FMarkLines.Lines[line]; - if l = nil then - exit; - for i := 0 to l.Count - 1 do - begin - Inc(cnt); - marks[cnt] := l.Items[i]; - if cnt = maxMarks then break; - end; - if BookmarksFirst then - SortMarks(marks, @DoMarksCompareBookmarksFirst) - else - SortMarks(marks, @DoMarksCompareBookmarksLast); -end; - -procedure TSynEditMarkList.Insert(Index: Integer; Item: TSynEditMark); -begin - Add(Item); -end; - procedure TSynEditMarkList.Delete(Index: Integer); var Mrk: TSynEditMark; @@ -1093,20 +1025,6 @@ begin DoChange; end; -function TSynEditMarkList.Last: TSynEditMark; -begin - if Count > 0 then - Result := Items[Count - 1] - else - Result := nil; -end; - -procedure TSynEditMarkList.Place(mark: TSynEditMark); -begin - if assigned(mark) then - Add(mark); -end; - procedure TSynEditMarkList.Put(Index: Integer; Item: TSynEditMark); begin FMarkLines.Mark[Index] := Item; @@ -1213,14 +1131,6 @@ begin Result := FMarkLines.MarkCount; end; -function TSynEditMarkList.First: TSynEditMark; -begin - if Count > 0 then - Result := Items[0] - else - Result := nil; -end; - procedure TSynEditMarkList.RegisterChangeHandler(Handler: TSynEditMarkChangeEvent; Filter: TSynEditMarkChangeReasons); begin diff --git a/components/synedit/test/testbookmarks.pas b/components/synedit/test/testbookmarks.pas index 83ea9df16e..c615e1c4f5 100644 --- a/components/synedit/test/testbookmarks.pas +++ b/components/synedit/test/testbookmarks.pas @@ -71,7 +71,6 @@ end; procedure TTestBookMarks.TestMarks; var - mks: TSynEditMarks; m, m1, m2: TSynEditMark; begin ReCreateEdit; @@ -81,29 +80,29 @@ begin m := AddMark(3,2); CheckMarks('3/2', [ 3,2 ]); - SynEdit.Marks.GetMarksForLine(2, True, mks); Assert(mks[1] = nil, 'mfl2'); - SynEdit.Marks.GetMarksForLine(3, True, mks); Assert(mks[1] = m, 'mfl3'); + Assert(SynEdit.Marks.Line[2][1] = nil, 'mfl2'); + Assert(SynEdit.Marks.Line[3][1] = m, 'mfl3'); m1 := AddMark(5,2); CheckMarks('3/2 - 5/1', [ 3,2, 5,2 ]); - SynEdit.Marks.GetMarksForLine(1, True, mks); Assert(mks[1] = nil, 'mfl1 /2'); - SynEdit.Marks.GetMarksForLine(2, True, mks); Assert(mks[1] = nil, 'mfl2 /2'); - SynEdit.Marks.GetMarksForLine(3, True, mks); Assert(mks[1] = m, 'mfl3 /2'); Assert(mks[2] = nil, 'mfl3a /2'); - SynEdit.Marks.GetMarksForLine(4, True, mks); Assert(mks[1] = nil, 'mfl4 /2'); - SynEdit.Marks.GetMarksForLine(5, True, mks); Assert(mks[1] = m1, 'mfl5 /2'); Assert(mks[2] = nil, 'mfl5a /2'); - SynEdit.Marks.GetMarksForLine(6, True, mks); Assert(mks[1] = nil, 'mfl6 /2'); + Assert(SynEdit.Marks.Line[1][1] = nil, 'mfl1 /2'); + Assert(SynEdit.Marks.Line[2][1] = nil, 'mfl2 /2'); + Assert(SynEdit.Marks.Line[3][1] = m, 'mfl3 /2'); Assert(SynEdit.Marks.Line[3].Count = 1, 'mfl3a /2'); + Assert(SynEdit.Marks.Line[4][1] = nil, 'mfl4 /2'); + Assert(SynEdit.Marks.Line[5][1] = m1, 'mfl5 /2'); Assert(SynEdit.Marks.Line[5].Count = 1, 'mfl5a /2'); + Assert(SynEdit.Marks.Line[6][1] = nil, 'mfl6 /2'); m2 := AddMark(3,1); // colums are in order, in which they where added CheckMarks('3/1 - 3/2 - 5/1', [ 3,2, 3,1, 5,2 ]); - SynEdit.Marks.GetMarksForLine(1, True, mks); Assert(mks[1] = nil, 'mfl1 /3'); - SynEdit.Marks.GetMarksForLine(2, True, mks); Assert(mks[1] = nil, 'mfl2 /3'); - SynEdit.Marks.GetMarksForLine(3, True, mks); - Assert(mks[1] = m, 'mfl3 /3'); Assert(mks[2] = m2, 'mfl3 /3'); - Assert(mks[3] = nil, 'mfl3a /3'); - SynEdit.Marks.GetMarksForLine(4, True, mks); Assert(mks[1] = nil, 'mfl4 /3'); - SynEdit.Marks.GetMarksForLine(5, True, mks); Assert(mks[1] = m1, 'mfl5 /3'); Assert(mks[2] = nil, 'mfl5a /3'); - SynEdit.Marks.GetMarksForLine(6, True, mks); Assert(mks[1] = nil, 'mfl6 /3'); + Assert(SynEdit.Marks.Line[1][1] = nil, 'mfl1 /3'); + Assert(SynEdit.Marks.Line[2][1] = nil, 'mfl2 /3'); + Assert(SynEdit.Marks.Line[3][1] = m, 'mfl3 /3'); + Assert(SynEdit.Marks.Line[3][2] = m2, 'mfl3 /3'); + Assert(SynEdit.Marks.Line[3].Count = 2, 'mfl3a /3'); + Assert(SynEdit.Marks.Line[4][1] = nil, 'mfl4 /3'); + Assert(SynEdit.Marks.Line[5][1] = m1, 'mfl5 /3'); Assert(SynEdit.Marks.Line[5].Count = 1, 'mfl5a /3'); + Assert(SynEdit.Marks.Line[6][1] = nil, 'mfl6 /3'); // check movement