- SPAttributeWidget and SPAttributeTable C++ified

- fixed memory leak with item properties (old instances of item properties window were not destroyed)

(bzr r10775)

6 files changed, 13 insertions, 19 deletions

diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h
index e63d660fe..1f8bad51d 100644
--- a/src/display/canvas-axonomgrid.h
+++ b/src/display/canvas-axonomgrid.h
@@ -24,7 +24,7 @@
 
 #include "canvas-grid.h"
 
-struct SPDesktop;
+class  SPDesktop;
 struct SPNamedView;
 
 namespace Inkscape {
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index 10feeca0e..f7cc3c032 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -24,10 +24,10 @@
 #include "snapper.h"
 #include "line-snapper.h"
 
-struct SPDesktop;
+class  SPDesktop;
 struct SPNamedView;
 struct SPCanvasBuf;
-class SPDocument;
+class  SPDocument;
 
 namespace Inkscape {
 
diff --git a/src/display/canvas-text.h b/src/display/canvas-text.h
index 85333d84e..90c02717c 100644
--- a/src/display/canvas-text.h
+++ b/src/display/canvas-text.h
@@ -16,8 +16,8 @@
 
 #include "sp-canvas-item.h"
 
-struct SPItem;
-struct SPDesktop;
+class SPItem;
+class SPDesktop;
 
 #define SP_TYPE_CANVASTEXT (sp_canvastext_get_type ())
 #define SP_CANVASTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CANVASTEXT, SPCanvasText))
diff --git a/src/display/gnome-canvas-acetate.cpp b/src/display/gnome-canvas-acetate.cpp
index bdda3a120..544efe61f 100644
--- a/src/display/gnome-canvas-acetate.cpp
+++ b/src/display/gnome-canvas-acetate.cpp
@@ -25,8 +25,7 @@ static double sp_canvas_acetate_point (SPCanvasItem *item, Geom::Point p, SPCanv
 
 static SPCanvasItemClass *parent_class;
 
-GType
-sp_canvas_acetate_get_type (void)
+GType sp_canvas_acetate_get_type (void)
 {
 	static GType acetate_type = 0;
 	if (!acetate_type) {
@@ -45,8 +44,7 @@ sp_canvas_acetate_get_type (void)
 	return acetate_type;
 }
 
-static void
-sp_canvas_acetate_class_init (SPCanvasAcetateClass *klass)
+static void sp_canvas_acetate_class_init (SPCanvasAcetateClass *klass)
 {
 	GtkObjectClass *object_class;
 	SPCanvasItemClass *item_class;
@@ -62,14 +60,12 @@ sp_canvas_acetate_class_init (SPCanvasAcetateClass *klass)
 	item_class->point = sp_canvas_acetate_point;
 }
 
-static void
-sp_canvas_acetate_init (SPCanvasAcetate */*acetate*/)
+static void sp_canvas_acetate_init (SPCanvasAcetate */*acetate*/)
 {
     /* Nothing here */
 }
 
-static void
-sp_canvas_acetate_destroy (GtkObject *object)
+static void sp_canvas_acetate_destroy (GtkObject *object)
 {
 	SPCanvasAcetate *acetate;
 
@@ -82,8 +78,7 @@ sp_canvas_acetate_destroy (GtkObject *object)
 		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
-static void
-sp_canvas_acetate_update( SPCanvasItem *item, Geom::Affine const &/*affine*/, unsigned int /*flags*/ )
+static void sp_canvas_acetate_update( SPCanvasItem *item, Geom::Affine const &/*affine*/, unsigned int /*flags*/ )
 {
     item->x1 = -G_MAXINT;
     item->y1 = -G_MAXINT;
@@ -91,8 +86,7 @@ sp_canvas_acetate_update( SPCanvasItem *item, Geom::Affine const &/*affine*/, un
     item->y2 = G_MAXINT;
 }
 
-static double
-sp_canvas_acetate_point( SPCanvasItem *item, Geom::Point /*p*/, SPCanvasItem **actual_item )
+static double sp_canvas_acetate_point( SPCanvasItem *item, Geom::Point /*p*/, SPCanvasItem **actual_item )
 {
     *actual_item = item;
 
diff --git a/src/display/sp-ctrlline.h b/src/display/sp-ctrlline.h
index eeed7e75d..4bfe50a77 100644
--- a/src/display/sp-ctrlline.h
+++ b/src/display/sp-ctrlline.h
@@ -16,7 +16,7 @@
 
 #include "sp-canvas-item.h"
 
-struct SPItem;
+class SPItem;
 
 #define SP_TYPE_CTRLLINE (sp_ctrlline_get_type ())
 #define SP_CTRLLINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRLLINE, SPCtrlLine))
diff --git a/src/display/sp-ctrlpoint.h b/src/display/sp-ctrlpoint.h
index 907f74bf8..a7a5475b7 100644
--- a/src/display/sp-ctrlpoint.h
+++ b/src/display/sp-ctrlpoint.h
@@ -14,7 +14,7 @@
 
 #include "sp-canvas-item.h"
 
-struct SPItem;
+class SPItem;
 
 #define SP_TYPE_CTRLPOINT (sp_ctrlpoint_get_type ())
 #define SP_CTRLPOINT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRLPOINT, SPCtrlPoint))