diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index bb5958c3ba..d314606238 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -51,7 +51,7 @@ uses LCLProc, Forms, Controls, LCLType, StdCtrls, ExtCtrls, Buttons, Dialogs, LCLPlatformDef, CheckLst, Menus, ComCtrls, // LazUtils - FileUtil, LazFileUtils, LazUTF8, LazLogger, lazutf8classes, LazFileCache, + FileUtil, LazFileUtils, LazUTF8, LazLoggerBase, lazutf8classes, LazFileCache, // LazControls DividerBevel, // Codetools diff --git a/ide/buildmodediffdlg.pas b/ide/buildmodediffdlg.pas index ce048611aa..61064b95c5 100644 --- a/ide/buildmodediffdlg.pas +++ b/ide/buildmodediffdlg.pas @@ -34,7 +34,7 @@ uses // LCL StdCtrls, ComCtrls, Forms, ButtonPanel, // LazUtils - LazUTF8, LazLogger, AvgLvlTree, + LazUTF8, LazLoggerBase, AvgLvlTree, // IDE LazarusIDEStrConsts, EnvironmentOpts, Project, ModeMatrixOpts, CompOptsModes; diff --git a/ide/buildprofilemanager.pas b/ide/buildprofilemanager.pas index 662ea82549..14f2821936 100644 --- a/ide/buildprofilemanager.pas +++ b/ide/buildprofilemanager.pas @@ -33,7 +33,7 @@ interface uses Classes, SysUtils, // LazUtils - Laz2_XMLCfg, LazLogger, LazFileUtils, LazUTF8, + Laz2_XMLCfg, LazLoggerBase, LazFileUtils, LazUTF8, // LCL Forms, Controls, Dialogs, ExtCtrls, StdCtrls, ComCtrls, Contnrs, ButtonPanel, InterfaceBase, LCLPlatformDef, diff --git a/ide/diffpatch.pas b/ide/diffpatch.pas index 7e7d0660bc..4142fedd7e 100644 --- a/ide/diffpatch.pas +++ b/ide/diffpatch.pas @@ -37,7 +37,7 @@ unit DiffPatch; interface uses - Classes, SysUtils, LazLogger; + Classes, SysUtils, LazLoggerBase; type TTextDiffFlag = ( diff --git a/ide/etquickfixes.pas b/ide/etquickfixes.pas index b13c04c756..437a1dbd67 100644 --- a/ide/etquickfixes.pas +++ b/ide/etquickfixes.pas @@ -57,7 +57,7 @@ uses // LCL Menus, Dialogs, Controls, // LazUtils - LazLogger, AvgLvlTree, LazFileUtils, LazUTF8, + LazLoggerBase, AvgLvlTree, LazFileUtils, LazUTF8, // Codetools CodeToolManager, CodeCache, CodeTree, CodeAtom, BasicCodeTools, KeywordFuncLists, // IdeIntf diff --git a/ide/etsrceditmarks.pas b/ide/etsrceditmarks.pas index c947533520..c4f87842d3 100644 --- a/ide/etsrceditmarks.pas +++ b/ide/etsrceditmarks.pas @@ -36,7 +36,7 @@ uses // LCL Graphics, Controls, Forms, ImgList, // LazUtils - LazLogger, LazFileUtils, + LazLoggerBase, LazFileUtils, // Codetools KeywordFuncLists, // SynEdit diff --git a/ide/frames/compiler_modematrix.pas b/ide/frames/compiler_modematrix.pas index 6c011f5be7..9318214e6d 100644 --- a/ide/frames/compiler_modematrix.pas +++ b/ide/frames/compiler_modematrix.pas @@ -35,7 +35,7 @@ unit Compiler_ModeMatrix; interface uses - Classes, SysUtils, types, LazLogger, LazUTF8, Controls, Graphics, ComCtrls, + Classes, SysUtils, types, LazLoggerBase, LazUTF8, Controls, Graphics, ComCtrls, Menus, LCLProc, IDEOptionsIntf, IDEImagesIntf, CompOptsIntf, EnvironmentOpts, PackageSystem, PackageDefs, Project, LazarusIDEStrConsts, TransferMacros, ModeMatrixOpts, ModeMatrixCtrl, compiler_config_target; diff --git a/ide/frames/compiler_other_options.pas b/ide/frames/compiler_other_options.pas index 6444a5eb5e..b9dc264243 100644 --- a/ide/frames/compiler_other_options.pas +++ b/ide/frames/compiler_other_options.pas @@ -32,7 +32,7 @@ uses // LCL Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls, ExtCtrls, Buttons, LCLType, // LazUtils - LazUTF8, LazLogger, + LazUTF8, LazLoggerBase, // Codetools CodeToolsCfgScript, KeywordFuncLists, // IdeIntf diff --git a/ide/frames/modematrixctrl.pas b/ide/frames/modematrixctrl.pas index 0097bb509d..de0a1464be 100644 --- a/ide/frames/modematrixctrl.pas +++ b/ide/frames/modematrixctrl.pas @@ -30,7 +30,7 @@ uses // LCL Controls, LCLType, LCLIntf, Grids, Graphics, StdCtrls, Menus, // LazUtils - LazLogger, + LazLoggerBase, // Codetools FileProcs, // IdeIntf diff --git a/ide/idecmdline.pas b/ide/idecmdline.pas index c89c9b22b0..dbf2043831 100644 --- a/ide/idecmdline.pas +++ b/ide/idecmdline.pas @@ -40,7 +40,7 @@ interface uses Classes, SysUtils, // LazUtils - FileUtil, LazFileUtils, LazUTF8, LazUTF8Classes, LazLogger, + FileUtil, LazFileUtils, LazUTF8, LazUTF8Classes, LazLoggerBase, // LCL LCLProc, // IDE @@ -365,7 +365,7 @@ begin for i:= 1 to ParamsAndCfgCount do begin if ParamIsOptionPlusValue(i, DebugLogOpt, AValue) then - LazLogger.DebugLogger.LogName := AValue; + LazLoggerBase.DebugLogger.LogName := AValue; end; end; diff --git a/ide/initialsetupdlgs.pas b/ide/initialsetupdlgs.pas index 5837232599..3c3dea0b1f 100644 --- a/ide/initialsetupdlgs.pas +++ b/ide/initialsetupdlgs.pas @@ -46,7 +46,7 @@ uses // CodeTools FileProcs, CodeToolManager, DefineTemplates, // LazUtils - FileUtil, LazUTF8, LazUTF8Classes, LazFileUtils, LazFileCache, LazLogger, + FileUtil, LazUTF8, LazUTF8Classes, LazFileUtils, LazFileCache, LazLoggerBase, // Other MacroDefIntf, GDBMIDebugger, DbgIntfDebuggerBase, TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts, IDEImagesIntf, diff --git a/ide/initialsetupproc.pas b/ide/initialsetupproc.pas index e876e3e7a6..98e37b4f8a 100644 --- a/ide/initialsetupproc.pas +++ b/ide/initialsetupproc.pas @@ -38,7 +38,7 @@ uses DefineTemplates, CodeToolManager, FileProcs, // LazUtils LazFileCache, LazUTF8, LazUTF8Classes, LazFileUtils, - LazLoggerBase, LazLogger, Laz2_XMLCfg, + LazLoggerBase, LazLoggerBase, Laz2_XMLCfg, // IDE LazarusIDEStrConsts, LazConf, EnvironmentOpts, IDEProcs; diff --git a/ide/modematrixopts.pas b/ide/modematrixopts.pas index 293535a1e1..961caf7f49 100644 --- a/ide/modematrixopts.pas +++ b/ide/modematrixopts.pas @@ -28,7 +28,7 @@ interface uses Classes, SysUtils, contnrs, // LazUtils - LazConfigStorage, Laz2_XMLCfg, LazLogger, LazUTF8, + LazConfigStorage, Laz2_XMLCfg, LazLoggerBase, LazUTF8, // Codetools FileProcs, KeywordFuncLists, CodeToolsCfgScript, // IDE diff --git a/ide/qfinitlocalvardlg.pas b/ide/qfinitlocalvardlg.pas index ac1a49ea2f..4ddd7ad5f5 100644 --- a/ide/qfinitlocalvardlg.pas +++ b/ide/qfinitlocalvardlg.pas @@ -37,7 +37,7 @@ uses // LCL Forms, Controls, Dialogs, ButtonPanel, ExtCtrls, // LazUtils - LazLogger, + LazLoggerBase, // Codetools CodeToolManager, CodeCache, StdCodeTools, // IdeIntf diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp index 1444948553..4bfbc28cfa 100644 --- a/ide/sourceeditor.pp +++ b/ide/sourceeditor.pp @@ -53,7 +53,7 @@ uses ExtendedNotebook, // LazUtils LConvEncoding, LazUTF8Classes, LazFileCache, LazUTF8, - LazLoggerBase, LazLogger, Translations, + LazLoggerBase, LazLoggerBase, Translations, // codetools BasicCodeTools, CodeBeautifier, CodeToolManager, CodeCache, SourceLog, LinkScanner, CodeTree, SourceChanger, diff --git a/ide/unitdependencies.pas b/ide/unitdependencies.pas index f6d1dfbba7..305b66476a 100644 --- a/ide/unitdependencies.pas +++ b/ide/unitdependencies.pas @@ -43,7 +43,7 @@ uses CodeToolManager, DefineTemplates, CTUnitGraph, CTUnitGroupGraph, FileProcs, CodeCache, AvgLvlTree, // LazUtils - LazLogger, LazFileUtils, LazFileCache, LazUtilities, LazUTF8, LvlGraphCtrl, + LazLoggerBase, LazFileUtils, LazFileCache, LazUtilities, LazUTF8, LvlGraphCtrl, // IDE interface LazIDEIntf, ProjectIntf, IDEWindowIntf, PackageIntf, SrcEditorIntf, IDEImagesIntf, IDEMsgIntf, IDEExternToolIntf, IDECommands, IDEDialogs, diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas index e040feb88b..fdc83298d3 100644 --- a/packager/packagesystem.pas +++ b/packager/packagesystem.pas @@ -49,7 +49,7 @@ uses // LCL Forms, Controls, Dialogs, LCLProc, // LazUtils - FileUtil, LazFileCache, LazLogger, LazFileUtils, LazUTF8, + FileUtil, LazFileCache, LazLoggerBase, LazFileUtils, LazUTF8, Laz2_XMLCfg, laz2_XMLRead, AvgLvlTree, // codetools FileProcs, DefineTemplates, CodeToolManager, CodeCache, DirectoryCacher, diff --git a/tools/iconvtable_dbcs.pas b/tools/iconvtable_dbcs.pas index 3edc704f95..8b88910bc5 100644 --- a/tools/iconvtable_dbcs.pas +++ b/tools/iconvtable_dbcs.pas @@ -26,7 +26,7 @@ uses cthreads, {$ENDIF} Classes, SysUtils, Unix, MTProcs, - LazFileUtils, LazUTF8, LazUTF8Classes, LazLogger, LConvEncoding; + LazFileUtils, LazUTF8, LazUTF8Classes, LazLoggerBase, LConvEncoding; var FromEncoding: String;