Set merge from trunk

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

diff --git a/src/spiral-context.h b/src/spiral-context.h
index 9ddff544122062f5b076b6db1d5ef4cb33d0f367..d80c9740edb28cee53fecb28bd6c9cf5d498b1b3 100644 (file)
--- a/src/spiral-context.h
+++ b/src/spiral-context.h
@@ -1,9 +1,10 @@
 #ifndef __SP_SPIRAL_CONTEXT_H__
 #define __SP_SPIRAL_CONTEXT_H__
 
-/*
+/** \file
  * Spiral drawing context
- *
+ */
+/*
  * Authors:
  *   Mitsuru Oka
  *   Lauris Kaplinski <lauris@kaplinski.com>
@@ -14,10 +15,10 @@
  * Released under GNU GPL
  */
 
+#include <gtk/gtktypeutils.h>
 #include <sigc++/sigc++.h>
 #include "event-context.h"
 #include "libnr/nr-point.h"
-struct SPKnotHolder;
 
 #define SP_TYPE_SPIRAL_CONTEXT            (sp_spiral_context_get_type ())
 #define SP_SPIRAL_CONTEXT(obj)            (GTK_CHECK_CAST ((obj), SP_TYPE_SPIRAL_CONTEXT, SPSpiralContext))
@@ -30,7 +31,7 @@ class SPSpiralContextClass;
 
 struct SPSpiralContext : public SPEventContext {
        SPItem * item;
-       NR::Point center;
+       Geom::Point center;
        gdouble revo;
        gdouble exp;
        gdouble t0;