diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2009-02-19 22:37:11 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2009-02-19 22:37:11 +0000 |
| commit | 50fcbbef80d397e283fec3b2fff36815b49a1213 (patch) | |
| tree | 6f5ec0378f54450e37799c1a9981231d78ae4881 | |
| parent | Spell checker and filter translation (diff) | |
| download | inkscape-50fcbbef80d397e283fec3b2fff36815b49a1213.tar.gz inkscape-50fcbbef80d397e283fec3b2fff36815b49a1213.zip | |
Remove superfluous FreehandShape LPE
(bzr r7330)
| -rw-r--r-- | src/draw-context.cpp | 4 | ||||
| -rw-r--r-- | src/live_effects/effect.cpp | 4 | ||||
| -rw-r--r-- | src/live_effects/lpe-patternalongpath.cpp | 4 | ||||
| -rw-r--r-- | src/live_effects/lpe-patternalongpath.h | 6 |
4 files changed, 2 insertions, 16 deletions
diff --git a/src/draw-context.cpp b/src/draw-context.cpp index 5e3ff82dc..a8d6187f6 100644 --- a/src/draw-context.cpp +++ b/src/draw-context.cpp @@ -278,7 +278,7 @@ spdc_paste_curve_as_freehand_shape(const SPCurve *c, SPDrawContext *dc, SPItem * // TODO: Don't paste path if nothing is on the clipboard - Effect::createAndApply(Inkscape::LivePathEffect::FREEHAND_SHAPE, dc->desktop->doc(), item); + Effect::createAndApply(PATTERN_ALONG_PATH, dc->desktop->doc(), item); Effect* lpe = sp_lpe_item_get_current_lpe(SP_LPE_ITEM(item)); gchar *svgd = sp_svg_write_path(c->get_pathvector()); static_cast<LPEPatternAlongPath*>(lpe)->pattern.paste_param_path(svgd); @@ -391,7 +391,7 @@ spdc_check_for_and_apply_waiting_LPE(SPDrawContext *dc, SPItem *item) if (SP_IS_LPETOOL_CONTEXT(dc)) { // since a geometric LPE was applied, we switch back to "inactive" mode - lpetool_context_switch_mode(SP_LPETOOL_CONTEXT(dc), Inkscape::LivePathEffect::INVALID_LPE); + lpetool_context_switch_mode(SP_LPETOOL_CONTEXT(dc), INVALID_LPE); } } if (SP_IS_PEN_CONTEXT(dc)) { diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index e4a5b9b43..9a1c33eeb 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -112,7 +112,6 @@ const Util::EnumData<EffectType> LPETypeData[] = { {PATTERN_ALONG_PATH, N_("Pattern Along Path"), "skeletal"}, // for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG {CURVE_STITCH, N_("Stitch Sub-Paths"), "curvestitching"}, /* 0.47 */ - {FREEHAND_SHAPE, N_("Freehand Shape"), "freehand_shape"}, // this is actually a special type of PatternAlongPath, used to paste shapes in pen/pencil tool {KNOT, N_("Knot"), "knot"}, {CONSTRUCT_GRID, N_("Construct grid"), "construct_grid"}, {SPIRO, N_("Spiro spline"), "spiro"}, @@ -140,9 +139,6 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case PATTERN_ALONG_PATH: neweffect = static_cast<Effect*> ( new LPEPatternAlongPath(lpeobj) ); break; - case FREEHAND_SHAPE: - neweffect = static_cast<Effect*> ( new LPEFreehandShape(lpeobj) ); - break; case BEND_PATH: neweffect = static_cast<Effect*> ( new LPEBendPath(lpeobj) ); break; diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp index 52bc42cb0..6ba680c15 100644 --- a/src/live_effects/lpe-patternalongpath.cpp +++ b/src/live_effects/lpe-patternalongpath.cpp @@ -214,10 +214,6 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con } } -LPEFreehandShape::LPEFreehandShape(LivePathEffectObject *lpeobject) : LPEPatternAlongPath(lpeobject) -{ -} - } // namespace LivePathEffect } /* namespace Inkscape */ diff --git a/src/live_effects/lpe-patternalongpath.h b/src/live_effects/lpe-patternalongpath.h index f35f7a5cb..ea89097b3 100644 --- a/src/live_effects/lpe-patternalongpath.h +++ b/src/live_effects/lpe-patternalongpath.h @@ -50,12 +50,6 @@ private: LPEPatternAlongPath& operator=(const LPEPatternAlongPath&); }; -class LPEFreehandShape : public LPEPatternAlongPath { -public: - LPEFreehandShape(LivePathEffectObject *lpeobject); - virtual ~LPEFreehandShape() {} -}; - }; //namespace LivePathEffect }; //namespace Inkscape |