From 1a2b3949416842de92dfb4e3ac26c33bbcba31eb Mon Sep 17 00:00:00 2001 From: Juha Date: Fri, 15 Mar 2024 11:50:05 +0200 Subject: [PATCH] Remove IdeIntf dependency from unit PackageDefs. --- components/buildintf/baseideintf.pas | 19 ++++++++++++++++++- components/ideintf/lazideintf.pas | 19 ++++++------------- ide/project.pp | 8 +++++--- ide/sourcefilemanager.pas | 2 +- packager/basepkgmanager.pas | 4 ++-- packager/packagedefs.pas | 4 +--- packager/pkgmanager.pas | 2 +- 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/components/buildintf/baseideintf.pas b/components/buildintf/baseideintf.pas index 21fcf2cf2b..d83c423de7 100644 --- a/components/buildintf/baseideintf.pas +++ b/components/buildintf/baseideintf.pas @@ -18,7 +18,7 @@ interface uses Classes, SysUtils, // LazUtils - LazUTF8, LazConfigStorage, + LazUTF8, LazConfigStorage, AvgLvlTree, // BuildIntf MacroIntf; @@ -29,6 +29,23 @@ type smsfsBackground // start in background ); + // new filename flags + // Normally you don't need to pass any flags. + TSearchIDEFileFlag = ( + siffDoNotCheckAllPackages, // do not search filename in unrelated packages (e.g. installed but not used by project) + siffCheckAllProjects, // search filename in all loaded projects + siffCaseSensitive, // check case sensitive, otherwise use Pascal case insensitivity (CompareText) + siffDoNotCheckOpenFiles, // do not search in files opened in source editor + siffIgnoreExtension // compare only filename, ignore file extension + ); + TSearchIDEFileFlags = set of TSearchIDEFileFlag; + + TLazBuildingFinishedEvent = procedure(Sender: TObject; BuildSuccessful: Boolean) of object; + TLazLoadSaveCustomDataEvent = procedure(Sender: TObject; Load: boolean; + CustomData: TStringToStringTree; // on save this is a temporary clone free for altering + PathDelimChanged: boolean + ) of object; + TGetIDEConfigStorage = function(const Filename: string; LoadFromDisk: Boolean ): TConfigStorage; diff --git a/components/ideintf/lazideintf.pas b/components/ideintf/lazideintf.pas index ab746e4fa6..7e19debdff 100644 --- a/components/ideintf/lazideintf.pas +++ b/components/ideintf/lazideintf.pas @@ -158,17 +158,10 @@ type pbfCreateMakefile ); TProjectBuildFlags = set of TProjectBuildFlag; - - // new filename flags - // Normally you don't need to pass any flags. - TSearchIDEFileFlag = ( - siffDoNotCheckAllPackages, // do not search filename in unrelated packages (e.g. installed but not used by project) - siffCheckAllProjects, // search filename in all loaded projects - siffCaseSensitive, // check case sensitive, otherwise use Pascal case insensitivity (CompareText) - siffDoNotCheckOpenFiles, // do not search in files opened in source editor - siffIgnoreExtension // compare only filename, ignore file extension - ); - TSearchIDEFileFlags = set of TSearchIDEFileFlag; + + // Deprecase in Lazarus 3.99, March 2024. + TSearchIDEFileFlag = BaseIDEIntf.TSearchIDEFileFlag deprecated 'Use the definition from BaseIDEIntf'; + TSearchIDEFileFlags = BaseIDEIntf.TSearchIDEFileFlags deprecated 'Use the definition from BaseIDEIntf'; // find unit flags // Normally you don't need to pass any flags. @@ -274,13 +267,13 @@ type itCustom // this state is not used yet. ); TLazToolStatusChangeEvent = procedure(Sender: TObject; OldStatus, NewStatus: TLazToolStatus) of object; - +{ TLazBuildingFinishedEvent = procedure(Sender: TObject; BuildSuccessful: Boolean) of object; TLazLoadSaveCustomDataEvent = procedure(Sender: TObject; Load: boolean; CustomData: TStringToStringTree; // on save this is a temporary clone free for altering PathDelimChanged: boolean ) of object; - +} { TLazIDEInterface } TLazIDEInterface = class(TComponent) diff --git a/ide/project.pp b/ide/project.pp index c2b7b75891..c33b3a056f 100644 --- a/ide/project.pp +++ b/ide/project.pp @@ -56,10 +56,12 @@ uses // LazUtils FPCAdds, LazUtilities, FileUtil, LazFileUtils, LazFileCache, LazMethodList, LazLoggerBase, FileReferenceList, LazUTF8, Laz2_XMLCfg, Maps, AvgLvlTree, + // BuildIntf + BaseIDEIntf, ProjectIntf, PackageIntf, MacroIntf, MacroDefIntf, + CompOptsIntf, IDEOptionsIntf, // IDEIntf - PropEdits, UnitResources, EditorSyntaxHighlighterDef, InputHistory, - CompOptsIntf, ProjectIntf, MacroIntf, MacroDefIntf, SrcEditorIntf, - IDEOptionsIntf, IDEOptEditorIntf, IDEDialogs, LazIDEIntf, PackageIntf, + PropEdits, UnitResources, EditorSyntaxHighlighterDef, InputHistory, SrcEditorIntf, + IDEOptEditorIntf, IDEDialogs, // IdeConfig EnvironmentOpts, LazConf, TransferMacros, SearchPathProcs, IdeXmlConfigProcs, IDECmdLine, IDEProcs, CompOptsModes, ModeMatrixOpts, diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas index 4841c23468..34abca2059 100644 --- a/ide/sourcefilemanager.pas +++ b/ide/sourcefilemanager.pas @@ -47,7 +47,7 @@ uses CodeCache, CodeTree, FindDeclarationTool, KeywordFuncLists, // BuildIntf NewItemIntf, ProjectIntf, PackageIntf, PackageDependencyIntf, IDEExternToolIntf, - ComponentReg, + ComponentReg, BaseIDEIntf, // IdeIntf IDEDialogs, PropEdits, IDEMsgIntf, LazIDEIntf, MenuIntf, IDEWindowIntf, FormEditingIntf, IdeIntfStrConsts, ObjectInspector, SrcEditorIntf, EditorSyntaxHighlighterDef, diff --git a/packager/basepkgmanager.pas b/packager/basepkgmanager.pas index 79da57051c..8630ab7c38 100644 --- a/packager/basepkgmanager.pas +++ b/packager/basepkgmanager.pas @@ -46,8 +46,8 @@ uses TypInfo, Classes, SysUtils, LazFileUtils, LazLoggerBase, Forms, ComCtrls, - PackageIntf, - LazIDEIntf, MenuIntf, IdeIntfStrConsts, + PackageIntf, BaseIDEIntf, + MenuIntf, IdeIntfStrConsts, EnvironmentOpts, LazarusIDEStrConsts, CompilerOptions, PackageDefs, PackageSystem, Project; diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas index 47fb78dc13..ed147a7fed 100644 --- a/packager/packagedefs.pas +++ b/packager/packagedefs.pas @@ -49,9 +49,7 @@ uses LazTracer, LazLoggerBase, Laz2_XMLCfg, AvgLvlTree, // BuildIntf MacroIntf, MacroDefIntf, IDEOptionsIntf, PublishModuleIntf, ComponentReg, - PackageDependencyIntf, PackageIntf, FppkgIntf, LazMsgWorker, - // IDEIntf - LazIDEIntf, + PackageDependencyIntf, PackageIntf, FppkgIntf, LazMsgWorker, BaseIDEIntf, // IdeConfig TransferMacros, IDEProcs, IDEOptionDefs, CompOptsModes, SearchPathProcs, IdeXmlConfigProcs, // IDE diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas index 7bec47a6a0..614cc6d812 100644 --- a/packager/pkgmanager.pas +++ b/packager/pkgmanager.pas @@ -58,7 +58,7 @@ uses FileProcs, CodeTree, CTUnitGraph, // BuildIntf ProjPackIntf, ProjectIntf, PackageIntf, PackageDependencyIntf, PackageLinkIntf, - NewItemIntf, CompOptsIntf, IDEExternToolIntf, MacroIntf, ComponentReg, + NewItemIntf, CompOptsIntf, IDEExternToolIntf, MacroIntf, ComponentReg, BaseIDEIntf, // IdeIntf IDECommands, MenuIntf, IDEWindowIntf, LazIDEIntf, IDEMsgIntf, SrcEditorIntf, IdeIntfStrConsts, ComponentEditors, PropEdits, IDEDialogs,