Refactor: move CompareMethods to LazMethodList. Keep alias in LCLProc.

git-svn-id: trunk@58204 -

components/ideintf/componenteditors.pas

@@ -24,7 +24,7 @@ uses
   LCLProc, LResources, Forms, Controls, Menus, ExtCtrls, CustomTimer, Graphics,
   Grids, CheckLst, Buttons, ComCtrls, Dialogs, GraphType,
   // LazUtils
-  Maps,
+  Maps, LazMethodList,
   // IdeIntf
   LazStringGridEdit, CheckListboxEditorDlg, CheckGroupEditorDlg,
   PropEdits, PropEditUtils, ComponentReg,

components/ideintf/componentreg.pas

@@ -25,7 +25,10 @@ interface
 
 uses
   Classes, SysUtils, typinfo, Laz_AVL_Tree, fgl,
-  Controls, Laz2_XMLCfg, LCLProc;
+  // LCL
+  Controls, LCLProc,
+  // LazUtils
+  Laz2_XMLCfg, LazMethodList;
 
 type
   TComponentPriorityCategory = (

components/ideintf/compoptsintf.pas

@@ -16,7 +16,10 @@ unit CompOptsIntf;
 interface
 
 uses
-  Classes, SysUtils, LCLProc,
+  Classes, SysUtils,
+  // LazUtils
+  LazMethodList,
+  // IdeIntf
   IDEOptionsIntf;
 
 type

components/ideintf/idecommands.pas

@@ -30,8 +30,13 @@ unit IDECommands;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, Forms, LCLType, Menus, PropEdits, IDEImagesIntf,
+  Classes, SysUtils,
-  ExtCtrls, LCLIntf;
+  // LCL
+  LCLProc, LCLType, LCLIntf, Forms, Menus,
+  // LazUtils
+  LazMethodList,
+  // IdeIntf
+  PropEdits, IDEImagesIntf;
   
 const
   { editor commands constants. see syneditkeycmds.pp for more

components/ideintf/ideexterntoolintf.pas

@@ -18,7 +18,7 @@ uses
   // LCL
   LCLProc,
   // LazUtils
-  UTF8Process, LazFileUtils, LazFileCache,
+  UTF8Process, LazFileUtils, LazFileCache, LazMethodList,
   // IdeIntf
   ObjInspStrConsts, LazLoggerBase, Menus;
 

components/ideintf/ideoptionsintf.pas

@@ -29,7 +29,7 @@ uses
   // LCL
   LCLProc, Controls, Buttons, Forms, StdCtrls, Graphics, ComCtrls, Grids,
   // LazUtils
-  Laz2_XMLCfg,
+  Laz2_XMLCfg, LazMethodList,
   // IdeIntf
   EditorSyntaxHighlighterDef;
 

components/ideintf/idewindowintf.pas

@@ -17,8 +17,13 @@ unit IDEWindowIntf;
 interface
 
 uses
-  Math, Classes, SysUtils, LCLProc, LazConfigStorage, LazUTF8, Forms, Controls,
+  Math, Classes, SysUtils,
-  LCLIntf, IDEOptionsIntf;
+  // LCL
+  LCLProc, LCLIntf, Forms, Controls,
+  // LazUtils
+  LazConfigStorage, LazUTF8, LazMethodList,
+  // IdeIntf
+  IDEOptionsIntf;
 
 const
   IDEWndCfgFileVersion = 2;

components/ideintf/lazideintf.pas

@@ -16,9 +16,14 @@ unit LazIDEIntf;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, Forms, Controls, Dialogs, PropEdits, LazHelpHTML,
+  Classes, SysUtils,
-  IDEOptionsIntf, CompOptsIntf, ProjectIntf,
+  // LCL
-  IDEExternToolIntf, SrcEditorIntf, IDEWindowIntf;
+  LCLProc, Forms, Controls, Dialogs, LazHelpHTML,
+  // LazUtils
+  LazMethodList,
+  // IdeIntf
+  PropEdits, IDEOptionsIntf, CompOptsIntf, ProjectIntf, IDEExternToolIntf,
+  SrcEditorIntf, IDEWindowIntf;
 
 type
   TIDEDirective = (

components/ideintf/menuintf.pas

@@ -18,7 +18,12 @@ unit MenuIntf;
 interface
 
 uses
-  Classes, SysUtils, LCLType, LCLProc, Menus, ImgList, Graphics,
+  Classes, SysUtils,
+  // LCL
+  LCLType, LCLProc, Menus, ImgList, Graphics,
+  // LazUtils
+  LazMethodList,
+  // IdeIntf
   IDECommands, IDEImagesIntf;
   
 type

components/ideintf/packageintf.pas

@@ -20,7 +20,7 @@ uses
   // LCL
   LCLProc, Forms,
   // LazUtils
-  LazConfigStorage,
+  LazConfigStorage, LazMethodList,
   // IdeIntf
   NewItemIntf, ProjPackIntf, PackageDependencyIntf;
   

components/ideintf/propedits.pp

@@ -31,7 +31,7 @@ uses
   // LazControls
   {$IFnDEF UseOINormalCheckBox} CheckBoxThemed, {$ENDIF}
   // LazUtils
-  FileUtil, StringHashList, FPCAdds, // for StrToQWord in older fpc versions
+  FileUtil, StringHashList, LazMethodList, FPCAdds, // for StrToQWord in older fpc versions
   // IdeIntf
   ObjInspStrConsts, PropEditUtils, IDEUtils,
   // Forms with .lfm files

components/lazcontrols/checkboxthemed.pas

@@ -18,7 +18,9 @@ uses
   Classes, SysUtils, Types, Math,
   // LCL
   Controls, StdCtrls, Graphics, ActnList, Forms,
-  LCLIntf, LMessages, LCLProc, LCLType, Themes;
+  LCLIntf, LMessages, LCLProc, LCLType, Themes,
+  // LazUtils
+  LazMethodList;
 
 type
   TCustomCheckBoxThemed = class;

components/lazutils/compwriterpas.pas

@@ -232,11 +232,6 @@ begin
   end;
 end;
 
-function CompareMethods(const m1, m2: TMethod): boolean;
-begin
-  Result:=(m1.Code=m2.Code) and (m1.Data=m2.Data);
-end;
-
 procedure RegisterDefinePropertiesPas(aClass: TPersistentClass;
   const OnDefineProperties: TCWPDefinePropertiesProc);
 var

components/lazutils/lazmethodlist.pas

@@ -62,8 +62,16 @@ type
     property AllowDuplicates: boolean read FAllowDuplicates write SetAllowDuplicates; // default false, changed in Lazarus 1.3
   end;
 
+function CompareMethods(const m1, m2: TMethod): boolean;
+
+
 implementation
 
+function CompareMethods(const m1, m2: TMethod): boolean;
+begin
+  Result:=(m1.Code=m2.Code) and (m1.Data=m2.Data);
+end;
+
 { TMethodList.TItemsEnumerator }
 
 function TMethodList.TItemsEnumerator.GetCurrent: TMethod;

components/synedit/lazsyntextarea.pp

@@ -6,7 +6,12 @@ unit LazSynTextArea;
 interface
 
 uses
-  Classes, SysUtils, Graphics, Controls, LCLType, LCLIntf, LCLProc,
+  Classes, SysUtils,
+  // LCL
+  Graphics, Controls, LCLType, LCLIntf, LCLProc,
+  // LazUtils
+  LazMethodList,
+  // SynEdit
   SynEditTypes, SynEditMiscProcs, SynEditMiscClasses, LazSynEditText,
   SynEditMarkup, SynEditHighlighter, SynTextDrawer;
 

components/synedit/syneditfoldedview.pp

@@ -45,10 +45,14 @@ unit SynEditFoldedView;
 interface
 
 uses
-  LCLProc, LazLoggerBase, Graphics,
+  Classes, SysUtils,
-  Classes, SysUtils, LazSynEditText, SynEditTypes, SynEditMiscClasses,
+  // LCL
-  SynEditMiscProcs, SynEditPointClasses,
+  LCLProc, Graphics,
-  SynEditHighlighter, SynEditHighlighterFoldBase;
+  // LazUtils
+  LazLoggerBase, LazMethodList,
+  // SynEdit
+  LazSynEditText, SynEditTypes, SynEditMiscClasses, SynEditMiscProcs,
+  SynEditPointClasses, SynEditHighlighter, SynEditHighlighterFoldBase;
 
 type
 

components/synedit/synedithighlighter.pp

@@ -32,8 +32,12 @@ unit SynEditHighlighter;
 interface
 
 uses
-  SysUtils, Classes,
+  SysUtils, Classes, Registry, IniFiles,
-  Graphics, LazUTF8, LCLProc, LCLIntf, LCLType, Registry, IniFiles,
+  // LCL
+  LCLProc, LCLIntf, LCLType, Graphics,
+  // LazUtils
+  LazUTF8, LazMethodList,
+  // SynEdit
   SynEditTypes, SynEditTextBase;
 
 type

components/synedit/syneditmarkuphighall.pp

@@ -26,9 +26,14 @@ unit SynEditMarkupHighAll;
 interface
 
 uses
-  Classes, SysUtils, ExtCtrls, SynEditMarkup, SynEditTypes, SynEditSearch,
+  Classes, SysUtils,
-  SynEditMiscClasses, Controls, LCLProc, SynEditHighlighter, SynEditPointClasses,
+  // LCL
-  SynEditMiscProcs, SynEditFoldedView, SynEditTextBase, LazClasses, LazUTF8;
+  LCLProc, Controls, ExtCtrls,
+  // LazUtils
+  LazClasses, LazUTF8, LazMethodList,
+  // SynEdit
+  SynEditMarkup, SynEditTypes, SynEditSearch, SynEditMiscClasses, SynEditHighlighter,
+  SynEditPointClasses, SynEditMiscProcs, SynEditFoldedView, SynEditTextBase;
 
 type
 

components/synedit/syneditmarkupifdef.pp

@@ -23,10 +23,15 @@ unit SynEditMarkupIfDef;
 interface
 
 uses
-  SysUtils, Classes, SynEditMiscClasses, SynHighlighterPas, SynEditMarkupHighAll,
+  SysUtils, Classes,
+  // LCL
+  Graphics, LCLProc,
+  // LazUtils
+  LazClasses, LazLoggerBase, LazMethodList,
+  // SynEdit
+  SynEditMiscClasses, SynHighlighterPas, SynEditMarkupHighAll,
   SynEditHighlighterFoldBase, SynEditFoldedView, LazSynEditText, SynEditMiscProcs,
-  SynEditMarkup, SynEditPointClasses, SynEditHighlighter, LazClasses, LazLoggerBase, Graphics,
+  SynEditMarkup, SynEditPointClasses, SynEditHighlighter;
-  LCLProc;
 
 type
 

components/synedit/syneditmiscclasses.pp

@@ -42,9 +42,13 @@ unit SynEditMiscClasses;
 interface
 
 uses
-  LCLIntf, LCLType, LCLProc,
+  Classes, SysUtils,
-  Classes, Graphics, Controls, SysUtils, Clipbrd, SynEditHighlighter,
+  // LazUtils
-  SynEditMiscProcs, SynEditTypes, LazSynEditText, SynEditPointClasses, ImgList;
+  LazMethodList,
+  // LCL
+  LCLIntf, LCLType, LCLProc, Graphics, Controls, Clipbrd, ImgList,
+  // SynEdit
+  SynEditHighlighter, SynEditMiscProcs, SynEditTypes, LazSynEditText, SynEditPointClasses;
 
 type
 

components/synedit/syneditmousecmds.pp

@@ -35,8 +35,13 @@ unit SynEditMouseCmds;
 interface
 
 uses
-  LazSynEditMouseCmdsTypes, Classes, Controls, SysUtils, SynEditStrConst, SynEditPointClasses,
+  Classes, SysUtils,
-  SynEditKeyCmds, Dialogs, LCLProc, Menus;
+  // LCL
+  LCLProc, Controls, Dialogs, Menus,
+  // LazUtils
+  LazMethodList,
+  // SynEdit
+  LazSynEditMouseCmdsTypes, SynEditStrConst, SynEditPointClasses, SynEditKeyCmds;
 
 type
 

components/synedit/syneditpointclasses.pas

@@ -36,11 +36,16 @@ unit SynEditPointClasses;
 interface
 
 uses
-  Classes, SysUtils, Controls, LCLProc, LCLType, LCLIntf, ExtCtrls, Graphics, Forms,
+  Classes, SysUtils,
+  // LCL
+  Controls, LCLProc, LCLType, LCLIntf, ExtCtrls, Graphics, Forms,
   {$IFDEF SYN_MBCSSUPPORT}
   Imm,
   {$ENDIF}
-  LazSynEditText, SynEditTypes, SynEditMiscProcs;//, SynEditTextBuffer;
+  // LazUtils
+  LazMethodList,
+  // SynEdit
+  LazSynEditText, SynEditTypes, SynEditMiscProcs;
 
 type
 

components/synedit/synedittextbase.pas

@@ -37,7 +37,13 @@ unit SynEditTextBase;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, SynEditMiscProcs, SynEditKeyCmds;
+  Classes, SysUtils,
+  // LCL
+  LCLProc,
+  // LazUtils
+  LazMethodList,
+  // SynEdit
+  SynEditMiscProcs, SynEditKeyCmds;
 
 type
 

components/synedit/syngutterbase.pp

@@ -5,8 +5,13 @@ unit SynGutterBase;
 interface
 
 uses
-  Classes, SysUtils, Graphics, Controls, Menus, math, LCLProc, SynEditMarks,
+  Classes, SysUtils, math,
-  SynEditMiscClasses, SynTextDrawer, SynEditMouseCmds, SynEditFoldedView;
+  // LCL
+  LCLProc, Graphics, Controls, Menus,
+  // LazUtils
+  LazMethodList,
+  // SynEdit
+  SynEditMarks, SynEditMiscClasses, SynTextDrawer, SynEditMouseCmds, SynEditFoldedView;
 
 type
 

components/synedit/syntextdrawer.pp

@@ -67,7 +67,12 @@ unit SynTextDrawer;
 interface
 
 uses
-  Classes, Types, SysUtils, LCLProc, LCLType, LCLIntf, Graphics, GraphUtil,
+  Classes, Types, SysUtils,
+  // LCL
+  LCLProc, LCLType, LCLIntf, Graphics, GraphUtil,
+  // LazUtils
+  LazMethodList,
+  // SynEdit
   SynEditTypes, SynEditMiscProcs;
 
 type

ide/buildmanager.pas

@@ -43,7 +43,7 @@ uses
   FileProcs, CodeToolsCfgScript, LinkScanner,
   // LazUtils
   LConvEncoding, FileUtil, LazFileUtils, LazFileCache, LazUTF8, Laz2_XMLCfg,
-  LazUtilities,
+  LazUtilities, LazMethodList,
   // IDEIntf
   IDEOptionsIntf, ProjectIntf, MacroIntf, IDEDialogs, IDEExternToolIntf,
   CompOptsIntf, LazIDEIntf, MacroDefIntf, IDEMsgIntf,

ide/codehelp.pas

@@ -48,7 +48,7 @@ uses
   KeywordFuncLists, PascalParserTool, CodeCache, CacheCodeTools, CustomCodeTool,
   FileProcs, DefineTemplates,
   // LazUtils
-  AvgLvlTree, FileUtil, LazFileUtils, LazUTF8, LazFileCache,
+  AvgLvlTree, FileUtil, LazFileUtils, LazUTF8, LazFileCache, LazMethodList,
   Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
   // SynEdit
   SynHighlighterPas,

ide/mainintf.pas

@@ -64,6 +64,8 @@ uses
   LCLType, Buttons, Controls, Graphics, Dialogs, Forms, LCLProc,
   // Codetools
   CodeCache,
+  // LazUtils
+  LazMethodList,
   // IDEIntf
   PropEdits, ObjectInspector, MenuIntf, SrcEditorIntf, ProjectIntf,
   CompOptsIntf, LazIDEIntf, IDEWindowIntf,

ide/project.pp

@@ -54,7 +54,8 @@ uses
   CodeToolsConfig, ExprEval, DefineTemplates, BasicCodeTools, CodeToolsCfgScript,
   LinkScanner, CodeToolManager, CodeCache, FileProcs,
   // LazUtils
-  FPCAdds, LazUtilities, FileUtil, LazFileUtils, LazFileCache, LazUTF8, Laz2_XMLCfg, Maps,
+  FPCAdds, LazUtilities, FileUtil, LazFileUtils, LazFileCache, LazMethodList,
+  LazUTF8, Laz2_XMLCfg, Maps,
   // IDEIntf
   PropEdits, UnitResources, EditorSyntaxHighlighterDef,
   CompOptsIntf, ProjectIntf, MacroIntf, MacroDefIntf, SrcEditorIntf,

ide/sourceeditor.pp

@@ -52,7 +52,7 @@ uses
   // LazControls
   ExtendedNotebook,
   // LazUtils
-  LConvEncoding, LazUtilities, LazFileCache, LazUTF8Classes, LazUTF8,
+  LConvEncoding, LazUtilities, LazFileCache, LazUTF8Classes, LazUTF8, LazMethodList,
   LazLoggerBase, Translations,
   // codetools
   BasicCodeTools, CodeBeautifier, CodeToolManager, CodeCache, SourceLog,

ide/sourcemarks.pas

@@ -41,6 +41,8 @@ uses
   Classes, SysUtils, Laz_AVL_Tree,
   // LCL
   Graphics, Controls, LCLProc,
+  // LazUtils
+  LazMethodList,
   // SynEdit
   SynEdit, SynEditMarks, SynEditMarkupGutterMark,
   // IdeIntf

lcl/controls.pp

@@ -39,7 +39,9 @@ uses
   // LCL
   LCLStrConsts, LCLType, LCLProc, GraphType, Graphics, LMessages, LCLIntf,
   InterfaceBase, ImgList, PropertyStorage, Menus, ActnList, LCLClasses,
-  LResources, LCLPlatformDef;
+  LResources, LCLPlatformDef,
+  // LazUtils
+  LazMethodList;
 
 {$I controlconsts.inc}
 

lcl/forms.pp

@@ -39,7 +39,7 @@ uses
   LResources, GraphType, Graphics, Menus, LMessages, CustomTimer, ActnList,
   ClipBrd, HelpIntfs, Controls, ImgList, Themes,
   // LazUtils
-  LazFileUtils, LazUTF8, Maps, IntegerList
+  LazFileUtils, LazUTF8, Maps, IntegerList, LazMethodList
   {$ifndef wince},gettext{$endif}// remove ifdefs when gettext is fixed and a new fpc is released
   ;
 

lcl/lclproc.pas

@@ -28,7 +28,7 @@ uses
   {$IFDEF Darwin}MacOSAll, {$ENDIF}
   Classes, SysUtils, Math, TypInfo, Types, Laz_AVL_Tree,
   // LazUtils
-  FPCAdds, LazFileUtils, LazMethodList, LazUTF8, LazUTF8Classes,
+  FPCAdds, LazFileUtils, LazUtilities, LazMethodList, LazUTF8, LazUTF8Classes,
   {$IFnDEF WithOldDebugln} LazLoggerBase, {$ENDIF}
   // LCL
   LCLStrConsts, LCLType;
@@ -141,11 +141,11 @@ procedure CalculateLeftTopWidthHeight(X1,Y1,X2,Y2: integer;
 function DeleteAmpersands(var Str : String) : Longint;
 function BreakString(const s: string; MaxLineLength, Indent: integer): string;
 
-function ComparePointers(p1, p2: Pointer): integer;
+function ComparePointers(p1, p2: Pointer): integer; inline;
 function CompareHandles(h1, h2: THandle): integer;
 function CompareRect(R1, R2: PRect): Boolean;
 function ComparePoints(const p1, p2: TPoint): integer;
-function CompareMethods(const m1, m2: TMethod): boolean;
+function CompareMethods(const m1, m2: TMethod): boolean; inline;
 
 function RoundToInt(const e: Extended): integer;
 function RoundToCardinal(const e: Extended): cardinal;
@@ -1270,12 +1270,7 @@ end;
 
 function ComparePointers(p1, p2: Pointer): integer;
 begin
-  if p1>p2 then
+  Result:=LazUtilities.ComparePointers(p1, p2);
-    Result:=1
-  else if p1<p2 then
-    Result:=-1
-  else
-    Result:=0;
 end;
 
 function CompareHandles(h1, h2: THandle): integer;
@@ -1314,7 +1309,7 @@ end;
 
 function CompareMethods(const m1, m2: TMethod): boolean;
 begin
-  Result:=(m1.Code=m2.Code) and (m1.Data=m2.Data);
+  Result:=LazMethodList.CompareMethods(m1, m2);
 end;
 
 function RoundToInt(const e: Extended): integer;

lcl/menus.pp

@@ -38,8 +38,12 @@ interface
 {$endif}
 
 uses
-  Types, Classes, SysUtils, LCLStrConsts, LCLType, LCLProc, LCLIntf, InterfaceBase,
+  Types, Classes, SysUtils,
-  LResources, LMessages, ActnList, Graphics, ImgList, LCLClasses, Themes;
+  // LCL
+  LCLStrConsts, LCLType, LCLProc, LCLIntf, LCLClasses, LResources, LMessages,
+  ActnList, Graphics, ImgList, Themes,
+  // LazUtils
+  LazMethodList;
 
 type
   TMenu = class;

lcl/stdctrls.pp

@@ -29,7 +29,7 @@ uses
   LCLStrConsts, LCLType, LCLProc, LCLIntf, LMessages, LResources, Graphics,
   ActnList, Controls, Forms, Menus, Themes,
   // LazUtils
-  TextStrings, ExtendedStrings, LazUTF8;
+  TextStrings, ExtendedStrings, LazUTF8, LazMethodList;
 
 type