Changeset 128 for trunk/UContact.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/UContact.pas (modified) (10 diffs)

trunk/UContact.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, fgl, Dialogs, UDataFile, LazUTF8, Base64, Graphics;
+  Classes, SysUtils, Generics.Collections, Generics.Defaults, Dialogs,
+  UDataFile, LazUTF8, Base64, Graphics, UListViewSort;
 
 type
@@ -62 +63 @@
     cfPeerTube, cfLinkedIn, cfMastodon, cfMySpace, cfReddit);
 
-  TContactFieldIndexes = TFPGList<TContactFieldIndex>;
+  TContactFieldIndexes = TList<TContactFieldIndex>;
 
   TContactFilterItem = class
@@ -71 +72 @@
   { TContactFilterItems }
 
-  TContactFilterItems = class(TFPGObjectList<TContactFilterItem>)
+  TContactFilterItems = class(TObjectList<TContactFilterItem>)
     function AddNew(FieldIndex: TContactFieldIndex; Value: string): TContactFilterItem;
   end;
@@ -98 +99 @@
   { TContactFields }
 
-  TContactFields = class(TFPGObjectList<TContactField>)
+  TContactFields = class(TObjectList<TContactField>)
   private
     Indexes: array[TContactFieldIndex] of TContactField;
@@ -143 +144 @@
   { TContactProperties }
 
-  TContactProperties = class(TFPGObjectList<TContactProperty>)
+  TContactProperties = class(TObjectList<TContactProperty>)
     function AddNew(Name, Value: string): TContactProperty;
     procedure Assign(Source: TContactProperties);
-    procedure AssignToList(List: TFPGObjectList<TObject>);
+    procedure AssignToList(List: TObjects);
     function GetByName(Name: string): TContactProperty;
     function GetByNameGroups(Name: string; Groups: TStringArray;
@@ -197 +198 @@
   { TContacts }
 
-  TContacts = class(TFPGObjectList<TContact>)
+  TContacts = class(TObjectList<TContact>)
     ContactsFile: TContactsFile;
     procedure Assign(Source: TContacts);
     procedure AddContacts(Contacts: TContacts);
     procedure InsertContacts(Index: Integer; Contacts: TContacts);
-    procedure AssignToList(List: TFPGObjectList<TObject>);
+    procedure AssignToList(List: TObjects);
     function AddNew: TContact;
     function Search(Text: string; FieldIndex: TContactFieldIndex): TContact;
@@ -854 +855 @@
 end;
 
-procedure TContactProperties.AssignToList(List: TFPGObjectList<TObject>);
+procedure TContactProperties.AssignToList(List: TObjects);
 var
   I: Integer;
@@ -1126 +1127 @@
 end;
 
-procedure TContacts.AssignToList(List: TFPGObjectList<TObject>);
-var
-  I: Integer;
-begin
-  while List.Count > Count do List.Delete(List.Count - 1);
-  while List.Count < Count do List.Add(nil);
-  for I := 0 to Count - 1 do
+procedure TContacts.AssignToList(List: TObjects);
+var
+  I: Integer;
+begin
+  while List.Count > Count do
+    List.Delete(List.Count - 1);
+  for I := 0 to List.Count - 1 do
     List[I] := Items[I];
+  while List.Count < Count do
+    List.Add(Items[List.Count]);
 end;
 
@@ -1906 +1909 @@
 end;
 
-function CompareContactFullName(const Item1, Item2: TContact): Integer;
+function CompareContactFullName(constref Item1, Item2: TContact): Integer;
 begin
   Result := CompareStr(Item1.Fields[cfFullName], Item2.Fields[cfFullName]);
 end;
 
-function ComparePropertyName(const Item1, Item2: TContactProperty): Integer;
+function ComparePropertyName(constref Item1, Item2: TContactProperty): Integer;
 begin
   Result := CompareStr(Item1.Name + ';' + Item1.Attributes.Text,
@@ -1921 +1924 @@
   I: Integer;
 begin
-  Contacts.Sort(CompareContactFullName);
+  Contacts.Sort(TComparer<TContact>.Construct(CompareContactFullName));
   for I := 0 to Contacts.Count - 1 do
-    Contacts[I].Properties.Sort(ComparePropertyName);
+    Contacts[I].Properties.Sort(TComparer<TContactProperty>.Construct(ComparePropertyName));
 end;