summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2009-03-24 21:32:14 +0000
committerleo2009-03-24 21:32:14 +0000
commita68843add80437470086ee57c1db9d1179219e0e (patch)
tree39603bdbf5fa75e59dd541492f5bce27a17e1963
parentaa6f4df8f0997545ced423c7be1c3eb53c399d6c (diff)
Warning fixes.
git-svn-id: http://svn.leocad.org/tags/leocad-0.75@755 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rwxr-xr-xlinux/gtkmisc.cpp8
-rwxr-xr-xlinux/pixmaps/vports01.xpm2
-rwxr-xr-xlinux/pixmaps/vports02.xpm2
-rwxr-xr-xlinux/pixmaps/vports03.xpm2
-rwxr-xr-xlinux/pixmaps/vports04.xpm2
-rwxr-xr-xlinux/pixmaps/vports05.xpm2
-rwxr-xr-xlinux/pixmaps/vports06.xpm2
-rwxr-xr-xlinux/pixmaps/vports07.xpm2
-rwxr-xr-xlinux/pixmaps/vports08.xpm2
-rwxr-xr-xlinux/pixmaps/vports09.xpm2
-rwxr-xr-xlinux/pixmaps/vports10.xpm2
-rwxr-xr-xlinux/pixmaps/vports11.xpm2
-rwxr-xr-xlinux/pixmaps/vports12.xpm2
-rwxr-xr-xlinux/pixmaps/vports13.xpm2
-rwxr-xr-xlinux/pixmaps/vports14.xpm2
15 files changed, 18 insertions, 18 deletions
diff --git a/linux/gtkmisc.cpp b/linux/gtkmisc.cpp
index e0d1d5e..ade4e34 100755
--- a/linux/gtkmisc.cpp
+++ b/linux/gtkmisc.cpp
@@ -32,7 +32,7 @@
// Load a pixmap file from the disk
void load_pixmap (const char* filename, GdkPixmap **gdkpixmap, GdkBitmap **mask)
{
- struct { char* name; char** data; } table[14] =
+ struct { const char* name; const char** data; } table[14] =
{
{ "vports01.xpm", vports01 },
{ "vports02.xpm", vports02 },
@@ -54,14 +54,14 @@ void load_pixmap (const char* filename, GdkPixmap **gdkpixmap, GdkBitmap **mask)
for (int i = 0; i < 14; i++)
if (strcmp (table[i].name, filename) == 0)
{
- *gdkpixmap = gdk_pixmap_create_from_xpm_d (GDK_ROOT_PARENT(), mask, NULL, table[i].data);
+ *gdkpixmap = gdk_pixmap_create_from_xpm_d (GDK_ROOT_PARENT(), mask, NULL, (gchar**)table[i].data);
break;
}
if (*gdkpixmap == NULL)
{
- char *dummy[] = { "1 1 1 1", " c None", " " };
- *gdkpixmap = gdk_pixmap_create_from_xpm_d (GDK_ROOT_PARENT(), mask, NULL, dummy);
+ const char *dummy[] = { "1 1 1 1", " c None", " " };
+ *gdkpixmap = gdk_pixmap_create_from_xpm_d (GDK_ROOT_PARENT(), mask, NULL, (gchar**)dummy);
}
}
diff --git a/linux/pixmaps/vports01.xpm b/linux/pixmaps/vports01.xpm
index 92c7b93..9e6e25d 100755
--- a/linux/pixmaps/vports01.xpm
+++ b/linux/pixmaps/vports01.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports01[] = {
+static const char* vports01[] = {
"41 31 2 1",
". c #000000",
"+ c #808080",
diff --git a/linux/pixmaps/vports02.xpm b/linux/pixmaps/vports02.xpm
index f62ac43..d78f0d2 100755
--- a/linux/pixmaps/vports02.xpm
+++ b/linux/pixmaps/vports02.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports02[] = {
+static const char* vports02[] = {
"41 31 3 1",
". c #000000",
"+ c #C0C0C0",
diff --git a/linux/pixmaps/vports03.xpm b/linux/pixmaps/vports03.xpm
index 17d3062..da35c97 100755
--- a/linux/pixmaps/vports03.xpm
+++ b/linux/pixmaps/vports03.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports03[] = {
+static const char* vports03[] = {
"41 31 3 1",
". c #000000",
"+ c #808080",
diff --git a/linux/pixmaps/vports04.xpm b/linux/pixmaps/vports04.xpm
index 0759397..f723fc0 100755
--- a/linux/pixmaps/vports04.xpm
+++ b/linux/pixmaps/vports04.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports04[] = {
+static const char* vports04[] = {
"41 31 3 1",
". c #000000",
"+ c #808080",
diff --git a/linux/pixmaps/vports05.xpm b/linux/pixmaps/vports05.xpm
index 6f380c3..61493e2 100755
--- a/linux/pixmaps/vports05.xpm
+++ b/linux/pixmaps/vports05.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports05[] = {
+static const char* vports05[] = {
"41 31 3 1",
". c #000000",
"+ c #808080",
diff --git a/linux/pixmaps/vports06.xpm b/linux/pixmaps/vports06.xpm
index 94af19f..bd161a0 100755
--- a/linux/pixmaps/vports06.xpm
+++ b/linux/pixmaps/vports06.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports06[] = {
+static const char* vports06[] = {
"41 31 3 1",
". c #000000",
"+ c #C0C0C0",
diff --git a/linux/pixmaps/vports07.xpm b/linux/pixmaps/vports07.xpm
index 292e157..8be7f61 100755
--- a/linux/pixmaps/vports07.xpm
+++ b/linux/pixmaps/vports07.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports07[] = {
+static const char* vports07[] = {
"41 31 3 1",
". c #000000",
"+ c #C0C0C0",
diff --git a/linux/pixmaps/vports08.xpm b/linux/pixmaps/vports08.xpm
index d304f88..6b0218c 100755
--- a/linux/pixmaps/vports08.xpm
+++ b/linux/pixmaps/vports08.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports08[] = {
+static const char* vports08[] = {
"41 31 3 1",
". c #000000",
"+ c #C0C0C0",
diff --git a/linux/pixmaps/vports09.xpm b/linux/pixmaps/vports09.xpm
index e65369a..a16554e 100755
--- a/linux/pixmaps/vports09.xpm
+++ b/linux/pixmaps/vports09.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports09[] = {
+static const char* vports09[] = {
"41 31 3 1",
". c #000000",
"+ c #808080",
diff --git a/linux/pixmaps/vports10.xpm b/linux/pixmaps/vports10.xpm
index b346695..dd9afc2 100755
--- a/linux/pixmaps/vports10.xpm
+++ b/linux/pixmaps/vports10.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports10[] = {
+static const char* vports10[] = {
"41 31 3 1",
". c #000000",
"+ c #C0C0C0",
diff --git a/linux/pixmaps/vports11.xpm b/linux/pixmaps/vports11.xpm
index 05d30ea..4cec015 100755
--- a/linux/pixmaps/vports11.xpm
+++ b/linux/pixmaps/vports11.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports11[] = {
+static const char* vports11[] = {
"41 31 3 1",
". c #000000",
"+ c #C0C0C0",
diff --git a/linux/pixmaps/vports12.xpm b/linux/pixmaps/vports12.xpm
index 15885b9..7ad6c38 100755
--- a/linux/pixmaps/vports12.xpm
+++ b/linux/pixmaps/vports12.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports12[] = {
+static const char* vports12[] = {
"41 31 3 1",
". c #000000",
"+ c #C0C0C0",
diff --git a/linux/pixmaps/vports13.xpm b/linux/pixmaps/vports13.xpm
index b9e72c8..69d7047 100755
--- a/linux/pixmaps/vports13.xpm
+++ b/linux/pixmaps/vports13.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports13[] = {
+static const char* vports13[] = {
"41 31 3 1",
". c #000000",
"+ c #808080",
diff --git a/linux/pixmaps/vports14.xpm b/linux/pixmaps/vports14.xpm
index 1930532..b1d1f91 100755
--- a/linux/pixmaps/vports14.xpm
+++ b/linux/pixmaps/vports14.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * vports14[] = {
+static const char* vports14[] = {
"41 31 3 1",
". c #000000",
"+ c #C0C0C0",