Fixing conts correctness.

diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index d98f8e9a200146eba303eeac2f863b467bc49221..30e622507b56c2640148f38a56db783e1836db91 100644 (file)
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -71,7 +71,9 @@ Filter::get_filter (Inkscape::Extension::Extension * ext) {
 }
 
 void
-Filter::merge_filters (Inkscape::XML::Node * to, Inkscape::XML::Node * from, Inkscape::XML::Document * doc, gchar * srcGraphic, gchar * srcGraphicAlpha)
+Filter::merge_filters( Inkscape::XML::Node * to, Inkscape::XML::Node * from,
+                      Inkscape::XML::Document * doc,
+                      gchar const * srcGraphic, gchar const * srcGraphicAlpha)
 {
        if (from == NULL) return;
 

diff --git a/src/extension/internal/filter/filter.h b/src/extension/internal/filter/filter.h
index fe6b678d9ac1ea257ce312695ec1137eb6ef3b87..a5d5d9d4ee00a3fcbd32d2b5d93b355c6f75c598 100644 (file)
--- a/src/extension/internal/filter/filter.h
+++ b/src/extension/internal/filter/filter.h
@@ -25,7 +25,7 @@ protected:
 
 private:
        Inkscape::XML::Document * get_filter (Inkscape::Extension::Extension * ext);
-       void merge_filters (Inkscape::XML::Node * to, Inkscape::XML::Node * from, Inkscape::XML::Document * doc, gchar * srcGraphic = NULL, gchar * srcGraphicAlpha = NULL);
+       void merge_filters (Inkscape::XML::Node * to, Inkscape::XML::Node * from, Inkscape::XML::Document * doc, gchar const * srcGraphic = NULL, gchar const * srcGraphicAlpha = NULL);
 
 public:
        Filter();

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 55da52f1a3269b09cc0ea23ea7ae45ed507a1cd2..11665b89072002f98ea55365f763c1edab232021 100644 (file)
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -421,7 +421,7 @@ sp_text_description(SPItem *item)
 
     GString *xs = SP_PX_TO_METRIC_STRING(style->font_size.computed, sp_desktop_namedview(SP_ACTIVE_DESKTOP)->getDefaultMetric());
 
-    char *trunc = "";
+    char const *trunc = "";
     Inkscape::Text::Layout const *layout = te_get_layout((SPItem *) item);
     if (layout && layout->inputTruncated()) {
         trunc = _(" [truncated]");