IDE: Clean up duplicate SetComboBoxText procedures.

This commit is contained in:
Juha 2025-11-09 09:46:38 +02:00
parent 7aa7dcd965
commit 1049d599ce
2 changed files with 4 additions and 34 deletions

View File

@ -35,7 +35,7 @@ uses
Classes, SysUtils, RegExpr,
LCLType, Controls, StdCtrls, Forms, Buttons, ExtCtrls, Dialogs, Graphics, ButtonPanel,
SynEditTypes, SynEdit,
IDEImagesIntf, IDEWindowIntf, IDEDialogs,
IDEImagesIntf, IDEWindowIntf, IDEDialogs, IDEUtils,
InputHistory,
EnvironmentOpts,
LazarusIdeStrConsts;
@ -104,7 +104,6 @@ type
procedure SetFindText(const NewFindText: AnsiString);
function GetReplaceText: AnsiString;
procedure SetReplaceText(const NewReplaceText: AnsiString);
procedure SetComboBoxText(AComboBox: TComboBox; const AText: AnsiString);
public
constructor Create(TheOwner: TComponent); override;
destructor Destroy; override;
@ -116,8 +115,8 @@ type
property Options: TSynSearchOptions read GetOptions write SetOptions;
property EnableAutoComplete: boolean read GetEnableAutoComplete
write SetEnableAutoComplete;
property FindText:AnsiString read GetFindText write SetFindText;
property ReplaceText:AnsiString read GetReplaceText write SetReplaceText;
property FindText: AnsiString read GetFindText write SetFindText;
property ReplaceText: AnsiString read GetReplaceText write SetReplaceText;
property OnKey: TOnFindDlgKey read FOnKey write SetOnKey;
property ComponentText[c: TFindDlgComponent]: string
read GetComponentText write SetComponentText;
@ -528,21 +527,7 @@ end;
procedure TLazFindReplaceDialog.SetReplaceText(const NewReplaceText:AnsiString);
begin
SetComboBoxText(ReplaceTextComboBox,NewReplaceText);
end;
procedure TLazFindReplaceDialog.SetComboBoxText(AComboBox:TComboBox;
const AText:AnsiString);
var a:integer;
begin
a:=AComboBox.Items.IndexOf(AText);
//debugln('TLazFindReplaceDialog.SetComboBoxText ',AText,' ',a);
if a>=0 then
AComboBox.ItemIndex:=a
else begin
AComboBox.Items.Add(AText);
AComboBox.ItemIndex:=AComboBox.Items.IndexOf(AText);
end;
SetComboBoxText(ReplaceTextComboBox,NewReplaceText,cstCaseInsensitive);
end;
end.

View File

@ -172,7 +172,6 @@ type
procedure SaveUserOverrides(const AMode: TRunParamsOptionsMode);
procedure SelectMode(const AName: string);
function SelectedMode: TRunParamsOptionsMode;
procedure SetComboBoxText(AComboBox: TComboBox; AText: ansistring);
public
constructor Create(AnOwner: TComponent); override;
destructor Destroy; override;
@ -831,20 +830,6 @@ begin
end;
end;
procedure TRunParamsOptsDlg.SetComboBoxText(AComboBox: TComboBox; AText: ansistring);
var
a: integer;
begin
a := AComboBox.Items.IndexOf(AText);
if a >= 0 then
AComboBox.ItemIndex := a
else
begin
AComboBox.Items.Add(AText);
AComboBox.ItemIndex := AComboBox.Items.IndexOf(AText);
end;
end;
procedure TRunParamsOptsDlg.SetOptions(NewOptions: TRunParamsOptions);
begin
fOptions.Assign(NewOptions);