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

LazUtils: "Add" and "AddObject" methods are needed in TDictionaryStringList after all. Patch from Antônio Galvão

Browse Source 
git-svn-id: trunk@40539 -
This commit is contained in:
juha 2013-03-13 00:01:54 +00:00
parent 58b6eb6943
commit afb022bcb4
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/lazutils/dictionarystringlist.pas
View File

@ -54,6 +54,8 @@ type
procedure Assign(Source: TPersistent); override; procedure Assign(Source: TPersistent); override;
procedure Clear; override; procedure Clear; override;
procedure Delete(Index: Integer); override; procedure Delete(Index: Integer); override;
function Add(const S: string): Integer; override;
function AddObject(const S: string; AObject: TObject): Integer; override;
function Contains(const S: string): Boolean; // A new function function Contains(const S: string): Boolean; // A new function
function Find(const S: string; out Index: Integer): Boolean; override; function Find(const S: string; out Index: Integer): Boolean; override;
function IndexOf(const S: string): Integer; override; function IndexOf(const S: string): Integer; override;
@ -107,10 +109,25 @@ begin
FMap.Remove(s); FMap.Remove(s);
end; end;
function TDictionaryStringList.Add(const S: string): Integer;
begin
if not Sorted and (Duplicates = dupIgnore) and FMap.Contains(S) then
Result := -1
else
Result := inherited Add(S);
end;
function TDictionaryStringList.AddObject(const S: string; AObject: TObject): Integer;
begin
Result := Add(S);
if Result > -1 then
Objects[Result] := AObject;
end;
procedure TDictionaryStringList.InsertItem(Index: Integer; const S: string); procedure TDictionaryStringList.InsertItem(Index: Integer; const S: string);
begin begin
// if FAssigning then Exit; // if FAssigning then Exit;
if (Duplicates <> dupAccept) and not Sorted then if not Sorted and (Duplicates <> dupAccept) then
if FMap.Contains(S) then if FMap.Contains(S) then
case Duplicates of case Duplicates of
DupIgnore : Exit; DupIgnore : Exit;