c -> cpp (eliminating unneded casts)

(bzr r448)

3 files changed, 27 insertions, 31 deletions

diff --git a/src/knot.cpp b/src/knot.cpp
index 5483280da..3194336ed 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -97,7 +97,7 @@ GType sp_knot_get_type()
  */
 static void sp_knot_class_init(SPKnotClass *klass)
 {
-    GObjectClass *object_class = (GObjectClass *) klass;
+    GObjectClass *object_class = klass;
 
     parent_class = (GObjectClass*) g_type_class_peek_parent(klass);
 
@@ -252,8 +252,8 @@ static void sp_knot_dispose(GObject *object)
         knot->tip = NULL;
     }
 
-    if (((GObjectClass *) (parent_class))->dispose) {
-        (* ((GObjectClass *) (parent_class))->dispose) (object);
+    if (parent_class->dispose) {
+        (*parent_class->dispose) (object);
     }
 }
 
@@ -287,14 +287,14 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot)
     g_assert(knot != NULL);
     g_assert(SP_IS_KNOT(knot));
 
-    g_object_ref(G_OBJECT(knot));
+    g_object_ref(knot);
     tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
 
     gboolean consumed = FALSE;
 
     /* Run client universal event handler, if present */
 
-    g_signal_emit(G_OBJECT(knot), knot_signals[EVENT], 0, event, &consumed);
+    g_signal_emit(knot, knot_signals[EVENT], 0, event, &consumed);
 
     if (consumed) {
         return TRUE;
@@ -303,7 +303,7 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot)
     switch (event->type) {
 	case GDK_2BUTTON_PRESS:
             if (event->button.button == 1) {
-                g_signal_emit(G_OBJECT(knot), knot_signals[DOUBLECLICKED], 0, event->button.state);
+                g_signal_emit(knot, knot_signals[DOUBLECLICKED], 0, event->button.state);
 
                 grabbed = FALSE;
                 moved = FALSE;
@@ -331,11 +331,11 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot)
                         sp_knot_set_flag(knot,
                                          SP_KNOT_DRAGGING,
                                          FALSE);
-                        g_signal_emit(G_OBJECT (knot),
+                        g_signal_emit(knot,
                                       knot_signals[UNGRABBED], 0,
                                       event->button.state);
                     } else {
-                        g_signal_emit(G_OBJECT (knot),
+                        g_signal_emit(knot,
                                       knot_signals[CLICKED], 0,
                                       event->button.state);
                     }
@@ -361,7 +361,7 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot)
                 within_tolerance = false;
 
                 if (!moved) {
-                    g_signal_emit(G_OBJECT (knot),
+                    g_signal_emit(knot,
                                   knot_signals[GRABBED], 0,
                                   event->motion.state);
                     sp_knot_set_flag(knot,
@@ -412,7 +412,7 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot)
                         sp_knot_set_flag(knot,
                                          SP_KNOT_DRAGGING,
                                          FALSE);
-                        g_signal_emit(G_OBJECT(knot),
+                        g_signal_emit(knot,
                                       knot_signals[UNGRABBED], 0,
                                       event->button.state);
                         sp_document_undo(SP_DT_DOCUMENT(knot->desktop));
@@ -432,7 +432,7 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot)
             break;
     }
 
-    g_object_unref(G_OBJECT(knot));
+    g_object_unref(knot);
 
     return consumed;
 }
@@ -501,7 +501,7 @@ void sp_knot_request_position(SPKnot *knot, NR::Point *p, guint state)
 
     gboolean done = FALSE;
 
-    g_signal_emit(G_OBJECT (knot),
+    g_signal_emit(knot,
                   knot_signals[REQUEST], 0,
                   p,
                   state,
@@ -524,7 +524,7 @@ gdouble sp_knot_distance(SPKnot * knot, NR::Point *p, guint state)
 
     gdouble distance = NR::L2(*p - knot->pos);
 
-    g_signal_emit(G_OBJECT(knot),
+    g_signal_emit(knot,
                   knot_signals[DISTANCE], 0,
                   p,
                   state,
@@ -547,7 +547,7 @@ void sp_knot_set_position(SPKnot *knot, NR::Point *p, guint state)
         SP_CTRL(knot->item)->moveto (*p);
     }
 
-    g_signal_emit(G_OBJECT (knot),
+    g_signal_emit(knot,
                   knot_signals[MOVED], 0,
                   p,
                   state);
diff --git a/src/knot.h b/src/knot.h
index 5693417fd..3df85014f 100644
--- a/src/knot.h
+++ b/src/knot.h
@@ -36,8 +36,7 @@ class SPKnotClass;
  * A knot is a draggable object, with callbacks to change something by
  * dragging it, visuably represented by a canvas item (mostly square).
  */
-struct SPKnot {
-    GObject object;
+struct SPKnot : GObject {
     SPDesktop *desktop;   /**< Desktop we are on. */
     SPCanvasItem *item;   /**< Our CanvasItem. */
     guint flags;
@@ -114,9 +113,7 @@ struct SPKnot {
 };
 
 /// The SPKnot vtable.
-struct SPKnotClass {
-    GObjectClass parent_class;
-
+struct SPKnotClass : GObjectClass {
     gint (* event) (SPKnot *knot, GdkEvent *event);
 
     /*
diff --git a/src/knotholder.cpp b/src/knotholder.cpp
index 081ef276c..ff6a81970 100644
--- a/src/knotholder.cpp
+++ b/src/knotholder.cpp
@@ -69,9 +69,8 @@ GType sp_knot_holder_get_type()
  * SPKnotHolder vtable initialization.
  */
 static void sp_knot_holder_class_init(SPKnotHolderClass *klass){
-    GObjectClass *object_class = (GObjectClass *) klass;
     parent_class = (GObjectClass*) g_type_class_peek_parent(klass);
-    object_class->dispose = sp_knot_holder_dispose;
+    klass->dispose = sp_knot_holder_dispose;
 }
 
 SPKnotHolder *sp_knot_holder_new(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler)
@@ -106,17 +105,17 @@ void sp_knot_holder_dispose(GObject *object) {
     g_object_unref(G_OBJECT(kh->item));
     while (kh->entity) {
         SPKnotHolderEntity *e = (SPKnotHolderEntity *) kh->entity->data;
-        g_signal_handler_disconnect(G_OBJECT (e->knot), e->_click_handler_id);
-        g_signal_handler_disconnect(G_OBJECT (e->knot), e->_ungrab_handler_id);
+        g_signal_handler_disconnect(e->knot, e->_click_handler_id);
+        g_signal_handler_disconnect(e->knot, e->_ungrab_handler_id);
         /* unref should call destroy */
-        g_object_unref(G_OBJECT(e->knot));
+        g_object_unref(e->knot);
         g_free(e);
         kh->entity = g_slist_remove(kh->entity, e);
     }
 }
 
 void sp_knot_holder_destroy(SPKnotHolder *kh) {
-    g_object_unref(G_OBJECT(kh));
+    g_object_unref(kh);
     }
 
 void sp_knot_holder_add(
@@ -170,9 +169,9 @@ void sp_knot_holder_add_full(
     NR::Point dp = e->knot_get(item) * sp_item_i2d_affine(item);
     sp_knot_set_position(e->knot, &dp, SP_KNOT_STATE_NORMAL);
 
-    e->handler_id = g_signal_connect(G_OBJECT(e->knot), "moved", G_CALLBACK(knot_moved_handler), knot_holder);
-    e->_click_handler_id = g_signal_connect(G_OBJECT(e->knot), "clicked", G_CALLBACK(knot_clicked_handler), knot_holder);
-    e->_ungrab_handler_id = g_signal_connect(G_OBJECT(e->knot), "ungrabbed", G_CALLBACK(knot_ungrabbed_handler), knot_holder);
+    e->handler_id = g_signal_connect(e->knot, "moved", G_CALLBACK(knot_moved_handler), knot_holder);
+    e->_click_handler_id = g_signal_connect(e->knot, "clicked", G_CALLBACK(knot_clicked_handler), knot_holder);
+    e->_ungrab_handler_id = g_signal_connect(e->knot, "ungrabbed", G_CALLBACK(knot_ungrabbed_handler), knot_holder);
 
 #ifdef KNOT_HOLDER_DEBUG
     g_signal_connect(ob, "destroy", sp_knot_holder_debug, "SPKnotHolder::knot");
@@ -190,7 +189,7 @@ static void knotholder_update_knots(SPKnotHolder *knot_holder, SPItem *item)
 
     for (GSList *el = knot_holder->entity; el; el = el->next) {
         SPKnotHolderEntity *e = (SPKnotHolderEntity *) el->data;
-        GObject *kob = G_OBJECT(e->knot);
+        GObject *kob = e->knot;
 
         NR::Point dp( e->knot_get(item) * i2d );
         g_signal_handler_block(kob, e->handler_id);
@@ -204,7 +203,7 @@ static void knot_clicked_handler(SPKnot *knot, guint state, gpointer data)
     SPKnotHolder *knot_holder = (SPKnotHolder *) data;
     SPItem *item  = SP_ITEM (knot_holder->item);
 
-    g_object_ref(G_OBJECT(knot_holder));
+    g_object_ref(knot_holder);
     for (GSList *el = knot_holder->entity; el; el = el->next) {
         SPKnotHolderEntity *e = (SPKnotHolderEntity *) el->data;
         if (e->knot == knot) {
@@ -220,7 +219,7 @@ static void knot_clicked_handler(SPKnot *knot, guint state, gpointer data)
     }
 
     knotholder_update_knots(knot_holder, item);
-    g_object_unref(G_OBJECT(knot_holder));
+    g_object_unref(knot_holder);
 
     // for drag, this is done by ungrabbed_handler, but for click we must do it here
     sp_document_done(SP_OBJECT_DOCUMENT(knot_holder->item));