Remove LCLProc.OffsetRect(). Move some functions from LCLProc to GraphMath (LazUtils).

components/anchordocking/anchordocking.pas

@@ -106,10 +106,13 @@ unit AnchorDocking;
 interface
 
 uses
-  Math, Classes, SysUtils, types, fgl,
-  LCLType, LCLIntf, LCLProc,
+  Types, Classes, SysUtils, Math, fgl,
+  // LCL
+  LCLType, LCLIntf,
   Controls, Forms, ExtCtrls, ComCtrls, Graphics, Themes, Menus, Buttons,
-  LazConfigStorage, Laz2_XMLCfg, LazFileCache, LazUTF8,
+  // LazUtils
+  LazLoggerBase, LazTracer, LazConfigStorage, Laz2_XMLCfg, LazFileCache, LazUTF8,
+  // AnchorDocking
   AnchorDockStr, AnchorDockStorage, AnchorDockPanel;
 
 {$IFDEF DebugDisableAutoSizing}

components/anchordocking/anchordockstorage.pas

@@ -7,7 +7,7 @@ Unit AnchorDockStorage;
 interface
 
 uses
-  Classes, SysUtils, Math,
+  Types, Classes, SysUtils, Math,
   // LCL
   LCLProc, ExtCtrls, ComCtrls, Forms, Controls,
   // LazUtils

components/anchordocking/restoredebugger/adlayoutviewer.pas

@@ -5,8 +5,13 @@ unit ADLayoutViewer;
 interface
 
 uses
-  Classes, SysUtils, types, math, Controls, Graphics, ComCtrls, LCLType,
-  LMessages, LCLIntf, AnchorDockStorage, LazLoggerBase;
+  Types, Classes, SysUtils, Math,
+  // LCL
+  Controls, Graphics, ComCtrls, LCLType, LMessages, LCLIntf,
+  // LazUtils
+  LazLoggerBase,
+  // AnchorDocking
+  AnchorDockStorage;
 
 type
   TADLTVMonitor = class

components/cairocanvas/tests/24217/unit1.pas

@@ -5,8 +5,12 @@ unit Unit1;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, PrintersDlgs, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ExtCtrls, CairoPrinter;
+  Types, Classes, SysUtils,
+  // LCL
+  Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls,
+  // LazUtils
+  FileUtil,
+  PrintersDlgs, CairoPrinter;
 
 type
 

components/fpreport/design/fpreportdesignctrl.pp

@@ -20,8 +20,11 @@ unit fpreportdesignctrl;
 interface
 
 uses
-  Classes, SysUtils, controls, fpreport, graphics, lmessages, fpreportlclexport, lcltype, menus,
-  fpreportdesignobjectlist, fpreportdrawruler, graphutil, ClipBrd, types;
+  Types, Classes, SysUtils,
+  // LCL
+  Controls, Graphics, LMessages, LCLType, Menus, GraphUtil, ClipBrd,
+  // fcl-report
+  fpreport, fpreportdesignobjectlist, fpreportdrawruler, fpreportlclexport;
 
 Const
   clGrid  = TColor($E0E0E0);      // Default color for guide grid

components/fpreport/design/fpreportdesignobjectlist.pp

@@ -21,7 +21,11 @@ unit fpreportdesignobjectlist;
 interface
 
 uses
-  Classes, SysUtils, graphics, lclintf, fpreportlclexport, fpreport, controls;
+  Types, Classes, SysUtils,
+  // LCL
+  Graphics, Controls,
+  // fcl-report
+  fpreport, fpreportlclexport;
 
 Const
   clResizeHandleSingle = clBlack;  // Pen color to draw selection resize handle

components/ideintf/graphpropedits.pas

@@ -16,11 +16,11 @@ unit GraphPropEdits;
 interface
 
 uses
-  Classes, TypInfo, SysUtils, Math,
+  Types, Classes, TypInfo, SysUtils, Math,
   // LCL
-  LCLIntf, LCLType, Forms, Graphics, Buttons, Menus, Dialogs, Grids, ImgList, EditBtn,
+  LCLType, Forms, Graphics, Buttons, Menus, Dialogs, Grids, ImgList, EditBtn,
   // LazUtils
-  GraphType, UITypes, LazFileUtils,
+  GraphType, LazFileUtils, UITypes,
   // IdeIntf
   PropEdits, GraphicPropEdit; // defines TGraphicPropertyEditorForm
 

components/ideintf/ideimagesintf.pas

@@ -25,9 +25,9 @@ unit IDEImagesIntf;
 interface
 
 uses
-  Classes, SysUtils, Math,
+  Types, Classes, SysUtils, Math,
   // LCL
-  LCLProc, LCLType, LResources, ImgList, Controls, Graphics, Buttons;
+  LCLType, LResources, ImgList, Controls, Graphics, Buttons;
 
 type
 

components/ideintf/idewindowintf.pas

@@ -17,7 +17,7 @@ unit IDEWindowIntf;
 interface
 
 uses
-  Math, Classes, SysUtils,
+  Types, Classes, SysUtils, Math,
   // LCL
   LCLIntf, LCLType, Forms, Controls,
   // LazUtils

components/lazreport/source/lr_class.pas

@@ -18,7 +18,7 @@ uses
   {$if defined(UNIX) and not defined(OPENBSD)}
   CLocale,
   {$endif}
-  Classes, TypInfo, SysUtils, Math, StrUtils, DateUtils,
+  Types, Classes, TypInfo, SysUtils, Math, StrUtils, DateUtils,
   MaskUtils, Variants, DB, DOM, XMLWrite, XMLRead, XMLConf,
   // LCL
   LCLType, LCLIntf, Controls, Forms, Dialogs, Menus, Graphics, Printers,

components/lazreport/source/lr_ctrls.pas

@@ -15,13 +15,14 @@ interface
 {$I LR_Vers.inc}
 
 uses
-  Classes, SysUtils, LResources,LMessages,Messages,
-  Forms, Controls, Graphics, Dialogs,
-  ExtCtrls, Buttons, StdCtrls,Menus,comctrls,
-  
-  LR_Fpc,
-
-  GraphType,LCLType,LCLIntf;
+  Types, Classes, SysUtils,
+  // LCL
+  LCLType, LCLIntf, LResources, LMessages, Messages, Forms, Controls, Graphics,
+  Dialogs, ExtCtrls, Buttons, StdCtrls, Menus, ComCtrls,
+  // LazUtils
+  GraphType,
+  // LazReport
+  LR_Fpc;
 
 type
   TfrButtonState = (fbsUp, fbsDisabled, fbsDown, fbsExclusive, fbsInactive);

components/lazreport/source/lr_desgn.pas

@@ -18,14 +18,16 @@ interface
 {$define sbod}  // status bar owner draw
 {$define ppaint}
 uses
-  Classes, SysUtils, Types, LazFileUtils, LazUTF8, LMessages,
-  Forms, Controls, Graphics, Dialogs, ComCtrls,
+  Classes, SysUtils, Types,
+  // LCL
+  LMessages, Forms, Controls, Graphics, Dialogs, ComCtrls,
   ExtCtrls, Buttons, StdCtrls, Menus,
-
-  LCLType,LCLIntf,LCLProc,GraphType,Printers, ActnList,
-
+  LCLType, LCLIntf, LCLProc, Printers, ActnList,
+  // LazUtils
+  LazUtilities, LazFileUtils, LazUTF8, GraphType,
+  // IdeIntf
   ObjectInspector, PropEdits, GraphPropEdits,
-  
+  // LazReport
   LR_Class, LR_Color,LR_Edit;
 
 

components/lazreport/source/lr_prdlg.pas

@@ -15,9 +15,11 @@ interface
 {$I LR_Vers.inc}
 
 uses
-  Classes, SysUtils, LResources,
-  Forms, Controls, Graphics, Dialogs,
-  Buttons, StdCtrls,LCLIntf,ExtCtrls, Spin,
+  Types, Classes, SysUtils,
+  // LCL
+  LCLIntf, LResources,
+  Forms, Controls, Graphics, Dialogs, Buttons, StdCtrls, ExtCtrls, Spin,
+  // Printers
   PrintersDlgs;
 
 type

components/lazreport/source/lr_view.pas

@@ -15,9 +15,16 @@ interface
 {$I LR_Vers.inc}
 
 uses
-  Classes, SysUtils, LResources, LMessages, Forms, Controls, Graphics, Dialogs,
-  ExtCtrls, Buttons, StdCtrls, Menus, GraphType, LCLType, LCLProc, LCLIntf, LazUTF8,
-  LR_Const, PrintersDlgs;
+  Types, Classes, SysUtils,
+  // LCL
+  LCLType, LCLIntf, LResources, LMessages, Forms, Controls, Graphics, Dialogs,
+  ExtCtrls, Buttons, StdCtrls, Menus,
+  // LazUtils
+  LazUTF8,
+  // LazReport
+  LR_Const,
+  // Printers
+  PrintersDlgs;
 
 type
   TfrPreviewForm = class;

components/lazutils/graphmath.pp

@@ -60,6 +60,9 @@ procedure BezierArcPoints(X, Y, Width, Height : Longint; Angle1, Angle2,
 
 function BezierMidPoint(const Bezier : TBezier) : TFloatPoint; inline;
 
+procedure CalculateLeftTopWidthHeight(X1,Y1,X2,Y2: integer;
+  out Left,Top,Width,Height: integer);
+
 procedure Coords2Angles(X, Y, Width, Height : Integer; SX, SY,
   EX, EY : Integer; var Angle1, Angle2 : Extended);
 
@@ -74,6 +77,11 @@ function FloatPoint(AX,AY : Extended): TFloatPoint; inline;
 
 function LineEndPoint(const StartPoint : TPoint; Angle, Length : Extended) : TPoint;
 
+procedure MakeMinMax(var i1, i2: integer);
+
+procedure MoveRect(var ARect: TRect; x, y: Integer);
+procedure MoveRectToFit(var ARect: TRect; const MaxRect: TRect);
+
 procedure PolyBezier2Polyline(Beziers: Array of TBezier;
   var Points : PPoint; var Count : Longint); Overload;
 procedure PolyBezier2Polyline(Beziers : Array of TPoint;
@@ -592,6 +600,31 @@ begin
   Result := (Bezier[0] + 3*Bezier[1] + 3*Bezier[2] + Bezier[3]) / 8;
 end;
 
+procedure CalculateLeftTopWidthHeight(X1, Y1, X2, Y2: integer;
+  out Left, Top, Width, Height: integer);
+begin
+  if X1 <= X2 then
+   begin
+    Left := X1;
+    Width := X2 - X1;
+  end
+  else
+  begin
+    Left := X2;
+    Width := X1 - X2;
+  end;
+  if Y1 <= Y2 then
+  begin
+    Top := Y1;
+    Height := Y2 - Y1;
+  end
+  else
+  begin
+    Top := Y2;
+    Height := Y1 - Y2;
+  end;
+end;
+
 {------------------------------------------------------------------------------
   Method:   Coords2Angles
   Params:   x,y,width,height,sx,sy,ex,ey, angle1,angle2
@@ -794,6 +827,50 @@ begin
   Result.X := StartPoint.X + Round(Length*cosAngle);
 end;
 
+procedure MakeMinMax(var i1, i2: integer);
+var
+  h: Integer;
+begin
+  if i1>i2 then begin
+    h:=i1;
+    i1:=i2;
+    i2:=h;
+  end;
+end;
+
+procedure MoveRect(var ARect: TRect; x, y: Integer);
+begin
+  inc(ARect.Right,x-ARect.Left);
+  inc(ARect.Bottom,y-ARect.Top);
+  ARect.Left:=x;
+  ARect.Top:=y;
+end;
+
+procedure MoveRectToFit(var ARect: TRect; const MaxRect: TRect);
+// move ARect, so it fits into MaxRect
+// if MaxRect is too small, ARect is resized.
+begin
+  if ARect.Left<MaxRect.Left then begin
+    // move rectangle right
+    ARect.Right:=Min(ARect.Right+MaxRect.Left-ARect.Left,MaxRect.Right);
+    ARect.Left:=MaxRect.Left;
+  end;
+  if ARect.Top<MaxRect.Top then begin
+    // move rectangle down
+    ARect.Bottom:=Min(ARect.Bottom+MaxRect.Top-ARect.Top,MaxRect.Bottom);
+    ARect.Top:=MaxRect.Top;
+  end;
+  if ARect.Right>MaxRect.Right then begin
+    // move rectangle left
+    ARect.Left:=Max(ARect.Left-ARect.Right+MaxRect.Right,MaxRect.Left);
+    ARect.Right:=MaxRect.Right;
+  end;
+  if ARect.Bottom>MaxRect.Bottom then begin
+    // move rectangle left
+    ARect.Top:=Max(ARect.Top-ARect.Bottom+MaxRect.Bottom,MaxRect.Top);
+    ARect.Bottom:=MaxRect.Bottom;
+  end;
+end;
 
 {------------------------------------------------------------------------------
   Method:   PolyBezier2Polyline

components/leakview/heaptrcview.pas

@@ -5,8 +5,10 @@ unit HeapTrcView;
 interface
 
 uses
-  Classes, SysUtils, XMLConf, DOM, contnrs, Clipbrd, LCLProc, LCLType,
-  LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls, ExtCtrls,
+  Types, Classes, SysUtils, XMLConf, DOM, contnrs,
+  // LCL
+  LCLType, Clipbrd, LResources,
+  Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls, ExtCtrls,
   // LazUtils
   FileUtil, LazFileUtils,
   // IDEIntf

components/rtticontrols/rttictrls.pas

@@ -24,9 +24,15 @@ unit RTTICtrls;
 interface
 
 uses
-  Classes, SysUtils, TypInfo, LResources, LCLProc, LCLType, LCLIntf, Forms,
+  Classes, SysUtils, TypInfo,
+  // LCL
+  LResources, LCLType, LCLIntf, Forms,
   Controls, Graphics, MaskEdit, Calendar, Spin, Dialogs, CheckLst, ComCtrls,
-  StdCtrls, Buttons, ExtCtrls, GraphPropEdits, PropEdits;
+  StdCtrls, Buttons, ExtCtrls,
+  // LazUtils
+  LazUtilities,
+  // IdeIntf
+  GraphPropEdits, PropEdits;
 
 type
   { TAliasStrings }

components/rtticontrols/rttigrids.pas

@@ -27,9 +27,9 @@ interface
 uses
   Classes, SysUtils, TypInfo,
   // LCL
-  LCLProc, LCLType, Controls, Grids,
+  LCLType, Controls, Grids,
   // LazUtils
-  LazLoggerBase, LazUTF8,
+  LazUtilities, LazLoggerBase, LazUTF8,
   // IdeIntf
   ObjectInspector, PropEdits,
   RTTICtrls;

components/synedit/syneditmarkupifdef.pp

@@ -27,7 +27,7 @@ uses
   // LCL
   Graphics, LCLProc,
   // LazUtils
-  LazClasses, LazLoggerBase, LazMethodList,
+  LazUtilities, LazClasses, LazLoggerBase, LazMethodList,
   // SynEdit
   SynEditMiscClasses, SynHighlighterPas, SynEditMarkupHighAll,
   SynEditHighlighterFoldBase, SynEditFoldedView, LazSynEditText, SynEditMiscProcs,

components/tachart/tagraph.pas

@@ -524,7 +524,8 @@ implementation
 {$R tagraph.res}
 
 uses
-  Clipbrd, Dialogs, {GraphMath,} LCLProc, LResources, Math, Types,
+  Math, Types,
+  Clipbrd, Dialogs, LResources,
   TADrawerCanvas, TAGeometry, TAMath, TAStyles;
 
 const

components/turbopower_ipro/iphtml.pas

@@ -51,10 +51,10 @@ interface
 
 uses
   //MemCheck,
-  Types, contnrs,
-  LCLType, LCLProc, LCLIntf, LResources, LMessages, LCLMemManager,
-  LazStringUtils, LConvEncoding, LazUTF8, AvgLvlTree,
-  Messages, SysUtils, Classes, Graphics, TypInfo,
+  Types, contnrs, SysUtils, Classes, TypInfo,
+  // LCL
+  LCLType, LCLIntf, LResources, LMessages, Messages, LCLMemManager,
+  Graphics, Controls, StdCtrls, ExtCtrls, Buttons, Forms, ClipBrd, Dialogs,
   {$IFDEF UseGifImageUnit} //TODO all of this units not exists
     GifImage,
   {$ELSE}
@@ -69,8 +69,10 @@ uses
   {$IFDEF UsePNGGraphic}
     IpPNGImg,
   {$ENDIF}
-  Controls, StdCtrls, ExtCtrls, Buttons, Forms, ClipBrd, Dialogs,
-  IpConst, IpUtils, IpHtmlTypes, IpHtmlClasses, IpHtmlProp, IpMsg, 
+  // LazUtils
+  LazStringUtils, LConvEncoding, LazUTF8, LazLoggerBase, AvgLvlTree,
+  // TurboPower_ipro
+  IpConst, IpUtils, IpHtmlTypes, IpHtmlClasses, IpHtmlProp, IpMsg,
   IpCSS, IpHtmlUtils, IpHtmlTabList;
 
 type
@@ -1408,7 +1410,7 @@ uses
   {$IFDEF Html_Print}
   Printers, PrintersDlgs, IpHtmlPv,
   {$ENDIF}
-  ipHtmlNodes, ipHtmlParser, ipHtmlBlockLayout, ipHtmlTableLayout; 
+  ipHtmlNodes, ipHtmlParser;
 
 {$R *.res}
 

components/turbopower_ipro/iphtmlblocklayout.pas

@@ -6,7 +6,10 @@ unit ipHtmlBlockLayout;
 interface
 
 uses
-  types, Classes, SysUtils, LCLPRoc, LCLIntf, Graphics,
+  Types, Classes, SysUtils,
+  // LCL
+  LCLIntf, Graphics,
+  // TurboPower_ipro
   IpUtils, IpHtmlTypes, IpHtmlProp, IpHtmlUtils, IpHtml, IpHtmlNodes;
 
 type

components/turbopower_ipro/iphtmlnodes.pas

@@ -6,9 +6,12 @@ unit IpHtmlNodes;
 interface
 
 uses
-  Classes, SysUtils, Graphics, GraphUtil, LCLIntf, LCLType, Types, 
+  Types, Classes, SysUtils,
+  // LCL
+  Graphics, GraphUtil, LCLIntf, LCLType,
   Controls, StdCtrls, ExtCtrls, Buttons, Dialogs,
-  IpConst, IpCSS, IpHtmlTypes, IpHtmlClasses, IpHtmlProp, 
+  // TurboPower_ipro
+  IpConst, IpCSS, IpHtmlTypes, IpHtmlClasses, IpHtmlProp,
   IpHtmlUtils, IpMsg, IpHtml;
 
 type

components/turbopower_ipro/iphtmlpv.pas

@@ -39,12 +39,12 @@ unit IpHtmlPv;
 interface
 
 uses
-  LCLType,
-  GraphType,
-  LCLIntf,
-  Buttons,
-  Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, ExtCtrls, Spin, IpHtml, IpConst, IpHtmlTypes;
+  Types, Classes, SysUtils,
+  // LCL
+  LCLType, LCLIntf, GraphType, Buttons, Messages, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, ExtCtrls, Spin,
+  // TurboPower_ipro
+  IpHtml, IpConst, IpHtmlTypes;
 
 type
 

designer/menutemplates.pas

@@ -24,10 +24,10 @@ unit MenuTemplates;
 interface
 
 uses
-  Classes, SysUtils, types, fgl,
+  Classes, SysUtils, Types, fgl,
   // LCL
   Buttons, Controls, Dialogs, StdCtrls, ExtCtrls, Menus,
-  ComCtrls, Forms, Graphics, Themes, LCLType, LCLIntf, LCLProc,
+  ComCtrls, Forms, Graphics, Themes, LCLType, LCLProc,
   // LazUtils
   LazFileUtils, Laz2_XMLCfg,
   // IdeIntf

examples/gridexamples/embedded_images/imgmain.pas

@@ -5,8 +5,10 @@ unit imgMain;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Grids,
-  ExtCtrls, StdCtrls, LMessages, Spin, ComCtrls;
+  Types, Classes, SysUtils,
+  LCLIntf, LMessages, Forms, Controls, Graphics, Dialogs, Grids, ExtCtrls,
+  StdCtrls, Spin, ComCtrls,
+  FileUtil;
 
 type
   { TImageData is stored in the list FImageList of the modified string grid and
@@ -94,9 +96,6 @@ implementation
 
 {$R *.lfm}
 
-uses
-  Types, LCLIntf;
-
 const
   //JPEG_FILE = '../../../images/splash_source/cheetah.jpg';
   //PNG_FILE1 = '../../../images/codetoolsdefines/da_block.png';

examples/virtualtreeview/vst_advanced/DrawTreeDemo.pas

@@ -20,8 +20,10 @@ uses
   {$ifdef Windows}
   Windows,
   {$endif}
-  LCLIntf, delphicompat, LCLType, SysUtils, Classes, ComCtrls, Graphics, Controls, Forms, Dialogs,
-  Laz.VirtualTrees, StdCtrls, shlobjext, LResources;
+  Types, SysUtils, Classes,
+  LCLIntf, LCLType, LResources, ComCtrls, Graphics, Controls, Forms, Dialogs, StdCtrls,
+  Laz.VirtualTrees, shlobjext, delphicompat,
+  LazFileUtils;
 
 type
   TDrawTreeForm = class(TForm)
@@ -70,7 +72,7 @@ implementation
 {$R *.lfm}
 
 uses
-  LazFileUtils, States;
+  States;
 
 //----------------------------------------------------------------------------------------------------------------------
 

ide/codehelp.pas

@@ -42,14 +42,14 @@ uses
   // RTL + FCL
   Classes, SysUtils, Laz_AVL_Tree,
   // LCL
-  LCLProc, Forms, Controls, Dialogs,
+  Forms, Controls, Dialogs,
   // CodeTools
   CodeAtom, CodeTree, CodeToolManager, FindDeclarationTool, BasicCodeTools,
   KeywordFuncLists, PascalParserTool, CodeCache, CacheCodeTools, CustomCodeTool,
   FileProcs, DefineTemplates,
   // LazUtils
   AvgLvlTree, FileUtil, LazFileUtils, LazUTF8, LazFileCache, LazMethodList,
-  LazLoggerBase, Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
+  LazUtilities, LazLoggerBase, LazTracer, Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
   // SynEdit
   SynHighlighterPas,
   // IDEIntf

ide/idehelpmanager.pas

@@ -35,10 +35,10 @@ uses
   // RTL + FCL
   Classes, SysUtils, Laz_AVL_Tree,
   // LCL
-  LCLProc, LCLIntf, LCLType, FileProcs, Forms, Controls, ComCtrls, StdCtrls,
+  LCLIntf, LCLType, FileProcs, Forms, Controls, ComCtrls, StdCtrls,
   Dialogs, Graphics, Buttons, ButtonPanel, LazHelpHTML, HelpIntfs,
   // LazUtils
-  LConvEncoding, LazFileUtils, HTML2TextRender,
+  LConvEncoding, LazUtilities, LazFileUtils, HTML2TextRender,
   // CodeTools
   BasicCodeTools, CodeToolManager, CodeCache, CustomCodeTool, CodeTree,
   PascalParserTool, FindDeclarationTool,

ide/lazarus.lpi

@@ -369,6 +369,7 @@
         <ComponentName Value="HelpSelectorDialog"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <UnitName Value="IDEHelpManager"/>
       </Unit>
       <Unit>
         <Filename Value="../designer/askcompnamedlg.pas"/>
@@ -760,7 +761,9 @@
       <Unit>
         <Filename Value="unitdependencies.pas"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="UnitDependenciesWindow"/>
         <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
         <UnitName Value="UnitDependencies"/>
       </Unit>
       <Unit>

ide/lazarus.pp

@@ -56,7 +56,7 @@ uses
   SysUtils,
   Interfaces,
   IDEInstances,//keep IDEInstances up so that it will be initialized soon
-  Forms, LCLProc,
+  Forms, LazUtilities, LazLoggerBase,
   IDEOptionsIntf,
   LazConf, IDEGuiCmdLine,
   Splash,

ide/mainbase.pas

@@ -58,9 +58,9 @@ uses
   // RTL + FCL
   Classes, SysUtils, Types, Math,
   // LCL
-  LCLProc, Buttons, Menus, ComCtrls, Controls, Graphics, Dialogs, Forms, ImgList,
+  Buttons, Menus, ComCtrls, Controls, Graphics, Dialogs, Forms, ImgList,
   // LazUtils
-  LazFileUtils, LazUTF8,
+  LazUtilities, LazFileUtils, LazLoggerBase, LazTracer, LazUTF8,
   // Codetools
   CodeToolManager,
   // SynEdit

ide/searchresultview.pp

@@ -39,12 +39,12 @@ interface
 uses
   Classes, SysUtils, Math, StrUtils, Laz_AVL_Tree,
   // LCL
-  LCLProc, LCLType, LCLIntf, Forms, Controls, Graphics, ComCtrls, Menus, Clipbrd,
+  LCLProc, LCLType, Forms, Controls, Graphics, ComCtrls, Menus, Clipbrd,
   ActnList, ExtCtrls, StdCtrls, Dialogs,
   // LazControls
   TreeFilterEdit, ExtendedNotebook,
   // LazUtils
-  LazUTF8, LazFileUtils, LazLoggerBase, LazStringUtils,
+  LazUTF8, LazUtilities, LazFileUtils, LazLoggerBase, LazStringUtils,
   // IdeIntf
   IDEImagesIntf, IDECommands,
   // IDE

ide/useunitdlg.pas

@@ -32,11 +32,11 @@ interface
 uses
   Classes, SysUtils,
   // LCL
-  LCLType, LCLProc, Forms, Controls, StdCtrls, ExtCtrls, ButtonPanel, Dialogs, Graphics,
+  LCLType, Forms, Controls, StdCtrls, ExtCtrls, ButtonPanel, Dialogs, Graphics,
   // LazControls
   ListFilterEdit,
   // LazUtils
-  LazUTF8, LazFileUtils,
+  LazUTF8, LazFileUtils, LazUtilities,
   // Codetools
   FileProcs, LinkScanner, CodeCache, CodeTree, CodeToolManager, IdentCompletionTool,
   // BuildIntf

lcl/controls.pp

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

lcl/include/control.inc

@@ -469,7 +469,7 @@ begin
         ARect:=Rect(0,0,Width,Height);
       end;
     end else begin
-      LCLProc.MoveRectToFit(ARect, NewDockSite.GetLogicalClientRect);
+      MoveRectToFit(ARect, NewDockSite.GetLogicalClientRect);
       // consider Align to increase chance the width/height is kept
       case Align of
         alLeft: OffsetRect(ARect,-ARect.Left,0);

lcl/include/winapi.inc

@@ -1516,20 +1516,6 @@ begin
   Result := MakeLong(l, h);
 end;
 
-{------------------------------------------------------------------------------
-  Function: OffSetRect
-  Params:   Rect: points to structure that moves.
-            dx  : amount to move the rect to left or right.  Must be negative to move to left.
-            dy  : amount to move the rect up or down.  Mmust be negative to move up.
-  Returns:  True if succesful
-
-  Moves the rectangle up or down, left or right.
- ------------------------------------------------------------------------------}
-function OffSetRect(var Rect: TRect; dx,dy: Integer): Boolean; inline;
-begin
-  Result:=LCLProc.OffsetRect(Rect,dx,dy);
-end;
-
 {------------------------------------------------------------------------------
   Function: PointtoSmallPoint
   Params:

lcl/include/winapih.inc

@@ -336,8 +336,6 @@ function MakeWParam(l, h: Word): WPARAM; inline;
 function MakeLParam(l, h: Word): LPARAM; inline;
 function MakeLResult(l, h: Word): LRESULT; inline;
 
-function OffsetRect(var Rect: TRect; dx,dy: Integer): Boolean; inline;
-
 function PtInRect(const Rect : TRect; const Point : TPoint) : Boolean; inline;
 function PointToSmallPoint(const P : TPoint) : TSmallPoint; inline;
 function PointToSmallPointNoChecks(const P : TPoint) : TSmallPoint; inline;

lcl/interfaces/carbon/carbonwscontrols.pp

@@ -24,7 +24,7 @@ interface
 
 uses
   // libs
-  MacOSAll, Classes, SysUtils,
+  MacOSAll, Types, Classes, SysUtils,
   // LCL
   Forms, Controls, Graphics, LCLType, LCLProc, LCLIntf,
   // widgetset

lcl/interfaces/cocoa/cocoaprivate.pas

@@ -1507,7 +1507,7 @@ end;
 function LCLViewExtension.lclClientFrame: TRect;
 begin
   Result := lclFrame;
-  Types.OffsetRect(Result, -Result.Left, -Result.Top);
+  OffsetRect(Result, -Result.Left, -Result.Top);
 end;
 
 function LCLViewExtension.lclContentView: NSView;

lcl/interfaces/cocoa/cocoatextedits.pas

@@ -1696,7 +1696,7 @@ begin
       //       (however, one should be careful and take layout offsets into account!)
       //       on the other hand, "cells" themselves are being deprecated...
       dr := lclFrame;
-      Types.OffsetRect(dr, -dr.Left, -dr.Top);
+      OffsetRect(dr, -dr.Left, -dr.Top);
       SubLayoutFromFrame( lclGetFrameToLayoutDelta, dr);
 
       // magic offsets are based on the macOS 10.13.6 visual style

lcl/interfaces/gtk2/gtk2wscomctrls.pp

@@ -22,7 +22,7 @@ interface
 
 uses
   // RTL, FCL, libs
-  Math, Sysutils, Classes, GLib2, Gtk2, Gdk2, Gdk2pixbuf,
+  Types, Classes, Sysutils, Math, GLib2, Gtk2, Gdk2, Gdk2pixbuf,
   // LazUtils
   LazTracer,
   // LCL

lcl/interfaces/gtk3/gtk3wscomctrls.pp

@@ -23,9 +23,13 @@ interface
 uses
   // libs
   LazGtk3, LazGdk3, LazGlib2,
-  // RTL, FCL, LCL
-  ComCtrls, Classes, LCLType, LMessages, Controls, Graphics, StdCtrls, Forms,
-  LCLProc, LCLIntf, ImgList, Math, Sysutils, ctypes, InterfaceBase,
+  // RTL, FCL
+  Types, Classes, Math, Sysutils, ctypes,
+  // LCL
+  LCLType, LMessages, Controls, Graphics, StdCtrls, ComCtrls, Forms,
+  ImgList, InterfaceBase,
+  // LazUtils
+  LazLoggerBase,
   // widgetset
   WSComCtrls, WSLCLClasses, WSControls, WSProc,
   Gtk3WSControls, Gtk3Int, gtk3widgets;

lcl/interfaces/qt5/qtint.pp

@@ -34,7 +34,7 @@ uses
   {$ENDIF}
   // Bindings - qt5 must come first to avoid type redefinition problems
   qt5,
-  // FPC
+  // RTL
   Classes, SysUtils, Math, Types,
   // LCL
   InterfaceBase, LCLPlatformDef, LCLProc, LCLType, LMessages,

lcl/interfaces/qt5/qtwscomctrls.pp

@@ -25,8 +25,10 @@ uses
   // Bindings
   qt5,
   qtwidgets, qtobjects, qtproc,
+  // RTL
+  SysUtils, Classes, Types,
   // LCL
-  SysUtils, Classes, Types, ComCtrls, Controls, LCLType, Graphics, StdCtrls,
+  ComCtrls, Controls, LCLType, Graphics, StdCtrls,
   LCLProc, LCLIntf, Forms, ImgList,
   // Widgetset
   WSProc, WSComCtrls, WSLCLClasses;

lcl/interfaces/qt5/qtwscontrols.pp

@@ -25,8 +25,10 @@ uses
   // Bindings
   qt5,
   qtwidgets, qtobjects, qtproc, qtint,
+  // RTL
+  SysUtils, Classes, Types,
   // LCL
-  SysUtils, Classes, Types, Controls, LCLType, LazUTF8, Forms, Graphics,
+  Controls, LCLType, LazUTF8, Forms, Graphics,
   // Widgetset
   InterfaceBase, WSProc, WSControls, WSLCLClasses;
 

lcl/interfaces/qt5/qtwsforms.pp

@@ -25,8 +25,10 @@ uses
   // Bindings
   qt5,
   qtobjects, qtwidgets, qtproc,
+  // RTL
+  SysUtils, Classes, Types,
   // LCL
-  SysUtils, Classes, types, Controls, LCLType, Forms,
+  Controls, LCLType, Forms,
   // Widgetset
   WSForms, WSProc, WSLCLClasses;
 

lcl/lclintf.pas

@@ -52,9 +52,10 @@ uses
   {$IFDEF Darwin}MacOSAll, CocoaAll,{$ENDIF}
   Math, Classes, SysUtils, Types,
   // LCL
-  LCLType, LCLProc, LMessages, LCLStrConsts, InterfaceBase,
+  LCLType, LMessages, LCLStrConsts, InterfaceBase,
   // LazUtils
-  GraphType, FileUtil, LazFileUtils, UTF8Process, LazUTF8, LazSysUtils, Maps;
+  GraphType, GraphMath, FileUtil, LazFileUtils, UTF8Process, LazUTF8,
+  LazSysUtils, LazLoggerBase, Maps;
 
 {$ifdef Trace}
   {$ASSERTIONS ON}

lcl/lclproc.pas

@@ -109,7 +109,6 @@ var
 
 function SendApplicationMessage(Msg: Cardinal; WParam: WParam; LParam: LParam):Longint;
 procedure OwnerFormDesignerModified(AComponent: TComponent);
-procedure FreeThenNil(var obj); inline;
 
 { the LCL interfaces finalization sections are called before the finalization
   sections of the LCL. Those parts, that should be finalized after the LCL, can
@@ -119,13 +118,6 @@ procedure CallInterfaceInitializationHandlers;
 procedure RegisterInterfaceFinalizationHandler(p: TProcedure);
 procedure CallInterfaceFinalizationHandlers;
 
-function OffsetRect(var ARect: TRect; dx, dy: Integer): Boolean;
-procedure MoveRect(var ARect: TRect; x, y: Integer);
-procedure MoveRectToFit(var ARect: TRect; const MaxRect: TRect);
-procedure MakeMinMax(var i1, i2: integer);
-procedure CalculateLeftTopWidthHeight(X1,Y1,X2,Y2: integer;
-  out Left,Top,Width,Height: integer);
-
 // Ampersands
 function DeleteAmpersands(var Str : String) : Integer;
 function RemoveAmpersands(const ASource: String): String;
@@ -836,23 +828,6 @@ begin
   end;
 end;
 
-function OffSetRect(var ARect: TRect; dx,dy: Integer): Boolean;
-Begin
-  with ARect do
-  begin
-    Left := Left + dx;
-    Right := Right + dx;
-    Top := Top + dy;
-    Bottom := Bottom + dy;
-  end;
-  Result := (ARect.Left >= 0) and (ARect.Top >= 0);
-end;
-
-procedure FreeThenNil(var obj);
-begin
-  LazUtilities.FreeThenNil(obj);
-end;
-
 procedure RegisterInterfaceInitializationHandler(p: TProcedure);
 begin
   InterfaceInitializationHandlers.Add(p);
@@ -879,76 +854,6 @@ begin
     TProcedure(InterfaceFinalizationHandlers[i])();
 end;
 
-procedure MoveRect(var ARect: TRect; x, y: Integer);
-begin
-  inc(ARect.Right,x-ARect.Left);
-  inc(ARect.Bottom,y-ARect.Top);
-  ARect.Left:=x;
-  ARect.Top:=y;
-end;
-
-procedure MoveRectToFit(var ARect: TRect; const MaxRect: TRect);
-// move ARect, so it fits into MaxRect
-// if MaxRect is too small, ARect is resized.
-begin
-  if ARect.Left<MaxRect.Left then begin
-    // move rectangle right
-    ARect.Right:=Min(ARect.Right+MaxRect.Left-ARect.Left,MaxRect.Right);
-    ARect.Left:=MaxRect.Left;
-  end;
-  if ARect.Top<MaxRect.Top then begin
-    // move rectangle down
-    ARect.Bottom:=Min(ARect.Bottom+MaxRect.Top-ARect.Top,MaxRect.Bottom);
-    ARect.Top:=MaxRect.Top;
-  end;
-  if ARect.Right>MaxRect.Right then begin
-    // move rectangle left
-    ARect.Left:=Max(ARect.Left-ARect.Right+MaxRect.Right,MaxRect.Left);
-    ARect.Right:=MaxRect.Right;
-  end;
-  if ARect.Bottom>MaxRect.Bottom then begin
-    // move rectangle left
-    ARect.Top:=Max(ARect.Top-ARect.Bottom+MaxRect.Bottom,MaxRect.Top);
-    ARect.Bottom:=MaxRect.Bottom;
-  end;
-end;
-
-procedure MakeMinMax(var i1, i2: integer);
-var
-  h: Integer;
-begin
-  if i1>i2 then begin
-    h:=i1;
-    i1:=i2;
-    i2:=h;
-  end;
-end;
-
-procedure CalculateLeftTopWidthHeight(X1, Y1, X2, Y2: integer;
-  out Left, Top, Width, Height: integer);
-begin
-  if X1 <= X2 then 
-   begin
-    Left := X1;
-    Width := X2 - X1;
-  end 
-  else 
-  begin
-    Left := X2;
-    Width := X1 - X2;
-  end;
-  if Y1 <= Y2 then 
-  begin
-    Top := Y1;
-    Height := Y2 - Y1;
-  end 
-  else 
-  begin
-    Top := Y2;
-    Height := Y1 - Y2;
-  end;
-end;
-
 function CompareHandles(h1, h2: THandle): integer;
 begin
   if h1>h2 then

lcl/postscriptcanvas.pas

@@ -2909,24 +2909,24 @@ begin
       taRightJustify:
       begin
         Offset := ARect.Right - fRect.Right;
-        LCLIntf.OffsetRect(fRect, Offset, 0);
+        OffsetRect(fRect, Offset, 0);
       end;
       taCenter:
       begin
         Offset :=  (ARect.Right - fRect.Right) div 2;
-        LCLIntf.OffsetRect(fRect, offset, 0);
+        OffsetRect(fRect, offset, 0);
       end;
     end;
     case Style.Layout of
       tlCenter:
       begin
         Offset :=  ((ARect.Bottom - ARect.Top) - (fRect.Bottom - fRect.Top)) div 2;
-        LCLIntf.OffsetRect(fRect, 0, offset);
+        OffsetRect(fRect, 0, offset);
       end;
       tlBottom:
       begin
         Offset :=  ARect.Bottom - fRect.Bottom;
-        LCLIntf.OffsetRect(fRect, 0, offset);
+        OffsetRect(fRect, 0, offset);
       end;
     end;
   end;

lcl/themes.pas

@@ -48,7 +48,7 @@ interface
 uses
   Classes, SysUtils, Types, Math,
   // LCL  -  Controls cannot be used here to prevent circular references
-  LCLProc, LCLType, Graphics, TmSchema,
+  LCLType, Graphics, TmSchema,
   // LazUtils
   GraphType;
   

packager/addtopackagedlg.pas

@@ -32,10 +32,10 @@ interface
 uses
   Classes, SysUtils, Laz_AVL_Tree,
   // LCL
-  LCLProc, LCLType, Forms, Controls, Buttons, ExtDlgs, StdCtrls, ExtCtrls,
+  LCLType, Forms, Controls, Buttons, ExtDlgs, StdCtrls, ExtCtrls,
   Dialogs, ComCtrls, ButtonPanel,
   // LazUtils
-  FileUtil, LazFileUtils, LazUTF8,
+  FileUtil, LazFileUtils, LazUtilities, LazUTF8,
   // IDEIntf
   NewItemIntf, PackageIntf, FormEditingIntf, IDEWindowIntf, ComponentReg,
   IDEDialogs,