Changeset 137 for trunk/Packages/Common/UListViewSort.pas

Timestamp:

Sep 9, 2022, 1:16:58 AM (2 years ago)

Author:

chronos

Message:

• Added: Robots page.
• Modified: Canonical URL for webcams.
• Modified: Removed compiler mode delphi as it is already set in project.
• Modified: Updated Common package.
• Modified: Use Generics.Collections instead of fgl.

File:

• trunk/Packages/Common/UListViewSort.pas (modified) (9 diffs)

trunk/Packages/Common/UListViewSort.pas

@@ -2 +2 @@
 
 // Date: 2019-05-17
-
-{$mode delphi}
 
 interface
@@ -9 +7 @@
 uses
   {$IFDEF Windows}Windows, CommCtrl, LMessages, {$ENDIF}Classes, Graphics, ComCtrls, SysUtils,
-  Controls, DateUtils, Dialogs, fgl, Forms, Grids, StdCtrls, ExtCtrls,
-  LclIntf, LclType, LResources;
+  Controls, DateUtils, Dialogs, Forms, Grids, StdCtrls, ExtCtrls,
+  LclIntf, LclType, LResources, Generics.Collections, Generics.Defaults;
 
 type
@@ -19 +17 @@
   TCompareEvent = function (Item1, Item2: TObject): Integer of object;
   TListFilterEvent = procedure (ListViewSort: TListViewSort) of object;
+
+  TObjects = TObjectList<TObject>;
 
   { TListViewSort }
@@ -52 +52 @@
     {$ENDIF}
   public
-    List: TFPGObjectList<TObject>;
-    Source: TFPGObjectList<TObject>;
+    Source: TObjects;
+    List: TObjects;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -149 +149 @@
 destructor TListViewEx.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
@@ -338 +338 @@
   ListViewSortCompare: TCompareEvent;
 
-function ListViewCompare(const Item1, Item2: TObject): Integer;
+function ListViewCompare(constref Item1, Item2: TObject): Integer;
 begin
   Result := ListViewSortCompare(Item1, Item2);
@@ -349 +349 @@
   ListViewSortCompare := Compare;
   if (List.Count > 0) then
-    List.Sort(ListViewCompare);
+    List.Sort(TComparer<TObject>.Construct(ListViewCompare));
 end;
 
@@ -355 +355 @@
 begin
   if Assigned(FOnFilter) then FOnFilter(Self)
-  else if Assigned(Source) then
-    List.Assign(Source) else
+  else if Assigned(Source) then begin
     List.Clear;
+    List.AddRange(Source);
+  end else List.Clear;
   if ListView.Items.Count <> List.Count then
     ListView.Items.Count := List.Count;
@@ -412 +413 @@
 begin
   inherited;
-  List := TFPGObjectList<TObject>.Create;
-  List.FreeObjects := False;
+  List := TObjects.Create;
+  List.OwnsObjects := False;
 end;
 
 destructor TListViewSort.Destroy;
 begin
-  List.Free;
+  FreeAndNil(List);
   inherited;
 end;