small cleanup in src/trace (warnings and trailing spaces)

[inkscape.git] / src / shape-editor.h

diff --git a/src/shape-editor.h b/src/shape-editor.h
index c8f5aa4191d0e6dd399612ef92a00c439477fa32..8780586c40b7ac227e94c8955b23bfb57c2f7ce2 100644 (file)
--- a/src/shape-editor.h
+++ b/src/shape-editor.h
@@ -16,6 +16,7 @@
 #include <libnr/nr-forward.h>
 
 namespace Inkscape { namespace NodePath { class Path; } }
+namespace Inkscape { namespace XML { class Node; } }
 
 #include "libnr/nr-path-code.h"
 #include "libnr/nr-point.h"
@@ -60,7 +61,7 @@ public:
 
     void update_statusbar ();
 
-    bool is_over_stroke (NR::Point event_p, bool remember);
+    bool is_over_stroke (Geom::Point event_p, bool remember);
 
     void add_node_near_point(); // uses the shapeeditor's remembered point, if any
 
@@ -74,7 +75,7 @@ public:
 
     void finish_drag ();
 
-    void select_rect (NR::Rect  const &rect, bool add);
+    void select_rect (Geom::Rect  const &rect, bool add);
 
     bool has_selection ();
     void deselect ();
@@ -114,10 +115,10 @@ public:
     void show_handles (bool show);
     void show_helperpath (bool show);
 
-    void flip (NR::Dim2 axis, boost::optional<NR::Point> center = boost::optional<NR::Point>());
+    void flip (Geom::Dim2 axis, boost::optional<Geom::Point> center = boost::optional<Geom::Point>());
 
-    void distribute (NR::Dim2 axis);
-    void align (NR::Dim2 axis);
+    void distribute (Geom::Dim2 axis);
+    void align (Geom::Dim2 axis);
 
     bool nodepath_edits_repr_key(gchar const *name);
 
@@ -134,8 +135,10 @@ private:
     double grab_t;
     int grab_node; // number of node grabbed by sp_node_context_is_over_stroke
     bool hit;
-    NR::Point curvepoint_event; // int coords from event
-    NR::Point curvepoint_doc; // same, in doc coords
+    Geom::Point curvepoint_event; // int coords from event
+    Geom::Point curvepoint_doc; // same, in doc coords
+
+    Inkscape::XML::Node *listener_attached_for;
 };