aboutsummaryrefslogtreecommitdiff
path: root/src/graph/view3D
diff options
context:
space:
mode:
Diffstat (limited to 'src/graph/view3D')
-rw-r--r--src/graph/view3D/control3d.c2
-rw-r--r--src/graph/view3D/globals.h2
-rw-r--r--src/graph/view3D/header.h2
-rw-r--r--src/graph/view3D/lighting3d.c2
-rw-r--r--src/graph/view3D/main3d.c4
-rw-r--r--src/graph/view3D/process3d.c3
-rw-r--r--src/graph/view3D/quit3d.c2
-rw-r--r--src/graph/view3D/save3d.c2
-rw-r--r--src/graph/view3D/testcol.c2
-rw-r--r--src/graph/view3D/volume3d.c6
10 files changed, 14 insertions, 13 deletions
diff --git a/src/graph/view3D/control3d.c b/src/graph/view3D/control3d.c
index a7e45760..9099d1f5 100644
--- a/src/graph/view3D/control3d.c
+++ b/src/graph/view3D/control3d.c
@@ -229,7 +229,7 @@ drawControlPanel(void )
int offShade=14;
controlPanelStruct *cp;
int i, strlength;
- char *s;
+ const char* s;
cp = viewport->controlPanel;
diff --git a/src/graph/view3D/globals.h b/src/graph/view3D/globals.h
index 5734564c..2c727617 100644
--- a/src/graph/view3D/globals.h
+++ b/src/graph/view3D/globals.h
@@ -58,7 +58,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/view3D/header.h b/src/graph/view3D/header.h
index ed4b5c45..53dd24ab 100644
--- a/src/graph/view3D/header.h
+++ b/src/graph/view3D/header.h
@@ -267,7 +267,7 @@ typedef struct _buttonStruct {
int buttonKey, pot, mask;
short buttonX, buttonY, buttonWidth, buttonHeight, xHalf, yHalf;
Window self;
- char *text;
+ const char* text;
int textColor,textHue,textShade;
} buttonStruct;
diff --git a/src/graph/view3D/lighting3d.c b/src/graph/view3D/lighting3d.c
index dc7f34ab..ff6f9dad 100644
--- a/src/graph/view3D/lighting3d.c
+++ b/src/graph/view3D/lighting3d.c
@@ -377,7 +377,7 @@ void
drawLightingPanel(void)
{
- char *s;
+ const char* s;
int i,strlength;
/* Draw border lines to separate the lighting window, potentiometers,
diff --git a/src/graph/view3D/main3d.c b/src/graph/view3D/main3d.c
index d04b7724..63805c25 100644
--- a/src/graph/view3D/main3d.c
+++ b/src/graph/view3D/main3d.c
@@ -81,7 +81,7 @@ GC processGC;
viewPoints *viewport;
controlPanelStruct *control;
XGCValues gcVals;
-char *s;
+const char* s;
int someInt;
/* check /usr/include/X11 for current implementation of
@@ -601,7 +601,7 @@ mergeDatabases(void)
XrmDatabase homeDB,serverDB,applicationDB;
char filenamebuf[1024];
char *filename = &filenamebuf[0];
- char *classname = "OpenAxiom";
+ const char *classname = "OpenAxiom";
char name[255];
(void) XrmInitialize();
diff --git a/src/graph/view3D/process3d.c b/src/graph/view3D/process3d.c
index 77eb8782..5c5e7d68 100644
--- a/src/graph/view3D/process3d.c
+++ b/src/graph/view3D/process3d.c
@@ -68,7 +68,8 @@ void
buttonAction (int bKey)
{
- char *s1, *s2;
+ const char* s1;
+ const char* s2;
int strL, strL1, strL2, offShade=14;
/* Button colors which are offColor, RED, are turned off, and those which
diff --git a/src/graph/view3D/quit3d.c b/src/graph/view3D/quit3d.c
index 0978e329..4a76103b 100644
--- a/src/graph/view3D/quit3d.c
+++ b/src/graph/view3D/quit3d.c
@@ -132,7 +132,7 @@ void
drawQuitPanel(void)
{
- char *s;
+ const char* s;
int i,strlength;
s = "Really?";
diff --git a/src/graph/view3D/save3d.c b/src/graph/view3D/save3d.c
index 94cccd32..5c41eb72 100644
--- a/src/graph/view3D/save3d.c
+++ b/src/graph/view3D/save3d.c
@@ -133,7 +133,7 @@ void
drawSavePanel(void)
{
- char *s;
+ const char* s;
int i,strlength;
GSetForeground(saveGC,(float)saveButtonColor,Xoption);
diff --git a/src/graph/view3D/testcol.c b/src/graph/view3D/testcol.c
index 4db2a7f9..9eaea909 100644
--- a/src/graph/view3D/testcol.c
+++ b/src/graph/view3D/testcol.c
@@ -96,7 +96,7 @@ XSizeHints viewSizeHints;
GC processGC;
viewPoints *viewport;
controlPanelStruct *control;
-char *s;
+const char* s;
int someInt;
/* check /usr/include/X11 for current implementation of
diff --git a/src/graph/view3D/volume3d.c b/src/graph/view3D/volume3d.c
index 3fdfa3be..1a44affc 100644
--- a/src/graph/view3D/volume3d.c
+++ b/src/graph/view3D/volume3d.c
@@ -96,17 +96,17 @@
/* someotherFont holds title font (see main.c) */
#define clipMessDy (globalFont->max_bounds.ascent/2 + \
globalFont->max_bounds.descent)
-static char *clipMess = "Clip Volume";
+static const char* clipMess = "Clip Volume";
#define eyeMess1Dy clipMessDy
#define eyeMess1X 7
#define eyeMess1Y (frustrumY + 40 + 3*eyeMess1Dy)
-static char *eyeMess1 = "Eye";
+static const char* eyeMess1 = "Eye";
#define eyeMess2X (globalFont->max_bounds.width + 14)
#define eyeMess2Y (frustrumY + 40)
#define eyeMess2Dy eyeMess1Dy
-static char *eyeMess2 = "Reference";
+static const char* eyeMess2 = "Reference";
/* global stuff */