paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-08 16:38:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Clean up / renames

Browse Source
This commit is contained in:
Martin 2022-08-24 23:00:52 +02:00
parent 55790d8f51
commit 836b9a1054
12 changed files with 66 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/lazdebuggers/lazdebuggerfp/fpdebugdebuggerworkthreads.pas
View File

@ -1178,10 +1178,10 @@ begin
WatchResConv.ExtraDepth := defExtraDepth in FWatchValue.EvaluateFlags;
WatchResConv.FirstIndexOffs := FWatchValue.FirstIndexOffs;
if not (defSkipValConv in AnEvalFlags) then begin
if (FWatchValue.GetFpDbgConverter <> nil) and
(FWatchValue.GetFpDbgConverter.GetConverter.GetObject is TFpDbgValueConverter)
if (FWatchValue.GetDbgValConverter <> nil) and
(FWatchValue.GetDbgValConverter.GetConverter.GetObject is TFpDbgValueConverter)
then
WatchResConv.ValConfig := FWatchValue.GetFpDbgConverter
WatchResConv.ValConfig := FWatchValue.GetDbgValConverter
else
WatchResConv.ValConvList := ValueConverterConfigList;
WatchResConv.Debugger := FDebugger;

2
components/lazdebuggers/lazdebuggerintf/lazdebuggerintf.pas
View File

@ -242,7 +242,7 @@ type
function GetDisplayFormat: TWatchDisplayFormat;
function GetEvaluateFlags: TWatcheEvaluateFlags;
function GetFpDbgConverter: TLazDbgValueConvertSelectorIntf;
function GetDbgValConverter: TLazDbgValueConvertSelectorIntf;
function GetExpression: String;
function GetFirstIndexOffs: Int64;
function GetRepeatCount: Integer;

1
components/lazdebuggers/lazdebuggerintf/lazdebuggervalueconverter.pas
View File

@ -35,7 +35,6 @@ type
procedure AddFreeNotification(ANotification: TNotifyEvent);
procedure RemoveFreeNotification(ANotification: TNotifyEvent);
function GetConverter: TLazDbgValueConverterIntf;
function GetBackendSpecificObject: TObject; deprecated;
function AllowedTypeNames: TStrings;
end;

4
components/lazdebuggers/lazdebugtestbase/ttestdebuggerclasses.pas
View File

@ -91,7 +91,7 @@ type
procedure RemoveNotification(AnEventType: TWatcheEvaluateEvent;
AnEvent: TNotifyEvent);
function ResData: TLzDbgWatchDataIntf;
function GetFpDbgConverter: TLazDbgValueConvertSelectorIntf;
function GetDbgValConverter: TLazDbgValueConvertSelectorIntf;
protected
procedure RequestData;
function GetTypeInfo: TDBGType; override;
@ -429,7 +429,7 @@ begin
Result := FCurrentResData;
end;
function TTestWatchValue.GetFpDbgConverter: TLazDbgValueConvertSelectorIntf;
function TTestWatchValue.GetDbgValConverter: TLazDbgValueConvertSelectorIntf;
begin
Result := nil;
end;

4
ide/packages/idedebugger/debugger.pp
View File

@ -762,7 +762,7 @@ type
procedure AddNotification(AnEventType: TWatcheEvaluateEvent; AnEvent: TNotifyEvent);
procedure RemoveNotification(AnEventType: TWatcheEvaluateEvent; AnEvent: TNotifyEvent);
function ResData: TLzDbgWatchDataIntf;
function GetFpDbgConverter: TLazDbgValueConvertSelectorIntf;
function GetDbgValConverter: TLazDbgValueConvertSelectorIntf;
private
FOnValidityChanged: TNotifyEvent;
FSnapShot: TIdeWatchValue;
@ -3997,7 +3997,7 @@ begin
Result := FCurrentResData;
end;
function TCurrentWatchValue.GetFpDbgConverter: TLazDbgValueConvertSelectorIntf;
function TCurrentWatchValue.GetDbgValConverter: TLazDbgValueConvertSelectorIntf;
begin
Result := FFpDbgConverter;
end;

16
ide/packages/idedebugger/frames/idedebugger_fpvalconv_options.lfm → ide/packages/idedebugger/frames/idedebugger_valconv_options.lfm
View File

@ -1,4 +1,4 @@
object IdeDbgFpValConvOptionsFrame: TIdeDbgFpValConvOptionsFrame
object IdeDbgValConvOptionsFrame: TIdeDbgValConvOptionsFrame
Left = 0
Height = 371
Top = 0
@ -8,7 +8,7 @@ object IdeDbgFpValConvOptionsFrame: TIdeDbgFpValConvOptionsFrame
TabOrder = 0
DesignLeft = 471
DesignTop = 200
inline FpDbgValConvFrame1: TFpDbgValConvFrame
inline DbgValConvFrame1: TIdeDbgValConvFrame
Height = 371
Width = 510
Align = alClient
@ -42,11 +42,17 @@ object IdeDbgFpValConvOptionsFrame: TIdeDbgFpValConvOptionsFrame
Width = 340
ClientHeight = 194
ClientWidth = 340
inherited lblName: TLabel
Width = 330
end
inherited EdName: TEdit
Width = 330
end
inherited lblTypeNames: TLabel
Width = 330
end
inherited memoTypeNames: TMemo
Height = 164
Height = 116
Width = 330
end
end
@ -54,5 +60,9 @@ object IdeDbgFpValConvOptionsFrame: TIdeDbgFpValConvOptionsFrame
inherited Splitter1: TSplitter
Width = 510
end
inherited pnlCurConvSetting: TPanel
Top = 371
Width = 510
end
end
end

32
ide/packages/idedebugger/frames/idedebugger_fpvalconv_options.pas → ide/packages/idedebugger/frames/idedebugger_valconv_options.pas
View File

@ -1,4 +1,4 @@
unit IdeDebugger_FpValConv_Options;
unit IdeDebugger_ValConv_Options;
{$mode objfpc}{$H+}
@ -7,15 +7,15 @@ interface
uses
Classes, SysUtils, Forms, Controls, IDEOptEditorIntf, IDEOptionsIntf,
FpDebugValueConvertors, IdeDebuggerStringConstants,
IdeFpDbgValueConverterSettingsFrame, IdeDebuggerOpts,
IdeDbgValueConverterSettingsFrame, IdeDebuggerOpts,
IdeDebuggerFpDbgValueConv;
type
{ TIdeDbgFpValConvOptionsFrame }
{ TIdeDbgValConvOptionsFrame }
TIdeDbgFpValConvOptionsFrame = class(TAbstractIDEOptionsEditor)
FpDbgValConvFrame1: TFpDbgValConvFrame;
TIdeDbgValConvOptionsFrame = class(TAbstractIDEOptionsEditor)
DbgValConvFrame1: TIdeDbgValConvFrame;
private
FValConvList: TIdeDbgValueConvertSelectorList;
public
@ -34,44 +34,44 @@ implementation
procedure Register;
begin
RegisterIDEOptionsEditor(GroupDebugger, TIdeDbgFpValConvOptionsFrame, DbgOptionsFpDbgOpts);
RegisterIDEOptionsEditor(GroupDebugger, TIdeDbgValConvOptionsFrame, DbgOptionsFpDbgOpts);
end;
{$R *.lfm}
{ TIdeDbgFpValConvOptionsFrame }
{ TIdeDbgValConvOptionsFrame }
destructor TIdeDbgFpValConvOptionsFrame.Destroy;
destructor TIdeDbgValConvOptionsFrame.Destroy;
begin
inherited Destroy;
FValConvList.Free;
end;
function TIdeDbgFpValConvOptionsFrame.GetTitle: String;
function TIdeDbgValConvOptionsFrame.GetTitle: String;
begin
Result := dlgFpConvOptFpDebugOptions;
end;
procedure TIdeDbgFpValConvOptionsFrame.Setup(
procedure TIdeDbgValConvOptionsFrame.Setup(
ADialog: TAbstractOptionsEditorDialog);
begin
FpDbgValConvFrame1.Setup;
DbgValConvFrame1.Setup;
end;
procedure TIdeDbgFpValConvOptionsFrame.ReadSettings(
procedure TIdeDbgValConvOptionsFrame.ReadSettings(
AOptions: TAbstractIDEOptions);
begin
if FValConvList = nil then
FValConvList := TIdeDbgValueConvertSelectorList.Create;
FValConvList.Assign(DebuggerOptions.FpDbgConverterConfig);
FValConvList.Changed := False;
FpDbgValConvFrame1.ValConvList := FValConvList;
DbgValConvFrame1.ValConvList := FValConvList;
end;
procedure TIdeDbgFpValConvOptionsFrame.WriteSettings(
procedure TIdeDbgValConvOptionsFrame.WriteSettings(
AOptions: TAbstractIDEOptions);
begin
FpDbgValConvFrame1.SaveCurrent;
DbgValConvFrame1.SaveCurrent;
if FValConvList.Changed then begin
DebuggerOptions.FpDbgConverterConfig.Assign(FValConvList);
DebuggerOptions.FpDbgConverterConfig.Changed := True;
@ -85,7 +85,7 @@ begin
end;
end;
class function TIdeDbgFpValConvOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;
class function TIdeDbgValConvOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;
begin
Result := TDebuggerOptions;
end;

2
ide/packages/idedebugger/idefpdbgvalueconvertersettingsframe.lfm → ide/packages/idedebugger/idedbgvalueconvertersettingsframe.lfm
View File

@ -1,4 +1,4 @@
object FpDbgValConvFrame: TFpDbgValConvFrame
object IdeDbgValConvFrame: TIdeDbgValConvFrame
Left = 0
Height = 519
Top = 0

40
ide/packages/idedebugger/idefpdbgvalueconvertersettingsframe.pas → ide/packages/idedebugger/idedbgvalueconvertersettingsframe.pas
View File

@ -1,4 +1,4 @@
unit IdeFpDbgValueConverterSettingsFrame;
unit IdeDbgValueConverterSettingsFrame;
{$mode objfpc}{$H+}
@ -11,9 +11,9 @@ uses
type
{ TFpDbgValConvFrame }
{ TIdeDbgValConvFrame }
TFpDbgValConvFrame = class(TFrame)
TIdeDbgValConvFrame = class(TFrame)
btnAdd: TButton;
btnRemove: TButton;
EdName: TEdit;
@ -64,9 +64,9 @@ implementation
{$R *.lfm}
{ TFpDbgValConvFrame }
{ TIdeDbgValConvFrame }
procedure TFpDbgValConvFrame.btnAddClick(Sender: TObject);
procedure TIdeDbgValConvFrame.btnAddClick(Sender: TObject);
var
AvailClass: TLazDbgValueConvertRegistry;
AName: String;
@ -92,7 +92,7 @@ begin
memoTypeNames.SetFocus;
end;
procedure TFpDbgValConvFrame.btnRemoveClick(Sender: TObject);
procedure TIdeDbgValConvFrame.btnRemoveClick(Sender: TObject);
var
i: Integer;
begin
@ -108,12 +108,12 @@ begin
lstConvertersClick(nil);
end;
procedure TFpDbgValConvFrame.dropActionChange(Sender: TObject);
procedure TIdeDbgValConvFrame.dropActionChange(Sender: TObject);
begin
UpdateConvForClass;
end;
procedure TFpDbgValConvFrame.lstConvertersClick(Sender: TObject);
procedure TIdeDbgValConvFrame.lstConvertersClick(Sender: TObject);
var
AvailClass: TLazDbgValueConvertRegistry;
begin
@ -141,7 +141,7 @@ begin
lstConvertersItemClick(nil, FCurIdx);
end;
procedure TFpDbgValConvFrame.lstConvertersItemClick(Sender: TObject; Index: integer);
procedure TIdeDbgValConvFrame.lstConvertersItemClick(Sender: TObject; Index: integer);
begin
if Index < 0 then
exit;
@ -157,20 +157,20 @@ begin
UpdateButtons;
end;
procedure TFpDbgValConvFrame.Splitter1CanOffset(Sender: TObject;
procedure TIdeDbgValConvFrame.Splitter1CanOffset(Sender: TObject;
var NewOffset: Integer; var Accept: Boolean);
begin
end;
procedure TFpDbgValConvFrame.SetCurConv(AValConv: TIdeDbgValueConvertSelector);
procedure TIdeDbgValConvFrame.SetCurConv(AValConv: TIdeDbgValueConvertSelector);
begin
FCurConvConf := AValConv;
FCurConv := TLazDbgValueConvertSelectorIntf(FCurConvConf).GetConverter;
UpdateConvPanel;
end;
procedure TFpDbgValConvFrame.UpdateConvForClass;
procedure TIdeDbgValConvFrame.UpdateConvForClass;
var
AvailClass: TLazDbgValueConvertRegistry;
begin
@ -184,7 +184,7 @@ begin
end;
end;
procedure TFpDbgValConvFrame.UpdateConvPanel;
procedure TIdeDbgValConvFrame.UpdateConvPanel;
var
F: TFrame;
begin
@ -200,7 +200,7 @@ begin
end;
end;
procedure TFpDbgValConvFrame.FillList;
procedure TIdeDbgValConvFrame.FillList;
var
i: Integer;
obj: TIdeDbgValueConvertSelector;
@ -215,14 +215,14 @@ begin
end;
end;
procedure TFpDbgValConvFrame.UpdateButtons;
procedure TIdeDbgValConvFrame.UpdateButtons;
begin
btnAdd.Enabled := ValueConverterRegistry.Count > 0;
btnRemove.Enabled := (lstConverters.Count > 0) and (lstConverters.ItemIndex >= 0);
pnlCurrentConv.Enabled := FCurConvConf <> nil;
end;
procedure TFpDbgValConvFrame.SetValConvList(AValue: TIdeDbgValueConvertSelectorList);
procedure TIdeDbgValConvFrame.SetValConvList(AValue: TIdeDbgValueConvertSelectorList);
begin
if FValConvList = AValue then Exit;
FValConvList := AValue;
@ -237,7 +237,7 @@ begin
UpdateButtons;
end;
procedure TFpDbgValConvFrame.SaveCurrent;
procedure TIdeDbgValConvFrame.SaveCurrent;
var
AvailClass: TLazDbgValueConvertRegistry;
begin
@ -258,7 +258,7 @@ begin
end;
end;
procedure TFpDbgValConvFrame.Setup;
procedure TIdeDbgValConvFrame.Setup;
var
AvailClass: TLazDbgValueConvertRegistry;
i: Integer;
@ -280,13 +280,13 @@ begin
UpdateButtons;
end;
constructor TFpDbgValConvFrame.Create(TheOwner: TComponent);
constructor TIdeDbgValConvFrame.Create(TheOwner: TComponent);
begin
inherited Create(TheOwner);
Setup;
end;
destructor TFpDbgValConvFrame.Destroy;
destructor TIdeDbgValConvFrame.Destroy;
begin
if FCurConvSettings <> nil then
FCurConvSettings.Free;

8
ide/packages/idedebugger/idedebugger.lpk
View File

@ -75,14 +75,14 @@
<UnitName Value="IdeDebuggerFpDbgValueConv"/>
</Item>
<Item>
<Filename Value="idefpdbgvalueconvertersettingsframe.pas"/>
<UnitName Value="IdeFpDbgValueConverterSettingsFrame"/>
<Filename Value="idedbgvalueconvertersettingsframe.pas"/>
<UnitName Value="IdeDbgValueConverterSettingsFrame"/>
<ResourceBaseClass Value="Frame"/>
</Item>
<Item>
<Filename Value="frames\idedebugger_fpvalconv_options.pas"/>
<Filename Value="frames\idedebugger_valconv_options.pas"/>
<HasRegisterProc Value="True"/>
<UnitName Value="IdeDebugger_FpValConv_Options"/>
<UnitName Value="IdeDebugger_ValConv_Options"/>
<ResourceBaseClass Value="Frame"/>
</Item>
<Item>

6
ide/packages/idedebugger/idedebuggerfpdbgvalueconv.pas
View File

@ -21,7 +21,6 @@ type
procedure SetConverter(AValue: TLazDbgValueConverterIntf);
protected
function GetBackendSpecificObject: TObject; deprecated;
function GetConverter: TLazDbgValueConverterIntf;
function AllowedTypeNames: TStrings;
@ -90,11 +89,6 @@ begin
FConverter.AddReference;
end;
function TIdeDbgValueConvertSelector.GetBackendSpecificObject: TObject;
begin
Result := Self;
end;
function TIdeDbgValueConvertSelector.GetConverter: TLazDbgValueConverterIntf;
begin
Result := FConverter;

8
ide/packages/idedebugger/idedebuggerpackage.pas
View File

@ -11,16 +11,16 @@ uses
IdeDebuggerBase, Debugger, ProcessDebugger, ProcessList, DebuggerTreeView,
IdeDebuggerUtils, IdeDebuggerWatchResult, IdeDebuggerWatchResPrinter,
IdeDebuggerWatchResUtils, ArrayNavigationFrame, IdeDebuggerStringConstants,
IdeDebuggerFpDbgValueConv, IdeFpDbgValueConverterSettingsFrame,
IdeDebugger_FpValConv_Options, IdeDebuggerOpts, IdeDebuggerWatchResultJSon,
IdeDebuggerFpDbgValueConv, IdeDbgValueConverterSettingsFrame,
IdeDebugger_ValConv_Options, IdeDebuggerOpts, IdeDebuggerWatchResultJSon,
WatchInspectToolbar, LazarusPackageIntf;
implementation
procedure Register;
begin
RegisterUnit('IdeDebugger_FpValConv_Options',
@IdeDebugger_FpValConv_Options.Register);
RegisterUnit('IdeDebugger_ValConv_Options',
@IdeDebugger_ValConv_Options.Register);
end;
initialization