LazUtils: Harmonize the CamelCase names of some units. Add a license header for LazTracer.

2025-04-08 09:18:18 +02:00 · 2023-04-07 12:21:10 +03:00 · 2023-04-07 12:21:10 +03:00 · abb5f2b097
commit abb5f2b097
parent 6788d80b4d
25 changed files with 62 additions and 56 deletions
--- a/components/fpvectorial/htmlvectorialreader.pas
+++ b/components/fpvectorial/htmlvectorialreader.pas
@ -14,12 +14,12 @@ interface

 uses
  Classes, SysUtils, math, contnrs,
-  fpimage, fpcanvas, laz2_xmlread, laz2_dom, fgl, lazfileutils,
+  fpimage, fpcanvas, Laz2_XMLRead, Laz2_DOM, fgl, LazFileUtils,
  // image data formats
  fpreadpng,
  // HTML can contain SVG
  svgvectorialreader,
-  fpvectorial, fpvutils, lazutf8, TypInfo;
+  fpvectorial, fpvutils, LazUTF8, TypInfo;

 type
  { TvHTMLVectorialReader }
--- a/components/fpvectorial/mathmlvectorialreader.pas
+++ b/components/fpvectorial/mathmlvectorialreader.pas
@ -14,7 +14,7 @@ interface

 uses
  Classes, SysUtils,
-  laz2_xmlread, laz2_dom,
+  Laz2_XMLRead, Laz2_DOM,
  fpvectorial;

 type
--- a/components/fpvectorial/svgvectorialreader.pas
+++ b/components/fpvectorial/svgvectorialreader.pas
@ -54,7 +54,7 @@ interface

 uses
  Classes, SysUtils, math, contnrs,
-  fpimage, fpcanvas, laz2_xmlread, laz2_dom, fgl,
+  fpimage, fpcanvas, Laz2_XMLRead, Laz2_DOM, fgl,
  // image data formats
  fpreadpng,
  fpvectorial, fpvutils, lazutf8, TypInfo;
--- a/components/fpvectorial/svgvectorialreader_rsvg.pas
+++ b/components/fpvectorial/svgvectorialreader_rsvg.pas
@ -18,11 +18,11 @@ interface

 uses
  Classes, SysUtils, math, contnrs, process, utf8Process,
-  laz2_xmlread, laz2_xmlwrite, laz2_dom,
+  Laz2_XMLRead, Laz2_XMLWrite, Laz2_DOM,
  // image data formats
  fpreadpng,
-  fpvectorial, fpvutils, lazutf8, TypInfo,
-  fileutil, lazfileutils;
+  fpvectorial, fpvutils, LazUTF8, TypInfo,
+  FileUtil, LazFileUtils;

 type
  { TvSVGVectorialReader_RSVG }
--- a/components/lazutils/laz2_dom.pas
+++ b/components/lazutils/laz2_dom.pas
@ -38,7 +38,7 @@ unit Laz2_DOM;
 interface

 uses
-  SysUtils, Classes, laz2_xmlutils;
+  SysUtils, Classes, Laz2_XMLUtils;

 // -------------------------------------------------------
 //   DOMException
--- a/components/lazutils/laz2_xmlcfg.pas
+++ b/components/lazutils/laz2_xmlcfg.pas
@ -27,9 +27,8 @@ interface

 uses
  {$IFDEF MEM_CHECK}MemCheck,{$ENDIF}
-  Classes, sysutils, LazFileCache,
-  Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite, LazUtilities,
-  typinfo;
+  Classes, sysutils, TypInfo,
+  LazFileCache, Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite, LazUtilities;

 type

--- a/components/lazutils/laz2_xmlread.pas
+++ b/components/lazutils/laz2_xmlread.pas
@ -14,7 +14,7 @@

 }

-unit laz2_XMLRead;
+unit Laz2_XMLRead;

 {$ifdef fpc}
 {$MODE objfpc}{$H+}
@ -26,7 +26,7 @@ unit laz2_XMLRead;
 interface

 uses
-  SysUtils, Classes, laz2_DOM;
+  SysUtils, Classes, Laz2_DOM;

 type
  TErrorSeverity = (esWarning, esError, esFatal);
@ -160,7 +160,7 @@ procedure RegisterDecoder(Proc: TGetDecoderProc);
 implementation

 uses
-  UriParser, laz2_xmlutils, LazUTF8;
+  URIParser, Laz2_XMLUtils, LazUTF8;

 const
  PubidChars: TSetOfChar = [' ', #13, #10, 'a'..'z', 'A'..'Z', '0'..'9',
--- a/components/lazutils/laz2_xmlutils.pas
+++ b/components/lazutils/laz2_xmlutils.pas
@ -11,7 +11,7 @@
  Copyright (c) 2006 by Sergei Gorelkin, sergei_gorelkin@mail.ru

 }
-unit laz2_xmlutils;
+unit Laz2_XMLUtils;

 {$ifdef fpc}{$mode objfpc}{$endif}
 {$H+}
--- a/components/lazutils/laz2_xmlwrite.pas
+++ b/components/lazutils/laz2_xmlwrite.pas
@ -15,7 +15,7 @@
 }


-unit laz2_XMLWrite;
+unit Laz2_XMLWrite;

 {$ifdef fpc}{$MODE objfpc}{$endif}
 {$H+}
@ -25,7 +25,7 @@ unit laz2_XMLWrite;

 interface

-uses Classes, LazUTF8, laz2_DOM, SysUtils, laz2_xmlutils;
+uses Classes, SysUtils, LazUTF8, Laz2_DOM, Laz2_XMLUtils;

 type
  TXMLWriterFlag = (
--- a/components/lazutils/laz2_xpath.pas
+++ b/components/lazutils/laz2_xpath.pas
@ -16,13 +16,13 @@
 {$mode objfpc}
 {$H+}

-unit laz2_xpath;
+unit Laz2_XPath;

 interface

 uses
  Math, SysUtils, Classes, LazUtilsStrConsts,
-  laz2_DOM, laz2_xmlutils;
+  Laz2_DOM, Laz2_XMLUtils;

 type
  TXPathContext = class;
--- a/components/lazutils/laz_xmlread.pas
+++ b/components/lazutils/laz_xmlread.pas
@ -17,10 +17,10 @@ unit Laz_XMLRead;
 interface

 uses
-  Classes, laz2_XMLRead, laz2_DOM;
+  Classes, Laz2_XMLRead, Laz2_DOM;

 type
-  EXMLReadError = laz2_XMLRead.EXMLReadError;
+  EXMLReadError = Laz2_XMLRead.EXMLReadError;
 const
  xrfOldXMLRead = [xrfAllowLowerThanInAttributeValue,xrfAllowSpecialCharsInAttributeValue];

@ -43,65 +43,65 @@ implementation

 procedure ReadXMLFile(out ADoc: TXMLDocument; const AFilename: String);
 begin
-  laz2_XMLRead.ReadXMLFile(ADoc,AFilename,xrfOldXMLRead);
+  Laz2_XMLRead.ReadXMLFile(ADoc,AFilename,xrfOldXMLRead);
 end;

 procedure ReadXMLFile(out ADoc: TXMLDocument; var f: File);
 begin
-  laz2_XMLRead.ReadXMLFile(ADoc,f,xrfOldXMLRead);
+  Laz2_XMLRead.ReadXMLFile(ADoc,f,xrfOldXMLRead);
 end;

 procedure ReadXMLFile(out ADoc: TXMLDocument; f: TStream);
 begin
-  laz2_XMLRead.ReadXMLFile(ADoc,f,xrfOldXMLRead);
+  Laz2_XMLRead.ReadXMLFile(ADoc,f,xrfOldXMLRead);
 end;

 procedure ReadXMLFile(out ADoc: TXMLDocument; f: TStream;
  const AFilename: String);
 begin
-  laz2_XMLRead.ReadXMLFile(ADoc,f,AFilename,xrfOldXMLRead);
+  Laz2_XMLRead.ReadXMLFile(ADoc,f,AFilename,xrfOldXMLRead);
 end;

 procedure ReadXMLFragment(AParentNode: TDOMNode; const AFilename: String);
 begin
-  laz2_XMLRead.ReadXMLFragment(AParentNode,AFilename,xrfOldXMLRead);
+  Laz2_XMLRead.ReadXMLFragment(AParentNode,AFilename,xrfOldXMLRead);
 end;

 procedure ReadXMLFragment(AParentNode: TDOMNode; var f: File);
 begin
-  laz2_XMLRead.ReadXMLFragment(AParentNode,f,xrfOldXMLRead);
+  Laz2_XMLRead.ReadXMLFragment(AParentNode,f,xrfOldXMLRead);
 end;

 procedure ReadXMLFragment(AParentNode: TDOMNode; var f: TStream);
 begin
-  laz2_XMLRead.ReadXMLFragment(AParentNode,f,xrfOldXMLRead);
+  Laz2_XMLRead.ReadXMLFragment(AParentNode,f,xrfOldXMLRead);
 end;

 procedure ReadXMLFragment(AParentNode: TDOMNode; var f: TStream;
  const AFilename: String);
 begin
-  laz2_XMLRead.ReadXMLFragment(AParentNode,f,AFilename,xrfOldXMLRead);
+  Laz2_XMLRead.ReadXMLFragment(AParentNode,f,AFilename,xrfOldXMLRead);
 end;

 procedure ReadDTDFile(var ADoc: TXMLDocument; const AFilename: String);
 begin
-  laz2_XMLRead.ReadDTDFile(ADoc,AFilename);
+  Laz2_XMLRead.ReadDTDFile(ADoc,AFilename);
 end;

 procedure ReadDTDFile(var ADoc: TXMLDocument; var f: File);
 begin
-  laz2_XMLRead.ReadDTDFile(ADoc,f);
+  Laz2_XMLRead.ReadDTDFile(ADoc,f);
 end;

 procedure ReadDTDFile(var ADoc: TXMLDocument; var f: TStream);
 begin
-  laz2_XMLRead.ReadDTDFile(ADoc,f);
+  Laz2_XMLRead.ReadDTDFile(ADoc,f);
 end;

 procedure ReadDTDFile(var ADoc: TXMLDocument; var f: TStream;
  const AFilename: String);
 begin
-  laz2_XMLRead.ReadDTDFile(ADoc,f,AFilename);
+  Laz2_XMLRead.ReadDTDFile(ADoc,f,AFilename);
 end;

 end.
--- a/components/lazutils/laz_xmlwrite.pas
+++ b/components/lazutils/laz_xmlwrite.pas
@ -16,7 +16,7 @@ unit Laz_XMLWrite;

 interface

-uses Classes, laz2_XMLWrite, laz2_DOM;
+uses Classes, Laz2_XMLWrite, Laz2_DOM;

 const
  xwfOldXMLWrite = [xwfSpecialCharsInAttributeValue];
@ -33,32 +33,32 @@ implementation

 procedure WriteXMLFile(doc: TXMLDocument; const AFileName: String);
 begin
-  laz2_XMLWrite.WriteXMLFile(doc,AFileName,xwfOldXMLWrite);
+  Laz2_XMLWrite.WriteXMLFile(doc,AFileName,xwfOldXMLWrite);
 end;

 procedure WriteXMLFile(doc: TXMLDocument; var AFile: Text);
 begin
-  laz2_XMLWrite.WriteXMLFile(doc,AFile,xwfOldXMLWrite);
+  Laz2_XMLWrite.WriteXMLFile(doc,AFile,xwfOldXMLWrite);
 end;

 procedure WriteXMLFile(doc: TXMLDocument; AStream: TStream);
 begin
-  laz2_XMLWrite.WriteXMLFile(doc,AStream,xwfOldXMLWrite);
+  Laz2_XMLWrite.WriteXMLFile(doc,AStream,xwfOldXMLWrite);
 end;

 procedure WriteXML(Element: TDOMNode; const AFileName: String);
 begin
-  laz2_XMLWrite.WriteXML(Element,AFileName,xwfOldXMLWrite);
+  Laz2_XMLWrite.WriteXML(Element,AFileName,xwfOldXMLWrite);
 end;

 procedure WriteXML(Element: TDOMNode; var AFile: Text);
 begin
-  laz2_XMLWrite.WriteXML(Element,AFile,xwfOldXMLWrite);
+  Laz2_XMLWrite.WriteXML(Element,AFile,xwfOldXMLWrite);
 end;

 procedure WriteXML(Element: TDOMNode; AStream: TStream);
 begin
-  laz2_XMLWrite.WriteXML(Element,AStream,xwfOldXMLWrite);
+  Laz2_XMLWrite.WriteXML(Element,AStream,xwfOldXMLWrite);
 end;

 end.
--- a/components/lazutils/laztracer.pas
+++ b/components/lazutils/laztracer.pas
@ -1,3 +1,11 @@
+{
+ *****************************************************************************
+  This file is part of LazUtils.
+
+  See the file COPYING.modifiedLGPL.txt, included in this distribution,
+  for details about the license.
+ *****************************************************************************
+}
 unit LazTracer;

 {$mode objfpc}{$H+}
--- a/components/lazutils/lcsvutils.pas
+++ b/components/lazutils/lcsvutils.pas
@ -6,7 +6,7 @@
  for details about the license.
 *****************************************************************************
 }
-unit lcsvutils;
+unit LCSVUtils;

 {$mode objfpc}{$H+}
 {$modeswitch nestedprocvars}
--- a/components/wiki/lazwiki/wiki2fpdocconvert.pas
+++ b/components/wiki/lazwiki/wiki2fpdocconvert.pas
@ -83,8 +83,8 @@ unit Wiki2FPDocConvert;
 interface

 uses
-  Classes, SysUtils, WikiParser, laz2_DOM, LazFileUtils, laz2_XMLRead,
-  laz2_XMLWrite, LazLoggerBase, WikiFormat;
+  Classes, SysUtils, WikiParser, LazFileUtils,
+  Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite, LazLoggerBase, WikiFormat;

 type

--- a/components/wiki/lazwiki/wiki2xhtmlconvert.pas
+++ b/components/wiki/lazwiki/wiki2xhtmlconvert.pas
@ -27,7 +27,7 @@ interface
 uses
  Classes, SysUtils,
  // LazUtils
-  laz2_XMLWrite, LazUTF8, laz2_DOM, LazLoggerBase, LazFileUtils, AvgLvlTree,
+  Laz2_XMLWrite, Laz2_DOM, LazUTF8, LazLoggerBase, LazFileUtils, AvgLvlTree,
  // CodeTools
  BasicCodeTools, KeywordFuncLists,
  // LazWiki
--- a/components/wiki/lazwiki/wikiformat.pas
+++ b/components/wiki/lazwiki/wikiformat.pas
@ -29,7 +29,7 @@ interface
 uses
  Classes, SysUtils, Laz_AVL_Tree,
  // LazUtils
-  LazFileUtils, laz2_XMLRead, laz2_DOM, LazLoggerBase, AvgLvlTree, LazUTF8, LazStringUtils,
+  LazFileUtils, Laz2_XMLRead, Laz2_DOM, LazLoggerBase, AvgLvlTree, LazUTF8, LazStringUtils,
  // Codetools
  BasicCodeTools, KeywordFuncLists,
  // LazWiki
--- a/components/wiki/lazwiki/wikiparser.pas
+++ b/components/wiki/lazwiki/wikiparser.pas
@ -36,7 +36,7 @@ interface
 uses
  Classes, SysUtils,
  // LazUtils
-  laz2_XMLRead, laz2_DOM, LazLoggerBase, LazUTF8, LazStringUtils,
+  Laz2_XMLRead, Laz2_DOM, LazLoggerBase, LazUTF8, LazStringUtils,
  // CodeTools
  BasicCodeTools, KeywordFuncLists;

--- a/components/wiki/wikiget.lpr
+++ b/components/wiki/wikiget.lpr
@ -31,7 +31,7 @@ uses
  {$ENDIF}
  Classes, SysUtils, CustApp, strutils, Laz_AVL_Tree,
  // LazUtils
-  LazFileUtils, laz2_XMLRead, laz2_DOM, laz2_XMLWrite, LazLogger, avglvltree,
+  LazFileUtils, Laz2_XMLRead, Laz2_DOM, Laz2_XMLWrite, LazLogger, avglvltree,
  LazUTF8, LazStringUtils,
  // CodeTools
  CodeToolsStructs,
--- a/ide/ideinstances.pas
+++ b/ide/ideinstances.pas
@ -43,9 +43,8 @@ uses
  {$ELSE}
  LazAdvancedIPC,
  {$ENDIF}
-  Interfaces, Controls, Forms, Dialogs, ExtCtrls, LCLProc,
-  LCLIntf, LCLType, LazFileUtils, LazUTF8, laz2_XMLRead, laz2_XMLWrite,
-  Laz2_DOM, FileUtil, UTF8Process,
+  Interfaces, Controls, Forms, Dialogs, ExtCtrls, LCLProc, LCLIntf, LCLType,
+  LazFileUtils, FileUtil, Laz2_XMLRead, Laz2_XMLWrite, Laz2_DOM, LazUTF8, UTF8Process,
  LazarusIDEStrConsts, IDECmdLine, LazConf;

 type
--- a/ide/packages/idedebugger/debugger.pp
+++ b/ide/packages/idedebugger/debugger.pp
@ -41,7 +41,7 @@ uses
  TypInfo, Classes, SysUtils, math, Types, fgl,
  // LazUtils
  Laz2_XMLCfg, LazFileUtils, LazStringUtils, LazUtilities, LazLoggerBase,
-  LazClasses, Maps, LazMethodList, laz2_XMLWrite,
+  LazClasses, Maps, LazMethodList, Laz2_XMLWrite,
  // DebuggerIntf
  DbgIntfBaseTypes, DbgIntfMiscClasses, DbgIntfDebuggerBase, LazDebuggerIntf,
  LazDebuggerIntfBaseTypes, LazDebuggerValueConverter, LazDebuggerTemplate,
--- a/ide/packages/idedebugger/idedebuggeropts.pas
+++ b/ide/packages/idedebugger/idedebuggeropts.pas
@ -6,7 +6,7 @@ interface

 uses
  Classes, SysUtils, IDEOptionsIntf, Laz2_XMLCfg, LazFileUtils, LazUTF8,
-  LazLoggerBase, Laz2_DOM, laz2_XMLRead, laz2_XMLWrite, DbgIntfDebuggerBase,
+  LazLoggerBase, Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite, DbgIntfDebuggerBase,
  IdeDebuggerStringConstants, IdeDebuggerBackendValueConv, EnvironmentOpts;

 type
--- a/ide/packages/idedebugger/test/testxmlopts.pas
+++ b/ide/packages/idedebugger/test/testxmlopts.pas
@ -6,7 +6,7 @@ interface

 uses
  Classes, SysUtils, IdeDebuggerOpts, EnvironmentOpts, DbgIntfDebuggerBase,
-  Laz2_DOM, laz2_XMLRead, laz2_xpath, fpcunit,
+  Laz2_DOM, Laz2_XMLRead, Laz2_XPath, fpcunit,
  testregistry;

 type
--- a/packager/packagesystem.pas
+++ b/packager/packagesystem.pas
@ -50,7 +50,7 @@ uses
  Forms, Controls, Dialogs, LCLProc,
  // LazUtils
  FileUtil, LazFileCache, LazLoggerBase, LazUtilities, LazFileUtils, LazUTF8,
-  Laz2_XMLCfg, laz2_XMLRead, LazStringUtils, AvgLvlTree,
+  Laz2_XMLCfg, Laz2_XMLRead, LazStringUtils, AvgLvlTree,
  // codetools
  FileProcs, DefineTemplates, CodeToolManager, CodeCache, DirectoryCacher,
  BasicCodeTools, NonPascalCodeTools, SourceChanger,
--- a/test/lazutils/testlazxml.pas
+++ b/test/lazutils/testlazxml.pas
@ -15,8 +15,8 @@ unit TestLazXML;
 interface

 uses
-  Classes, SysUtils, fpcunit, testglobals, laz2_DOM, laz2_xmlutils, laz2_xpath,
-  laz2_XMLRead, LazLogger;
+  Classes, SysUtils, fpcunit, testglobals, Laz2_DOM, Laz2_XMLUtils, Laz2_XPath,
+  Laz2_XMLRead, LazLogger;

 type