diff --git a/components/anchordocking/restoredebugger/mainunit.pas b/components/anchordocking/restoredebugger/mainunit.pas index b5f22e8a9a..c633f471d6 100644 --- a/components/anchordocking/restoredebugger/mainunit.pas +++ b/components/anchordocking/restoredebugger/mainunit.pas @@ -34,7 +34,7 @@ unit MainUnit; interface uses - Classes, SysUtils, math, FileUtil, LazFileUtils, LazLogger, LazUTF8, SynEdit, + Classes, SysUtils, math, FileUtil, LazFileUtils, LazLoggerBase, LazUTF8, SynEdit, SynHighlighterXML, AnchorDocking, AnchorDockStorage, ADLayoutViewer, Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, Buttons, StdCtrls, XMLPropStorage; diff --git a/components/chmhelp/packages/idehelp/chmprog.pas b/components/chmhelp/packages/idehelp/chmprog.pas index 81eb88aeb9..c81c4f32af 100644 --- a/components/chmhelp/packages/idehelp/chmprog.pas +++ b/components/chmhelp/packages/idehelp/chmprog.pas @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, chmreader, chmFiftiMain, Dialogs, - FileUtil, LazFileUtils, LazUTF8, LazLogger, LazStringUtils, + FileUtil, LazFileUtils, LazUTF8, LazLoggerBase, LazStringUtils, LazHelpIntf, HelpIntfs, IDEHelpIntf, MacroIntf; diff --git a/components/codetools/examples/sourcecloser.lpr b/components/codetools/examples/sourcecloser.lpr index 3949d0446d..96ca629351 100644 --- a/components/codetools/examples/sourcecloser.lpr +++ b/components/codetools/examples/sourcecloser.lpr @@ -35,7 +35,7 @@ program sourcecloser; uses Classes, SysUtils, CustApp, // LazUtils - AvgLvlTree, LazLogger, LazFileUtils, Laz2_XMLCfg, LazUTF8, + AvgLvlTree, LazLoggerBase, LazFileUtils, Laz2_XMLCfg, LazUTF8, // CodeTools FileProcs, BasicCodeTools, CodeToolManager, CodeCache, SourceChanger, CodeTree, DefineTemplates, LinkScanner; diff --git a/components/codetools/examples/testfpcsrcunitrules.lpr b/components/codetools/examples/testfpcsrcunitrules.lpr index 86845598a7..d5ddba7840 100644 --- a/components/codetools/examples/testfpcsrcunitrules.lpr +++ b/components/codetools/examples/testfpcsrcunitrules.lpr @@ -30,7 +30,7 @@ program TestFPCSrcUnitRules; uses Classes, SysUtils, CustApp, AVL_Tree, // LazUtils - LazFileUtils, AvgLvlTree, LazLogger, + LazFileUtils, AvgLvlTree, LazLoggerBase, // CodeTools FileProcs, CodeToolManager, DefineTemplates, CodeToolsConfig; diff --git a/components/fpcunit/ide/regtestinsight.pas b/components/fpcunit/ide/regtestinsight.pas index 5cfb1992bd..54cb4f957f 100644 --- a/components/fpcunit/ide/regtestinsight.pas +++ b/components/fpcunit/ide/regtestinsight.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, - lazlogger, Forms, Controls, + LazLoggerBase, Forms, Controls, IDECommands, MenuIntf, IDEWindowIntf, LazIDEIntf, IDEMsgIntf, IDEOptEditorIntf, IDEOptionsIntf, IDEExternToolIntf, Projectintf, diff --git a/components/lazcontrols/spinex.pp b/components/lazcontrols/spinex.pp index cdfc597054..7723dace10 100644 --- a/components/lazcontrols/spinex.pp +++ b/components/lazcontrols/spinex.pp @@ -77,7 +77,7 @@ uses Classes, SysUtils, Math, // LCL LCLType, Controls, ClipBrd, ComCtrls, GroupedEdit, LResources - {$ifdef debugspinex}, LazLogger{$endif}; + {$ifdef debugspinex}, LazLoggerBase{$endif}; diff --git a/components/lazreport/samples/console_cgi_http/unitreporter.pas b/components/lazreport/samples/console_cgi_http/unitreporter.pas index fcfa263ae8..1ce447f6c1 100644 --- a/components/lazreport/samples/console_cgi_http/unitreporter.pas +++ b/components/lazreport/samples/console_cgi_http/unitreporter.pas @@ -5,7 +5,7 @@ unit UnitReporter; interface uses - Classes, SysUtils, LazLogger, Graphics, LR_Class, LR_DBSet, LR_BarC, LR_Shape, + Classes, SysUtils, LazLoggerBase, Graphics, LR_Class, LR_DBSet, LR_BarC, LR_Shape, LR_RRect, LR_ChBox, LR_CrossTab, LR_CodeReport, lr_e_pdf, lr_e_fclpdf, LR_E_TXT, LR_E_CSV, LR_E_HTM, LR_e_img, LR_e_htmldiv, le_e_spreadsheet, diff --git a/components/lazreport/samples/editor/maincalleditor.pas b/components/lazreport/samples/editor/maincalleditor.pas index ed65308334..d2ea97d003 100644 --- a/components/lazreport/samples/editor/maincalleditor.pas +++ b/components/lazreport/samples/editor/maincalleditor.pas @@ -31,7 +31,7 @@ uses LR_DBSet, IniFiles, LR_PGrid, Menus, ComCtrls, ActnList, Lr_e_txt, Lr_e_htm, LR_E_CSV, LR_DSet, LR_BarC, LR_RRect, LR_Shape, LR_ChBox, lconvencoding, lr_e_gen, lr_utils, LCLProc, ExtCtrls, custompreview, LR_Pars, LR_e_htmldiv, - lrAddFunctionLibrary, LazLogger, LazFileUtils, LCLTranslator; + lrAddFunctionLibrary, LazLoggerBase, LazFileUtils, LCLTranslator; type diff --git a/components/lazreport/source/lr_ngcanvas.pas b/components/lazreport/source/lr_ngcanvas.pas index 98f94ac0fc..000b9fa97c 100644 --- a/components/lazreport/source/lr_ngcanvas.pas +++ b/components/lazreport/source/lr_ngcanvas.pas @@ -7,7 +7,7 @@ unit lr_ngcanvas; interface uses - Classes, SysUtils, Math, Types, LCLType, LCLProc, LazLogger, Graphics, FileUtil, + Classes, SysUtils, Math, Types, LCLType, LCLProc, LazLoggerBase, Graphics, FileUtil, fpjson, jsonparser, FPimage, FPImgCanv, FPCanvas, FPWriteBMP, FPWritePNG, fpparsettf, EasyLazFreeType, LazFreeTypeFontCollection, LazFreeTypeFPImageDrawer; diff --git a/components/opengl/usergui_example/imguimain.pas b/components/opengl/usergui_example/imguimain.pas index 3b56e78d4d..886b3d8f6f 100644 --- a/components/opengl/usergui_example/imguimain.pas +++ b/components/opengl/usergui_example/imguimain.pas @@ -5,7 +5,7 @@ unit imguimain; interface uses - Classes, Forms, Controls, Graphics, ExtCtrls, OpenGLContext, LazLogger, + Classes, Forms, Controls, Graphics, ExtCtrls, OpenGLContext, LazLoggerBase, GL, GLExt, LCLType, fpImage, SysUtils; type diff --git a/components/synedit/syneditwrappedview.pp b/components/synedit/syneditwrappedview.pp index ad790848d6..3a733affa3 100644 --- a/components/synedit/syneditwrappedview.pp +++ b/components/synedit/syneditwrappedview.pp @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, math, LazSynEditText, SynEdit, SynEditViewedLineMap, SynEditTypes, SynEditMiscProcs, SynEditHighlighter, SynEditMiscClasses, - Graphics, LazLogger, LazListClasses; + Graphics, LazLoggerBase, LazListClasses; type TLazSynEditLineWrapPlugin = class; diff --git a/components/synedit/synhighlighterpas.pp b/components/synedit/synhighlighterpas.pp index 9d98980e19..c2ae563646 100644 --- a/components/synedit/synhighlighterpas.pp +++ b/components/synedit/synhighlighterpas.pp @@ -53,7 +53,7 @@ interface uses SysUtils, Classes, Registry, Graphics, SynEditHighlighterFoldBase, SynEditMiscProcs, SynEditTypes, SynEditHighlighter, SynEditTextBase, - SynEditStrConst, SynEditMiscClasses, LazLogger; + SynEditStrConst, SynEditMiscClasses, LazLoggerBase; type TSynPasStringMode = (spsmDefault, spsmStringOnly, spsmNone); diff --git a/components/wiki/wikiconvert.lpr b/components/wiki/wikiconvert.lpr index 3bd553b26e..18132f12d8 100644 --- a/components/wiki/wikiconvert.lpr +++ b/components/wiki/wikiconvert.lpr @@ -25,7 +25,7 @@ uses Classes, SysUtils, CustApp, WikiParser, WikiFormat, Wiki2XHTMLConvert, Wiki2HTMLConvert, Wiki2CHMConvert, Wiki2FPDocConvert, LazUtf8, LazFileUtils, FileUtil, - LazLogger, KeywordFuncLists; + LazLoggerBase, KeywordFuncLists; type diff --git a/components/wiki/wikiget.lpr b/components/wiki/wikiget.lpr index 4ce257f4ca..52dd8bcdba 100644 --- a/components/wiki/wikiget.lpr +++ b/components/wiki/wikiget.lpr @@ -31,7 +31,7 @@ uses {$ENDIF} Classes, SysUtils, CustApp, strutils, AVL_Tree, // LazUtils - LazFileUtils, Laz2_XMLRead, Laz2_DOM, Laz2_XMLWrite, LazLogger, avglvltree, + LazFileUtils, Laz2_XMLRead, Laz2_DOM, Laz2_XMLWrite, LazLoggerBase, avglvltree, LazUTF8, LazStringUtils, // CodeTools CodeToolsStructs, diff --git a/designer/menueditor.pp b/designer/menueditor.pp index 4bd48fb4a6..1ef9ac32c6 100644 --- a/designer/menueditor.pp +++ b/designer/menueditor.pp @@ -32,7 +32,7 @@ uses ActnList, Controls, Dialogs, StdCtrls, ExtCtrls, Menus, Forms, Graphics, ImgList, Themes, LCLType, LCLIntf, LCLProc, // LazUtils - LazLogger, LazTracer, + LazLoggerBase, LazTracer, // IdeIntf FormEditingIntf, IDEWindowIntf, IDEImagesIntf, ComponentEditors, IDEDialogs, IdeIntfStrConsts, PropEdits, diff --git a/doceditor/frpeditor.pas b/doceditor/frpeditor.pas index fb737c026e..ee976f3867 100644 --- a/doceditor/frpeditor.pas +++ b/doceditor/frpeditor.pas @@ -27,7 +27,7 @@ unit frpeditor; interface uses SysUtils, Classes, DOM, Forms, Controls, ExtCtrls, ComCtrls, - StdCtrls, Dialogs, Menus, FPDEUtil, LazDEMsg, LazDEOpts, LazLogger; + StdCtrls, Dialogs, Menus, FPDEUtil, LazDEMsg, LazDEOpts, LazLoggerBase; Type { TPackageEditor } diff --git a/ide/codetoolsdefines.pas b/ide/codetoolsdefines.pas index 55d544331a..ad48cce60a 100644 --- a/ide/codetoolsdefines.pas +++ b/ide/codetoolsdefines.pas @@ -49,7 +49,7 @@ uses LCLType, LCLIntf, Forms, Controls, Buttons, StdCtrls, ComCtrls, ExtCtrls, Menus, Graphics, Dialogs, ButtonPanel, // LazUtils - LazFileUtils, LazLogger, LazStringUtils, + LazFileUtils, LazLoggerBase, LazStringUtils, // SynEdit SynEdit, // Codetools diff --git a/ide/exttoolsconsole.pas b/ide/exttoolsconsole.pas index bd8bc78dfb..36a1cd9042 100644 --- a/ide/exttoolsconsole.pas +++ b/ide/exttoolsconsole.pas @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, // LazUtils - LazLogger, LazUtilities, + LazLoggerBase, LazUtilities, // BuildIntf IDEExternToolIntf, // IDE diff --git a/ide/exttoolside.pas b/ide/exttoolside.pas index ad98e8356e..9ea235806d 100644 --- a/ide/exttoolside.pas +++ b/ide/exttoolside.pas @@ -9,7 +9,7 @@ uses // LCL Forms, // LazUtils - LazLogger, + LazLoggerBase, // IDEIntf IDEExternToolIntf, IDEMsgIntf, PackageIntf, LazIDEIntf, // IDE diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp index a9e72eb271..14a99cfbc3 100644 --- a/ide/sourceeditor.pp +++ b/ide/sourceeditor.pp @@ -52,7 +52,7 @@ uses ExtendedNotebook, // LazUtils LConvEncoding, FileUtil, LazFileUtils, LazFileCache, LazUTF8, - LazMethodList, LazLoggerBase, LazLogger, Translations, LazUtilities, LazTracer, + LazMethodList, LazLoggerBase, Translations, LazUtilities, LazTracer, LazStringUtils, // codetools BasicCodeTools, CodeBeautifier, CodeToolManager, CodeCache, SourceLog, diff --git a/packager/fppkghelper.pas b/packager/fppkghelper.pas index d86253b237..7f9ee56945 100644 --- a/packager/fppkghelper.pas +++ b/packager/fppkghelper.pas @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, pkgFppkg, fpmkunit, fprepos, // LazUtils - LazLogger, LazFileCache, FileUtil, LazFileUtils, + LazLoggerBase, LazFileCache, FileUtil, LazFileUtils, // IDE LazarusIDEStrConsts; diff --git a/tools/lazres.pp b/tools/lazres.pp index a251784722..70ff2ca174 100644 --- a/tools/lazres.pp +++ b/tools/lazres.pp @@ -40,7 +40,7 @@ program LazRes; {$ENDIF} uses - Classes, SysUtils, LazLogger, LResources, resource, reswriter, + Classes, SysUtils, LazLoggerBase, LResources, resource, reswriter, bitmapresource, groupresource, groupiconresource, groupcursorresource, LazFileUtils, LazUTF8;