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

[inkscape.git] / src / display / gnome-canvas-acetate.cpp

diff --git a/src/display/gnome-canvas-acetate.cpp b/src/display/gnome-canvas-acetate.cpp
index 1a58c4b19a9eb029d4fbe18c0f012b78e057d526..c257f1f9286dadc67072b386e5f37fe93239af14 100644 (file)
--- a/src/display/gnome-canvas-acetate.cpp
+++ b/src/display/gnome-canvas-acetate.cpp
@@ -14,15 +14,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "display-forward.h"
 #include "gnome-canvas-acetate.h"
 
 static void sp_canvas_acetate_class_init (SPCanvasAcetateClass *klass);
 static void sp_canvas_acetate_init (SPCanvasAcetate *acetate);
 static void sp_canvas_acetate_destroy (GtkObject *object);
 
-static void sp_canvas_acetate_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags);
-static double sp_canvas_acetate_point (SPCanvasItem *item, NR::Point p, SPCanvasItem **actual_item);
+static void sp_canvas_acetate_update (SPCanvasItem *item, Geom::Matrix const &affine, unsigned int flags);
+static double sp_canvas_acetate_point (SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item);
 
 static SPCanvasItemClass *parent_class;
 
@@ -32,7 +31,7 @@ sp_canvas_acetate_get_type (void)
        static GtkType acetate_type = 0;
        if (!acetate_type) {
                GtkTypeInfo acetate_info = {
-                       "SPCanvasAcetate",
+                       (gchar *)"SPCanvasAcetate",
                        sizeof (SPCanvasAcetate),
                        sizeof (SPCanvasAcetateClass),
                        (GtkClassInitFunc) sp_canvas_acetate_class_init,
@@ -62,9 +61,9 @@ sp_canvas_acetate_class_init (SPCanvasAcetateClass *klass)
 }
 
 static void
-sp_canvas_acetate_init (SPCanvasAcetate *acetate)
+sp_canvas_acetate_init (SPCanvasAcetate */*acetate*/)
 {
-       /* Nothing here */
+    /* Nothing here */
 }
 
 static void
@@ -82,19 +81,19 @@ sp_canvas_acetate_destroy (GtkObject *object)
 }
 
 static void
-sp_canvas_acetate_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags)
+sp_canvas_acetate_update( SPCanvasItem *item, Geom::Matrix const &/*affine*/, unsigned int /*flags*/ )
 {
-       item->x1 = -G_MAXINT;
-       item->y1 = -G_MAXINT;
-       item->x2 = G_MAXINT;
-       item->y2 = G_MAXINT;
+    item->x1 = -G_MAXINT;
+    item->y1 = -G_MAXINT;
+    item->x2 = G_MAXINT;
+    item->y2 = G_MAXINT;
 }
 
 static double
-sp_canvas_acetate_point (SPCanvasItem *item, NR::Point p, SPCanvasItem **actual_item)
+sp_canvas_acetate_point( SPCanvasItem *item, Geom::Point /*p*/, SPCanvasItem **actual_item )
 {
-       *actual_item = item;
+    *actual_item = item;
 
-       return 0.0;
+    return 0.0;
 }