15 files changed, 18 insertions, 18 deletions
diff --git a/libimage/error.xpm b/libimage/error.xpm
index f704a56..deeec9a 100644
--- a/libimage/error.xpm
+++ b/libimage/error.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * error_xpm[] = {
+static const char * error_xpm[] = {
 "491 386 65 1",
 " 	c None",
 ".	c #5E605D",
diff --git a/libimage/error_small.xpm b/libimage/error_small.xpm
index 5c61f2a..ffd582e 100644
--- a/libimage/error_small.xpm
+++ b/libimage/error_small.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * error_small_xpm[] = {
+static const char * error_small_xpm[] = {
 "150 115 65 1",
 " 	c None",
 ".	c #5F605E",
diff --git a/libimage/img1.xpm b/libimage/img1.xpm
index 02143eb..de075f6 100644
--- a/libimage/img1.xpm
+++ b/libimage/img1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * img1_xpm[] = {
+static const char * img1_xpm[] = {
 "37 50 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/libimage/img2.xpm b/libimage/img2.xpm
index f4046e4..68b2f2b 100644
--- a/libimage/img2.xpm
+++ b/libimage/img2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * img2_xpm[] = {
+static const char * img2_xpm[] = {
 "42 50 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/libimage/img3.xpm b/libimage/img3.xpm
index c83fa64..d56a9df 100644
--- a/libimage/img3.xpm
+++ b/libimage/img3.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * img3_xpm[] = {
+static const char * img3_xpm[] = {
 "42 50 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/libimage/img4.xpm b/libimage/img4.xpm
index 3be99a9..fa50c91 100644
--- a/libimage/img4.xpm
+++ b/libimage/img4.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * img4_xpm[] = {
+static const char * img4_xpm[] = {
 "44 50 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/libimage/img5.xpm b/libimage/img5.xpm
index 9aa80d3..9201405 100644
--- a/libimage/img5.xpm
+++ b/libimage/img5.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * img5_xpm[] = {
+static const char * img5_xpm[] = {
 "43 50 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/libimage/img6.xpm b/libimage/img6.xpm
index e915233..92d22f1 100644
--- a/libimage/img6.xpm
+++ b/libimage/img6.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * img6_xpm[] = {
+static const char * img6_xpm[] = {
 "41 50 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/libimage/img7.xpm b/libimage/img7.xpm
index d9ef9e5..b8d8230 100644
--- a/libimage/img7.xpm
+++ b/libimage/img7.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * img7_xpm[] = {
+static const char * img7_xpm[] = {
 "43 50 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/libimage/img8.xpm b/libimage/img8.xpm
index 3baee10..c82d72d 100644
--- a/libimage/img8.xpm
+++ b/libimage/img8.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * img8_xpm[] = {
+static const char * img8_xpm[] = {
 "42 50 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/libimage/img9.xpm b/libimage/img9.xpm
index 31debe9..f08202b 100644
--- a/libimage/img9.xpm
+++ b/libimage/img9.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * img9_xpm[] = {
+static const char * img9_xpm[] = {
 "39 50 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/libimage/pnm.c b/libimage/pnm.c
index cb91dc5..f9b6b36 100644
--- a/libimage/pnm.c
+++ b/libimage/pnm.c
@@ -33,7 +33,7 @@
 Print error message and get out
 @param variable list of arguments explaining error
 @return - none*/
-void cPNM::error(char* format, ... )
+void cPNM::error(const char* format, ... )
 {
   if(m_szError)
     free(m_szError);
diff --git a/libimage/pnm.h b/libimage/pnm.h
index 1b4d50e..f97cbda 100644
--- a/libimage/pnm.h
+++ b/libimage/pnm.h
@@ -139,7 +139,7 @@ protected:
   Print error message and get out
   @param variable list of arguments explaining error
   @return - none*/
-  void error (char* format, ... );
+  void error (const char* format, ... );
 
   /*****************************************************************************
   Get pnm magic number (P1, P2, ...)
diff --git a/libimage/xpm.c b/libimage/xpm.c
index 2165f1f..bfcb1ad 100644
--- a/libimage/xpm.c
+++ b/libimage/xpm.c
@@ -55,10 +55,10 @@ cXPM gOverlay_Image_9(img9_xpm);
 cXPM gOverlay_Error(error_xpm);
 cXPM gOverlay_ErrorSmall(error_small_xpm);
 
-cXPM::cXPM(char* pXPM[])
+cXPM::cXPM(const char* pXPM[])
 :m_Colors(NULL)
 {
-  char **p = pXPM;
+  const char **p = pXPM;
   int c;
   if (4 != sscanf(*p, "%d %d %d %d", &m_nWidth, &m_nHeight, &m_nColors, &c)
       || c != 1 ) 
@@ -117,7 +117,7 @@ bool cXPM::Overlay(unsigned char* pRGBMem,unsigned int nMemWidth,unsigned int nM
   if(!m_Colors || !pRGBMem || !m_pXPM)
     return false;
   
-  char **p = m_pXPM; 
+  const char **p = m_pXPM; 
 
   for(unsigned int h = 0;
     h < m_nHeight 
diff --git a/libimage/xpm.h b/libimage/xpm.h
index ace7837..3268ce2 100644
--- a/libimage/xpm.h
+++ b/libimage/xpm.h
@@ -29,7 +29,7 @@
 class cXPM 
 {
 
-  char **m_pXPM;
+  const char **m_pXPM;
   unsigned int m_nWidth;
   unsigned int m_nHeight;
   unsigned int m_nColors;
@@ -42,7 +42,7 @@ class cXPM
 protected:
   bool GetColor(unsigned int color,unsigned int& rgb) const;
 public:
-  cXPM(char* pXPM[]);
+  cXPM(const char* pXPM[]);
   virtual ~cXPM();
 
   enum ePlacement