LCL, LazUtils: Move string manipulation functions from LCLProc to LazStringUtils.

git-svn-id: trunk@61038 -

components/debuggerintf/dbgintfdebuggerbase.pp

@@ -48,7 +48,7 @@ uses
   // LCL
   LCLProc,
   // LazUtils
-  LazClasses, LazLoggerBase, LazFileUtils, Maps, LazMethodList,
+  LazClasses, LazLoggerBase, LazFileUtils, LazStringUtils, Maps, LazMethodList,
   // DebuggerIntf
   DbgIntfBaseTypes, DbgIntfMiscClasses, DbgIntfPseudoTerminal;
 

components/lazdebuggergdbmi/cmdlinedebugger.pp

@@ -39,8 +39,15 @@ unit CmdLineDebugger;
 interface
 
 uses
-  Classes, Types, process, FileUtil, LCLProc, LazLoggerBase, UTF8Process,
-  DbgIntfDebuggerBase, Forms, DebugUtils;
+  Classes, Types, process,
+  // LCL
+  Forms,
+  // LazUtils
+  LazLoggerBase, UTF8Process,
+  // DebuggerIntf
+  DbgIntfDebuggerBase,
+  // LazDebuggerGdbmi
+  DebugUtils;
 
 type
 

components/lazdebuggergdbmi/debugutils.pp

@@ -35,7 +35,11 @@ unit DebugUtils;
 interface 
 
 uses
-  DbgIntfBaseTypes, Classes, LCLProc, LazUTF8;
+  Classes,
+  // LazUtils
+  LazLoggerBase, LazUTF8,
+  // DebuggerIntf
+  DbgIntfBaseTypes;
 
 type
 

components/lazdebuggergdbmi/gdbmidebugger.pp

@@ -57,16 +57,17 @@ uses
   Classes, SysUtils, strutils, math, fgl, Variants,
   // LCL
   Controls, Dialogs, Forms,
-  LCLProc,
   // LazUtils
-  FileUtil, LazUTF8, LazClasses, LazLoggerBase, Maps,
+  FileUtil, LazUTF8, LazClasses, LazLoggerBase, LazStringUtils, Maps,
   // IdeIntf
   BaseIDEIntf,
   {$IFDEF Darwin}
   LazFileUtils,
   {$ENDIF}
-  DebugUtils, GDBTypeInfo, GDBMIDebugInstructions, GDBMIMiscClasses,
-  DbgIntfBaseTypes, DbgIntfDebuggerBase, DbgIntfPseudoTerminal, GdbmiStringConstants;
+  // DebuggerIntf
+  DbgIntfBaseTypes, DbgIntfDebuggerBase, DbgIntfPseudoTerminal,
+  // LazDebuggerGdbmi
+  DebugUtils, GDBTypeInfo, GDBMIDebugInstructions, GDBMIMiscClasses, GdbmiStringConstants;
 
 type
   TGDBMIProgramInfo = record

components/lazdebuggergdbmi/gdbmidebuginstructions.pp

@@ -5,7 +5,11 @@ unit GDBMIDebugInstructions;
 interface
 
 uses
-  Classes, SysUtils, math, CmdLineDebugger, GDBMIMiscClasses, LazLoggerBase, LazClasses;
+  Classes, SysUtils, math,
+  // LazUtils
+  LazLoggerBase, LazClasses,
+  // LazDebuggerGdbmi
+  CmdLineDebugger, GDBMIMiscClasses;
 
 type
 

components/lazdebuggergdbmi/gdbmimiscclasses.pp

@@ -31,7 +31,11 @@ unit GDBMIMiscClasses;
 interface
 
 uses
-    Classes, SysUtils, DebugUtils, DbgIntfDebuggerBase;
+  Classes, SysUtils,
+  // DebuggerIntf
+  DbgIntfDebuggerBase,
+  // LazDebuggerGdbmi
+  DebugUtils;
 
 type
 

components/lazdebuggergdbmi/gdbmiserverdebugger.pas

@@ -31,7 +31,11 @@ unit GDBMIServerDebugger;
 interface
 
 uses
-  Classes, sysutils, GDBMIDebugger, GDBMIMiscClasses, DbgIntfDebuggerBase;
+  Classes, sysutils,
+  // DebuggerIntf
+  DbgIntfDebuggerBase,
+  // LazDebuggerGdbmi
+  GDBMIDebugger, GDBMIMiscClasses;
   
 type
 

components/lazdebuggergdbmi/gdbtypeinfo.pp

@@ -35,8 +35,6 @@ interface
 
 uses
   Classes, SysUtils, math,
-  // LCL
-  LclProc,
   // LazUtils
   LazLoggerBase, LazStringUtils,
   // DebuggerIntf

components/lazdebuggergdbmi/sshgdbmidebugger.pas

@@ -37,9 +37,18 @@ unit SSHGDBMIDebugger;
 interface
 
 uses
-  Classes, SysUtils, Dialogs, Controls, GDBMIDebugger, PropEdits,
-  DbgIntfDebuggerBase, Graphics, LCLProc, GdbmiStringConstants;
-  
+  Classes, SysUtils,
+  // LCL
+  Dialogs, Controls, Graphics,
+  // LazUtils
+  LazStringUtils,
+  // IdeIntf
+  PropEdits,
+  // DebuggerIntf
+  DbgIntfDebuggerBase,
+  // LazDebuggerGdbmi
+  GDBMIDebugger, GdbmiStringConstants;
+
 type
 
   { TSSHGDBMIDebugger }

components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas

@@ -22,8 +22,14 @@ unit LldbDebugger;
 interface
 
 uses
-  Classes, SysUtils, math, DbgIntfDebuggerBase, DbgIntfBaseTypes, LazLoggerBase,
-  LazClasses, LazFileUtils, Maps, LCLProc, strutils, DebugProcess,
+  Classes, SysUtils, strutils, math,
+  // LazUtils
+  LazClasses, LazFileUtils, LazLoggerBase, LazStringUtils, Maps,
+  // DebuggerIntf
+  DbgIntfDebuggerBase, DbgIntfBaseTypes,
+  // CmdLineDebuggerBase
+  DebugProcess,
+  // LazDebuggerLldb
   LldbInstructions, LldbHelper;
 
 type

components/lazdebuggers/lazdebuggerlldb/lldbhelper.pas

@@ -18,7 +18,9 @@ unit LldbHelper;
 interface
 
 uses
-  Classes, SysUtils, math, DbgIntfBaseTypes, strutils;
+  Classes, SysUtils, strutils, math,
+  // DebuggerIntf
+  DbgIntfBaseTypes;
 
 function LastPos(ASearch, AString: string): Integer;
 

components/lazdebuggers/lazdebuggerlldb/lldbinstructions.pas

@@ -18,8 +18,15 @@ unit LldbInstructions;
 interface
 
 uses
-  SysUtils, math, Classes, LazLoggerBase, DbgIntfDebuggerBase, DbgIntfBaseTypes,
-  strutils, DebugInstructions, LldbHelper;
+  SysUtils, Classes, strutils,
+  // LazUtils
+  LazLoggerBase,
+  // DebuggerIntf
+  DbgIntfDebuggerBase, DbgIntfBaseTypes,
+  // CmdLineDebuggerBase
+  DebugInstructions,
+  // LazDebuggerLldb
+  LldbHelper;
 
 type
 

components/lazdebuggers/lazdebugtestbase/testdbgconfig.pas

@@ -21,7 +21,8 @@ unit TestDbgConfig;
 interface
 
 uses
-  Classes, SysUtils, LCLProc;
+  Classes, SysUtils,
+  LazStringUtils;
 
 var
   AppDir, ConfDir: String;

components/lazdebuggers/lazdebugtestbase/testdbgcontrolform.pas

@@ -5,9 +5,11 @@ unit TestDbgControlForm;
 interface
 
 uses
+  // LCL
   Interfaces, Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
-  EditBtn, ComCtrls, CheckLst, TestDbgControl, TestDbgConfig,
-  TTestDbgExecuteables;
+  EditBtn, ComCtrls, CheckLst,
+  // LazDebugTestBase
+  TestDbgControl, TestDbgConfig, TTestDbgExecuteables;
 
 type
 

components/lazutils/lazstringutils.pas

@@ -81,6 +81,17 @@ function FindNextDelimitedItem(const List: string; Delimiter: char;
                                var Position: integer; FindItem: string): string;
 function MergeWithDelimiter(const a, b: string; Delimiter: char): string;
 
+// String manipulation
+function StripLN(const ALine: String): String;
+function GetPart(const ASkipTo, AnEnd: String; var ASource: String;
+  const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String; overload;
+function GetPart(const ASkipTo, AnEnd: array of String; var ASource: String;
+  const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String; overload;
+function TextToSingleLine(const AText: string): string;
+function SwapCase(Const S: String): String;
+// case..of utility
+function StringCase(const AString: String; const ACase: array of String {; const AIgnoreCase = False, APartial = false: Boolean}): Integer; overload;
+function StringCase(const AString: String; const ACase: array of String; const AIgnoreCase, APartial: Boolean): Integer; overload;
 
 implementation
 
@@ -1036,5 +1047,192 @@ begin
     Result:=b;
 end;
 
+function StripLN(const ALine: String): String;
+var
+  idx: Integer;
+begin
+  Result := ALine;
+  idx := Pos(#10, Result);
+  if idx = 0
+  then begin
+    idx := Pos(#13, Result);
+    if idx = 0 then Exit;
+  end
+  else begin
+    if (idx > 1)
+    and (Result[idx - 1] = #13)
+    then Dec(idx);
+  end;
+  SetLength(Result, idx - 1);
+end;
+
+function GetPart(const ASkipTo, AnEnd: String; var ASource: String;
+  const AnIgnoreCase, AnUpdateSource: Boolean): String;
+begin
+  Result := GetPart([ASkipTo], [AnEnd], ASource, AnIgnoreCase, AnUpdateSource);
+end;
+
+function GetPart(const ASkipTo, AnEnd: array of String; var ASource: String;
+  const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String;
+var
+  n, i, idx: Integer;
+  S, Source, Match: String;
+  HasEscape: Boolean;
+begin
+  Source := ASource;
+
+  if High(ASkipTo) >= 0
+  then begin
+    idx := 0;
+    Match := '';
+    HasEscape := False;
+    if AnIgnoreCase
+    then S := UpperCase(Source)
+    else S := Source;
+    for n := Low(ASkipTo) to High(ASkipTo) do
+    begin
+      if ASkipTo[n] = ''
+      then begin
+        HasEscape := True;
+        Continue;
+      end;
+      if AnIgnoreCase
+      then i := Pos(UpperCase(ASkipTo[n]), S)
+      else i := Pos(ASkipTo[n], S);
+      if i > idx
+      then begin
+        idx := i;
+        Match := ASkipTo[n];
+      end;
+    end;
+    if (idx = 0) and not HasEscape
+    then begin
+      Result := '';
+      Exit;
+    end;
+    if idx > 0
+    then Delete(Source, 1, idx + Length(Match) - 1);
+  end;
+
+  if AnIgnoreCase
+  then S := UpperCase(Source)
+  else S := Source;
+  idx := MaxInt;
+  for n := Low(AnEnd) to High(AnEnd) do
+  begin
+    if AnEnd[n] = '' then Continue;
+    if AnIgnoreCase
+    then i := Pos(UpperCase(AnEnd[n]), S)
+    else i := Pos(AnEnd[n], S);
+    if (i > 0) and (i < idx) then idx := i;
+  end;
+
+  if idx = MaxInt
+  then begin
+    Result := Source;
+    Source := '';
+  end
+  else begin
+    Result := Copy(Source, 1, idx - 1);
+    Delete(Source, 1, idx - 1);
+  end;
+
+  if AnUpdateSource
+  then ASource := Source;
+end;
+
+{
+  Ensures the covenient look of multiline string
+  when displaying it in the single line
+  * Replaces CR and LF with spaces
+  * Removes duplicate spaces
+}
+function TextToSingleLine(const AText: string): string;
+var
+  str: string;
+  i, wstart, wlen: Integer;
+begin
+  str := Trim(AText);
+  wstart := 0;
+  wlen := 0;
+  i := 1;
+  while i < Length(str) - 1 do
+  begin
+    if (str[i] in [' ', #13, #10]) then
+    begin
+      if (wstart = 0) then
+      begin
+        wstart := i;
+        wlen := 1;
+      end else
+        Inc(wlen);
+    end else
+    begin
+      if wstart > 0 then
+      begin
+        str[wstart] := ' ';
+        Delete(str, wstart+1, wlen-1);
+        Dec(i, wlen-1);
+        wstart := 0;
+      end;
+    end;
+    Inc(i);
+  end;
+  Result := str;
+end;
+
+function SwapCase(Const S: String): String;
+// Inverts the character case. Like LowerCase and UpperCase combined.
+var
+  i : Integer;
+  P : PChar;
+begin
+  Result := S;
+  if not assigned(pointer(result)) then exit;
+  UniqueString(Result);
+  P:=Pchar(pointer(Result));
+  for i := 1 to Length(Result) do begin
+    if (P^ in ['a'..'z']) then
+      P^ := char(byte(p^) - 32)
+    else if (P^ in ['A'..'Z']) then
+      P^ := char(byte(p^) + 32);
+    Inc(P);
+  end;
+end;
+
+function StringCase(const AString: String; const ACase: array of String {; const AIgnoreCase = False, APartial = false: Boolean}): Integer;
+begin
+  Result := StringCase(AString, ACase, False, False);
+end;
+
+function StringCase(const AString: String; const ACase: array of String; const AIgnoreCase, APartial: Boolean): Integer;
+var
+  Search, S: String;
+begin
+  if High(ACase) = -1
+  then begin
+    Result := -1;
+    Exit;
+  end;
+
+  if AIgnoreCase
+  then Search := UpperCase(AString)
+  else Search := AString;
+
+  for Result := Low(ACase) to High(ACase) do
+  begin
+    if AIgnoreCase
+    then S := UpperCase(ACase[Result])
+    else S := ACase[Result];
+
+    if Search = S then Exit;
+    if not APartial then Continue;
+    if Length(Search) >= Length(S) then Continue;
+    if StrLComp(PChar(Search), PChar(S), Length(Search)) = 0 then Exit;
+  end;
+
+  Result := -1;
+end;
+
 end.
 

components/todolist/tododlg.pas

@@ -29,10 +29,14 @@ unit ToDoDlg;
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, ButtonPanel, Menus, Spin,
-  TodoList, ToDoListStrConsts, IDECommands, LCLType,
-  MenuIntf, PackageIntf, SrcEditorIntf, IDEWindowIntf, LazIDEIntf;
+  Classes, SysUtils,
+  // LCL
+  LCLType, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls,
+  Buttons, ButtonPanel, Menus, Spin,
+  // IdeIntf
+  IDECommands, MenuIntf, PackageIntf, SrcEditorIntf, IDEWindowIntf, LazIDEIntf,
+  // TodoList
+  TodoList, ToDoListStrConsts;
 
 type
 

components/todolist/todolist.pas

@@ -62,10 +62,10 @@ uses
   // FCL, RTL
   Classes, SysUtils, Math, StrUtils, Laz_AVL_Tree,
   // LCL
-  LCLProc, LCLType, LclIntf, Forms, Controls, StdCtrls, Dialogs, ComCtrls,
+  LCLType, LclIntf, Forms, Controls, StdCtrls, Dialogs, ComCtrls,
   ActnList, XMLPropStorage,
   // LazUtils
-  LazUTF8Classes, LazFileUtils, LazFileCache, LazLoggerBase,
+  LazUTF8Classes, LazFileUtils, LazStringUtils, LazFileCache, LazLoggerBase, LazTracer,
   // Codetools
   CodeCache, CodeToolManager, BasicCodeTools, FileProcs,
   // IDEIntf

debugger/debugger.pp

@@ -42,7 +42,8 @@ uses
   // LCL
   LCLProc,
   // LazUtils
-  Laz2_XMLCfg, LazFileUtils, LazLoggerBase, LazConfigStorage, LazClasses, Maps,
+  Laz2_XMLCfg, LazFileUtils, LazStringUtils, LazLoggerBase, LazConfigStorage,
+  LazClasses, Maps,
   // DebuggerIntf
   DbgIntfBaseTypes, DbgIntfMiscClasses, DbgIntfDebuggerBase;
 

debugger/frames/debugger_general_options.pas

@@ -27,9 +27,9 @@ interface
 uses
   Classes, SysUtils, TypInfo,
   // LCL
-  Forms, Controls, StdCtrls, ExtCtrls, Buttons, Dialogs, LCLProc,
+  Forms, Controls, StdCtrls, ExtCtrls, Buttons, Dialogs,
   // LazUtils
-  FileUtil, LazFileUtils, LazFileCache,
+  FileUtil, LazFileUtils, LazStringUtils, LazFileCache,
   // DebuggerIntf
   DbgIntfDebuggerBase,
   // IdeIntf

ide/initialsetupdlgs.pas

@@ -40,19 +40,24 @@ unit InitialSetupDlgs;
 interface
 
 uses
-  // RTL + FCL + LCL
-  Classes, SysUtils,
-  Forms, Controls, Buttons, Dialogs, Graphics, ComCtrls, ExtCtrls, StdCtrls, LCLProc,
-  pkgglobals, process,
-  fpmkunit,
+  // RTL + FCL
+  Classes, SysUtils, pkgglobals, process, fpmkunit,
+  // LCL
+  Forms, Controls, Buttons, Dialogs, Graphics, ComCtrls, ExtCtrls, StdCtrls,
   // CodeTools
   FileProcs, CodeToolManager, DefineTemplates,
   // LazUtils
-  FileUtil, LazUTF8, LazUTF8Classes, LazFileUtils, LazFileCache, LazLoggerBase,
-  // Other
-  MacroDefIntf, GDBMIDebugger, DbgIntfDebuggerBase, IDEDialogs,
-  TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts, IDEImagesIntf,
-  AboutFrm, IDETranslations, BaseBuildManager, InitialSetupProc, FppkgHelper,
+  FileUtil, LazUTF8, LazUTF8Classes, LazFileUtils, LazStringUtils, LazFileCache,
+  LazLoggerBase,
+  // IdeIntf
+  MacroDefIntf, IDEDialogs, IDEImagesIntf,
+  // DebuggerIntf
+  DbgIntfDebuggerBase,
+  // LazDebuggerGdbmi
+  GDBMIDebugger,
+  // IDE
+  TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts,
+  AboutFrm, IDETranslations, BaseBuildManager, InitialSetupProc,
   {$IF FPC_FULLVERSION>30100}
   GenerateFppkgConfigurationDlg,
   {$ENDIF}

lcl/lclproc.pas

@@ -285,18 +285,7 @@ procedure DbgSaveData(FileName: String; AData: PChar; ADataSize: PtrUInt);
 procedure DbgAppendToFile(FileName, S: String);
 procedure DbgAppendToFileWithoutLn(FileName, S: String);
 
-// some string manipulation functions
-function StripLN(const ALine: String): String;
-function GetPart(const ASkipTo, AnEnd: String; var ASource: String;
-  const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String; overload;
-function GetPart(const ASkipTo, AnEnd: array of String; var ASource: String;
-  const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String; overload;
-function TextToSingleLine(const AText: string): string;
-function SwapCase(Const S: String): String;
-
 // case..of utility functions
-function StringCase(const AString: String; const ACase: array of String {; const AIgnoreCase = False, APartial = false: Boolean}): Integer; overload;
-function StringCase(const AString: String; const ACase: array of String; const AIgnoreCase, APartial: Boolean): Integer; overload;
 function ClassCase(const AClass: TClass; const ACase: array of TClass {; const ADescendant: Boolean = True}): Integer; overload;
 function ClassCase(const AClass: TClass; const ACase: array of TClass; const ADecendant: Boolean): Integer; overload;
 
@@ -2322,193 +2311,6 @@ begin
   CloseFile(F);
 end;
 
-function StripLN(const ALine: String): String;
-var
-  idx: Integer;
-begin
-  Result := ALine;
-  idx := Pos(#10, Result);
-  if idx = 0
-  then begin
-    idx := Pos(#13, Result);
-    if idx = 0 then Exit;
-  end
-  else begin
-    if (idx > 1)
-    and (Result[idx - 1] = #13)
-    then Dec(idx);
-  end;
-  SetLength(Result, idx - 1);
-end;
-
-function GetPart(const ASkipTo, AnEnd: String; var ASource: String;
-  const AnIgnoreCase, AnUpdateSource: Boolean): String;
-begin
-  Result := GetPart([ASkipTo], [AnEnd], ASource, AnIgnoreCase, AnUpdateSource);
-end;
-
-function GetPart(const ASkipTo, AnEnd: array of String; var ASource: String;
-  const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String;
-var
-  n, i, idx: Integer;
-  S, Source, Match: String;
-  HasEscape: Boolean;
-begin
-  Source := ASource;
-
-  if High(ASkipTo) >= 0
-  then begin
-    idx := 0;
-    Match := '';
-    HasEscape := False;
-    if AnIgnoreCase
-    then S := UpperCase(Source)
-    else S := Source;
-    for n := Low(ASkipTo) to High(ASkipTo) do
-    begin
-      if ASkipTo[n] = ''
-      then begin
-        HasEscape := True;
-        Continue;
-      end;
-      if AnIgnoreCase
-      then i := Pos(UpperCase(ASkipTo[n]), S)
-      else i := Pos(ASkipTo[n], S);
-      if i > idx
-      then begin
-        idx := i;
-        Match := ASkipTo[n];
-      end;
-    end;
-    if (idx = 0) and not HasEscape
-    then begin
-      Result := '';
-      Exit;
-    end;
-    if idx > 0
-    then Delete(Source, 1, idx + Length(Match) - 1);
-  end;
-
-  if AnIgnoreCase
-  then S := UpperCase(Source)
-  else S := Source;
-  idx := MaxInt;
-  for n := Low(AnEnd) to High(AnEnd) do
-  begin
-    if AnEnd[n] = '' then Continue;
-    if AnIgnoreCase
-    then i := Pos(UpperCase(AnEnd[n]), S)
-    else i := Pos(AnEnd[n], S);
-    if (i > 0) and (i < idx) then idx := i;
-  end;
-
-  if idx = MaxInt
-  then begin
-    Result := Source;
-    Source := '';
-  end
-  else begin
-    Result := Copy(Source, 1, idx - 1);
-    Delete(Source, 1, idx - 1);
-  end;
-
-  if AnUpdateSource
-  then ASource := Source;
-end;
-
-{
-  Ensures the covenient look of multiline string
-  when displaying it in the single line
-  * Replaces CR and LF with spaces
-  * Removes duplicate spaces
-}
-function TextToSingleLine(const AText: string): string;
-var
-  str: string;
-  i, wstart, wlen: Integer;
-begin
-  str := Trim(AText);
-  wstart := 0;
-  wlen := 0;
-  i := 1;
-  while i < Length(str) - 1 do
-  begin
-    if (str[i] in [' ', #13, #10]) then
-    begin
-      if (wstart = 0) then
-      begin
-        wstart := i;
-        wlen := 1;
-      end else
-        Inc(wlen);
-    end else
-    begin
-      if wstart > 0 then
-      begin
-        str[wstart] := ' ';
-        Delete(str, wstart+1, wlen-1);
-        Dec(i, wlen-1);
-        wstart := 0;
-      end;
-    end;
-    Inc(i);
-  end;
-  Result := str;
-end;
-
-function SwapCase(Const S: String): String;
-// Inverts the character case. Like LowerCase and UpperCase combined.
-var
-  i : Integer;
-  P : PChar;
-begin
-  Result := S;
-  if not assigned(pointer(result)) then exit;
-  UniqueString(Result);
-  P:=Pchar(pointer(Result));
-  for i := 1 to Length(Result) do begin
-    if (P^ in ['a'..'z']) then
-      P^ := char(byte(p^) - 32)
-    else if (P^ in ['A'..'Z']) then
-      P^ := char(byte(p^) + 32);
-    Inc(P);
-  end;
-end;
-
-function StringCase(const AString: String; const ACase: array of String {; const AIgnoreCase = False, APartial = false: Boolean}): Integer;
-begin
-  Result := StringCase(AString, ACase, False, False);
-end;
-
-function StringCase(const AString: String; const ACase: array of String; const AIgnoreCase, APartial: Boolean): Integer;
-var
-  Search, S: String;
-begin
-  if High(ACase) = -1
-  then begin
-    Result := -1;
-    Exit;
-  end;
-
-  if AIgnoreCase
-  then Search := UpperCase(AString)
-  else Search := AString;
-
-  for Result := Low(ACase) to High(ACase) do
-  begin
-    if AIgnoreCase
-    then S := UpperCase(ACase[Result])
-    else S := ACase[Result];
-
-    if Search = S then Exit;
-    if not APartial then Continue;
-    if Length(Search) >= Length(S) then Continue;
-    if StrLComp(PChar(Search), PChar(S), Length(Search)) = 0 then Exit;
-  end;
-
-  Result := -1;
-end;
-
 function ClassCase(const AClass: TClass; const ACase: array of TClass {; const ADecendant: Boolean = True}): Integer;
 begin
   Result := ClassCase(AClass, ACase, True);

tools/apiwizz/apiwizard.pp

@@ -31,8 +31,11 @@ unit APIWizard;
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls, Dialogs, StdCtrls, ExtCtrls, LCLproc, ComCtrls,
-  LazFileUtils, LazUTF8, LazUTF8Classes;
+  Classes, SysUtils,
+  // LCL
+  Forms, Controls, Dialogs, StdCtrls, ExtCtrls, LCLproc, ComCtrls,
+  // LazUtils
+  LazFileUtils, LazStringUtils, LazUTF8, LazUTF8Classes;
 
 type