LCL: exploded some With-blocks for fpc 3.1.1

git-svn-id: trunk@50237 -

lcl/calendar.pp

@@ -159,8 +159,7 @@ constructor TCustomCalendar.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
   fCompStyle := csCalendar;
-  with GetControlClassDefaultSize do
+  SetInitialBounds(0, 0, GetControlClassDefaultSize.CX, GetControlClassDefaultSize.CY);
-    SetInitialBounds(0, 0, CX, CY);
   FDisplaySettings := DefaultDisplaySettings;
   ControlStyle:=ControlStyle-[csTripleClicks,csQuadClicks,csAcceptsControls,csCaptureMouse];
   DateTime := Now;

lcl/dbgrids.pas

@@ -1674,9 +1674,7 @@ begin
   {$ifdef dbgDBGrid}
   DebugLn('%s.IsEOF', [ClassName]);
   {$endif}
-  with FDatalink do
+  Result := FDatalink.Active and FDatalink.DataSet.EOF;
-    result :=
-      Active and DataSet.EOF;
 end;
 
 function TCustomDBGrid.ValidDataSet: boolean;
@@ -1684,7 +1682,7 @@ begin
   {$ifdef dbgDBGrid}
   DebugLn('%s.ValidDataSet', [ClassName]);
   {$endif}
-  result := FDatalink.Active And (FDatalink.DataSet<>nil)
+  Result := FDatalink.Active And (FDatalink.DataSet<>nil)
 end;
 
 function TCustomDBGrid.InsertCancelable: boolean;

lcl/editbtn.pas

@@ -1944,8 +1944,7 @@ begin
   TabStop := True;
   FocusOnButtonClick := False;
 
-  with GetControlClassDefaultSize do
+  SetInitialBounds(0, 0, GetControlClassDefaultSize.CX, GetControlClassDefaultSize.CY);
-    SetInitialBounds(0, 0, CX, CY);
 
   with FButton do
   begin

lcl/extdlgs.pas

@@ -266,8 +266,7 @@ constructor TPreviewFileControl.Create(TheOwner: TComponent);
 begin
   inherited Create(TheOwner);
   FCompStyle:=csPreviewFileControl;
-  with GetControlClassDefaultSize do
+  SetInitialBounds(0, 0, GetControlClassDefaultSize.CX, GetControlClassDefaultSize.CY);
-    SetInitialBounds(0, 0, CX, CY);
 end;
 
 { TPreviewFileDialog }

lcl/graphmath.pp

@@ -268,10 +268,8 @@ end;
 
 Operator := (Value : TFloatPoint) : TPoint;
 begin
-  With Result do begin
+  Result.X := Trunc(SimpleRoundTo(Value.X, 0));
-    X := Trunc(SimpleRoundTo(Value.X, 0));
+  Result.Y := Trunc(SimpleRoundTo(Value.Y, 0));
-    Y := Trunc(SimpleRoundTo(Value.Y, 0));
-  end;
 end;
 
 Operator := (Value : TPoint) : TFloatPoint;

lcl/industrialbase.pp

@@ -30,8 +30,7 @@ constructor TIndustrialBase.Create(aOwner: TComponent);
 begin
   inherited Create(aOwner);
   FAntiAliasingMode := amDontCare;
-  with GetControlClassDefaultSize do
+  SetInitialBounds(0, 0, GetControlClassDefaultSize.cx, GetControlClassDefaultSize.cy);
-    SetInitialBounds(0, 0, cx, cy);
   ControlStyle := ControlStyle - [csSetCaption];
 end;
 

lcl/lazcanvas.pas

@@ -262,13 +262,10 @@ begin
   if pen.style = psSolid then
     for r := 1 to pen.width do
     begin
-      with b do
+      CheckLine (b.left,b.top,b.left,b.bottom);
-        begin
+      CheckLine (b.left,b.bottom,b.right,b.bottom);
-        CheckLine (left,top,left,bottom);
+      CheckLine (b.right,b.bottom,b.right,b.top);
-        CheckLine (left,bottom,right,bottom);
+      CheckLine (b.right,b.top,b.left,b.top);
-        CheckLine (right,bottom,right,top);
-        CheckLine (right,top,left,top);
-        end;
       DecRect (b);
     end
   else if pen.style <> psClear then
@@ -277,13 +274,10 @@ begin
       pattern := Pen.pattern
     else
       pattern := PenPatterns[pen.style];
-    with b do
+    CheckPLine (b.left,b.top,b.left,b.bottom);
-      begin
+    CheckPLine (b.left,b.bottom,b.right,b.bottom);
-      CheckPLine (left,top,left,bottom);
+    CheckPLine (b.right,b.bottom,b.right,b.top);
-      CheckPLine (left,bottom,right,bottom);
+    CheckPLine (b.right,b.top,b.left,b.top);
-      CheckPLine (right,bottom,right,top);
-      CheckPLine (right,top,left,top);
-      end;
   end;
 end;
 
@@ -303,18 +297,15 @@ begin
     Exit;
   end;
 
-//  if clipping then
-//    CheckRectClipping (ClipRect, B);
-  with b do
   case Brush.style of
-      bsSolid : FillRectangleColor (self, left,top, right,bottom);
+    bsSolid : FillRectangleColor (self, b.left,b.top, b.right,b.bottom);
-      bsPattern : FillRectanglePattern (self, left,top, right,bottom, brush.pattern);
+    bsPattern : FillRectanglePattern (self, b.left,b.top, b.right,b.bottom, brush.pattern);
     bsImage :
       if assigned (brush.image) then
         if RelativeBrushImage then
-            FillRectangleImageRel (self, left,top, right,bottom, brush.image)
+          FillRectangleImageRel (self, b.left,b.top, b.right,b.bottom, brush.image)
         else
-            FillRectangleImage (self, left,top, right,bottom, brush.image)
+          FillRectangleImage (self, b.left,b.top, b.right,b.bottom, brush.image)
       else
         raise PixelCanvasException.Create (sErrNoImage);
     bsBDiagonal : FillRectangleHashDiagonal (self, b, HashWidth);

lcl/postscriptcanvas.pas

@@ -1113,8 +1113,7 @@ begin
   Self.WriteComment('Pushing and Setting current clip rect');
   Self.Write('clipsave');
   B := TxRectToBounds(FLazClipRect);
-  with B do
+  Write(Format('%f %f %f %f rectclip',[B.fx, B.fy, B.fwidth, B.fheight],FFs));
-    Self.Write(Format('%f %f %f %f rectclip',[fx, fy, fwidth, fheight],FFs));
   Include(FStatus, pcsClipSaved);
 end;
 
@@ -1820,18 +1819,12 @@ begin
   ellipsePath:='matrix currentmatrix %f %f translate %f %f scale 0 0 1 %d %d arc setmatrix';
 
   PixelsToPoints(RX,RY,r.fx,r.fy);
-  {choice between newpath and moveto beginning of arc
-   go with newpath for precision, does this violate any assumptions in code???
-   write(format('%d %d moveto',[x1+rx, y1]),Lst  # this also works}
-  with r do
-  begin
   WriteB('newpath');
-    WriteB(Format(ellipsePath,[pp1.fx+fx,pp1.fy-fy,fx,fy,90,180],FFs));
+  WriteB(Format(ellipsePath,[pp1.fx+r.fx,pp1.fy-r.fy,r.fx,r.fy,90,180],FFs));
-    WriteB(Format(ellipsePath,[pp1.fx+fx,pp2.fy+fy,fx,fy,180,270],FFs));
+  WriteB(Format(ellipsePath,[pp1.fx+r.fx,pp2.fy+r.fy,r.fx,r.fy,180,270],FFs));
-    WriteB(Format(ellipsePath,[pp2.fx-fx,pp2.fy+fy,fx,fy,270,360],FFs));
+  WriteB(Format(ellipsePath,[pp2.fx-r.fx,pp2.fy+r.fy,r.fx,r.fy,270,360],FFs));
-    WriteB(Format(ellipsePath,[pp2.fx-fx,pp1.fy-fy,fx,fy,0,90],FFs));
+  WriteB(Format(ellipsePath,[pp2.fx-r.fx,pp1.fy-r.fy,r.fx,r.fy,0,90],FFs));
   WriteB('closepath');
-  end;
 
   SetBrushFillPattern(True,True);
   

lcl/printers.pas

@@ -1011,28 +1011,28 @@ end;
 
 function TPaperSize.GetDefaultPaperRect(const AName: string;
   var APaperRect:TPaperRect): Integer;
+var
+  PR: TPaperRect;
 begin
   Result := IndexOfDefaultPaper(AName);
   if Result>=0 then
-  with FInternalPapers[Result].PaperRect do begin
+  PR:=FInternalPapers[Result].PaperRect;
   if FOwnedPrinter.Orientation in [poPortrait, poReversePortrait] then
   begin
-      APaperRect.PhysicalRect := PhysicalRect;
+    APaperRect.PhysicalRect := PR.PhysicalRect;
-      APaperRect.WorkRect     := WorkRect;
+    APaperRect.WorkRect     := PR.WorkRect;
   end else
   begin
     APaperRect.PhysicalRect.Left   := 0;
     APaperRect.PhysicalRect.Top    := 0;
-      APaperRect.PhysicalRect.Right  := PhysicalRect.Bottom;
+    APaperRect.PhysicalRect.Right  := PR.PhysicalRect.Bottom;
-      APaperRect.Physicalrect.Bottom := PhysicalRect.Right;
+    APaperRect.Physicalrect.Bottom := PR.PhysicalRect.Right;
 
-      APaperRect.WorkRect.Left   := WorkRect.Top;
+    APaperRect.WorkRect.Left   := PR.WorkRect.Top;
-      APaperRect.WorkRect.Top    := PhysicalRect.Right-WorkRect.Right;
+    APaperRect.WorkRect.Top    := PR.PhysicalRect.Right-PR.WorkRect.Right;
-      APaperRect.WorkRect.Right  := WorkRect.Bottom;
+    APaperRect.WorkRect.Right  := PR.WorkRect.Bottom;
-      APaperRect.WorkRect.Bottom := PhysicalRect.Right-Workrect.Left;
+    APaperRect.WorkRect.Bottom := PR.PhysicalRect.Right-PR.Workrect.Left;
   end;
-  end;
-
 end;
 
 function TPaperSize.GetPhysPaperHeight: Integer;
@@ -1335,11 +1335,13 @@ begin
 end;
 
 function TPrinterCanvas.GetRightMargin: Integer;
+var
+  PR: TPaperRect;
 begin
   if (fRightMargin=0) and (fPrinter<>nil) then
   begin
-    with fPrinter.Papersize.PaperRect do
+    PR:=fPrinter.Papersize.PaperRect;
-      Result := PhysicalRect.Right-WorkRect.Right;
+    Result := PR.PhysicalRect.Right-PR.WorkRect.Right;
   end else
     Result := fRightMargin;
 end;