From 4c1951cc43deafcc0131ba6a0878b4f371651f68 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 8 Mar 2015 16:30:33 +0100
Subject: merged anf fixed from trunk

(bzr r13645.1.39)
---
 src/live_effects/parameter/satellitepairarray.cpp | 2 +-
 src/live_effects/parameter/satellitepairarray.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/live_effects/parameter')

diff --git a/src/live_effects/parameter/satellitepairarray.cpp b/src/live_effects/parameter/satellitepairarray.cpp
index 9c2c1f93b..0fc27153f 100644
--- a/src/live_effects/parameter/satellitepairarray.cpp
+++ b/src/live_effects/parameter/satellitepairarray.cpp
@@ -54,7 +54,7 @@ void SatellitePairArrayParam::set_pointwise(Geom::Pointwise *pointwise)
     last_pointwise = pointwise;
 }
 
-void SatellitePairArrayParam::set_document_unit(Glib::ustring const * value_document_unit)
+void SatellitePairArrayParam::set_document_unit(Glib::ustring value_document_unit)
 {
     documentUnit = value_document_unit;
 }
diff --git a/src/live_effects/parameter/satellitepairarray.h b/src/live_effects/parameter/satellitepairarray.h
index 79a015c6d..d20339ccb 100644
--- a/src/live_effects/parameter/satellitepairarray.h
+++ b/src/live_effects/parameter/satellitepairarray.h
@@ -52,7 +52,7 @@ public:
     virtual bool providesKnotHolderEntities() const {
         return true;
     }
-    void set_document_unit(Glib::ustring const * value_document_unit);
+    void set_document_unit(Glib::ustring value_document_unit);
     void set_use_distance(bool use_knot_distance );
     void set_unit(const gchar *abbr);
     void set_effect_type(EffectType et);
@@ -72,7 +72,7 @@ private:
     int helper_size;
     bool use_distance;
     const gchar *unit;
-    Glib::ustring const * documentUnit;
+    Glib::ustring documentUnit;
     EffectType _effectType;
     Geom::Pointwise *last_pointwise;
 
-- 
cgit v1.2.3