Rename CompareMethods to more logical SameMethod. Remove old deprecated functions.

components/buildintf/ideexterntoolintf.pas

@@ -870,7 +870,7 @@ begin
       and (ShowConsole=Source.ShowConsole)
       and (HideWindow=Source.HideWindow)
       and (ResolveMacros=Source.ResolveMacros)
-      and CompareMethods(TMethod(CustomMacroFunction),TMethod(Source.CustomMacroFunction))
+      and SameMethod(TMethod(CustomMacroFunction),TMethod(Source.CustomMacroFunction))
       and (Quiet=Source.Quiet);
   end else
     Result:=inherited Equals(Obj);

components/ideintf/idecommands.pas

@@ -1324,7 +1324,7 @@ procedure TIDECommand.SetOnExecute(const aOnExecute: TNotifyEvent);
 var
   xUser: TIDESpecialCommand;
 begin
-  if CompareMethods(TMethod(FOnExecute), TMethod(aOnExecute)) then Exit;
+  if SameMethod(TMethod(FOnExecute), TMethod(aOnExecute)) then Exit;
   FOnExecute := aOnExecute;
   for xUser in FUsers do
     if xUser.SyncProperties then
@@ -1822,7 +1822,7 @@ end;
 
 procedure TIDESpecialCommand.SetOnClickMethod(const aOnClick: TNotifyEvent);
 begin
-  if CompareMethods(TMethod(FOnClickMethod), TMethod(aOnClick)) then Exit;
+  if SameMethod(TMethod(FOnClickMethod), TMethod(aOnClick)) then Exit;
   FOnClickMethod := aOnClick;
   if (FCommand<>nil) and SyncAvailable then
     FCommand.OnExecute:=aOnClick;

components/ideintf/propedits.pp

@@ -3428,7 +3428,7 @@ begin
         begin
           OldMethod:=GetMethodProp(InstProp.Instance,InstProp.PropInfo);
           NewMethod:=GetMethodProp(AncestorInstProp.Instance,AncestorInstProp.PropInfo);
-          if CompareMethods(OldMethod,NewMethod) then continue;
+          if SameMethod(OldMethod,NewMethod) then continue;
           Changed:=true;
           SetMethodProp(InstProp.Instance,InstProp.PropInfo,NewMethod);
         end;

components/lazcontrols/checkboxthemed.pas

@@ -471,7 +471,7 @@ begin
     if not CheckFromAction then begin
       if Assigned(OnClick) then
         if not (Assigned(Action) and
-          CompareMethods(TMethod(Action.OnExecute), TMethod(OnClick)))
+          SameMethod(TMethod(Action.OnExecute), TMethod(OnClick)))
           then OnClick(self);
       if (Action is TCustomAction) and
         (TCustomAction(Action).Checked <> (AValue = cbChecked))

components/lazutils/lazmethodlist.pas

@@ -64,12 +64,14 @@ type
     property AllowDuplicates: boolean read FAllowDuplicates write SetAllowDuplicates; // default false, changed in Lazarus 1.3
   end;
 
+function SameMethod(const m1, m2: TMethod): boolean; inline;
 function CompareMethods(const m1, m2: TMethod): boolean; inline;
+    deprecated 'Use SameMethod instead.'; // In 2.3 October 2021. Remove in 2.5.
 
 
 implementation
 
-function CompareMethods(const m1, m2: TMethod): boolean;
+function SameMethod(const m1, m2: TMethod): boolean;
 begin
 {$PUSH}  {$BOOLEVAL ON}
 // With a full evaluation of the boolean expression the generated code will not
@@ -78,6 +80,11 @@ begin
 {$POP}
 end;
 
+function CompareMethods(const m1, m2: TMethod): boolean;
+begin
+  Result := SameMethod(m1, m2);
+end;
+
 { TMethodList.TItemsEnumerator }
 
 function TMethodList.TItemsEnumerator.GetCurrent: TMethod;
@@ -140,7 +147,7 @@ begin
       j:=i+1;
       while j<FCount do
       begin
-        if CompareMethods(FItems[i], FItems[j]) then
+        if SameMethod(FItems[i], FItems[j]) then
           Delete(j)
         else
           inc(j);
@@ -212,7 +219,7 @@ begin
   if Self<>nil then begin
     Result:=FCount-1;
     while Result>=0 do begin
-      if CompareMethods(FItems[Result], AMethod) then
+      if SameMethod(FItems[Result], AMethod) then
         Exit;
       dec(Result);
     end;

ide/buildmanager.pas

@@ -372,7 +372,8 @@ begin
   FreeAndNil(InputHistories);
   FreeAndNil(DefaultCfgVars);
 
-  if CompareMethods(TMethod(CodeToolBoss.OnRescanFPCDirectoryCache), TMethod(@DoOnRescanFPCDirectoryCache)) then
+  if SameMethod(TMethod(CodeToolBoss.OnRescanFPCDirectoryCache),
+                TMethod(@DoOnRescanFPCDirectoryCache)) then
     CodeToolBoss.OnRescanFPCDirectoryCache:=nil;
 
   inherited Destroy;

ide/main.pp

@@ -4432,8 +4432,8 @@ begin
     Project1.DefineTemplates.AllChanged(false);
     IncreaseBuildMacroChangeStamp;
     MainBuildBoss.SetBuildTargetProject1(false);
-    MainIDE.UpdateCaption;
+    UpdateCaption;
-    MainIDE.UpdateDefineTemplates;
+    UpdateDefineTemplates;
   end;
 end;
 
@@ -4640,7 +4640,7 @@ end;
 
 procedure TMainIDE.mnuStopProjectClicked(Sender: TObject);
 begin
-  if (MainIDE.ToolStatus = itBuilder) then
+  if (ToolStatus = itBuilder) then
     mnuAbortBuildProjectClicked(Sender)
   else
     DebugBoss.DoStopProject;

lcl/include/control.inc

@@ -2942,7 +2942,7 @@ procedure TControl.Click;
     if Action=nil then exit;
     if not Assigned(Action.OnExecute) then exit;
     if not Assigned(FOnClick) then exit;
-    Result:=CompareMethods(TMethod(FOnClick),TMethod(Action.OnExecute));
+    Result:=SameMethod(TMethod(FOnClick),TMethod(Action.OnExecute));
   end;
 
 var

lcl/include/menuitem.inc

@@ -57,7 +57,7 @@ procedure TMenuItem.Click;
     if Action=nil then exit;
     if not Assigned(Action.OnExecute) then exit;
     if not Assigned(FOnClick) then exit;
-    Result:=CompareMethods(TMethod(FOnClick),TMethod(Action.OnExecute));
+    Result:=SameMethod(TMethod(FOnClick),TMethod(Action.OnExecute));
   end;
 
 var

lcl/lclproc.pas

@@ -136,15 +136,6 @@ function CompareRect(R1, R2: PRect): Boolean;
 function ComparePoints(const p1, p2: TPoint): integer;
 function CompareCaret(const FirstCaret, SecondCaret: TPoint): integer;
 
-// Deprecated in 2.1 / 12.12.2020 / Remove in 2.3
-function CompareMethods(m1, m2: TMethod): boolean; deprecated 'Use LazMethodList.CompareMethods';
-function ComparePointers(p1, p2: Pointer): integer; deprecated 'Use LazUtilities.ComparePointers';
-function RoundToInt(e: Extended): integer; deprecated 'Use LazUtilities.RoundToInt';
-function RoundToCardinal(e: Extended): cardinal; deprecated 'Use LazUtilities.RoundToCardinal';
-function TruncToInt(e: Extended): integer; deprecated 'Use LazUtilities.TruncToInt';
-function TruncToCardinal(e: Extended): cardinal; deprecated 'Use LazUtilities.TruncToCardinal';
-function StrToDouble(const s: string): double; deprecated 'Use LazUtilities.StrToDouble';
-
 // Call debugging procedure in LazLoggerBase.
 procedure RaiseGDBException(const Msg: string); inline;
 
@@ -1085,41 +1076,6 @@ begin
     Result:=0;
 end;
 
-function CompareMethods(m1, m2: TMethod): boolean;
-begin
-  Result:=LazMethodList.CompareMethods(m1, m2);
-end;
-
-function ComparePointers(p1, p2: Pointer): integer;
-begin
-  Result:=LazUtilities.ComparePointers(p1, p2);
-end;
-
-function RoundToInt(e: Extended): integer;
-begin
-  Result:=LazUtilities.RoundToInt(e);
-end;
-
-function RoundToCardinal(e: Extended): cardinal;
-begin
-  Result:=LazUtilities.RoundToCardinal(e);
-end;
-
-function TruncToInt(e: Extended): integer;
-begin
-  Result:=LazUtilities.TruncToInt(e);
-end;
-
-function TruncToCardinal(e: Extended): cardinal;
-begin
-  Result:=LazUtilities.TruncToCardinal(e);
-end;
-
-function StrToDouble(const s: string): double;
-begin
-  Result:=LazUtilities.StrToDouble(s);
-end;
-
 procedure MergeSort(List: TFPList; const OnCompare: TListSortCompare);
 begin
   if List=nil then exit;