Changeset 316 for trunk/UItemList.pas

Timestamp:

Jun 19, 2024, 11:53:06 PM (5 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/UItemList.pas (modified) (5 diffs)

trunk/UItemList.pas

@@ -1 +1 @@
 unit UItemList;
 
-{$mode delphi}
-
 interface
 
 uses
-  Classes, SysUtils, fgl, DOM, XML, Common, Graphics;
+  Classes, SysUtils, Generics.Collections, DOM, XML, Common, Graphics;
 
 type
@@ -33 +31 @@
   { TItemFields }
 
-  TItemFields = class(TFPGObjectList<TItemField>)
+  TItemFields = class(TObjectList<TItemField>)
     function AddField(Index: Integer; SysName, Name: string; DataType: TDataType): TItemField;
     function SearchByIndex(Index: Integer): TItemField;
@@ -78 +76 @@
   { TItemList }
 
-  TItemList = class(TFPGObjectList<TItem>)
+  TItemList = class(TObjectList<TItem>)
     NewId: Integer;
     class function GetItemClass: TItemClass; virtual;
@@ -120 +118 @@
 destructor TItemField.Destroy;
 begin
-  EnumStates.Free;
-  inherited Destroy;
+  FreeAndNil(EnumStates);
+  inherited;
 end;
 
@@ -316 +314 @@
     ReferenceList := GetReferenceList(Field.Index);
     if (ReadId > 0) and Assigned(ReferenceList) then
-      SetValueReference(Field.Index, TItem(ReferenceList.List[ReadId]));
+      SetValueReference(Field.Index, TItem(ReferenceList[ReadId]));
   end else
     raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[Field.DataType]]));