Fix crash in cycle-selection (and restructure internals).

[inkscape.git] / src / seltrans-handles.h

diff --git a/src/seltrans-handles.h b/src/seltrans-handles.h
index 0afa552ea0183b45398970566c59d3b42a13fa82..f796a1007bb0f35bc2f59393f918ec7a404e60fb 100644 (file)
--- a/src/seltrans-handles.h
+++ b/src/seltrans-handles.h
@@ -1,5 +1,5 @@
-#ifndef __SP_SELTRANS_HANDLES_H__
-#define __SP_SELTRANS_HANDLES_H__
+#ifndef SEEN_SP_SELTRANS_HANDLES_H
+#define SEEN_SP_SELTRANS_HANDLES_H
 
 /*
  * Seltrans knots
@@ -13,6 +13,8 @@
  */
 
 #include "display/sodipodi-ctrl.h"
+#include <2geom/forward.h>
+#include <gdk/gdkcursor.h>
 
 namespace Inkscape
 {
@@ -23,35 +25,48 @@ class SPSelTransHandle;
 
 // request handlers
 gboolean sp_sel_trans_scale_request(Inkscape::SelTrans *seltrans,
-                                   SPSelTransHandle const &handle, NR::Point &p, guint state);
+                                   SPSelTransHandle const &handle, Geom::Point &p, guint state);
 gboolean sp_sel_trans_stretch_request(Inkscape::SelTrans *seltrans,
-                                     SPSelTransHandle const &handle, NR::Point &p, guint state);
+                                     SPSelTransHandle const &handle, Geom::Point &p, guint state);
 gboolean sp_sel_trans_skew_request(Inkscape::SelTrans *seltrans,
-                                  SPSelTransHandle const &handle, NR::Point &p, guint state);
+                                  SPSelTransHandle const &handle, Geom::Point &p, guint state);
 gboolean sp_sel_trans_rotate_request(Inkscape::SelTrans *seltrans,
-                                    SPSelTransHandle const &handle, NR::Point &p, guint state);
+                                    SPSelTransHandle const &handle, Geom::Point &p, guint state);
 gboolean sp_sel_trans_center_request(Inkscape::SelTrans *seltrans,
-                                    SPSelTransHandle const &handle, NR::Point &p, guint state);
+                                    SPSelTransHandle const &handle, Geom::Point &p, guint state);
 
 // action handlers
-void sp_sel_trans_scale(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
-void sp_sel_trans_stretch(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
-void sp_sel_trans_skew(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
-void sp_sel_trans_rotate(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
-void sp_sel_trans_center(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
+void sp_sel_trans_scale(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
+void sp_sel_trans_stretch(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
+void sp_sel_trans_skew(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
+void sp_sel_trans_rotate(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
+void sp_sel_trans_center(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
 
 struct SPSelTransHandle {
        GtkAnchorType anchor;
        GdkCursorType cursor;
        guint control;
-       void (* action) (Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
-       gboolean (* request) (Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, NR::Point &p, guint state);
+       void (* action) (Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
+       gboolean (* request) (Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
        gdouble x, y;
 };
 
+// TODO these must be purged:
 extern SPSelTransHandle const handles_scale[8];
 extern SPSelTransHandle const handles_rotate[8];
 extern SPSelTransHandle const handle_center;
 
-#endif
+#endif // SEEN_SP_SELTRANS_HANDLES_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+