Changeset 132 for trunk/Application

Timestamp:

Mar 18, 2022, 3:47:27 PM (3 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/Application/UWebObjects.pas (modified) (11 diffs)

trunk/Application/UWebObjects.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UHtmlClasses, UXmlClasses, SpecializedList, SpecializedDictionary;
+  Classes, SysUtils, UHtmlClasses, UXmlClasses, SpecializedDictionary, fgl;
 
 type
-  TListView = class
-
-  end;
-
   TQueryFormItemType = (fitText, fitComboBox, fitRadioButton, fitSelect, fitPassword,
     fitSubmit, fitReset, fitHidden, fitFileSelect, fitButton, fitCheckBox, fitTextArea);
@@ -38 +34 @@
   { TQueryFormItemList }
 
-  TQueryFormItemList = class(TListObject)
+  TQueryFormItemList = class(TFPGObjectList<TQueryFormItem>)
     function FindByName(AValue: string): TQueryFormItem;
   end;
@@ -53 +49 @@
   end;
 
+  TQueryFormGroups = class(TFPGObjectList<TQueryFormGroup>)
+  end;
+
   TQueryAction = class
     Caption: string;
     Action: string;
+  end;
+
+  TQueryActions = class(TFPGObjectList<TQueryAction>)
   end;
 
@@ -63 +65 @@
   public
     Title: string;
-    Groups: TListObject; // TListObject<TQueryFormGroup>
-    Actions: TListObject; // TListObject<TQueryAction>
+    Groups: TQueryFormGroups;
+    Actions: TQueryActions;
     ClassId: string;
     function AddNewGroup: TQueryFormGroup;
@@ -72 +74 @@
     destructor Destroy; override;
   end;
+
 
 implementation
@@ -122 +125 @@
 destructor TQueryFormItem.Destroy;
 begin
-  Value.Free;
-  inherited Destroy;
+  FreeAndNil(Value);
+  inherited;
 end;
 
@@ -189 +192 @@
 function TQueryForm.AddNewGroup: TQueryFormGroup;
 begin
-  Result := TQueryFormGroup(Groups.AddNew(TQueryFormGroup.Create));
+  Result := TQueryFormGroup.Create;
+  Groups.Add(Result);
 end;
 
 function TQueryForm.AddNewAction(Caption, Action: string): TQueryAction;
 begin
-  Result := TQueryAction(Actions.AddNew(TQueryAction.Create));
+  Result := TQueryAction.Create;
   Result.Caption := Caption;
   Result.Action := Action;
+  Actions.Add(Result);
 end;
 
@@ -210 +215 @@
 begin
   inherited;
-  Actions := TListObject.Create;
-  Groups := TListObject.Create;
+  Actions := TQueryActions.Create;
+  Groups := TQueryFormGroups.Create;
   Method := 'post';
   Action.AsString := '';
@@ -218 +223 @@
 destructor TQueryForm.Destroy;
 begin
-  Actions.Free;
-  Groups.Free;
-  inherited Destroy;
+  FreeAndNil(Actions);
+  FreeAndNil(Groups);
+  inherited;
 end;
 
@@ -238 +243 @@
 function TQueryFormGroup.AddNewItem: TQueryFormItem;
 begin
-  Result := TQueryFormItem(Rows.AddNew(TQueryFormItem.Create));
+  Result := TQueryFormItem.Create;
+  Rows.Add(Result);
 end;
 
@@ -248 +254 @@
 destructor TQueryFormGroup.Destroy;
 begin
-  Rows.Free;
-  inherited Destroy;
+  FreeAndNil(Rows);
+  inherited;
 end;