trivial changes to address warning with g++-4.2

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index 059d476f102571718de6e48622f569db9b43ffb6..a73344d1775802e74148653ac2bfb23730017671 100644 (file)
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -197,7 +197,7 @@ static void Inkscape::colorprofile_set( SPObject *object, unsigned key, gchar co
                         g_warning("object has no document.  using active");
                     }
                     //# 1.  Get complete URI of document
-                    gchar* docbase = SP_DOCUMENT_URI( doc );
+                    gchar const *docbase = SP_DOCUMENT_URI( doc );
                     if (!docbase)
                         {
                         g_warning("null docbase");

diff --git a/src/conditions.cpp b/src/conditions.cpp
index e5a1d47c9c95505a239559e2c53c0400573ebe44..936346f25e49f1f710db9945884ccf00d9d47c29 100644 (file)
--- a/src/conditions.cpp
+++ b/src/conditions.cpp
@@ -149,7 +149,7 @@ static std::vector<Glib::ustring> splitByWhitespace(gchar const *value) {
 #define SVG10FEATURE    "org.w3c."
 
 static bool evaluateSVG11Feature(gchar const *feature) {
-    static gchar *_supported_features[] = {
+    static gchar const *_supported_features[] = {
         "SVG", // incomplete "SVG-static" - missing support for "Filter"
            /* SVG - user agent supports at least one of the following:
                 "SVG-static", "SVG-animation", "SVG-dynamic" or "SVGDOM" */
@@ -228,7 +228,7 @@ static bool evaluateSVG11Feature(gchar const *feature) {
 }
 
 static bool evaluateSVG10Feature(gchar const *feature) {
-    static gchar *_supported_features[] = {
+    static gchar const *_supported_features[] = {
         "svg.static", // incomplete - no filter effects
         "dom.svg.static", // not sure
         // "svg.animation",

diff --git a/src/dom/xpathtoken.cpp b/src/dom/xpathtoken.cpp
index ac0ead535c86b1e5ec6468e3811e018303ef30b7..fe906f4f8351b99c7cbacaee8510db86514b89d4 100644 (file)
--- a/src/dom/xpathtoken.cpp
+++ b/src/dom/xpathtoken.cpp
@@ -522,7 +522,7 @@ static bool tokFuncRound(Token &tok, Stack &stack)
 typedef struct
 {
     int ival;
-    char *sval;
+    char const *sval;
     TokenFunc tokenFunc;
 } TokenTableEntry;
 

diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index c915de75bfb3dbf34dcb8c65acb24c0070238d03..7ed7408db3632ddd8031a26910b22e5b28f1afe2 100644 (file)
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -120,7 +120,7 @@ static const char *dstr(double d)
 /**
  *  Output data to the buffer, printf()-style
  */
-void PovOutput::out(char *fmt, ...)
+void PovOutput::out(char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);

diff --git a/src/extension/internal/pov-out.h b/src/extension/internal/pov-out.h
index 28f630f776611ed172ccb23c20c5d27aea6a04b0..18aad56d190d52b239c2f7cf3cc3ff9ee55698b9 100644 (file)
--- a/src/extension/internal/pov-out.h
+++ b/src/extension/internal/pov-out.h
@@ -72,7 +72,7 @@ private:
        /**
         * Format text to our output buffer
         */             
-       void out(char *fmt, ...) G_GNUC_PRINTF(2,3);
+       void out(char const *fmt, ...) G_GNUC_PRINTF(2,3);
 
     /**
      * Output a 2d vector