From 072916d0ef7dccd696b59381f50bcf776abccefb Mon Sep 17 00:00:00 2001 From: johanengelen Date: Tue, 8 Apr 2008 17:50:06 +0000 Subject: [PATCH] rename LPEPathAlongPath -> LPEBendPath --- src/live_effects/CMakeLists.txt | 4 ++-- src/live_effects/Makefile_insert | 4 ++-- src/live_effects/effect.cpp | 9 ++++----- src/live_effects/effect.h | 2 +- .../{lpe-pathalongpath.cpp => lpe-bendpath.cpp} | 16 ++++++++-------- .../{lpe-pathalongpath.h => lpe-bendpath.h} | 14 +++++++------- 6 files changed, 24 insertions(+), 25 deletions(-) rename src/live_effects/{lpe-pathalongpath.cpp => lpe-bendpath.cpp} (93%) rename src/live_effects/{lpe-pathalongpath.h => lpe-bendpath.h} (79%) diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt index 57957b88a..d437e40f9 100644 --- a/src/live_effects/CMakeLists.txt +++ b/src/live_effects/CMakeLists.txt @@ -13,8 +13,8 @@ lpeobject.cpp lpeobject.h lpeobject-reference.cpp lpeobject-reference.h -lpe-pathalongpath.cpp -lpe-pathalongpath.h +lpe-bendpath.cpp +lpe-bendpath.h lpe-skeletalstrokes.cpp lpe-skeletalstrokes.h lpe-skeleton.cpp diff --git a/src/live_effects/Makefile_insert b/src/live_effects/Makefile_insert index 4edc2c19f..7d2121c12 100644 --- a/src/live_effects/Makefile_insert +++ b/src/live_effects/Makefile_insert @@ -18,8 +18,8 @@ live_effects_liblive_effects_a_SOURCES = \ live_effects/n-art-bpath-2geom.h \ live_effects/lpe-skeletalstrokes.cpp \ live_effects/lpe-skeletalstrokes.h \ - live_effects/lpe-pathalongpath.cpp \ - live_effects/lpe-pathalongpath.h \ + live_effects/lpe-bendpath.cpp \ + live_effects/lpe-bendpath.h \ live_effects/lpe-sketch.cpp \ live_effects/lpe-sketch.h \ live_effects/lpe-knot.cpp \ diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 73f6e3dec..4b3ee5b0f 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -33,8 +33,7 @@ // include effects: #include "live_effects/lpe-skeletalstrokes.h" -#include "live_effects/lpe-pathalongpath.h" -//here!! +#include "live_effects/lpe-bendpath.h" #include "live_effects/lpe-sketch.h" #include "live_effects/lpe-vonkoch.h" #include "live_effects/lpe-knot.h" @@ -53,7 +52,7 @@ namespace LivePathEffect { const Util::EnumData LPETypeData[INVALID_LPE] = { // {constant defined in effect.h, N_("name of your effect"), "name of your effect in SVG"} - {PATH_ALONG_PATH, N_("Bend Path"), "bend_path"}, + {BEND_PATH, N_("Bend"), "bend_path"}, {SKELETAL_STROKES, N_("Pattern Along Path"), "skeletal"}, {SKETCH, N_("Sketch"), "sketch"}, {VONKOCH, N_("VonKoch"), "vonkoch"}, @@ -77,8 +76,8 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case SKELETAL_STROKES: neweffect = (Effect*) new LPESkeletalStrokes(lpeobj); break; - case PATH_ALONG_PATH: - neweffect = (Effect*) new LPEPathAlongPath(lpeobj); + case BEND_PATH: + neweffect = (Effect*) new LPEBendPath(lpeobj); break; //here!! case SKETCH: diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index 4293fd854..2f8014cc6 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -51,7 +51,7 @@ namespace NodePath { namespace LivePathEffect { enum EffectType { - PATH_ALONG_PATH = 0, + BEND_PATH = 0, SKELETAL_STROKES, SKETCH, VONKOCH, diff --git a/src/live_effects/lpe-pathalongpath.cpp b/src/live_effects/lpe-bendpath.cpp similarity index 93% rename from src/live_effects/lpe-pathalongpath.cpp rename to src/live_effects/lpe-bendpath.cpp index d17a0f84f..026c8fb5f 100644 --- a/src/live_effects/lpe-pathalongpath.cpp +++ b/src/live_effects/lpe-bendpath.cpp @@ -1,4 +1,4 @@ -#define INKSCAPE_LPE_PATHALONGPATH_CPP +#define INKSCAPE_LPE_BENDPATH_CPP /* * Copyright (C) Johan Engelen 2007 @@ -7,7 +7,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "live_effects/lpe-pathalongpath.h" +#include "live_effects/lpe-bendpath.h" #include "sp-shape.h" #include "sp-item.h" #include "sp-path.h" @@ -54,7 +54,7 @@ first) but I think we can first forget about them. namespace Inkscape { namespace LivePathEffect { -LPEPathAlongPath::LPEPathAlongPath(LivePathEffectObject *lpeobject) : +LPEBendPath::LPEBendPath(LivePathEffectObject *lpeobject) : Effect(lpeobject), bend_path(_("Bend path"), _("Path along which to bend the original path"), "bendpath", &wr, this, "M0,0 L1,0"), prop_scale(_("Width"), _("Width of the path"), "prop_scale", &wr, this, 1), @@ -72,13 +72,13 @@ LPEPathAlongPath::LPEPathAlongPath(LivePathEffectObject *lpeobject) : groupSpecialBehavior = false; } -LPEPathAlongPath::~LPEPathAlongPath() +LPEBendPath::~LPEBendPath() { } void -LPEPathAlongPath::doBeforeEffect (SPLPEItem *lpeitem) +LPEBendPath::doBeforeEffect (SPLPEItem *lpeitem) { if(SP_IS_GROUP(lpeitem)) { @@ -103,7 +103,7 @@ LPEPathAlongPath::doBeforeEffect (SPLPEItem *lpeitem) Geom::Piecewise > -LPEPathAlongPath::doEffect_pwd2 (Geom::Piecewise > & pwd2_in) +LPEBendPath::doEffect_pwd2 (Geom::Piecewise > & pwd2_in) { using namespace Geom; @@ -145,7 +145,7 @@ LPEPathAlongPath::doEffect_pwd2 (Geom::Piecewise > & pwd2 } void -LPEPathAlongPath::resetDefaults(SPItem * item) +LPEBendPath::resetDefaults(SPItem * item) { if (SP_IS_PATH(item) || SP_IS_GROUP(item)) { @@ -189,7 +189,7 @@ LPEPathAlongPath::resetDefaults(SPItem * item) } void -LPEPathAlongPath::transform_multiply(Geom::Matrix const& postmul, bool set) +LPEBendPath::transform_multiply(Geom::Matrix const& postmul, bool set) { // TODO: implement correct transformation instead of this default behavior Effect::transform_multiply(postmul, set); diff --git a/src/live_effects/lpe-pathalongpath.h b/src/live_effects/lpe-bendpath.h similarity index 79% rename from src/live_effects/lpe-pathalongpath.h rename to src/live_effects/lpe-bendpath.h index f1578d5bf..53e580c3a 100644 --- a/src/live_effects/lpe-pathalongpath.h +++ b/src/live_effects/lpe-bendpath.h @@ -1,5 +1,5 @@ -#ifndef INKSCAPE_LPE_PATHALONGPATH_H -#define INKSCAPE_LPE_PATHALONGPATH_H +#ifndef INKSCAPE_LPE_BENDPATH_H +#define INKSCAPE_LPE_BENDPATH_H /* * Inkscape::LPEPathAlongPath @@ -28,10 +28,10 @@ namespace Inkscape { namespace LivePathEffect { //for Bend path on group : we need information concerning the group Bounding box -class LPEPathAlongPath : public Effect, LivePathEffect_group_bbox { +class LPEBendPath : public Effect, LivePathEffect_group_bbox { public: - LPEPathAlongPath(LivePathEffectObject *lpeobject); - virtual ~LPEPathAlongPath(); + LPEBendPath(LivePathEffectObject *lpeobject); + virtual ~LPEBendPath(); virtual void doBeforeEffect (SPLPEItem *lpeitem); @@ -51,8 +51,8 @@ private: void on_pattern_pasted(); - LPEPathAlongPath(const LPEPathAlongPath&); - LPEPathAlongPath& operator=(const LPEPathAlongPath&); + LPEBendPath(const LPEBendPath&); + LPEBendPath& operator=(const LPEBendPath&); }; }; //namespace LivePathEffect -- 2.30.2