X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdisplay%2Fsp-ctrlline.h;h=a13907a7061e0aed36cfd9bdac10b77193500ac1;hb=0dc33d4ce43e0bb49c63aa53b826ec4a1ff68e28;hp=88bebe601b3105f978ef2ca15d365abdf68bdff6;hpb=f14407d198897d57447ae6643dc6563769c3dcdd;p=inkscape.git

diff --git a/src/display/sp-ctrlline.h b/src/display/sp-ctrlline.h
index 88bebe601..a13907a70 100644
--- a/src/display/sp-ctrlline.h
+++ b/src/display/sp-ctrlline.h
@@ -1,5 +1,5 @@
-#ifndef __INKSCAPE_CTRLLINE_H__
-#define __INKSCAPE_CTRLLINE_H__
+#ifndef SEEN_INKSCAPE_CTRLLINE_H
+#define SEEN_INKSCAPE_CTRLLINE_H
 
 /*
  * Simple straight line
@@ -14,7 +14,7 @@
  * Released under GNU GPL
  */
 
-#include "sp-canvas.h"
+#include "sp-canvas-item.h"
 
 struct SPItem;
 
@@ -25,8 +25,8 @@ struct SPItem;
 struct SPCtrlLine : public SPCanvasItem{
     SPItem *item;  // the item to which this line belongs in some sense; may be NULL for some users
     guint32 rgba;
-    NR::Point s, e;
-    NR::Matrix affine;
+    Geom::Point s, e;
+    Geom::Matrix affine;
 };
 struct SPCtrlLineClass : public SPCanvasItemClass{};
 
@@ -34,11 +34,11 @@ 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);
 
 
 
-#endif
+#endif // SEEN_INKSCAPE_CTRLLINE_H
 
 /*
   Local Variables:
@@ -49,4 +49,4 @@ void sp_ctrlline_set_coords (SPCtrlLine *cl, const NR::Point start, const NR::Po
   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 :