summaryrefslogtreecommitdiffstats
path: root/src/sp-spiral.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-09-26 13:56:34 +0000
committerMarkus Engel <markus.engel@tum.de>2013-09-26 13:56:34 +0000
commit2eb38df468e306e32b9961fcc102431e413ebb42 (patch)
tree71bef633bfc255edfa17887a9bbcec507889c68d /src/sp-spiral.cpp
parentSimplified some in-code circle creation. (diff)
parentC++ify calling a few SPLPEItem functions, much more work than expected... slo... (diff)
downloadinkscape-2eb38df468e306e32b9961fcc102431e413ebb42.tar.gz
inkscape-2eb38df468e306e32b9961fcc102431e413ebb42.zip
Merged from trunk (r12593).
(bzr r11608.1.132)
Diffstat (limited to 'src/sp-spiral.cpp')
-rw-r--r--src/sp-spiral.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sp-spiral.cpp b/src/sp-spiral.cpp
index 6a22059a8..b9d1d11da 100644
--- a/src/sp-spiral.cpp
+++ b/src/sp-spiral.cpp
@@ -323,7 +323,7 @@ void SPSpiral::fitAndDraw(SPCurve* c, double dstep, Geom::Point darray[], Geom::
}
void SPSpiral::set_shape() {
- if (sp_lpe_item_has_broken_path_effect(this)) {
+ if (hasBrokenPathEffect()) {
g_warning ("The spiral shape has unknown LPE on it! Convert to path to make it editable preserving the appearance; editing it as spiral will remove the bad LPE");
if (this->getRepr()->attribute("d")) {
@@ -377,10 +377,10 @@ void SPSpiral::set_shape() {
/* Reset the shape'scurve to the "original_curve"
* This is very important for LPEs to work properly! (the bbox might be recalculated depending on the curve in shape)*/
- this->setCurveInsync( c, TRUE);
- this->setCurveBeforeLPE( c );
+ setCurveInsync( c, TRUE);
+ setCurveBeforeLPE( c );
- if (sp_lpe_item_has_path_effect(this) && sp_lpe_item_path_effects_enabled(this)) {
+ if (hasPathEffect() && sp_lpe_item_path_effects_enabled(this)) {
SPCurve *c_lpe = c->copy();
bool success = sp_lpe_item_perform_path_effect(this, c_lpe);