summaryrefslogtreecommitdiffstats
path: root/src/object-edit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/object-edit.cpp')
-rw-r--r--src/object-edit.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index a683500c0..2b03d7654 100644
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
@@ -80,8 +80,8 @@ sp_item_knot_holder(SPItem *item, SPDesktop *desktop)
knotholder = new OffsetKnotHolder(desktop, item, NULL);
} else if (SP_IS_FLOWTEXT(item) && SP_FLOWTEXT(item)->has_internal_frame()) {
knotholder = new FlowtextKnotHolder(desktop, SP_FLOWTEXT(item)->get_frame(NULL), NULL);
- } else if ((SP_OBJECT(item)->style->fill.isPaintserver())
- && SP_IS_PATTERN(SP_STYLE_FILL_SERVER(SP_OBJECT(item)->style))) {
+ } else if ((item->style->fill.isPaintserver())
+ && SP_IS_PATTERN(item->style->getFillPaintServer())) {
knotholder = new KnotHolder(desktop, item, NULL);
knotholder->add_pattern_knotholder();
}
@@ -164,11 +164,11 @@ RectKnotHolderEntityRX::knot_click(guint state)
if (state & GDK_SHIFT_MASK) {
/* remove rounding from rectangle */
- SP_OBJECT_REPR(rect)->setAttribute("rx", NULL);
- SP_OBJECT_REPR(rect)->setAttribute("ry", NULL);
+ rect->getRepr()->setAttribute("rx", NULL);
+ rect->getRepr()->setAttribute("ry", NULL);
} else if (state & GDK_CONTROL_MASK) {
/* Ctrl-click sets the vertical rounding to be the same as the horizontal */
- SP_OBJECT_REPR(rect)->setAttribute("ry", SP_OBJECT_REPR(rect)->attribute("rx"));
+ rect->getRepr()->setAttribute("ry", rect->getRepr()->attribute("rx"));
}
}
@@ -222,11 +222,11 @@ RectKnotHolderEntityRY::knot_click(guint state)
if (state & GDK_SHIFT_MASK) {
/* remove rounding */
- SP_OBJECT_REPR(rect)->setAttribute("rx", NULL);
- SP_OBJECT_REPR(rect)->setAttribute("ry", NULL);
+ rect->getRepr()->setAttribute("rx", NULL);
+ rect->getRepr()->setAttribute("ry", NULL);
} else if (state & GDK_CONTROL_MASK) {
/* Ctrl-click sets the vertical rounding to be the same as the horizontal */
- SP_OBJECT_REPR(rect)->setAttribute("rx", SP_OBJECT_REPR(rect)->attribute("ry"));
+ rect->getRepr()->setAttribute("rx", rect->getRepr()->attribute("ry"));
}
}