summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter/satellitepairarray.h
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-03-08 15:30:33 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-03-08 15:30:33 +0000
commit4c1951cc43deafcc0131ba6a0878b4f371651f68 (patch)
tree4780e949d3637f39db64176a33a0460266f62b30 /src/live_effects/parameter/satellitepairarray.h
parentupdate to trunk and fixed helper paths (diff)
downloadinkscape-4c1951cc43deafcc0131ba6a0878b4f371651f68.tar.gz
inkscape-4c1951cc43deafcc0131ba6a0878b4f371651f68.zip
merged anf fixed from trunk
(bzr r13645.1.39)
Diffstat (limited to 'src/live_effects/parameter/satellitepairarray.h')
-rw-r--r--src/live_effects/parameter/satellitepairarray.h4
1 files changed, 2 insertions, 2 deletions
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;