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

[inkscape.git] / src / common-context.h

diff --git a/src/common-context.h b/src/common-context.h
index 22fa796ee62df09d7a83603300aa393d292827bc..74b6bbaef61bd7e3d7e8f3b008a4a18de6003589 100644 (file)
--- a/src/common-context.h
+++ b/src/common-context.h
@@ -21,8 +21,7 @@
 
 #include "event-context.h"
 #include "display/curve.h"
-#include "display/display-forward.h"
-#include <libnr/nr-point.h>
+#include <2geom/point.h>
 
 #define SP_TYPE_COMMON_CONTEXT (sp_common_context_get_type())
 #define SP_COMMON_CONTEXT(o) (GTK_CHECK_CAST((o), SP_TYPE_COMMON_CONTEXT, SPCommonContext))
@@ -55,10 +54,10 @@ struct SPCommonContext : public SPEventContext {
     SPCurve *cal2;
 
     /** left edge points for this segment */
-    NR::Point point1[SAMPLING_SIZE];
+    Geom::Point point1[SAMPLING_SIZE];
 
     /** right edge points for this segment */
-    NR::Point point2[SAMPLING_SIZE];
+    Geom::Point point2[SAMPLING_SIZE];
 
     /** number of edge points for this segment */
     gint npoints;
@@ -67,13 +66,13 @@ struct SPCommonContext : public SPEventContext {
     Inkscape::XML::Node *repr;
 
     /* common */
-    NR::Point cur;
-    NR::Point vel;
+    Geom::Point cur;
+    Geom::Point vel;
     double vel_max;
-    NR::Point acc;
-    NR::Point ang;
-    NR::Point last;
-    NR::Point del;
+    Geom::Point acc;
+    Geom::Point ang;
+    Geom::Point last;
+    Geom::Point del;
 
     /* extended input data */
     gdouble pressure;
@@ -116,5 +115,5 @@ GType sp_common_context_get_type(void);
   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 :