hdspconf: more string constant fixes

Signed-off-by: Tim Blechmann <tim@klingt.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/hdspconf/pixmaps/alsalogo.xpm b/hdspconf/pixmaps/alsalogo.xpm
index b32c32dc5f3bc7772b943dd243603a2c1f0b7ee8..cd22dd2173e6b044add55b35db67981ee48513bd 100644 (file)
--- a/hdspconf/pixmaps/alsalogo.xpm
+++ b/hdspconf/pixmaps/alsalogo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-char * alsalogo_xpm[] = {
+const char * alsalogo_xpm[] = {
 "50 50 398 2",
 "      c None",
 ".     c #C0C0C0",

diff --git a/hdspconf/pixmaps/lad_banner.xpm b/hdspconf/pixmaps/lad_banner.xpm
index 8bb8545cd1915f938474bf82d65c72d26edb313c..11d4357418accf695ace6f89999c310c3b4cd149 100644 (file)
--- a/hdspconf/pixmaps/lad_banner.xpm
+++ b/hdspconf/pixmaps/lad_banner.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-char * lad_banner_xpm[] = {
+const char * lad_banner_xpm[] = {
 "113 39 1833 2",
 "      c None",
 ".     c #C0C0C0",

diff --git a/hdspconf/pixmaps/rme.xpm b/hdspconf/pixmaps/rme.xpm
index a892603c466ef0f11c074b34dd3eefc1b4f4a584..b94fa7ef361055015f10e44c7827a4f8df1391f0 100644 (file)
--- a/hdspconf/pixmaps/rme.xpm
+++ b/hdspconf/pixmaps/rme.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-char * rme_xpm[] = {
+const char * rme_xpm[] = {
 "113 35 2300 2",
 "      c None",
 ".     c #030505",

diff --git a/hdspconf/src/HC_PrefSyncRef.h b/hdspconf/src/HC_PrefSyncRef.h
index 5ef8875b7088b27d9481a36b8a6ad79b87748139..8c3a71f04bef8a8f670ce3e66f9b982118aaaf4d 100644 (file)
--- a/hdspconf/src/HC_PrefSyncRef.h
+++ b/hdspconf/src/HC_PrefSyncRef.h
@@ -1,8 +1,8 @@
 /*
  *   HDSPConf
- *    
+ *
  *   Copyright (C) 2003 Thomas Charbonnel (thomas@undata.org)
- *    
+ *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -42,7 +42,7 @@ public:
     Fl_Round_Button *adat_sync;
     void setRef(int r);
 private:
-    char *adat_name;
+    const char *adat_name;
 };
 
 #endif

diff --git a/hdspconf/src/HC_XpmRenderer.cxx b/hdspconf/src/HC_XpmRenderer.cxx
index 72742f8892aba9c9a3e28dd37f0f0e2d9eb16c43..ed66d4d12cc11a8aec01eb6aba6339a9a0f3dc1d 100644 (file)
--- a/hdspconf/src/HC_XpmRenderer.cxx
+++ b/hdspconf/src/HC_XpmRenderer.cxx
@@ -1,8 +1,8 @@
 /*
  *   HDSPConf
- *    
+ *
  *   Copyright (C) 2003 Thomas Charbonnel (thomas@undata.org)
- *    
+ *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -21,7 +21,7 @@
 #pragma implementation
 #include "HC_XpmRenderer.h"
 
-HC_XpmRenderer::HC_XpmRenderer(int x, int y, int w, int h, char * const *xpm):Fl_Widget(x, y, w, h)
+HC_XpmRenderer::HC_XpmRenderer(int x, int y, int w, int h, const char * const *xpm):Fl_Widget(x, y, w, h)
 {
     pixmap = xpm;
 }

diff --git a/hdspconf/src/HC_XpmRenderer.h b/hdspconf/src/HC_XpmRenderer.h
index 3c6f768c42c0dac6c98422e92d45b9fa646583d4..1e1854127840e61b9155d69b9691c6edb664e934 100644 (file)
--- a/hdspconf/src/HC_XpmRenderer.h
+++ b/hdspconf/src/HC_XpmRenderer.h
@@ -1,8 +1,8 @@
 /*
  *   HDSPConf
- *    
+ *
  *   Copyright (C) 2003 Thomas Charbonnel (thomas@undata.org)
- *    
+ *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -30,10 +30,10 @@
 class HC_XpmRenderer:public Fl_Widget
 {
 public:
-    HC_XpmRenderer(int x, int y, int w, int h, char * const *xpm);
+    HC_XpmRenderer(int x, int y, int w, int h, const char * const *xpm);
     void draw();
 private:
-    char * const *pixmap;
+    const char * const *pixmap;
 };
 
 #endif

diff --git a/hdspconf/src/pixmaps.h b/hdspconf/src/pixmaps.h
index c193ed255d2bead90f2dcb3abe552bca6067229d..4c5aa65aa6ab94de12406efa3b2cd3183d8f7ba1 100644 (file)
--- a/hdspconf/src/pixmaps.h
+++ b/hdspconf/src/pixmaps.h
@@ -1,8 +1,8 @@
 /*
  *   HDSPConf
- *    
+ *
  *   Copyright (C) 2003 Thomas Charbonnel (thomas@undata.org)
- *    
+ *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -21,9 +21,9 @@
 #ifndef pixmaps_H
 #define pixmaps_H
 
-extern char * rme_xpm[];
-extern char * alsalogo_xpm[];
-extern char * lad_banner_xpm[];
+extern const char * rme_xpm[];
+extern const char * alsalogo_xpm[];
+extern const char * lad_banner_xpm[];
 
 #endif