diff --git a/debugger/breakpointsdlg.pp b/debugger/breakpointsdlg.pp index 060b67c268..4a502b827e 100644 --- a/debugger/breakpointsdlg.pp +++ b/debugger/breakpointsdlg.pp @@ -546,7 +546,7 @@ begin // line if ABreakpoint.Line > 0 - then AnItem.SubItems[1] := IntToStr(ABreakpoint.SourceLine) + then AnItem.SubItems[1] := IntToStr(ABreakpoint.Line) else AnItem.SubItems[1] := ''; // expression diff --git a/debugger/breakpropertydlg.pas b/debugger/breakpropertydlg.pas index f08a4197eb..a49a9c1903 100644 --- a/debugger/breakpropertydlg.pas +++ b/debugger/breakpropertydlg.pas @@ -122,7 +122,7 @@ begin edtFilename.text := FBreakpoint.Source; // line if FBreakpoint.Line > 0 - then edtLine.Text := IntToStr(FBreakpoint.SourceLine) + then edtLine.Text := IntToStr(FBreakpoint.Line) else edtLine.Text := ''; // expression edtCondition.Text := FBreakpoint.Expression; diff --git a/debugger/debugger.pp b/debugger/debugger.pp index 5255d23657..00e7d674b5 100644 --- a/debugger/debugger.pp +++ b/debugger/debugger.pp @@ -230,6 +230,8 @@ type property Expression: String read GetExpression write SetExpression; property HitCount: Integer read GetHitCount; property InitialEnabled: Boolean read FInitialEnabled write SetInitialEnabled; + // TDBGBreakPoint: Line is the line-number as stored in the debug info + // TIDEBreakPoint: Line is the location in the Source (potentially modified Source) property Line: Integer read GetLine; property Source: String read GetSource; property Valid: TValidState read GetValid; @@ -250,7 +252,6 @@ type procedure DoActionChange; virtual; procedure DoHit(const ACount: Integer; var AContinue: Boolean); override; procedure EnableGroups; - function GetSourceLine: Integer; virtual; procedure RemoveFromGroupList(const AGroup: TIDEBreakPointGroup; const AGroupList: TList); procedure ClearGroupList(const AGroupList: TList); @@ -280,9 +281,6 @@ type property AutoContinueTime: Cardinal read GetAutoContinueTime write SetAutoContinueTime; property Group: TIDEBreakPointGroup read GetGroup write SetGroup; property Loading: Boolean read FLoading; - property SourceLine: Integer read GetSourceLine; // the current line of this breakpoint in the source - // this may differ from the location set - // todo: move to manager ? end; TIDEBreakPointClass = class of TIDEBreakPoint; @@ -2183,11 +2181,6 @@ begin TIDEBreakPointGroup(FDisableGroupList[n]).Enabled := True; end; -function TIDEBreakPoint.GetSourceLine: Integer; -begin - Result := Line; -end; - function TIDEBreakPoint.GetActions: TIDEBreakPointActions; begin Result := FActions; diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas index 304e334d3f..f4b01e75c9 100644 --- a/ide/debugmanager.pas +++ b/ide/debugmanager.pas @@ -233,7 +233,6 @@ type public destructor Destroy; override; procedure ResetMaster; - function GetSourceLine: integer; override; procedure CopySourcePositionToBreakPoint; procedure SetLocation(const ASource: String; const ALine: Integer); override; property SourceMark: TSourceMark read FSourceMark write SetSourceMark; @@ -1138,14 +1137,6 @@ begin Changed; end; -function TManagedBreakPoint.GetSourceLine: integer; -begin - if FSourceMark<>nil then - Result:=FSourceMark.Line - else - Result:=inherited GetSourceLine; -end; - procedure TManagedBreakPoint.CopySourcePositionToBreakPoint; begin if FSourceMark=nil then exit;