A simple layout document as to what, why and how is cppification.

[inkscape.git] / src / knot.cpp

diff --git a/src/knot.cpp b/src/knot.cpp
index cc26653e5f7d996af169d7556412be1a80090c11..95a9ec1482b675614228b1c0bc2291aa0a597ae6 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -116,7 +116,7 @@ static void sp_knot_class_init(SPKnotClass *klass)
                                          G_SIGNAL_RUN_FIRST,
                                          G_STRUCT_OFFSET(SPKnotClass, clicked),
                                          NULL, NULL,
-                                         sp_marshal_NONE__UINT,
+                                         g_cclosure_marshal_VOID__UINT,
                                          G_TYPE_NONE, 1,
                                          G_TYPE_UINT);
 
@@ -125,7 +125,7 @@ static void sp_knot_class_init(SPKnotClass *klass)
                                                G_SIGNAL_RUN_FIRST,
                                                G_STRUCT_OFFSET(SPKnotClass, doubleclicked),
                                                NULL, NULL,
-                                               sp_marshal_NONE__UINT,
+                                               g_cclosure_marshal_VOID__UINT,
                                                G_TYPE_NONE, 1,
                                                G_TYPE_UINT);
 
@@ -134,7 +134,7 @@ static void sp_knot_class_init(SPKnotClass *klass)
                                           G_SIGNAL_RUN_FIRST,
                                           G_STRUCT_OFFSET(SPKnotClass, grabbed),
                                           NULL, NULL,
-                                          sp_marshal_NONE__UINT,
+                                          g_cclosure_marshal_VOID__UINT,
                                           G_TYPE_NONE, 1,
                                           G_TYPE_UINT);
 
@@ -143,7 +143,7 @@ static void sp_knot_class_init(SPKnotClass *klass)
                                            G_SIGNAL_RUN_FIRST,
                                            G_STRUCT_OFFSET(SPKnotClass, ungrabbed),
                                            NULL, NULL,
-                                           sp_marshal_NONE__UINT,
+                                           g_cclosure_marshal_VOID__UINT,
                                            G_TYPE_NONE, 1,
                                            G_TYPE_UINT);
 
@@ -384,7 +384,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
                                      SP_KNOT_DRAGGING,
                                      TRUE);
                 }
-                sp_event_context_snap_delay_handler(knot->desktop->event_context, NULL, knot, (GdkEventMotion *)event, DelayedSnapEvent::KNOT_HANDLER);
+                sp_event_context_snap_delay_handler(knot->desktop->event_context, NULL, (gpointer) knot, (GdkEventMotion *)event, DelayedSnapEvent::KNOT_HANDLER);
                 sp_knot_handler_request_position(event, knot);
                 moved = TRUE;
             }
@@ -427,7 +427,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
                                 g_signal_emit(knot,
                                               knot_signals[UNGRABBED], 0,
                                               event->button.state);
-                                sp_document_undo(sp_desktop_document(knot->desktop));
+                                SPDocumentUndo::undo(sp_desktop_document(knot->desktop));
                                 knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled."));
                                 transform_escaped = true;
                                 consumed = TRUE;