From c883d7627a479c8c5b6a9f77b9841fa5631572ad Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Mon, 27 Apr 2015 19:39:29 -0400
Subject: 2Geom sync - initial commit

(bzr r14059.2.1)
---
 src/live_effects/parameter/filletchamferpointarray.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/live_effects/parameter/filletchamferpointarray.h')

diff --git a/src/live_effects/parameter/filletchamferpointarray.h b/src/live_effects/parameter/filletchamferpointarray.h
index 7849d5afb..bc05ecfc4 100644
--- a/src/live_effects/parameter/filletchamferpointarray.h
+++ b/src/live_effects/parameter/filletchamferpointarray.h
@@ -47,9 +47,9 @@ public:
     virtual double len_to_rad(int index, double len);
     virtual double len_to_time(int index, double len);
     virtual double time_to_len(int index, double time);
-    virtual std::pair<std::size_t, std::size_t> get_positions(int index, std::vector<Geom::Path> subpaths);
-    virtual int last_index(int index, std::vector<Geom::Path> subpaths);
-    std::vector<double> get_times(int index, std::vector<Geom::Path> subpaths, bool last);
+    virtual std::pair<std::size_t, std::size_t> get_positions(int index, Geom::PathVector subpaths);
+    virtual int last_index(int index, Geom::PathVector subpaths);
+    std::vector<double> get_times(int index, Geom::PathVector subpaths, bool last);
     virtual void set_helper_size(int hs);
     virtual void set_use_distance(bool use_knot_distance);
     virtual void set_chamfer_steps(int value_chamfer_steps);
-- 
cgit v1.2.3


From 78cee203a59243dcabbf67499682ce720be6d1d6 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 9 May 2015 17:50:08 +0200
Subject: Remove documentUnits from live_effect/effect.cpp/h Remove units from
 fillet-chamfer and roughen

(bzr r14136)
---
 src/live_effects/parameter/filletchamferpointarray.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/live_effects/parameter/filletchamferpointarray.h')

diff --git a/src/live_effects/parameter/filletchamferpointarray.h b/src/live_effects/parameter/filletchamferpointarray.h
index 7849d5afb..9bfd86b41 100644
--- a/src/live_effects/parameter/filletchamferpointarray.h
+++ b/src/live_effects/parameter/filletchamferpointarray.h
@@ -53,8 +53,6 @@ public:
     virtual void set_helper_size(int hs);
     virtual void set_use_distance(bool use_knot_distance);
     virtual void set_chamfer_steps(int value_chamfer_steps);
-    virtual void set_document_unit(Glib::ustring value_document_unit);
-    virtual void set_unit(const gchar *abbr);
     virtual void addCanvasIndicators(SPLPEItem const *lpeitem,
                                      std::vector<Geom::PathVector> &hp_vec);
     virtual bool providesKnotHolderEntities() const {
@@ -89,8 +87,6 @@ private:
     int helper_size;
     int chamfer_steps;
     bool use_distance;
-    const gchar *unit;
-    Glib::ustring documentUnit;
     Geom::PathVector hp;
 
     Geom::Piecewise<Geom::D2<Geom::SBasis> > last_pwd2;
-- 
cgit v1.2.3