From 6a9762c7603a32c7ec5cc0aaed8048d84daee6e8 Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Thu, 30 Apr 2015 11:17:07 +0200
Subject: Update 2Geom to r2347

(bzr r14059.2.3)
---
 src/ui/tool/node.cpp             | 2 +-
 src/ui/tool/node.h               | 4 ++--
 src/ui/tool/path-manipulator.cpp | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index ea8b53991..b3b76b9c0 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -1567,7 +1567,7 @@ NodeList::iterator NodeList::before(double t, double *fracpart)
     return ret;
 }
 
-NodeList::iterator NodeList::before(Geom::PathPosition const &pvp)
+NodeList::iterator NodeList::before(Geom::PathTime const &pvp)
 {
     iterator ret = begin();
     std::advance(ret, pvp.curve_index);
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index 5c907910b..025c460e2 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -406,11 +406,11 @@ public:
 
     void setClosed(bool c) { _closed = c; }
     iterator before(double t, double *fracpart = NULL);
-    iterator before(Geom::PathPosition const &pvp);
+    iterator before(Geom::PathTime const &pvp);
     const_iterator before(double t, double *fracpart = NULL) const {
         return const_iterator(before(t, fracpart)._node);
     }
-    const_iterator before(Geom::PathPosition const &pvp) const {
+    const_iterator before(Geom::PathTime const &pvp) const {
         return const_iterator(before(pvp)._node);
     }
 
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 2356e60bf..e54764216 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -1649,14 +1649,14 @@ void PathManipulator::_updateDragPoint(Geom::Point const &evp)
     Geom::PathVector pv = _spcurve->get_pathvector();
     if (pv.empty()) return;
 
-    boost::optional<Geom::PathVectorPosition> pvp =
-        pv.nearestPosition(_desktop->w2d(evp) * to_desktop.inverse());
+    boost::optional<Geom::PathVectorTime> pvp =
+        pv.nearestTime(_desktop->w2d(evp) * to_desktop.inverse());
     Geom::Point nearest_pt = _desktop->d2w(pv.pointAt(*pvp) * to_desktop);
     
     double fracpart = pvp->t;
     std::list<SubpathPtr>::iterator spi = _subpaths.begin();
     for (unsigned i = 0; i < pvp->path_index; ++i, ++spi) {}
-    NodeList::iterator first = (*spi)->before(pvp->asPathPosition());
+    NodeList::iterator first = (*spi)->before(pvp->asPathTime());
     
     double stroke_tolerance = _getStrokeTolerance();
     if (first && first.next() &&
-- 
cgit v1.2.3