Changeset 29 for trunk/Forms

Timestamp:

Nov 24, 2021, 7:34:57 PM (3 years ago)

Author:

chronos

Message:

• Modified: Use fgl and generics instead of contnrs and TObjectList.

Location:

trunk

Files:

• . (modified) (1 prop)
• Forms/UFormContact.pas (modified) (1 diff)
• Forms/UFormContacts.pas (modified) (1 diff)
• Forms/UFormFindDuplicity.pas (modified) (7 diffs)
• Forms/UFormGenerate.pas (modified) (2 diffs)

trunk

@@ -6 +6 @@
 *.res
 vCardStudio.exe
+vCardStudio.dbg

@@ -6 +6 @@
 *.res
 vCardStudio.exe
+vCardStudio.dbg

trunk/Forms/UFormContact.pas

@@ -87 +87 @@
 var
   FormContact: TFormContact;
+
 
 implementation

trunk/Forms/UFormContacts.pas

@@ -43 +43 @@
     FContacts: TContacts;
     procedure SetContacts(AValue: TContacts);
-
   public
     property Contacts: TContacts read FContacts write SetContacts;

trunk/Forms/UFormFindDuplicity.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, ActnList, Menus, Contnrs, UContact;
+  ExtCtrls, StdCtrls, ActnList, Menus, fgl, UContact;
 
 type
@@ -22 +22 @@
   { TFoundItems }
 
-  TFoundItems = class(TObjectList)
+  TFoundItems = class(TFPGObjectList<TFoundItem>)
     function SearchByField(Field: string): TFoundItem;
   end;
@@ -47 +47 @@
     FContacts: TContacts;
     procedure SetContacts(AValue: TContacts);
-
   public
     FoundItems: TFoundItems;
@@ -59 +58 @@
   FormFindDuplicity: TFormFindDuplicity;
 
+
 implementation
 
@@ -89 +89 @@
 destructor TFoundItem.Destroy;
 begin
-  Contacts.Free;
-  inherited Destroy;
+  FreeAndNil(Contacts);
+  inherited;
 end;
 
@@ -118 +118 @@
 end;
 
-function FoundItemsSort(Item1, Item2: Pointer): Integer;
-begin
-  if TFoundItem(Item1).Contacts.Count < TFoundItem(Item2).Contacts.Count then Result := 1
-  else if TFoundItem(Item1).Contacts.Count > TFoundItem(Item2).Contacts.Count then Result := -1
+function FoundItemsSort(const Item1, Item2: TFoundItem): Integer;
+begin
+  if Item1.Contacts.Count < Item2.Contacts.Count then Result := 1
+  else if Item1.Contacts.Count > Item2.Contacts.Count then Result := -1
   else Result := 0;
 end;
@@ -206 +206 @@
 procedure TFormFindDuplicity.FormDestroy(Sender: TObject);
 begin
-  FoundItems.Free;
+  FreeAndNil(FoundItems);
 end;
 

trunk/Forms/UFormGenerate.pas

@@ -21 +21 @@
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
-  private
-
   public
     Contacts: TContacts;
@@ -30 +28 @@
 var
   FormGenerate: TFormGenerate;
+
 
 implementation

@@ -6 +6 @@
 *.res
 vCardStudio.exe
+vCardStudio.dbg