Revert recent refactoring changes by johnce because they break the build, which canno...

[inkscape.git] / src / display / sp-ctrlline.h

diff --git a/src/display/sp-ctrlline.h b/src/display/sp-ctrlline.h
index c4368686f349b2016fad9ebf450f52e4a79bdbac..696fb52eeaac77610644317f9188f8ac9c4854f1 100644 (file)
--- a/src/display/sp-ctrlline.h
+++ b/src/display/sp-ctrlline.h
@@ -6,33 +6,35 @@
  *
  * Author:
  *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
  *
+ * Copyright (C) 2007 Johan Engelen
  * Copyright (C) 1999-2002 Lauris Kaplinski
  *
  * Released under GNU GPL
  */
 
 #include "sp-canvas.h"
-#include <livarot/Shape.h>
-
 
+struct SPItem;
 
 #define SP_TYPE_CTRLLINE (sp_ctrlline_get_type ())
 #define SP_CTRLLINE(obj) (GTK_CHECK_CAST ((obj), SP_TYPE_CTRLLINE, SPCtrlLine))
 #define SP_IS_CTRLLINE(obj) (GTK_CHECK_TYPE ((obj), SP_TYPE_CTRLLINE))
 
 struct SPCtrlLine : public SPCanvasItem{
+    SPItem *item;  // the item to which this line belongs in some sense; may be NULL for some users
     guint32 rgba;
-    NRPoint s, e;
-    Shape* shp;
+    Geom::Point s, e;
+    Geom::Matrix affine;
 };
 struct SPCtrlLineClass : public SPCanvasItemClass{};
 
-GtkType sp_ctrlline_get_type (void);
+GType sp_ctrlline_get_type (void);
 
 void sp_ctrlline_set_rgba32 (SPCtrlLine *cl, guint32 rgba);
 void sp_ctrlline_set_coords (SPCtrlLine *cl, gdouble x0, gdouble y0, gdouble x1, gdouble y1);
-void sp_ctrlline_set_coords (SPCtrlLine *cl, const NR::Point start, const NR::Point end);
+void sp_ctrlline_set_coords (SPCtrlLine *cl, const Geom::Point start, const Geom::Point end);