From a2d46616f1f046cddb75797753ffe9e42d5e9909 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Tue, 29 Dec 2009 19:14:32 +0200 Subject: [PATCH] Fix: deprecated conversion from string constant Signed-off-by: Jari Aalto --- BlueSwirls.xpm | 2 +- back.xpm | 2 +- fern2.xpm | 2 +- greenstucco.xpm | 2 +- sunflower.xpm | 2 +- wm.cc | 6 +++--- wood.xpm | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BlueSwirls.xpm b/BlueSwirls.xpm index acfe72c..c5f9ee5 100644 --- a/BlueSwirls.xpm +++ b/BlueSwirls.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *BlueSwirls[] = { +static const char *BlueSwirls[] = { /* width height num_colors chars_per_pixel */ " 128 128 41 1", /* colors */ diff --git a/back.xpm b/back.xpm index 7bd35f3..ae1f888 100644 --- a/back.xpm +++ b/back.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *magick[] = { +static const char *magick[] = { /* columns rows colors chars-per-pixel */ "64 64 10 1", " c #4e4e4c", diff --git a/fern2.xpm b/fern2.xpm index b1514d6..277f37e 100644 --- a/fern2.xpm +++ b/fern2.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *fern2[] = { +static const char *fern2[] = { /* width height num_colors chars_per_pixel */ " 267 199 2 1", /* colors */ diff --git a/greenstucco.xpm b/greenstucco.xpm index b6a8957..c0818e5 100644 --- a/greenstucco.xpm +++ b/greenstucco.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *greenstucco[] = { +static const char *greenstucco[] = { /* width height num_colors chars_per_pixel */ " 80 80 58 1", /* colors */ diff --git a/sunflower.xpm b/sunflower.xpm index 2d0ba40..f5e6530 100644 --- a/sunflower.xpm +++ b/sunflower.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char *Sunflower[] = { +static const char *Sunflower[] = { /* width height num_colors chars_per_pixel */ " 255 278 233 2", /* colors */ diff --git a/wm.cc b/wm.cc index fdcacd5..4ae90fe 100644 --- a/wm.cc +++ b/wm.cc @@ -72,9 +72,9 @@ WindowManager::WindowManager() { #ifdef USE_PIXMAPS // loadPixmap(wood_xpm, &popupBgd); // loadPixmap(greenstucco, &popupBgd); - loadPixmap(Sunflower, &popupBgd); - loadPixmap(wood_xpm, &inactiveBgd); - loadPixmap(magick, &activeBgd); + loadPixmap((char **)Sunflower, &popupBgd); + loadPixmap((char **)wood_xpm, &inactiveBgd); + loadPixmap((char **)magick, &activeBgd); #endif // this works under everything but Solaris diff --git a/wood.xpm b/wood.xpm index edb3c19..fd9b8c3 100644 --- a/wood.xpm +++ b/wood.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * wood_xpm[] = { +static const char * wood_xpm[] = { "100 100 4 1", " c #FFFFBABA5959", ". c #FFFFC3C36565", -- 1.6.5