Split SPCanvasItem and SPCanvasGroup to individual .h files. Removed forward header.

[inkscape.git] / src / display / sodipodi-ctrlrect.h

diff --git a/src/display/sodipodi-ctrlrect.h b/src/display/sodipodi-ctrlrect.h
index dc931b7dc1caedeb0101919fa0d57eb4a5f7e757..9ecba47c80a3e69a150dfe2f074c66cb2d850f1e 100644 (file)
--- a/src/display/sodipodi-ctrlrect.h
+++ b/src/display/sodipodi-ctrlrect.h
@@ -1,5 +1,5 @@
-#ifndef __INKSCAPE_CTRLRECT_H__
-#define __INKSCAPE_CTRLRECT_H__
+#ifndef SEEN_INKSCAPE_CTRLRECT_H
+#define SEEN_INKSCAPE_CTRLRECT_H
 
 /**
  * \file sodipodi-ctrlrect.h
@@ -17,7 +17,10 @@
  */
 
 #include <glib/gtypes.h>
-#include "sp-canvas.h"
+#include "sp-canvas-item.h"
+#include "libnr/nr-rect-l.h"
+
+struct SPCanvasBuf;
 
 #define SP_TYPE_CTRLRECT (sp_ctrlrect_get_type ())
 #define SP_CTRLRECT(obj) (GTK_CHECK_CAST((obj), SP_TYPE_CTRLRECT, CtrlRect))
@@ -32,16 +35,16 @@ public:
     void init();
     void setColor(guint32 b, bool h, guint f);
     void setShadow(int s, guint c);
-    void setRectangle(NR::Rect const &r);
+    void setRectangle(Geom::Rect const &r);
     void setDashed(bool d);
 
     void render(SPCanvasBuf *buf);
-    void update(NR::Matrix const &affine, unsigned int flags);
+    void update(Geom::Matrix const &affine, unsigned int flags);
     
 private:
     void _requestUpdate();
     
-    NR::Rect _rect;
+    Geom::Rect _rect;
     bool _has_fill;
     bool _dashed;
     NRRectL _area;
@@ -56,7 +59,7 @@ struct SPCtrlRectClass : public SPCanvasItemClass {};
 
 GtkType sp_ctrlrect_get_type();
 
-#endif
+#endif // SEEN_RUBBERBAND_H
 
 /*
   Local Variables:
@@ -67,4 +70,4 @@ GtkType sp_ctrlrect_get_type();
   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 :