[SOLVED] Duplicate code removal in lcl/controls.pp

[lagprogramming]

procedure TControlChildSizing.Assign(Source: TPersistent); has useless duplication of the following code:

Code: Pascal  [Select][+][-]

1. FEnlargeHorizontal:=SrcSizing.EnlargeHorizontal;
2.     FEnlargeVertical:=SrcSizing.EnlargeVertical;
3.     FShrinkHorizontal:=SrcSizing.ShrinkHorizontal;
4.     FShrinkVertical:=SrcSizing.ShrinkVertical;

   
function TControlChildSizing.IsEqual(Sizing: TControlChildSizing): boolean; has useless duplication of the following code:

Code: Pascal  [Select][+][-]

1. (FEnlargeHorizontal=Sizing.EnlargeHorizontal)
2.       and (FEnlargeVertical=Sizing.EnlargeVertical)
3.       and (FShrinkHorizontal=Sizing.ShrinkHorizontal)
4.       and (FShrinkVertical=Sizing.ShrinkVertical)
5.  

     
The following patch removes the duplicate code.

Code: Pascal  [Select][+][-]

1. diff --git a/lcl/controls.pp b/lcl/controls.pp
2. index 397076a37a..172b2e1e7f 100644
3. --- a/lcl/controls.pp
4. +++ b/lcl/controls.pp
5. @@ -4033,10 +4033,6 @@ begin
6.      SrcSizing:=TControlChildSizing(Source);
7.      if IsEqual(SrcSizing) then exit;
8.  
9. -    FEnlargeHorizontal:=SrcSizing.EnlargeHorizontal;
10. -    FEnlargeVertical:=SrcSizing.EnlargeVertical;
11. -    FShrinkHorizontal:=SrcSizing.ShrinkHorizontal;
12. -    FShrinkVertical:=SrcSizing.ShrinkVertical;
13.      FEnlargeHorizontal:=SrcSizing.EnlargeHorizontal;
14.      FEnlargeVertical:=SrcSizing.EnlargeVertical;
15.      FShrinkHorizontal:=SrcSizing.ShrinkHorizontal;
16. @@ -4061,10 +4057,6 @@ end;
17.  function TControlChildSizing.IsEqual(Sizing: TControlChildSizing): Boolean;
18.  begin
19.    Result:=(FEnlargeHorizontal=Sizing.EnlargeHorizontal)
20. -      and (FEnlargeVertical=Sizing.EnlargeVertical)
21. -      and (FShrinkHorizontal=Sizing.ShrinkHorizontal)
22. -      and (FShrinkVertical=Sizing.ShrinkVertical)
23. -      and (FEnlargeHorizontal=Sizing.EnlargeHorizontal)
24.        and (FEnlargeVertical=Sizing.EnlargeVertical)
25.        and (FShrinkHorizontal=Sizing.ShrinkHorizontal)
26.        and (FShrinkVertical=Sizing.ShrinkVertical)

[Martin_fr]

Please report on the bugtracker. Thanks

[JuhaManninen]

I removed the duplicate lines. Thanks for noticing them.