enable safe support for motion hints

[inkscape.git] / src / display / curve.h

diff --git a/src/display/curve.h b/src/display/curve.h
index d46fa13b123f2cad594a99f9dffb537189a51495..39720e40195157e00e51630e75d57c79fc0167ef 100644 (file)
--- a/src/display/curve.h
+++ b/src/display/curve.h
@@ -40,11 +40,12 @@ public:
 
     virtual ~SPCurve();
 
-    void set_pathv(Geom::PathVector const & new_pathv);
+    void set_pathvector(Geom::PathVector const & new_pathv);
     NArtBpath const * get_bpath() const;
     Geom::PathVector const & get_pathvector() const;
 
     guint get_length() const;
+    guint get_segment_count() const;
 
     SPCurve * ref();
     SPCurve * unref();
@@ -52,9 +53,8 @@ public:
     SPCurve * copy() const;
 
     GSList * split() const;
+    void transform(NR::Matrix const &m);
     void transform(Geom::Matrix const &m);
-    void transform(NR::Matrix const &);
-    void transform(NR::translate const &);
     void stretch_endpoints(NR::Point const &, NR::Point const &);
     void move_endpoints(NR::Point const &, NR::Point const &);
     void last_point_additive_move(Geom::Point const & p);
@@ -78,8 +78,9 @@ public:
     bool is_empty() const;
     bool is_closed() const;
     NArtBpath const * last_bpath() const;
+    Geom::Curve const * last_segment() const;
     Geom::Path const * last_path() const;
-    NArtBpath const * first_bpath() const;
+    Geom::Curve const * first_segment() const;
     Geom::Path const * first_path() const;
     NR::Point first_point() const;
     NR::Point last_point() const;
@@ -143,17 +144,12 @@ private:
 //friends:
     friend double sp_curve_distance_including_space(SPCurve const *const curve, double seg2len[]);
     friend double sp_curve_nonzero_distance_including_space(SPCurve const *const curve, double seg2len[]);
-    template<class M> friend void tmpl_curve_transform(SPCurve *const curve, M const &m);
-    // this function is the only one who needs read access to _movePos and _posSet
-    friend void sp_polygon_set(SPObject *object, unsigned int key, const gchar *value);
-
-    static void debug_check( char const * text, SPCurve const * curve);
-    static void debug_check( char const * text, bool a);
+    template<class M> friend void tmpl_curve_transform(SPCurve * curve, M const &m);
 };
 
 #define SP_CURVE_LENGTH(c) (((SPCurve const *)(c))->get_length())
 #define SP_CURVE_BPATH(c) (((SPCurve const *)(c))->get_bpath())
-#define SP_CURVE_SEGMENT(c,i) (((SPCurve const *)(c))->get_bpath() + (i))
+
 
 #endif /* !SEEN_DISPLAY_CURVE_H */