diff --git a/.gitattributes b/.gitattributes index f9c41c306a..609ee821a5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1299,7 +1299,6 @@ ideintf/graphicpropedit.pas svneol=native#text/plain ideintf/graphpropedits.pas svneol=native#text/pascal ideintf/helpfpdoc.pas svneol=native#text/pascal ideintf/helphtml.pas svneol=native#text/pascal -ideintf/helpintf.pas svneol=native#text/pascal ideintf/idecommands.pas svneol=native#text/pascal ideintf/idedialogs.pas svneol=native#text/plain ideintf/idehelpintf.pas svneol=native#text/plain @@ -2298,6 +2297,7 @@ lcl/languages/lcl.po svneol=native#text/plain lcl/languages/lcl.ru.po svneol=native#text/plain lcl/languages/lcl.ua.po svneol=native#text/plain lcl/lazconfigstorage.pas svneol=native#text/pascal +lcl/lazhelpintf.pas svneol=native#text/pascal lcl/lazlinkedlist.pas svneol=native#text/pascal lcl/lclclasses.pp svneol=native#text/pascal lcl/lclicons.lrs svneol=native#text/pascal diff --git a/components/chmhelp/packages/idehelp/lazchmhelp.pas b/components/chmhelp/packages/idehelp/lazchmhelp.pas index 7ab1177c95..594d71cfe4 100644 --- a/components/chmhelp/packages/idehelp/lazchmhelp.pas +++ b/components/chmhelp/packages/idehelp/lazchmhelp.pas @@ -23,7 +23,7 @@ unit LazChmHelp; interface uses - Classes, SysUtils, HelpIntf, HelpManager, LazConfigStorage, PropEdits, + Classes, SysUtils, LazHelpIntf, HelpManager, LazConfigStorage, PropEdits, LHelpControl; type diff --git a/ide/helpfpcmessages.pas b/ide/helpfpcmessages.pas index c91e8b5448..bd9449f5ff 100644 --- a/ide/helpfpcmessages.pas +++ b/ide/helpfpcmessages.pas @@ -38,7 +38,7 @@ interface uses Classes, SysUtils, LCLProc, Dialogs, FileUtil, TextTools, MacroIntf, - LazarusIDEStrConsts, LazConfigStorage, IDEHelpIntf, HelpIntf, HelpHTML; + LazarusIDEStrConsts, LazConfigStorage, IDEHelpIntf, LazHelpIntf, HelpHTML; const lihcFPCMessages = 'FreePascal Compiler messages'; diff --git a/ide/helpmanager.pas b/ide/helpmanager.pas index df214fc152..ca64104682 100644 --- a/ide/helpmanager.pas +++ b/ide/helpmanager.pas @@ -38,7 +38,7 @@ uses BasicCodeTools, CodeToolManager, CodeAtom, CodeCache, CustomCodeTool, CodeTree, PascalParserTool, FindDeclarationTool, PropEdits, ObjectInspector, FormEditingIntf, ProjectIntf, - HelpIntf, HelpHTML, HelpFPDoc, MacroIntf, IDEWindowIntf, IDEMsgIntf, + LazHelpIntf, HelpHTML, HelpFPDoc, MacroIntf, IDEWindowIntf, IDEMsgIntf, LazIDEIntf, IDEHelpIntf, LazarusIDEStrConsts, TransferMacros, DialogProcs, IDEOptionDefs, ObjInspExt, EnvironmentOpts, AboutFrm, MsgView, Project, PackageDefs, MainBar, diff --git a/ide/helpoptions.pas b/ide/helpoptions.pas index d74b7d00d1..c81f71b3b4 100644 --- a/ide/helpoptions.pas +++ b/ide/helpoptions.pas @@ -37,7 +37,7 @@ interface uses Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Buttons, ExtCtrls, - ObjectInspector, HelpIntf, IDEWindowIntf, IDEDialogs, Laz_XMLCfg, + ObjectInspector, LazHelpIntf, IDEWindowIntf, IDEDialogs, Laz_XMLCfg, LazConf, LazarusIDEStrConsts, IDEProcs, IDEOptionDefs; type diff --git a/ide/idecontexthelpedit.pas b/ide/idecontexthelpedit.pas index a142bb7d10..72cb33840e 100644 --- a/ide/idecontexthelpedit.pas +++ b/ide/idecontexthelpedit.pas @@ -33,7 +33,7 @@ uses Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs, Buttons, ButtonPanel, StdCtrls, ComCtrls, // IDEIntf - IDEWindowIntf, HelpIntf, + IDEWindowIntf, LazHelpIntf, // IDE IDEWindowHelp, LazarusIDEStrConsts, ExtCtrls; diff --git a/ide/idewindowhelp.pas b/ide/idewindowhelp.pas index 00db4554e5..ecf51b3b39 100644 --- a/ide/idewindowhelp.pas +++ b/ide/idewindowhelp.pas @@ -30,7 +30,7 @@ unit IDEWindowHelp; interface uses - Classes, SysUtils, LCLProc, Controls, FileUtil, Dialogs, HelpIntf, + Classes, SysUtils, LCLProc, Controls, FileUtil, Dialogs, LazHelpIntf, LazConfigStorage, EnvironmentOpts, Laz_XMLCfg, IDEOptionDefs; type diff --git a/ide/lazdocfrm.pas b/ide/lazdocfrm.pas index e3907a8f35..397818f8fa 100644 --- a/ide/lazdocfrm.pas +++ b/ide/lazdocfrm.pas @@ -44,7 +44,7 @@ uses SynEdit, CodeToolManager, CodeCache, Laz_DOM, Laz_XMLRead, Laz_XMLWrite, - IDEHelpIntf, HelpIntf, + IDEHelpIntf, LazHelpIntf, IDEProcs, LazarusIDEStrConsts; const diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp index ca379bbf46..ff337d71a8 100644 --- a/ide/uniteditor.pp +++ b/ide/uniteditor.pp @@ -50,7 +50,7 @@ uses SynEditTypes, SynEdit, SynRegExpr, SynEditHighlighter, SynEditAutoComplete, SynEditKeyCmds, SynCompletion, // IDE interface - MacroIntf, ProjectIntf, HelpIntf, SrcEditorIntf, MenuIntf, LazIDEIntf, + MacroIntf, ProjectIntf, LazHelpIntf, SrcEditorIntf, MenuIntf, LazIDEIntf, IDEWindowIntf, // IDE units LazarusIDEStrConsts, LazConf, IDECommands, EditorOptions, KeyMapping, Project, diff --git a/ideintf/allideintf.pas b/ideintf/allideintf.pas index 0740072b2d..d18a9ac5b4 100644 --- a/ideintf/allideintf.pas +++ b/ideintf/allideintf.pas @@ -32,7 +32,6 @@ uses GraphPropEdits, HelpFPDoc, HelpHTML, - HelpIntf, IDECommands, IDEDialogs, IDEHelpIntf, diff --git a/ideintf/helpfpdoc.pas b/ideintf/helpfpdoc.pas index 205c0427d9..4cd7600911 100644 --- a/ideintf/helpfpdoc.pas +++ b/ideintf/helpfpdoc.pas @@ -26,7 +26,7 @@ unit HelpFPDoc; interface uses - Classes, SysUtils, LCLProc, FileUtil, MacroIntf, HelpIntf, HelpHTML; + Classes, SysUtils, LCLProc, FileUtil, MacroIntf, LazHelpIntf, HelpHTML; type { TFPDocHTMLHelpDatabase } diff --git a/ideintf/helphtml.pas b/ideintf/helphtml.pas index f69b6ebce6..8382fb133c 100644 --- a/ideintf/helphtml.pas +++ b/ideintf/helphtml.pas @@ -23,7 +23,7 @@ interface uses Classes, SysUtils, LCLProc, Forms, Process, FileUtil, LazConfigStorage, - HelpIntf; + LazHelpIntf; resourcestring hhsHelpTheHelpDatabaseWasUnableToFindFile = 'The help database %s%s%s was ' diff --git a/ideintf/idehelpintf.pas b/ideintf/idehelpintf.pas index 5798aabbe9..a780f090f7 100644 --- a/ideintf/idehelpintf.pas +++ b/ideintf/idehelpintf.pas @@ -23,7 +23,7 @@ unit IDEHelpIntf; interface uses - Classes, SysUtils, HelpIntf, TextTools; + Classes, SysUtils, LazHelpIntf, TextTools; type { THelpDBIRegExprMessage diff --git a/ideintf/menuintf.pas b/ideintf/menuintf.pas index 9a3a902ae0..4fbcf1d841 100644 --- a/ideintf/menuintf.pas +++ b/ideintf/menuintf.pas @@ -29,7 +29,8 @@ unit MenuIntf; interface uses - Classes, SysUtils, LCLProc, Menus, ImgList, Graphics, HelpIntf, IDECommands; + Classes, SysUtils, LCLProc, Menus, ImgList, Graphics, LazHelpIntf, + IDECommands; type TIDEMenuItem = class; diff --git a/lcl/alllclunits.pp b/lcl/alllclunits.pp index ee231aa359..1276052426 100644 --- a/lcl/alllclunits.pp +++ b/lcl/alllclunits.pp @@ -41,7 +41,7 @@ uses InterfaceBase, IntfGraphics, // components and functions - LCLClasses, AsyncProcess, Maps, HelpIntfs, + LCLClasses, AsyncProcess, Maps, HelpIntfs, LazHelpIntf, StdActns, Buttons, Extctrls, Calendar, Clipbrd, Forms, LCLIntf, Spin, Comctrls, Graphics, StdCtrls, Arrow, Controls, ImgList, Menus, Toolwin, Dialogs, Messages, Clistbox, ActnList, Grids, MaskEdit, ButtonPanel, diff --git a/lcl/helpintfs.pas b/lcl/helpintfs.pas index d774ad796f..380370a7f5 100644 --- a/lcl/helpintfs.pas +++ b/lcl/helpintfs.pas @@ -38,6 +38,13 @@ interface uses Classes, SysUtils; +type + THelpManager = class(TInterfacedObject) + + end; + +var + HelpManager: THelpManager = nil; implementation diff --git a/ideintf/helpintf.pas b/lcl/lazhelpintf.pas similarity index 99% rename from ideintf/helpintf.pas rename to lcl/lazhelpintf.pas index 972adadb32..954619903e 100644 --- a/ideintf/helpintf.pas +++ b/lcl/lazhelpintf.pas @@ -21,7 +21,7 @@ - Add Help Editing functions - Standalone help system for LCL applications } -unit HelpIntf; +unit LazHelpIntf; {$mode objfpc}{$H+} diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas index bbc011eb42..d2c74202f5 100644 --- a/packager/packagesystem.pas +++ b/packager/packagesystem.pas @@ -1081,7 +1081,6 @@ begin AddFile('graphpropedits.pas','GraphPropEdits',pftUnit,[],cpBase); AddFile('helpfpdoc.pas','HelpFPDoc',pftUnit,[],cpBase); AddFile('helphtml.pas','HelpHTML',pftUnit,[],cpBase); - AddFile('helpintf.pas','HelpIntf',pftUnit,[],cpBase); AddFile('idecommands.pas','IDECommands',pftUnit,[],cpBase); AddFile('idewindowintf.pas','IDEWindowIntf',pftUnit,[pffHasRegisterProc],cpBase); AddFile('imagelisteditor.pp','ImageListEditor',pftUnit,[],cpBase);