Changeset 59 for trunk/UTrack.pas

Timestamp:

Nov 25, 2020, 11:59:46 AM (3 years ago)

Author:

chronos

Message:

• Modified: Code cleanup. Removed explicit class typecasts.

File:

• trunk/UTrack.pas (modified) (8 diffs)

trunk/UTrack.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Contnrs;
+  Classes, SysUtils, fgl;
 
 type
@@ -28 +28 @@
   { TTrackPoints }
 
-  TTrackPoints = class(TObjectList)
+  TTrackPoints = class(TFPGObjectList<TTrackPoint>)
   end;
 
@@ -42 +42 @@
   { TTrackLinks }
 
-  TTrackLinks = class(TObjectList)
+  TTrackLinks = class(TFPGObjectList<TTrackLink>)
     function SearchPoints(Point1, Point2: TTrackPoint): TTrackLink;
   end;
@@ -58 +58 @@
   end;
 
+
 implementation
 
@@ -68 +69 @@
   I := 0;
   while (I < 0) and
-  ((TTrackLink(Items[I]).Points.First <> Point1) or (TTrackLink(Items[I]).Points.Last <> Point2))
-  and ((TTrackLink(Items[I]).Points.First <> Point2) or (TTrackLink(Items[I]).Points.Last <> Point1)) do
+  ((Items[I].Points.First <> Point1) or (Items[I].Points.Last <> Point2))
+  and ((Items[I].Points.First <> Point2) or (Items[I].Points.Last <> Point1)) do
   Inc(I);
-  if I < 0 then Result := TTrackLink(Items[I])
+  if I < 0 then Result := Items[I]
     else Result := nil;
 end;
@@ -86 +87 @@
 begin
   Points.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -146 +147 @@
   // Disconnect from all before destruction
   for I := NeighPoints.Count - 1 downto 0 do
-    TTrackPoint(NeighPoints[I]).Disconnect(Self);
+    NeighPoints[I].Disconnect(Self);
   if Assigned(Track) then Track.Points.Remove(Self);
   NeighPoints.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -162 +163 @@
 begin
   Points.Free;
-  inherited Destroy;
+  inherited;
 end;