From 74649824e41b26bcf560ba485364a6ffe7b80fca Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 6 Apr 2015 20:12:48 +0200
Subject: rename pathinfo function

(bzr r13645.1.78)
---
 src/helper/geom-pathinfo.cpp            | 4 ++--
 src/helper/geom-pathinfo.h              | 2 +-
 src/helper/geom-pointwise.cpp           | 2 +-
 src/live_effects/lpe-fillet-chamfer.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/helper/geom-pathinfo.cpp b/src/helper/geom-pathinfo.cpp
index ac94c0281..0cb7c64dd 100644
--- a/src/helper/geom-pathinfo.cpp
+++ b/src/helper/geom-pathinfo.cpp
@@ -80,9 +80,9 @@ void Pathinfo::_setPathInfo(Geom::PathVector path_vector, bool skip_degenerate)
     }
 }
 
-size_t Pathinfo::numberCurves() const
+size_t Pathinfo::size() const
 {
-    return data.back().first;
+    return data.back().first + 1;
 }
 
 size_t Pathinfo::subPathIndex(size_t index) const
diff --git a/src/helper/geom-pathinfo.h b/src/helper/geom-pathinfo.h
index 7a597202f..73220b959 100644
--- a/src/helper/geom-pathinfo.h
+++ b/src/helper/geom-pathinfo.h
@@ -27,7 +27,7 @@ public:
     virtual ~Pathinfo();
     void setPwd2(Piecewise<D2<SBasis> > pwd2);
     void setPathVector(Geom::PathVector path_vector, bool skip_degenerate = false);
-    size_t numberCurves() const;
+    size_t size() const;
     size_t subPathIndex(size_t index) const;
     size_t last(size_t index) const;
     size_t first(size_t index) const;
diff --git a/src/helper/geom-pointwise.cpp b/src/helper/geom-pointwise.cpp
index f68c9b13f..54cfbb45d 100644
--- a/src/helper/geom-pointwise.cpp
+++ b/src/helper/geom-pointwise.cpp
@@ -238,7 +238,7 @@ void Pointwise::insertDegenerateSatellites(Piecewise<D2<SBasis> > A, Geom::PathV
 {
     size_t size_A = A.size();
     _path_info.setPathVector(B);
-    size_t size_B = _path_info.numberCurves();
+    size_t size_B = _path_info.size();
     size_t satellite_gap = size_B - size_A;
     if (satellite_gap == 0){
         return;
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 935e97ec9..cad67cea9 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -427,7 +427,7 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
             ++it;
         }
         Pathinfo path_info(original_pathv);
-        size_t number_curves = path_info.numberCurves() + 1;
+        size_t number_curves = path_info.size();
         if (pointwise && number_curves != sats.size()) {
             pointwise->recalculateForNewPwd2(pwd2_in, original_pathv);
         } else {
-- 
cgit v1.2.3