aboutsummaryrefslogtreecommitdiff
path: root/src/graph/view2D
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2012-08-26 20:27:00 +0000
committerdos-reis <gdr@axiomatics.org>2012-08-26 20:27:00 +0000
commit50731b6737c4ec7ef2f5be7eca44a5e7692d305a (patch)
tree9ca4458f507b8ef9bb4141b450e6708f523c5e26 /src/graph/view2D
parent5d206512273e528a4b3c863a7556f26f8c1c59de (diff)
downloadopen-axiom-50731b6737c4ec7ef2f5be7eca44a5e7692d305a.tar.gz
* graph/Gdraws/Gfun.c (GDrawLine): Make string parameter of type
const char*. (GDrawPushButton): Likewise. (GDrawString): Likewise. (PSCreateContext): Likewise. (centerX): Likewise. * Makefile.am (all-graph): Require all-utils.
Diffstat (limited to 'src/graph/view2D')
-rw-r--r--src/graph/view2D/control2d.c2
-rw-r--r--src/graph/view2D/globals2.h2
-rw-r--r--src/graph/view2D/main2d.c2
-rw-r--r--src/graph/view2D/viewport2D.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/graph/view2D/control2d.c b/src/graph/view2D/control2d.c
index 191a0619..ea79102d 100644
--- a/src/graph/view2D/control2d.c
+++ b/src/graph/view2D/control2d.c
@@ -164,7 +164,7 @@ drawControlPanel(void)
controlPanelStruct *cp;
int i,strlength;
- char *s;
+ const char* s;
cp = viewport->controlPanel;
/* Draw border lines to separate the potentiometer, message, graph select
diff --git a/src/graph/view2D/globals2.h b/src/graph/view2D/globals2.h
index 1544471d..c7b8d9b3 100644
--- a/src/graph/view2D/globals2.h
+++ b/src/graph/view2D/globals2.h
@@ -54,7 +54,7 @@ extern GC processGC;
extern viewPoints *viewport;
extern controlPanelStruct *control;
extern XGCValues gcVals;
-extern char *s;
+extern const char* s;
extern int someInt;
extern unsigned long foregroundColor, backgroundColor;
diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c
index 1c176729..9cd10c6e 100644
--- a/src/graph/view2D/main2d.c
+++ b/src/graph/view2D/main2d.c
@@ -86,10 +86,10 @@ char scaleXReport[5],
scaleYReport[5],
deltaXReport[5],
deltaYReport[5],
- *s,
errorStr[80],
filename[256], /** For writing viewport data out to a file **/
*xDefault; /** used for accessing .XDefaults **/
+const char* s;
unsigned long *spadColors;
diff --git a/src/graph/view2D/viewport2D.c b/src/graph/view2D/viewport2D.c
index 0d5aaf30..50e571db 100644
--- a/src/graph/view2D/viewport2D.c
+++ b/src/graph/view2D/viewport2D.c
@@ -559,7 +559,7 @@ drawTheViewport(int dFlag)
************************************/
viewPoints *
-makeViewport(char *title,int vX,int vY,int vW,int vH,int showCP)
+makeViewport(const char* title,int vX,int vY,int vW,int vH,int showCP)
{
Pixmap spadbits,spadmask;
XSetWindowAttributes viewAttrib;