From bb95f46f02fd15afbe9289e539baed940e2f03c0 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 4 Dec 2009 15:48:55 +0000
Subject: [PATCH] LCL: renamed some Arc parameters

git-svn-id: trunk@22966 -
---
 lcl/graphics.pp                         | 4 ++--
 lcl/include/canvas.inc                  | 9 +++++----
 tools/install/check_fpc_dependencies.sh | 6 +++++-
 tools/install/create_fpc_export_tgz.sh  | 5 ++++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lcl/graphics.pp b/lcl/graphics.pp
index 4725a609a8..7f88c03cfb 100644
--- a/lcl/graphics.pp
+++ b/lcl/graphics.pp
@@ -1063,12 +1063,12 @@ type
     procedure RestoreHandleState; virtual;
 
     // extra drawing methods (there are more in the ancestor TFPCustomCanvas)
-    procedure Arc(ALeft, ATop, ARight, ABottom, angle1, angle2: Integer); virtual;
+    procedure Arc(ALeft, ATop, ARight, ABottom, Angle16Deg, Angle16DegLength: Integer); virtual;
     procedure Arc(ALeft, ATop, ARight, ABottom, SX, SY, EX, EY: Integer); virtual;
     //procedure BrushCopy(Dest: TRect; InternalImages: TBitmap; Src: TRect;
     //                    TransparentColor: TColor); virtual;
     procedure Chord(x1, y1, x2, y2,
-                    StartAngle16Deg, EndAngle16Deg: Integer); virtual;
+                    Angle16Deg, Angle16DegLength: Integer); virtual;
     procedure Chord(x1, y1, x2, y2, SX, SY, EX, EY: Integer); virtual;
     procedure CopyRect(const Dest: TRect; SrcCanvas: TCanvas;
                        const Source: TRect); virtual;
diff --git a/lcl/include/canvas.inc b/lcl/include/canvas.inc
index 9419aba890..f4880a0707 100644
--- a/lcl/include/canvas.inc
+++ b/lcl/include/canvas.inc
@@ -662,11 +662,12 @@ end;
   Zero degrees is at the 3'o clock position.
 
  ------------------------------------------------------------------------------}
-procedure TCanvas.Arc(ALeft, ATop, ARight, ABottom, angle1, angle2 : Integer);
+procedure TCanvas.Arc(ALeft, ATop, ARight, ABottom,
+  Angle16Deg, Angle16DegLength: Integer);
 begin
   Changing;
   RequiredState([csHandleValid, csPenValid]);
-  LCLIntf.Arc(FHandle, ALeft, ATop, ARight, ABottom, angle1, angle2);
+  LCLIntf.Arc(FHandle, ALeft, ATop, ARight, ABottom, Angle16Deg, Angle16DegLength);
   Changed;
 end;
 
@@ -1396,11 +1397,11 @@ end;
 
 ------------------------------------------------------------------------------}
 procedure TCanvas.Chord(x1, y1, x2, y2,
-  StartAngle16Deg, EndAngle16Deg: Integer);
+  Angle16Deg, Angle16DegLength: Integer);
 begin
   Changing;
   RequiredState([csHandleValid, csBrushValid, csPenValid]);
-  LCLIntf.AngleChord(FHandle, x1, y1, x2, y2, StartAngle16Deg, EndAngle16Deg);
+  LCLIntf.AngleChord(FHandle, x1, y1, x2, y2, Angle16Deg, Angle16DegLength);
   Changed;
 end;
 
diff --git a/tools/install/check_fpc_dependencies.sh b/tools/install/check_fpc_dependencies.sh
index 7f16b1b53a..aa66145b7f 100755
--- a/tools/install/check_fpc_dependencies.sh
+++ b/tools/install/check_fpc_dependencies.sh
@@ -8,7 +8,11 @@ set -e
 
 # try to compile a program
 echo Testing fpc ...
-TmpDir=~/tmp/fpc
+TmpDir=$TEMP
+if [ -z "$TmpDir" ]; then
+  TmpDir=~/tmp
+fi
+TmpDir=$TmpDir/fpc
 rm -rf $TmpDir
 mkdir -p $TmpDir
 TestPas=$TmpDir/test.pas
diff --git a/tools/install/create_fpc_export_tgz.sh b/tools/install/create_fpc_export_tgz.sh
index f4113ea568..7e6b5aa5f6 100755
--- a/tools/install/create_fpc_export_tgz.sh
+++ b/tools/install/create_fpc_export_tgz.sh
@@ -20,7 +20,10 @@ if [ "x$OutputFile" = "x" ]; then
   exit
 fi
 
-TmpDir=~/tmp
+TmpDir=$TEMP
+if [ -z "$TmpDir" ]; then
+  TmpDir=~/tmp
+fi
 TmpFPCDir=$TmpDir/fpc
 FPCTGZ=$TmpDir/fpc.tgz
 if [ "x$Download" = "xyes" ]; then