Changeset 424 for trunk/LocalPlayer

Timestamp:

Apr 25, 2022, 6:22:53 PM (3 years ago)

Author:

chronos

Message:

• Modified: Update Common package to version 0.10.
• Modified: fgl unit replaced by Generics.Collections.

Location:

trunk/LocalPlayer

Files:

• Help.pas (modified) (2 diffs)
• UKeyBindings.pas (modified) (4 diffs)

trunk/LocalPlayer/Help.pas

@@ -7 +7 @@
   Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
   Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
-  ButtonB, PVSB, Types, fgl, IsoEngine;
+  ButtonB, PVSB, Types, Generics.Collections, IsoEngine;
 
 const
@@ -60 +60 @@
   { THistItems }
 
-  THistItems = class(TFPGObjectList<THistItem>)
+  THistItems = class(TObjectList<THistItem>)
     function AddNew(Kind, No, Pos: Integer; SearchContent: string): THistItem;
   end;

trunk/LocalPlayer/UKeyBindings.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, fgl, LCLProc, LCLType, Menus, Registry;
+  Classes, SysUtils, Generics.Collections, Generics.Defaults, LCLProc, LCLType,
+  Menus, Registry;
 
 type
@@ -24 +25 @@
   { TKeyBindings }
 
-  TKeyBindings = class(TFPGObjectList<TKeyBinding>)
+  TKeyBindings = class(TObjectList<TKeyBinding>)
   private
   public
@@ -290 +291 @@
 end;
 
-function CompareAlpha(const Item1, Item2: TKeyBinding): Integer;
+function CompareAlpha(constref Item1, Item2: TKeyBinding): Integer;
 begin
   Result := CompareStr(Item1.FullName, Item2.FullName);
@@ -297 +298 @@
 procedure TKeyBindings.SortAlpha;
 begin
-  Sort(CompareAlpha);
+  Sort(TComparer<TKeyBinding>.Construct(CompareAlpha));
 end;