diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/live_effects/lpe-envelope.cpp | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/live_effects/lpe-envelope.cpp')
| -rw-r--r-- | src/live_effects/lpe-envelope.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp index 49f294498..4f5623fba 100644 --- a/src/live_effects/lpe-envelope.cpp +++ b/src/live_effects/lpe-envelope.cpp @@ -1,5 +1,3 @@ -#define INKSCAPE_LPE_ENVELOPE_CPP - /* * Copyright (C) Steren Giannini 2008 <steren.giannini@gmail.com> * @@ -52,7 +50,7 @@ LPEEnvelope::~LPEEnvelope() } void -LPEEnvelope::doBeforeEffect (SPLPEItem *lpeitem) +LPEEnvelope::doBeforeEffect (SPLPEItem const* lpeitem) { // get the item bounding box original_bbox(lpeitem); @@ -227,7 +225,7 @@ LPEEnvelope::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd } void -LPEEnvelope::resetDefaults(SPItem * item) +LPEEnvelope::resetDefaults(SPItem const* item) { Effect::resetDefaults(item); |