Changeset 571 for Common

Timestamp:

Jun 14, 2024, 9:37:37 PM (5 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

Common

Files:

• FindFile.pas (modified) (1 diff)
• FormEx.pas (modified) (1 diff)
• Languages/PixelPointer.cs.po (added)
• Languages/PixelPointer.pot (added)
• Languages/Table.cs.po (added)
• Languages/Table.pot (added)
• ListViewSort.pas (modified) (2 diffs)
• PixelPointer.pas (modified) (2 diffs)
• Pool.pas (modified) (5 diffs)
• RegistryEx.pas (modified) (1 diff)
• StopWatch.pas (modified) (3 diffs)
• Threading.pas (modified) (1 diff)

Common/FindFile.pas

@@ -75 +75 @@
 constructor TFindFile.Create(AOwner: TComponent);
 begin
-  inherited Create(AOwner);
+  inherited;
   Path := IncludeTrailingBackslash(UTF8Encode(GetCurrentDir));
   FileMask := FilterAll;

Common/FormEx.pas

@@ -68 +68 @@
   end;
 
-  PersistentForm.Load(Self);
   Translator.TranslateComponentRecursive(Self);
   ThemeManager.UseTheme(Self);

Common/ListViewSort.pas

@@ -136 +136 @@
 constructor TListViewEx.Create(TheOwner: TComponent);
 begin
-  inherited Create(TheOwner);
+  inherited;
   Filter := TListViewFilter.Create(Self);
   Filter.Parent := Self;
@@ -172 +172 @@
 constructor TListViewFilter.Create(AOwner: TComponent);
 begin
-  inherited Create(AOwner);
+  inherited;
   FStringGrid1 := TStringGrid.Create(Self);
   FStringGrid1.Align := alClient;

Common/PixelPointer.pas

@@ -18 +18 @@
     function GetRGB: Cardinal; inline;
   public
+    class function CreateRGB(R, G, B: Byte): TPixel32; static;
+    class function CreateRGBA(R, G, B, A: Byte): TPixel32; static;
     property RGB: Cardinal read GetRGB write SetRGB;
     case Integer of
@@ -104 +106 @@
 end;
 
+class function TPixel32.CreateRGB(R, G, B: Byte): TPixel32;
+begin
+  Result.R := R;
+  Result.G := G;
+  Result.B := B;
+  Result.A := 0;
+end;
+
+class function TPixel32.CreateRGBA(R, G, B, A: Byte): TPixel32;
+begin
+  Result.R := R;
+  Result.G := G;
+  Result.B := B;
+  Result.A := A;
+end;
+
 procedure TPixel32.SetRGB(AValue: Cardinal);
 begin

Common/Pool.pas

@@ -57 +57 @@
   try
     Lock.Acquire;
-    inherited SetTotalCount(AValue);
+    inherited;
   finally
     Lock.Release;
@@ -67 +67 @@
   try
     Lock.Acquire;
-    Result := inherited GetUsedCount;
+    Result := inherited;
   finally
     Lock.Release;
@@ -88 +88 @@
       end;
     end;
-    Result := inherited Acquire;
+    Result := inherited;
   finally
     Lock.Release;
@@ -98 +98 @@
   try
     Lock.Acquire;
-    inherited Release(Item);
+    inherited;
   finally
     Lock.Release;
@@ -113 +113 @@
 begin
   TotalCount := 0;
-  Lock.Free;
+  FreeAndNil(Lock);
   inherited;
 end;

Common/RegistryEx.pas

@@ -133 +133 @@
   //CloseKey;
   {$ENDIF}
-  Result := inherited OpenKey(Key, CanCreate);
+  Result := inherited;
 end;
 

Common/StopWatch.pas

@@ -13 +13 @@
   TStopWatch = class
   private
-    fFrequency : TLargeInteger;
-    fIsRunning: Boolean;
-    fIsHighResolution: Boolean;
-    fStartCount, fStopCount : TLargeInteger;
-    procedure SetTickStamp(var lInt : TLargeInteger) ;
+    FFrequency: TLargeInteger;
+    FIsRunning: Boolean;
+    FIsHighResolution: Boolean;
+    FStartCount, fStopCount: TLargeInteger;
+    procedure SetTickStamp(var Value: TLargeInteger);
     function GetElapsedTicks: TLargeInteger;
     function GetElapsedMiliseconds: TLargeInteger;
     function GetElapsed: string;
   public
-    constructor Create(const startOnCreate : Boolean = False) ;
+    constructor Create(const StartOnCreate: Boolean = False) ;
     procedure Start;
     procedure Stop;
-    property IsHighResolution : Boolean read fIsHighResolution;
-    property ElapsedTicks : TLargeInteger read GetElapsedTicks;
-    property ElapsedMiliseconds : TLargeInteger read GetElapsedMiliseconds;
-    property Elapsed : string read GetElapsed;
-    property IsRunning : Boolean read fIsRunning;
+    property IsHighResolution: Boolean read FIsHighResolution;
+    property ElapsedTicks: TLargeInteger read GetElapsedTicks;
+    property ElapsedMiliseconds: TLargeInteger read GetElapsedMiliseconds;
+    property Elapsed: string read GetElapsed;
+    property IsRunning: Boolean read FIsRunning;
   end;
 
@@ -35 +35 @@
 implementation
 
-constructor TStopWatch.Create(const startOnCreate : boolean = false) ;
+constructor TStopWatch.Create(const StartOnCreate: Boolean = False);
 begin
-  inherited Create;
-
-  fIsRunning := False;
+  FIsRunning := False;
 
   {$IFDEF WINDOWS}
   fIsHighResolution := QueryPerformanceFrequency(fFrequency) ;
   {$ELSE}
-  fIsHighResolution := False;
+  FIsHighResolution := False;
   {$ENDIF}
-  if NOT fIsHighResolution then fFrequency := MSecsPerSec;
+  if NOT FIsHighResolution then FFrequency := MSecsPerSec;
 
   if StartOnCreate then Start;
@@ -53 +51 @@
 function TStopWatch.GetElapsedTicks: TLargeInteger;
 begin
-  Result := fStopCount - fStartCount;
+  Result := FStopCount - FStartCount;
 end;
 
-procedure TStopWatch.SetTickStamp(var lInt : TLargeInteger) ;
+procedure TStopWatch.SetTickStamp(var Value: TLargeInteger);
 begin
-  if fIsHighResolution then
+  if FIsHighResolution then
     {$IFDEF Windows}
-    QueryPerformanceCounter(lInt)
+    QueryPerformanceCounter(Value)
     {$ELSE}
     {$ENDIF}
   else
-    lInt := MilliSecondOf(Now) ;
+    Value := MilliSecondOf(Now);
 end;
 
 function TStopWatch.GetElapsed: string;
 var
-  dt: TDateTime;
+  Elapsed: TDateTime;
 begin
-  dt := ElapsedMiliseconds / MSecsPerSec / SecsPerDay;
-  result := Format('%d days, %s', [Trunc(dt), FormatDateTime('hh:nn:ss.z', Frac(dt))]) ;
+  Elapsed := ElapsedMiliseconds / MSecsPerSec / SecsPerDay;
+  Result := Format('%d days, %s', [Trunc(Elapsed), FormatDateTime('hh:nn:ss.z', Frac(Elapsed))]) ;
 end;
 
 function TStopWatch.GetElapsedMiliseconds: TLargeInteger;
 begin
-  Result := (MSecsPerSec * (fStopCount - fStartCount)) div fFrequency;
+  Result := (MSecsPerSec * (fStopCount - FStartCount)) div FFrequency;
 end;
 
 procedure TStopWatch.Start;
 begin
-  SetTickStamp(fStartCount);
-  fIsRunning := True;
+  SetTickStamp(FStartCount);
+  FIsRunning := True;
 end;
 
 procedure TStopWatch.Stop;
 begin
-  SetTickStamp(fStopCount);
-  fIsRunning := False;
+  SetTickStamp(FStopCount);
+  FIsRunning := False;
 end;
 

Common/Threading.pas

@@ -188 +188 @@
 constructor TThreadList.Create;
 begin
-  inherited Create;
+  inherited;
 end;