Warning cleanup.

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

diff --git a/src/shape-editor.h b/src/shape-editor.h
index 4e78869570839aea6979a8967b092f9b05c51c37..f30f1aa12f7d0bf045c63dc2a7eb4aae5ea8d994 100644 (file)
--- a/src/shape-editor.h
+++ b/src/shape-editor.h
@@ -41,15 +41,10 @@ public:
 
     void set_item (SPItem *item, SubType type, bool keep_knotholder = false);
     void set_item_lpe_path_parameter(SPItem *item, SPObject *lpeobject, const char * key);
-    void set_knotholder(KnotHolder * knot_holder);
-    void reset_item (SubType type, bool keep_knotholder = true);
     void unset_item (SubType type, bool keep_knotholder = false);
 
-    const SPItem *get_item (SubType type);
-
-    bool has_nodepath ();
-    bool has_knotholder ();
-    void update_knotholder ();
+    bool has_nodepath (); //((deprecated))
+    void update_knotholder (); //((deprecated))
 
     bool has_local_change (SubType type);
     void decrement_local_change (SubType type);
@@ -61,7 +56,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
 
@@ -75,7 +70,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 ();
@@ -115,17 +110,26 @@ 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);
 
+    // this one is only public because it's called from non-C++ repr changed callback
+    void shapeeditor_event_attr_changed(gchar const *name);
+
 private:
+    bool has_knotholder ();
+    void reset_item (SubType type, bool keep_knotholder = true);
+    const SPItem *get_item (SubType type);
+
     SPDesktop *desktop;
 
     Inkscape::NodePath::Path *nodepath;
+
+    // TODO: std::list<KnotHolder *> knotholders;
     KnotHolder *knotholder;
 
     ShapeEditorsCollective *container;
@@ -135,8 +139,8 @@ 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;
 };