summaryrefslogtreecommitdiffstats
path: root/src/arc-context.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-12-31 12:20:39 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2012-12-31 12:20:39 +0000
commit4cff9f1b30d110eba814d9adc0689fa073c79157 (patch)
treeb1de1bcf24183e7cc4829f0ceee993af338bb829 /src/arc-context.cpp
parentFix GObject pointer conversion warnings in event context (diff)
downloadinkscape-4cff9f1b30d110eba814d9adc0689fa073c79157.tar.gz
inkscape-4cff9f1b30d110eba814d9adc0689fa073c79157.zip
Replace C-style pointer casts in event contexts
(bzr r12001)
Diffstat (limited to 'src/arc-context.cpp')
-rw-r--r--src/arc-context.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/arc-context.cpp b/src/arc-context.cpp
index 9675df8e3..c35e0041f 100644
--- a/src/arc-context.cpp
+++ b/src/arc-context.cpp
@@ -86,10 +86,10 @@ GType sp_arc_context_get_type()
static void sp_arc_context_class_init(SPArcContextClass *klass)
{
- GObjectClass *object_class = (GObjectClass *) klass;
- SPEventContextClass *event_context_class = (SPEventContextClass *) klass;
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
+ SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass);
- parent_class = (SPEventContextClass*) g_type_class_peek_parent(klass);
+ parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass));
object_class->dispose = sp_arc_context_dispose;
@@ -127,8 +127,8 @@ static void sp_arc_context_finish(SPEventContext *ec)
sp_arc_finish(ac);
ac->sel_changed_connection.disconnect();
- if (((SPEventContextClass *) parent_class)->finish) {
- ((SPEventContextClass *) parent_class)->finish(ec);
+ if ((SP_EVENT_CONTEXT_CLASS(parent_class))->finish) {
+ (SP_EVENT_CONTEXT_CLASS(parent_class))->finish(ec);
}
}
@@ -174,8 +174,8 @@ static void sp_arc_context_setup(SPEventContext *ec)
SPArcContext *ac = SP_ARC_CONTEXT(ec);
Inkscape::Selection *selection = sp_desktop_selection(ec->desktop);
- if (((SPEventContextClass *) parent_class)->setup) {
- ((SPEventContextClass *) parent_class)->setup(ec);
+ if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) {
+ (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec);
}
ec->shape_editor = new ShapeEditor(ec->desktop);
@@ -219,8 +219,8 @@ static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *i
break;
}
- if (((SPEventContextClass *) parent_class)->item_handler) {
- ret = ((SPEventContextClass *) parent_class)->item_handler(event_context, item, event);
+ if ((SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler) {
+ ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler(event_context, item, event);
}
return ret;
@@ -401,8 +401,8 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent
}
if (!ret) {
- if (((SPEventContextClass *) parent_class)->root_handler) {
- ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event);
+ if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) {
+ ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event);
}
}