Changeset 456 for trunk/Packages/Common/Common.pas

Timestamp:

May 30, 2023, 11:31:10 AM (18 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.

File:

• trunk/Packages/Common/Common.pas (moved) (moved from trunk/Packages/Common/UCommon.pas ) (9 diffs)

trunk/Packages/Common/Common.pas

@@ -1 @@
-unit UCommon;
+unit Common;
 
 interface
@@ -7 +7 @@
   {$IFDEF UNIX}baseunix,{$ENDIF}
   Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf, Graphics,
-  FileUtil; //, ShFolder, ShellAPI;
+  FileUtil, Generics.Collections; //, ShFolder, ShellAPI;
 
 type
@@ -42 +42 @@
   clLightRed = TColor($8080FF);
 
-function AddLeadingZeroes(const aNumber, Length : Integer) : string;
+function AddLeadingZeroes(const aNumber, Length : integer) : string;
 function BinToInt(BinStr: string): Int64;
 function BinToHexString(Source: AnsiString): string;
@@ -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;
@@ -96 +97 @@
 function BinToInt(BinStr : string) : Int64;
 var
-  I : Byte;
+  i : byte;
   RetVar : Int64;
 begin
   BinStr := UpperCase(BinStr);
-  if BinStr[Length(BinStr)] = 'B' then Delete(BinStr,Length(BinStr),1);
+  if BinStr[length(BinStr)] = 'B' then Delete(BinStr,length(BinStr),1);
   RetVar := 0;
-  for I := 1 to Length(BinStr) do begin
-    if not (BinStr[I] in ['0','1']) then begin
+  for i := 1 to length(BinStr) do begin
+    if not (BinStr[i] in ['0','1']) then begin
       RetVar := 0;
       Break;
     end;
-    RetVar := (RetVar shl 1) + (Byte(BinStr[I]) and 1) ;
+    RetVar := (RetVar shl 1) + (byte(BinStr[i]) and 1) ;
   end;
 
@@ -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;
@@ -435 +447 @@
 end;
 
-function AddLeadingZeroes(const aNumber, Length : Integer) : string;
+function AddLeadingZeroes(const aNumber, Length : integer) : string;
 begin
   Result := SysUtils.Format('%.*d', [Length, aNumber]) ;
@@ -614 +626 @@
   begin
     for J := ReadFrom to Len do
-      if (S[J] = C) then
+      if (S[j] = C) then
       begin
         Result := J;
@@ -631 +643 @@
     Inc(I);
     APos := ReadUntil(I, '<');
-    Result := Result + Copy(S, I, APos - I);
+    Result := Result + Copy(S, I, APos - i);
     I := ReadUntil(APos + 1, '>');
   end;