Changeset 128 for trunk/Forms/UFormFindDuplicity.pas

Timestamp:

Apr 8, 2022, 9:43:55 PM (2 years ago)

Author:

chronos

Message:

• Modified: Use Generics.Collection instead of fgl for better Delphi compatibility.

File:

• trunk/Forms/UFormFindDuplicity.pas (modified) (4 diffs)

trunk/Forms/UFormFindDuplicity.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, ActnList, Menus, fgl, UContact;
+  ExtCtrls, StdCtrls, ActnList, Menus, UContact, Generics.Collections,
+  Generics.Defaults;
 
 type
@@ -20 +21 @@
   { TFoundItems }
 
-  TFoundItems = class(TFPGObjectList<TFoundItem>)
+  TFoundItems = class(TObjectList<TFoundItem>)
     function SearchByField(Field: string): TFoundItem;
   end;
@@ -135 +136 @@
 end;
 
-function FoundItemsSort(const Item1, Item2: TFoundItem): Integer;
+function FoundItemsSort(constref Item1, Item2: TFoundItem): Integer;
 begin
   if Item1.Contacts.Count < Item2.Contacts.Count then Result := 1
@@ -161 +162 @@
     end;
   end;
-  FoundItems.Sort(FoundItemsSort);
+  FoundItems.Sort(TComparer<TFoundItem>.Construct(FoundItemsSort));
   ReloadList;
 end;