From db2c3823318a41f4c065778ee4c8ffa2e65c81a1 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Wed, 11 Nov 2015 14:49:03 +0000
Subject: [PATCH] lcl: less with-blocks for FPC 3.1.1

git-svn-id: trunk@50304 -
---
 lcl/interfaces/cocoa/cocoaobject.inc |  7 ++----
 lcl/interfaces/cocoa/cocoaprivate.pp | 18 +++++----------
 lcl/interfaces/cocoa/cocoautils.pas  | 33 ++++++++++------------------
 3 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/lcl/interfaces/cocoa/cocoaobject.inc b/lcl/interfaces/cocoa/cocoaobject.inc
index 5e8106dfd0..71d9ee3f40 100644
--- a/lcl/interfaces/cocoa/cocoaobject.inc
+++ b/lcl/interfaces/cocoa/cocoaobject.inc
@@ -604,11 +604,8 @@ begin
     ADesc.Format := ricfRGBA;
   end;
 
-  with ABitmap.image.size do
-  begin
-    ADesc.Width := Round(width);
-    ADesc.Height := Round(Height);
-  end;
+  ADesc.Width := Round(ABitmap.image.size.width);
+  ADesc.Height := Round(ABitmap.image.size.Height);
 
   //ADesc.PaletteColorCount := 0;
 
diff --git a/lcl/interfaces/cocoa/cocoaprivate.pp b/lcl/interfaces/cocoa/cocoaprivate.pp
index 06dc1b4166..27b28ce5d8 100644
--- a/lcl/interfaces/cocoa/cocoaprivate.pp
+++ b/lcl/interfaces/cocoa/cocoaprivate.pp
@@ -2396,11 +2396,8 @@ end;
 
 procedure LCLViewExtension.lclRelativePos(var Left, Top: Integer);
 begin
-  with frame.origin do
-  begin
-    Left := Round(x);
-    Top := Round(y);
-  end;
+  Left := Round(frame.origin.x);
+  Top := Round(frame.origin.y);
 end;
 
 procedure LCLViewExtension.lclLocalToScreen(var X, Y:Integer);
@@ -2477,13 +2474,10 @@ var
   r: NSRect;
 begin
   r := bounds;
-  with Result do
-  begin
-    Left := 0;
-    Top := 0;
-    Right := Round(r.size.width);
-    Bottom := Round(r.size.height);
-  end;
+  Result.Left := 0;
+  Result.Top := 0;
+  Result.Right := Round(r.size.width);
+  Result.Bottom := Round(r.size.height);
 end;
 
 
diff --git a/lcl/interfaces/cocoa/cocoautils.pas b/lcl/interfaces/cocoa/cocoautils.pas
index 58c0a19cbb..1d1cf15f4b 100644
--- a/lcl/interfaces/cocoa/cocoautils.pas
+++ b/lcl/interfaces/cocoa/cocoautils.pas
@@ -321,13 +321,10 @@ end;
 
 function CGRectToRect(const c: CGRect): TRect;
 begin
-  with Result do
-  begin
-    Left := Round(c.origin.x);
-    Top := Round(c.origin.y);
-    Right := Round(c.origin.x + c.size.width);
-    Bottom := Round(c.origin.y + c.size.height);
-  end;
+  Result.Left := Round(c.origin.x);
+  Result.Top := Round(c.origin.y);
+  Result.Right := Round(c.origin.x + c.size.width);
+  Result.Bottom := Round(c.origin.y + c.size.height);
 end;
 
 function RectToNSRect(const r: TRect): NSRect;
@@ -338,24 +335,18 @@ end;
 
 function NSRectToRect(const NS: NSRect): TRect;
 begin
-  with Result do
-  begin
-    Left := Round(ns.origin.x);
-    Top := Round(ns.origin.y);
-    Right := Round(ns.origin.x + ns.size.width);
-    Bottom := Round(ns.origin.y + ns.size.height);
-  end;
+  Result.Left := Round(ns.origin.x);
+  Result.Top := Round(ns.origin.y);
+  Result.Right := Round(ns.origin.x + ns.size.width);
+  Result.Bottom := Round(ns.origin.y + ns.size.height);
 end;
 
 procedure NSToLCLRect(const ns: NSRect; ParentHeight: Single; out lcl: TRect);
 begin
-  with lcl do
-  begin
-    Left := Round(ns.origin.x);
-    Top := Round(ParentHeight - ns.size.height - ns.origin.y);
-    Right := Round(ns.origin.x + ns.size.width);
-    Bottom := Round(lcl.Top + ns.size.height);
-  end;
+  lcl.Left := Round(ns.origin.x);
+  lcl.Top := Round(ParentHeight - ns.size.height - ns.origin.y);
+  lcl.Right := Round(ns.origin.x + ns.size.width);
+  lcl.Bottom := Round(lcl.Top + ns.size.height);
 end;
 
 procedure LCLToNSRect(const lcl: TRect; ParentHeight: Single; out ns: NSRect);