Merge from trunk.

[inkscape.git] / src / pen-context.h

diff --git a/src/pen-context.h b/src/pen-context.h
index a358126acad8e5074d0f636160637c095d96126e..1026369d1cae7f7a353c00b457fbf2937ad23eda 100644 (file)
--- a/src/pen-context.h
+++ b/src/pen-context.h
@@ -30,7 +30,7 @@ enum {
  * SPPenContext: a context for pen tool events.
  */
 struct SPPenContext : public SPDrawContext {
-    NR::Point p[5];
+    Geom::Point p[5];
 
     /** \invar npoints in {0, 2, 5}. */
     // npoints somehow determines the type of the node (what does it mean, exactly? the number of Bezier handles?)
@@ -66,6 +66,7 @@ inline bool sp_pen_context_has_waiting_LPE(SPPenContext *pc) {
 void sp_pen_context_set_polyline_mode(SPPenContext *const pc);
 void sp_pen_context_wait_for_LPE_mouse_clicks(SPPenContext *pc, Inkscape::LivePathEffect::EffectType effect_type,
                                               unsigned int num_clicks, bool use_polylines = true);
+void sp_pen_context_cancel_waiting_for_LPE(SPPenContext *pc);
 void sp_pen_context_put_into_waiting_mode(SPDesktop *desktop, Inkscape::LivePathEffect::EffectType effect_type,
                                           unsigned int num_clicks, bool use_polylines = true);
 
@@ -80,4 +81,4 @@ void sp_pen_context_put_into_waiting_mode(SPDesktop *desktop, Inkscape::LivePath
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :