Changeset 560

Timestamp:

Sep 10, 2022, 11:35:01 AM (2 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.
• Added: Implode and explode method.
• Added: Custom specialized generic classes.

Location:

Common

Files:

• Common.lpk (modified) (2 diffs)
• Common.pas (modified) (1 diff)
• UCommon.pas (modified) (3 diffs)
• UFindFile.pas (modified) (1 diff)
• UFormAbout.pas (modified) (2 diffs)
• UGenerics.pas (added)
• UJobProgressView.pas (modified) (1 diff)
• UListViewSort.pas (modified) (1 diff)
• UMemory.pas (modified) (2 diffs)
• UPool.pas (modified) (2 diffs)
• UResetableThread.pas (modified) (3 diffs)
• USyncCounter.pas (modified) (1 diff)
• UThreading.pas (modified) (1 diff)
• UURI.pas (modified) (5 diffs)

Common/Common.lpk

@@ -42 +42 @@
     <License Value="Copy left."/>
     <Version Minor="10"/>
-    <Files Count="31">
+    <Files Count="32">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -179 +179 @@
         <UnitName Value="UTestCase"/>
       </Item31>
+      <Item32>
+        <Filename Value="UGenerics.pas"/>
+        <UnitName Value="UGenerics"/>
+      </Item32>
     </Files>
     <CompatibilityMode Value="True"/>

Common/Common.pas

@@ -14 +14 @@
   UPersistentForm, UFindFile, UScaleDPI, UTheme, UStringTable, UMetaCanvas, 
   UGeometric, UTranslator, ULanguages, UFormAbout, UAboutDialog, 
-  UPixelPointer, UDataFile, UTestCase, LazarusPackageIntf;
+  UPixelPointer, UDataFile, UTestCase, UGenerics, LazarusPackageIntf;
 
 implementation

Common/UCommon.pas

@@ -7 +7 @@
   {$IFDEF UNIX}baseunix,{$ENDIF}
   Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf, Graphics,
-  FileUtil; //, ShFolder, ShellAPI;
+  FileUtil, Generics.Collections; //, ShFolder, ShellAPI;
 
 type
@@ -65 +65 @@
 function GetFileFilterItemExt(Filter: string; Index: Integer): string;
 function IntToBin(Data: Int64; Count: Byte): string;
+function Implode(Separator: Char; List: TList<string>): string;
 function LastPos(const SubStr: String; const S: String): Integer;
 function LoadFileToStr(const FileName: TFileName): AnsiString;
@@ -313 +314 @@
 end;
 
+function Implode(Separator: Char; List: TList<string>): string;
+var
+  I: Integer;
+begin
+  Result := '';
+  for I := 0 to List.Count - 1 do begin
+    Result := Result + List[I];
+    if I < List.Count - 1 then Result := Result + Separator;
+  end;
+end;
+
 {$IFDEF WINDOWS}
 function GetUserName: string;

Common/UFindFile.pas

@@ -85 +85 @@
 begin
   s.Free;
-  inherited Destroy;
+  inherited;
 end;
 

Common/UFormAbout.pas

@@ -20 +20 @@
     PanelButtons: TPanel;
     procedure ButtonHomePageClick(Sender: TObject);
-    procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
-  private
-    { private declarations }
   public
     AboutDialog: TObject; //TAboutDialog
@@ -77 +74 @@
 end;
 
-procedure TFormAbout.FormCreate(Sender: TObject);
-begin
-end;
-
 end.
 

Common/UJobProgressView.pas

@@ -641 +641 @@
 begin
   FLock.Free;
-  inherited Destroy;
+  inherited;
 end;
 

Common/UListViewSort.pas

@@ -149 +149 @@
 destructor TListViewEx.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 

Common/UMemory.pas

@@ -49 +49 @@
 procedure TPositionMemory.SetSize(AValue: Integer);
 begin
-  inherited SetSize(AValue);
+  inherited;
   if FPosition > FSize then FPosition := FSize;
 end;
@@ -106 +106 @@
 begin
   Size := 0;
-  inherited Destroy;
+  inherited;
 end;
 

Common/UPool.pas

@@ -106 +106 @@
 constructor TThreadedPool.Create;
 begin
-  inherited Create;
+  inherited;
   Lock := TCriticalSection.Create;
 end;
@@ -114 +114 @@
   TotalCount := 0;
   Lock.Free;
-  inherited Destroy;
+  inherited;
 end;
 

Common/UResetableThread.pas

@@ -165 +165 @@
   FreeAndNil(FStopEvent);
   FreeAndNil(FLock);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -284 +284 @@
 constructor TThreadPool.Create;
 begin
-  inherited Create;
+  inherited;
 end;
 
@@ -291 +291 @@
   TotalCount := 0;
   WaitForEmpty;
-  inherited Destroy;
+  inherited;
 end;
 

Common/USyncCounter.pas

@@ -68 +68 @@
 begin
   Lock.Free;
-  inherited Destroy;
+  inherited;
 end;
 

Common/UThreading.pas

@@ -292 +292 @@
   end;
   FThread.Free;
-  inherited Destroy;
+  inherited;
 end;
 

Common/UURI.pas

@@ -182 +182 @@
 begin
   Items.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -231 +231 @@
 begin
   Path.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -242 +242 @@
     Fragment := TURI(Source).Fragment;
     Query := TURI(Source).Query;
-  end else inherited Assign(Source);
+  end else inherited;
 end;
 
@@ -290 +290 @@
 destructor TURL.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
@@ -343 +343 @@
 begin
   Directory.Free;
-  inherited Destroy;
-end;
-
+  inherited;
+end;
 
 end.