Changeset 128 for trunk/Forms/UFormContacts.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/UFormContacts.pas (modified) (5 diffs)

trunk/Forms/UFormContacts.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Menus, ActnList, UContact, UListViewSort, fgl, LazUTF8, Clipbrd;
+  Menus, ActnList, UContact, UListViewSort, LazUTF8, Clipbrd,
+  Generics.Collections;
 
 type
@@ -76 +77 @@
     FContacts: TContacts;
     FUpdateCount: Integer;
-    procedure FilterList(List: TFPGObjectList<TObject>);
+    procedure FilterList(List: TObjectList<TObject>);
     procedure SetContacts(AValue: TContacts);
     function GetPreviousContact(Contact: TContact): TContact;
@@ -188 +189 @@
 end;
 
-procedure TFormContacts.FilterList(List: TFPGObjectList<TObject>);
+procedure TFormContacts.FilterList(List: TObjectList<TObject>);
 var
   I: Integer;
@@ -194 +195 @@
   K: Integer;
   FoundCount: Integer;
+  Item: TContact;
 begin
   for I := List.Count - 1 downto 0 do begin
     if List.Items[I] is TContact then begin
-      with TContact(List.Items[I]) do begin
+      Item := TContact(List.Items[I]);
+      with Item do begin
         FoundCount := 0;
         for J := 0 to FilterItems.Count - 1 do
         if FilterItems[J].FieldIndex = cfNone then begin
-          for K := 0 to TContact(List.Items[I]).GetFields.Count - 1 do begin
+          for K := 0 to Item.GetFields.Count - 1 do begin
             if Pos(UTF8LowerCase(FilterItems[J].Value),
-              UTF8LowerCase(TContact(List.Items[I]).Fields[TContact.GetFields[K].Index])) > 0 then begin
+              UTF8LowerCase(Item.Fields[TContact.GetFields[K].Index])) > 0 then begin
                 Inc(FoundCount);
                 Break;
@@ -210 +213 @@
         end else begin
           if Pos(UTF8LowerCase(FilterItems[J].Value),
-            UTF8LowerCase(TContact(List.Items[I]).Fields[FilterItems[J].FieldIndex])) > 0 then
+            UTF8LowerCase(Item.Fields[FilterItems[J].FieldIndex])) > 0 then
               Inc(FoundCount);
         end;