From: Jon A. Cruz <jon@joncruz.org>
Date: Wed, 20 Jan 2010 23:10:33 +0000 (+1300)
Subject: Fixing conts correctness.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=256c35d7e50df902ffa03f3e08932573c507d434;p=inkscape.git

Fixing conts correctness.
---

diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index d98f8e9a2..30e622507 100644
--- 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 fe6b678d9..a5d5d9d4e 100644
--- 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 55da52f1a..11665b890 100644
--- 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]");