From e6e262b34c193502d1f9be44324515bf8c861d47 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 17 Feb 2015 00:23:51 +0100
Subject: starting fillet/chamfer

(bzr r13645.1.15)
---
 src/2geom/satellite.h                   | 2 +-
 src/live_effects/lpe-fillet-chamfer.cpp | 2 +-
 src/live_effects/lpe-fillet-chamfer.h   | 1 -
 src/live_effects/parameter/array.h      | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/2geom/satellite.h b/src/2geom/satellite.h
index 06b4a1dd6..a83de5af2 100644
--- a/src/2geom/satellite.h
+++ b/src/2geom/satellite.h
@@ -145,7 +145,7 @@ class Satellite
 
     static const std::map<gchar const *,SatelliteType> GcharMapToSatelliteType;
 
-    static double getOpositeTime(Geom::D2<Geom::SBasis> SBasisCurve, double time);
+    double getOpositeTime(Geom::D2<Geom::SBasis> SBasisCurve);
 
   private:
 
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index df9de81b7..b34cd87a1 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -174,7 +174,7 @@ LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in)
             bool last = curve_it2 == curve_endit;
             std::vector<double> times;
             times.push_back(filletChamferData[counter].second.getTime());
-            times.push_back(filletChamferData[indexFix].second.getOpositeTime((*curve_it1).toSBasis(),filletChamferData[indexFix].second.getTime()));
+            times.push_back(filletChamferData[indexFix].second.getOpositeTime((*curve_it1).toSBasis()));
             times.push_back(filletChamferData[indexFix].second.getTime());
             Curve *knotCurve1 = curve_it1->portion(times[0], times[1]);
             if (counterCurves > 0) {
diff --git a/src/live_effects/lpe-fillet-chamfer.h b/src/live_effects/lpe-fillet-chamfer.h
index 94a2bd2b3..2c0dfcaab 100644
--- a/src/live_effects/lpe-fillet-chamfer.h
+++ b/src/live_effects/lpe-fillet-chamfer.h
@@ -19,7 +19,6 @@
 #include "live_effects/parameter/satellitepairarray.h"
 #include "live_effects/effect.h"
 
-using namespace Geom;
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
index c99777b08..8145d62a3 100644
--- a/src/live_effects/parameter/array.h
+++ b/src/live_effects/parameter/array.h
@@ -115,7 +115,6 @@ protected:
     void writesvgData(SVGOStringStream &str, std::pair<int, Geom::Satellite> const &nVector) const {
         str << nVector.first;
         str << ",";
-        std::map<Geom::SatelliteType, gchar const *> stg = nVector.second.SatelliteTypeToGcharMap;
         str <<   nVector.second.getSatelliteTypeGchar();
         str << "*";
         str << nVector.second.getIsTime();
-- 
cgit v1.2.3