Changeset 420 for trunk/Packages/Common/UCommon.pas

Timestamp:

Dec 28, 2021, 4:46:47 PM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package to version 0.9.
• Modified: Code cleanup.

File:

• trunk/Packages/Common/UCommon.pas (modified) (3 diffs)

trunk/Packages/Common/UCommon.pas

@@ -40 +40 @@
 {$ENDIF}
 
-function IntToBin(Data: Int64; Count: Byte): string;
+function AddLeadingZeroes(const aNumber, Length : integer) : string;
 function BinToInt(BinStr: string): Int64;
-function TryHexToInt(Data: string; var Value: Integer): Boolean;
-function TryBinToInt(Data: string; var Value: Integer): Boolean;
 function BinToHexString(Source: AnsiString): string;
 //function DelTree(DirName : string): Boolean;
@@ -49 +47 @@
 function BCDToInt(Value: Byte): Byte;
 function CompareByteArray(Data1, Data2: TArrayOfByte): Boolean;
+procedure CopyStringArray(Dest: TStringArray; Source: array of string);
+function CombinePaths(Path1, Path2: string): string;
+function ComputerName: string;
+procedure DeleteFiles(APath, AFileSpec: string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string);
+procedure FileDialogUpdateFilterFileType(FileDialog: TOpenDialog);
+procedure FreeThenNil(var Obj);
+function GetDirCount(Dir: string): Integer;
 function GetUserName: string;
-function LoggedOnUserNameEx(Format: TUserNameFormat): string;
-function SplitString(var Text: string; Count: Word): string;
 function GetBitCount(Variable: QWord; MaxIndex: Integer): Integer;
 function GetBit(Variable: QWord; Index: Byte): Boolean;
+function GetStringPart(var Text: string; Separator: string): string;
+function GenerateNewName(OldName: string): string;
+function GetFileFilterItemExt(Filter: string; Index: Integer): string;
+function IntToBin(Data: Int64; Count: Byte): string;
+function LastPos(const SubStr: String; const S: String): Integer;
+function LoadFileToStr(const FileName: TFileName): AnsiString;
+function LoggedOnUserNameEx(Format: TUserNameFormat): string;
+function MergeArray(A, B: array of string): TArrayOfString;
+function OccurenceOfChar(What: Char; Where: string): Integer;
+procedure OpenWebPage(URL: string);
+procedure OpenFileInShell(FileName: string);
+function PosFromIndex(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
+function PosFromIndexReverse(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
+function RemoveQuotes(Text: string): string;
+procedure SaveStringToFile(S, FileName: string);
 procedure SetBit(var Variable: Int64; Index: Byte; State: Boolean); overload;
 procedure SetBit(var Variable: QWord; Index: Byte; State: Boolean); overload;
 procedure SetBit(var Variable: Cardinal; Index: Byte; State: Boolean); overload;
 procedure SetBit(var Variable: Word; Index: Byte; State: Boolean); overload;
-function AddLeadingZeroes(const aNumber, Length : integer) : string;
-function LastPos(const SubStr: String; const S: String): Integer;
-function GenerateNewName(OldName: string): string;
-function GetFileFilterItemExt(Filter: string; Index: Integer): string;
-procedure FileDialogUpdateFilterFileType(FileDialog: TOpenDialog);
-procedure DeleteFiles(APath, AFileSpec: string);
-procedure OpenWebPage(URL: string);
-procedure OpenFileInShell(FileName: string);
-procedure ExecuteProgram(Executable: string; Parameters: array of string);
-procedure FreeThenNil(var Obj);
-function RemoveQuotes(Text: string): string;
-function ComputerName: string;
-function OccurenceOfChar(What: Char; Where: string): Integer;
-function GetDirCount(Dir: string): Integer;
-function MergeArray(A, B: array of string): TArrayOfString;
-function LoadFileToStr(const FileName: TFileName): AnsiString;
-procedure SaveStringToFile(S, FileName: string);
 procedure SearchFiles(AList: TStrings; Dir: string;
   FilterMethod: TFilterMethod = nil; FileNameMethod: TFileNameMethod = nil);
-function GetStringPart(var Text: string; Separator: string): string;
+function SplitString(var Text: string; Count: Word): string;
 function StripTags(const S: string): string;
-function PosFromIndex(SubStr: string; Text: string;
-  StartIndex: Integer): Integer;
-function PosFromIndexReverse(SubStr: string; Text: string;
-  StartIndex: Integer): Integer;
-procedure CopyStringArray(Dest: TStringArray; Source: array of string);
+function TryHexToInt(Data: string; var Value: Integer): Boolean;
+function TryBinToInt(Data: string; var Value: Integer): Boolean;
+procedure SortStrings(Strings: TStrings);
 
 
@@ -669 +671 @@
 end;
 
+function CombinePaths(Path1, Path2: string): string;
+begin
+  Result := Path1;
+  if Result <> '' then Result := Result + DirectorySeparator + Path2
+    else Result := Path2;
+end;
+
+procedure SortStrings(Strings: TStrings);
+var
+  Tmp: TStringList;
+begin
+  Strings.BeginUpdate;
+  try
+    if Strings is TStringList then begin
+      TStringList(Strings).Sort;
+    end else begin
+      Tmp := TStringList.Create;
+      try
+        Tmp.Assign(Strings);
+        Tmp.Sort;
+        Strings.Assign(Tmp);
+      finally
+        Tmp.Free;
+      end;
+    end;
+  finally
+    Strings.EndUpdate;
+  end;
+end;
+
 
 initialization