diff options
| author | Peter Moulder <peter.moulder@monash.edu> | 2007-09-16 12:28:27 +0000 |
|---|---|---|
| committer | pjrm <pjrm@users.sourceforge.net> | 2007-09-16 12:28:27 +0000 |
| commit | 4e4ebf48914fe22803d4e6891af13f1292456f2e (patch) | |
| tree | 7339396445719c9364957861afb350dbe3d9d396 | |
| parent | merge in 2geom rev. 1154 (diff) | |
| download | inkscape-4e4ebf48914fe22803d4e6891af13f1292456f2e.tar.gz inkscape-4e4ebf48914fe22803d4e6891af13f1292456f2e.zip | |
trivial changes to address warning with g++-4.2
(bzr r3757)
| -rw-r--r-- | src/color-profile.cpp | 2 | ||||
| -rw-r--r-- | src/conditions.cpp | 4 | ||||
| -rw-r--r-- | src/dom/xpathtoken.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/pov-out.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/pov-out.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index 059d476f1..a73344d17 100644 --- 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 e5a1d47c9..936346f25 100644 --- 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 ac0ead535..fe906f4f8 100644 --- 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 c915de75b..7ed7408db 100644 --- 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 28f630f77..18aad56d1 100644 --- 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 |