From 984754de75d79dc9aa21773ad5d6ed4886db52d5 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Wed, 8 Sep 2010 17:59:00 +0000
Subject: [PATCH] function rename, Arc() -> DevDrawArc()

---
 ChangeLog                     |  8 ++++++++
 src/frontend/display.c        |  2 +-
 src/frontend/display.h        |  2 +-
 src/frontend/plotting/grid.c  | 12 ++++++------
 src/frontend/wdisp/windisp.c  |  2 +-
 src/frontend/wdisp/winprint.c |  2 +-
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0958fd063..89742e156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-08  Robert Larice
+ * src/frontend/display.c ,
+ * src/frontend/display.h ,
+ * src/frontend/plotting/grid.c ,
+ * src/frontend/wdisp/windisp.c ,
+ * src/frontend/wdisp/winprint.c :
+    function rename, Arc() -> DevDrawArc()
+
 2010-09-08  Robert Larice
  * README.adms ,
  * autogen.sh ,
diff --git a/src/frontend/display.c b/src/frontend/display.c
index b34dd3ffd..965ab17ca 100644
--- a/src/frontend/display.c
+++ b/src/frontend/display.c
@@ -209,7 +209,7 @@ void DrawLine(int x1, int y1, int x2, int y2)
 
 }
 
-void Arc(int x0, int y0, int radius, double theta, double delta_theta)
+void DevDrawArc(int x0, int y0, int radius, double theta, double delta_theta)
 {
 
     (*(dispdev->Arc))(x0, y0, radius, theta, delta_theta);
diff --git a/src/frontend/display.h b/src/frontend/display.h
index fc3e95e8f..64b9b7e02 100644
--- a/src/frontend/display.h
+++ b/src/frontend/display.h
@@ -18,7 +18,7 @@ int NewViewport(GRAPH *pgraph);
 void DevClose(void);
 void DevClear(void);
 void DrawLine(int x1, int y1, int x2, int y2);
-void Arc(int x0, int y0, int radius, double theta, double delta_theta);
+void DevDrawArc(int x0, int y0, int radius, double theta, double delta_theta);
 void Text(char *text, int x, int y);
 void DefineColor(int colorid, double red, double green, double blue);
 void DefineLinestyle(int linestyleid, int mask);
diff --git a/src/frontend/plotting/grid.c b/src/frontend/plotting/grid.c
index c9bdb80c8..59cd573f2 100644
--- a/src/frontend/plotting/grid.c
+++ b/src/frontend/plotting/grid.c
@@ -845,7 +845,7 @@ drawpolargrid(GRAPH *graph)
     dist = sqrt((double) (relcx * relcx + relcy * relcy));
 
     SetLinestyle(0);
-    Arc(graph->grid.xaxis.circular.center,
+    DevDrawArc(graph->grid.xaxis.circular.center,
             graph->grid.yaxis.circular.center,
             graph->grid.xaxis.circular.radius,
             (double) 0.0, 2*M_PI);
@@ -1264,7 +1264,7 @@ drawsmithgrid(GRAPH *graph)
 
     SetLinestyle(0);
 
-    Arc(gr_xcenter, gr_ycenter, gr_radius, 0.0, 2*M_PI);
+    DevDrawArc(gr_xcenter, gr_ycenter, gr_radius, 0.0, 2*M_PI);
 /*
     if ((xoff > - gr_radius) && (xoff < gr_radius)) {
         zheight = gr_radius * sin(acos((double) xoff / gr_radius));
@@ -1412,7 +1412,7 @@ cliparc(double cx, double cy, double rad, double start, double end, int iclipx,
         return(-1);
     if (dist + rad < cliprad) {
         /* The arc is entirely in the boundary. */
-        Arc((int)cx, (int)cy, (int)rad, start, end-start);
+        DevDrawArc((int)cx, (int)cy, (int)rad, start, end-start);
         return(flag?start:end);
     } else if ((dist - rad >= cliprad) || (rad - dist >= cliprad)) {
         /* The arc is outside of the boundary. */
@@ -1484,7 +1484,7 @@ cliparc(double cx, double cy, double rad, double start, double end, int iclipx,
 	    start = d;
 	    d = tmp;
 	}
-        Arc((int)cx, (int)cy, (int)rad, start, d-start);
+        DevDrawArc((int)cx, (int)cy, (int)rad, start, d-start);
 	sclip = start;
 	eclip = d;
     }
@@ -1511,7 +1511,7 @@ cliparc(double cx, double cy, double rad, double start, double end, int iclipx,
     }
 
     if (in) {
-        Arc((int)cx, (int)cy, (int)rad, l, d-l);
+        DevDrawArc((int)cx, (int)cy, (int)rad, l, d-l);
 	sclip = l;
 	eclip = d;
     }
@@ -1521,7 +1521,7 @@ cliparc(double cx, double cy, double rad, double start, double end, int iclipx,
     
     /* And from here to the end. */
     if (in) {
-        Arc((int)cx, (int)cy, (int)rad, d, end-d);
+        DevDrawArc((int)cx, (int)cy, (int)rad, d, end-d);
 	/* special case */
 	if (flag != 2) {
 	  sclip = d;
diff --git a/src/frontend/wdisp/windisp.c b/src/frontend/wdisp/windisp.c
index 403fa1125..87dec3a95 100644
--- a/src/frontend/wdisp/windisp.c
+++ b/src/frontend/wdisp/windisp.c
@@ -765,7 +765,7 @@ int WIN_Arc(int x0, int y0, int radius, double theta, double delta_theta)
    /* plot */
    NewPen = CreatePen( LType(wd->ColorIndex), linewidth, ColorTable[wd->ColorIndex] );
    OldPen = SelectObject(wd->hDC, NewPen);
-   Arc( wd->hDC, left, yb-top, right, yb-bottom, xs, yb-ys, xe, yb-ye);/*FIXME name clash*/
+   DevDrawArc( wd->hDC, left, yb-top, right, yb-bottom, xs, yb-ys, xe, yb-ye);/*FIXME name clash*/
    OldPen = SelectObject(wd->hDC, OldPen);
    DeleteObject( NewPen);
 
diff --git a/src/frontend/wdisp/winprint.c b/src/frontend/wdisp/winprint.c
index d7ad26398..d7751f7fa 100644
--- a/src/frontend/wdisp/winprint.c
+++ b/src/frontend/wdisp/winprint.c
@@ -392,7 +392,7 @@ int WPRINT_Arc(int x0, int y0, int radius, double theta, double delta_theta)
 	/* Zeichnen */
 	NewPen = CreatePen( LineTable[pd->LineIndex], 0, ColorTable[ColIndex] );
 	OldPen = SelectObject(PrinterDC, NewPen);
-	Arc( PrinterDC, left, yb-top, right, yb-bottom, xs, yb-ys, xe, yb-ye);/*FIXME name clash*/
+	DevDrawArc( PrinterDC, left, yb-top, right, yb-bottom, xs, yb-ys, xe, yb-ye);/*FIXME name clash*/
 	OldPen = SelectObject(PrinterDC, OldPen);
 	DeleteObject( NewPen);