From dced6ada2b53c601ed6a90849cd54a78b6485980 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 18 Jul 2020 11:55:45 +0200 Subject: Remove spurious semicolons --- src/Canvas.cpp | 4 ++-- src/box.c | 40 ++++++++++++++++++++-------------------- src/circle.c | 12 ++++++------ src/edge.c | 48 ++++++++++++++++++++++++------------------------ src/node.c | 50 +++++++++++++++++++++++++------------------------- src/port.c | 8 ++++---- src/text.c | 12 ++++++------ 7 files changed, 87 insertions(+), 87 deletions(-) (limited to 'src') diff --git a/src/Canvas.cpp b/src/Canvas.cpp index 6a18cdc..73e32bc 100644 --- a/src/Canvas.cpp +++ b/src/Canvas.cpp @@ -1866,8 +1866,8 @@ ganv_canvas_get_property(GObject* object, switch (prop_id) { GET_CASE(WIDTH, double, canvas->impl->width) - GET_CASE(HEIGHT, double, canvas->impl->height) - GET_CASE(LOCKED, boolean, canvas->impl->locked); + GET_CASE(HEIGHT, double, canvas->impl->height) + GET_CASE(LOCKED, boolean, canvas->impl->locked) case PROP_FOCUSED_ITEM: g_value_set_object(value, GANV_CANVAS(object)->impl->focused_item); break; diff --git a/src/box.c b/src/box.c index e7ecac8..3ecb99d 100644 --- a/src/box.c +++ b/src/box.c @@ -87,16 +87,16 @@ ganv_box_set_property(GObject* object, GanvBoxCoords* coords = &impl->coords; switch (prop_id) { - SET_CASE(X1, double, coords->x1); - SET_CASE(Y1, double, coords->y1); - SET_CASE(X2, double, coords->x2); - SET_CASE(Y2, double, coords->y2); - SET_CASE(RADIUS_TL, double, impl->radius_tl); - SET_CASE(RADIUS_TR, double, impl->radius_tr); - SET_CASE(RADIUS_BR, double, impl->radius_br); - SET_CASE(RADIUS_BL, double, impl->radius_bl); - SET_CASE(STACKED, boolean, coords->stacked); - SET_CASE(BEVELED, boolean, impl->beveled); + SET_CASE(X1, double, coords->x1) + SET_CASE(Y1, double, coords->y1) + SET_CASE(X2, double, coords->x2) + SET_CASE(Y2, double, coords->y2) + SET_CASE(RADIUS_TL, double, impl->radius_tl) + SET_CASE(RADIUS_TR, double, impl->radius_tr) + SET_CASE(RADIUS_BR, double, impl->radius_br) + SET_CASE(RADIUS_BL, double, impl->radius_bl) + SET_CASE(STACKED, boolean, coords->stacked) + SET_CASE(BEVELED, boolean, impl->beveled) default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -117,16 +117,16 @@ ganv_box_get_property(GObject* object, GanvBoxCoords* coords = &impl->coords; switch (prop_id) { - GET_CASE(X1, double, coords->x1); - GET_CASE(X2, double, coords->x2); - GET_CASE(Y1, double, coords->y1); - GET_CASE(Y2, double, coords->y2); - GET_CASE(RADIUS_TL, double, impl->radius_tl); - GET_CASE(RADIUS_TR, double, impl->radius_tr); - GET_CASE(RADIUS_BR, double, impl->radius_br); - GET_CASE(RADIUS_BL, double, impl->radius_bl); - GET_CASE(STACKED, boolean, impl->coords.stacked); - GET_CASE(BEVELED, boolean, impl->beveled); + GET_CASE(X1, double, coords->x1) + GET_CASE(X2, double, coords->x2) + GET_CASE(Y1, double, coords->y1) + GET_CASE(Y2, double, coords->y2) + GET_CASE(RADIUS_TL, double, impl->radius_tl) + GET_CASE(RADIUS_TR, double, impl->radius_tr) + GET_CASE(RADIUS_BR, double, impl->radius_br) + GET_CASE(RADIUS_BL, double, impl->radius_bl) + GET_CASE(STACKED, boolean, impl->coords.stacked) + GET_CASE(BEVELED, boolean, impl->beveled) default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; diff --git a/src/circle.c b/src/circle.c index a69c207..4784c06 100644 --- a/src/circle.c +++ b/src/circle.c @@ -72,9 +72,9 @@ ganv_circle_set_property(GObject* object, GanvCircle* circle = GANV_CIRCLE(object); switch (prop_id) { - SET_CASE(RADIUS, double, circle->impl->coords.radius); - SET_CASE(RADIUS_EMS, double, circle->impl->coords.radius_ems); - SET_CASE(FIT_LABEL, boolean, circle->impl->fit_label); + SET_CASE(RADIUS, double, circle->impl->coords.radius) + SET_CASE(RADIUS_EMS, double, circle->impl->coords.radius_ems) + SET_CASE(FIT_LABEL, boolean, circle->impl->fit_label) default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -97,9 +97,9 @@ ganv_circle_get_property(GObject* object, GanvCircle* circle = GANV_CIRCLE(object); switch (prop_id) { - GET_CASE(RADIUS, double, circle->impl->coords.radius); - GET_CASE(RADIUS_EMS, double, circle->impl->coords.radius_ems); - GET_CASE(FIT_LABEL, boolean, circle->impl->fit_label); + GET_CASE(RADIUS, double, circle->impl->coords.radius) + GET_CASE(RADIUS_EMS, double, circle->impl->coords.radius_ems) + GET_CASE(FIT_LABEL, boolean, circle->impl->fit_label) default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; diff --git a/src/edge.c b/src/edge.c index a22bc73..6ce6f6f 100644 --- a/src/edge.c +++ b/src/edge.c @@ -116,17 +116,17 @@ ganv_edge_set_property(GObject* object, GanvEdgeCoords* coords = &impl->coords; switch (prop_id) { - SET_CASE(WIDTH, double, coords->width); - SET_CASE(HANDLE_RADIUS, double, coords->handle_radius); - SET_CASE(DASH_LENGTH, double, impl->dash_length); - SET_CASE(DASH_OFFSET, double, impl->dash_offset); - SET_CASE(COLOR, uint, impl->color); - SET_CASE(CONSTRAINING, boolean, impl->coords.constraining); - SET_CASE(CURVED, boolean, impl->coords.curved); - SET_CASE(ARROWHEAD, boolean, impl->coords.arrowhead); - SET_CASE(SELECTED, boolean, impl->selected); - SET_CASE(HIGHLIGHTED, boolean, impl->highlighted); - SET_CASE(GHOST, boolean, impl->ghost); + SET_CASE(WIDTH, double, coords->width) + SET_CASE(HANDLE_RADIUS, double, coords->handle_radius) + SET_CASE(DASH_LENGTH, double, impl->dash_length) + SET_CASE(DASH_OFFSET, double, impl->dash_offset) + SET_CASE(COLOR, uint, impl->color) + SET_CASE(CONSTRAINING, boolean, impl->coords.constraining) + SET_CASE(CURVED, boolean, impl->coords.curved) + SET_CASE(ARROWHEAD, boolean, impl->coords.arrowhead) + SET_CASE(SELECTED, boolean, impl->selected) + SET_CASE(HIGHLIGHTED, boolean, impl->highlighted) + SET_CASE(GHOST, boolean, impl->ghost) case PROP_TAIL: { const gobject tmp = g_value_get_object(value); if (impl->tail != tmp) { @@ -162,19 +162,19 @@ ganv_edge_get_property(GObject* object, GanvEdgePrivate* impl = edge->impl; switch (prop_id) { - GET_CASE(TAIL, object, impl->tail); - GET_CASE(HEAD, object, impl->head); - GET_CASE(WIDTH, double, impl->coords.width); - SET_CASE(HANDLE_RADIUS, double, impl->coords.handle_radius); - GET_CASE(DASH_LENGTH, double, impl->dash_length); - GET_CASE(DASH_OFFSET, double, impl->dash_offset); - GET_CASE(COLOR, uint, impl->color); - GET_CASE(CONSTRAINING, boolean, impl->coords.constraining); - GET_CASE(CURVED, boolean, impl->coords.curved); - GET_CASE(ARROWHEAD, boolean, impl->coords.arrowhead); - GET_CASE(SELECTED, boolean, impl->selected); - GET_CASE(HIGHLIGHTED, boolean, impl->highlighted); - SET_CASE(GHOST, boolean, impl->ghost); + GET_CASE(TAIL, object, impl->tail) + GET_CASE(HEAD, object, impl->head) + GET_CASE(WIDTH, double, impl->coords.width) + SET_CASE(HANDLE_RADIUS, double, impl->coords.handle_radius) + GET_CASE(DASH_LENGTH, double, impl->dash_length) + GET_CASE(DASH_OFFSET, double, impl->dash_offset) + GET_CASE(COLOR, uint, impl->color) + GET_CASE(CONSTRAINING, boolean, impl->coords.constraining) + GET_CASE(CURVED, boolean, impl->coords.curved) + GET_CASE(ARROWHEAD, boolean, impl->coords.arrowhead) + GET_CASE(SELECTED, boolean, impl->selected) + GET_CASE(HIGHLIGHTED, boolean, impl->highlighted) + SET_CASE(GHOST, boolean, impl->ghost) default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; diff --git a/src/node.c b/src/node.c index 4955f36..6857dd2 100644 --- a/src/node.c +++ b/src/node.c @@ -154,17 +154,17 @@ ganv_node_set_property(GObject* object, GanvNodePrivate* impl = node->impl; switch (prop_id) { - SET_CASE(DASH_LENGTH, double, impl->dash_length); - SET_CASE(DASH_OFFSET, double, impl->dash_offset); - SET_CASE(BORDER_WIDTH, double, impl->border_width); - SET_CASE(FILL_COLOR, uint, impl->fill_color); - SET_CASE(BORDER_COLOR, uint, impl->border_color); - SET_CASE(CAN_TAIL, boolean, impl->can_tail); - SET_CASE(CAN_HEAD, boolean, impl->can_head); - SET_CASE(IS_SOURCE, boolean, impl->is_source); - SET_CASE(HIGHLIGHTED, boolean, impl->highlighted); - SET_CASE(DRAGGABLE, boolean, impl->draggable); - SET_CASE(GRABBED, boolean, impl->grabbed); + SET_CASE(DASH_LENGTH, double, impl->dash_length) + SET_CASE(DASH_OFFSET, double, impl->dash_offset) + SET_CASE(BORDER_WIDTH, double, impl->border_width) + SET_CASE(FILL_COLOR, uint, impl->fill_color) + SET_CASE(BORDER_COLOR, uint, impl->border_color) + SET_CASE(CAN_TAIL, boolean, impl->can_tail) + SET_CASE(CAN_HEAD, boolean, impl->can_head) + SET_CASE(IS_SOURCE, boolean, impl->is_source) + SET_CASE(HIGHLIGHTED, boolean, impl->highlighted) + SET_CASE(DRAGGABLE, boolean, impl->draggable) + SET_CASE(GRABBED, boolean, impl->grabbed) case PROP_PARTNER: impl->partner = (GanvNode*)g_value_get_object(value); break; @@ -216,20 +216,20 @@ ganv_node_get_property(GObject* object, GanvNodePrivate* impl = node->impl; switch (prop_id) { - GET_CASE(PARTNER, object, impl->partner); - GET_CASE(LABEL, string, impl->label ? impl->label->impl->text : NULL); - GET_CASE(DASH_LENGTH, double, impl->dash_length); - GET_CASE(DASH_OFFSET, double, impl->dash_offset); - GET_CASE(BORDER_WIDTH, double, impl->border_width); - GET_CASE(FILL_COLOR, uint, impl->fill_color); - GET_CASE(BORDER_COLOR, uint, impl->border_color); - GET_CASE(CAN_TAIL, boolean, impl->can_tail); - GET_CASE(CAN_HEAD, boolean, impl->can_head); - GET_CASE(IS_SOURCE, boolean, impl->is_source); - GET_CASE(SELECTED, boolean, impl->selected); - GET_CASE(HIGHLIGHTED, boolean, impl->highlighted); - GET_CASE(DRAGGABLE, boolean, impl->draggable); - GET_CASE(GRABBED, boolean, impl->grabbed); + GET_CASE(PARTNER, object, impl->partner) + GET_CASE(LABEL, string, impl->label ? impl->label->impl->text : NULL) + GET_CASE(DASH_LENGTH, double, impl->dash_length) + GET_CASE(DASH_OFFSET, double, impl->dash_offset) + GET_CASE(BORDER_WIDTH, double, impl->border_width) + GET_CASE(FILL_COLOR, uint, impl->fill_color) + GET_CASE(BORDER_COLOR, uint, impl->border_color) + GET_CASE(CAN_TAIL, boolean, impl->can_tail) + GET_CASE(CAN_HEAD, boolean, impl->can_head) + GET_CASE(IS_SOURCE, boolean, impl->is_source) + GET_CASE(SELECTED, boolean, impl->selected) + GET_CASE(HIGHLIGHTED, boolean, impl->highlighted) + GET_CASE(DRAGGABLE, boolean, impl->draggable) + GET_CASE(GRABBED, boolean, impl->grabbed) case PROP_CANVAS: g_value_set_object(value, ganv_item_get_canvas(GANV_ITEM(object))); break; diff --git a/src/port.c b/src/port.c index fa76f22..eca3e83 100644 --- a/src/port.c +++ b/src/port.c @@ -96,8 +96,8 @@ ganv_port_set_property(GObject* object, GanvPort* port = GANV_PORT(object); switch (prop_id) { - SET_CASE(IS_INPUT, boolean, port->impl->is_input); - SET_CASE(IS_CONTROLLABLE, boolean, port->impl->is_controllable); + SET_CASE(IS_INPUT, boolean, port->impl->is_input) + SET_CASE(IS_CONTROLLABLE, boolean, port->impl->is_controllable) default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -116,8 +116,8 @@ ganv_port_get_property(GObject* object, GanvPort* port = GANV_PORT(object); switch (prop_id) { - GET_CASE(IS_INPUT, boolean, port->impl->is_input); - GET_CASE(IS_CONTROLLABLE, boolean, port->impl->is_controllable); + GET_CASE(IS_INPUT, boolean, port->impl->is_input) + GET_CASE(IS_CONTROLLABLE, boolean, port->impl->is_controllable) default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; diff --git a/src/text.c b/src/text.c index bbac187..d7ab3e0 100644 --- a/src/text.c +++ b/src/text.c @@ -188,12 +188,12 @@ ganv_text_get_property(GObject* object, } switch (prop_id) { - GET_CASE(TEXT, string, impl->text); - GET_CASE(X, double, impl->coords.x); - GET_CASE(Y, double, impl->coords.y); - GET_CASE(WIDTH, double, impl->coords.width); - GET_CASE(HEIGHT, double, impl->coords.height); - GET_CASE(COLOR, uint, impl->color); + GET_CASE(TEXT, string, impl->text) + GET_CASE(X, double, impl->coords.x) + GET_CASE(Y, double, impl->coords.y) + GET_CASE(WIDTH, double, impl->coords.width) + GET_CASE(HEIGHT, double, impl->coords.height) + GET_CASE(COLOR, uint, impl->color) default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; -- cgit v1.2.1