diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2007-11-04 01:01:15 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2007-11-04 01:01:15 +0000 |
| commit | e36b55fc22df7631393784974077c5f7a1b00e67 (patch) | |
| tree | 23d9394249fa9b6e95817a473b422dc3126cb53c /src/live_effects | |
| parent | Fix bug [ 1811188 ] save as PS/EPS crashes (diff) | |
| download | inkscape-e36b55fc22df7631393784974077c5f7a1b00e67.tar.gz inkscape-e36b55fc22df7631393784974077c5f7a1b00e67.zip | |
Add virtual to a lot of the destructors. Note: perhaps it will have to be reverted for some files to keep them C-compatible.
(bzr r4024)
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/lpe-curvestitch.h | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-gears.h | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-pathalongpath.h | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-skeletalstrokes.h | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-skeleton.h | 10 | ||||
| -rw-r--r-- | src/live_effects/lpe-slant.h | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-test-doEffect-stack.h | 10 | ||||
| -rw-r--r-- | src/live_effects/lpeobject-reference.h | 2 | ||||
| -rw-r--r-- | src/live_effects/parameter/enum.h | 2 | ||||
| -rw-r--r-- | src/live_effects/parameter/path.h | 2 | ||||
| -rw-r--r-- | src/live_effects/parameter/point.h | 2 |
11 files changed, 19 insertions, 19 deletions
diff --git a/src/live_effects/lpe-curvestitch.h b/src/live_effects/lpe-curvestitch.h index fd41f6849..ce7ad583c 100644 --- a/src/live_effects/lpe-curvestitch.h +++ b/src/live_effects/lpe-curvestitch.h @@ -26,7 +26,7 @@ namespace LivePathEffect { class LPECurveStitch : public Effect { public: LPECurveStitch(LivePathEffectObject *lpeobject); - ~LPECurveStitch(); + virtual ~LPECurveStitch(); std::vector<Geom::Path> doEffect (std::vector<Geom::Path> & path_in); diff --git a/src/live_effects/lpe-gears.h b/src/live_effects/lpe-gears.h index 4109c2ed0..01d74943a 100644 --- a/src/live_effects/lpe-gears.h +++ b/src/live_effects/lpe-gears.h @@ -20,7 +20,7 @@ namespace LivePathEffect { class LPEGears : public Effect { public: LPEGears(LivePathEffectObject *lpeobject); - ~LPEGears(); + virtual ~LPEGears(); std::vector<Geom::Path> doEffect (std::vector<Geom::Path> & path_in); diff --git a/src/live_effects/lpe-pathalongpath.h b/src/live_effects/lpe-pathalongpath.h index 8cc2251a1..59ae8b4d2 100644 --- a/src/live_effects/lpe-pathalongpath.h +++ b/src/live_effects/lpe-pathalongpath.h @@ -28,7 +28,7 @@ enum PAPCopyType { class LPEPathAlongPath : public Effect {
public:
LPEPathAlongPath(LivePathEffectObject *lpeobject);
- ~LPEPathAlongPath();
+ virtual ~LPEPathAlongPath();
Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_in);
diff --git a/src/live_effects/lpe-skeletalstrokes.h b/src/live_effects/lpe-skeletalstrokes.h index 64127ff0e..d18bb7cb5 100644 --- a/src/live_effects/lpe-skeletalstrokes.h +++ b/src/live_effects/lpe-skeletalstrokes.h @@ -28,7 +28,7 @@ enum SkelCopyType { class LPESkeletalStrokes : public Effect { public: LPESkeletalStrokes(LivePathEffectObject *lpeobject); - ~LPESkeletalStrokes(); + virtual ~LPESkeletalStrokes(); Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_in); diff --git a/src/live_effects/lpe-skeleton.h b/src/live_effects/lpe-skeleton.h index 816b8b707..ed63d6388 100644 --- a/src/live_effects/lpe-skeleton.h +++ b/src/live_effects/lpe-skeleton.h @@ -24,13 +24,13 @@ namespace LivePathEffect { class LPESkeleton : public Effect { public: LPESkeleton(LivePathEffectObject *lpeobject); - ~LPESkeleton(); + virtual ~LPESkeleton(); // Choose to implement one of the doEffect functions. You can delete or comment out the others. -// void doEffect (SPCurve * curve); -// NArtBpath * doEffect (NArtBpath * path_in); -// std::vector<Geom::Path> doEffect (std::vector<Geom::Path> & path_in); - Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_in); +// virtual void doEffect (SPCurve * curve); +// virtual NArtBpath * doEffect (NArtBpath * path_in); +// virtual std::vector<Geom::Path> doEffect (std::vector<Geom::Path> & path_in); + virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_in); private: // add the parameters for your effect here: diff --git a/src/live_effects/lpe-slant.h b/src/live_effects/lpe-slant.h index c92a37f80..ca4a404e5 100644 --- a/src/live_effects/lpe-slant.h +++ b/src/live_effects/lpe-slant.h @@ -22,7 +22,7 @@ namespace LivePathEffect { class LPESlant : public Effect { public: LPESlant(LivePathEffectObject *lpeobject); - ~LPESlant(); + virtual ~LPESlant(); void doEffect(SPCurve * curve); diff --git a/src/live_effects/lpe-test-doEffect-stack.h b/src/live_effects/lpe-test-doEffect-stack.h index 0635bc06c..dd0cf76cc 100644 --- a/src/live_effects/lpe-test-doEffect-stack.h +++ b/src/live_effects/lpe-test-doEffect-stack.h @@ -22,12 +22,12 @@ namespace LivePathEffect { class LPEdoEffectStackTest : public Effect { public: LPEdoEffectStackTest(LivePathEffectObject *lpeobject); - ~LPEdoEffectStackTest(); + virtual ~LPEdoEffectStackTest(); - void doEffect (SPCurve * curve); - NArtBpath * doEffect (NArtBpath * path_in); - std::vector<Geom::Path> doEffect (std::vector<Geom::Path> & path_in); - Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_in); + virtual void doEffect (SPCurve * curve); + virtual NArtBpath * doEffect (NArtBpath * path_in); + virtual std::vector<Geom::Path> doEffect (std::vector<Geom::Path> & path_in); + virtual Geom::Piecewise<Geom::D2<Geom::SBasis> > doEffect (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_in); private: ScalarParam step; diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h index ba652ff3e..6a2f75327 100644 --- a/src/live_effects/lpeobject-reference.h +++ b/src/live_effects/lpeobject-reference.h @@ -28,7 +28,7 @@ namespace LivePathEffect { class LPEObjectReference : public Inkscape::URIReference { public: LPEObjectReference(SPObject *owner); - ~LPEObjectReference(); + virtual ~LPEObjectReference(); SPObject *owner; diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h index 4ee28f895..1c5384f57 100644 --- a/src/live_effects/parameter/enum.h +++ b/src/live_effects/parameter/enum.h @@ -38,7 +38,7 @@ public: defvalue = default_value; value = defvalue; }; - ~EnumParam() { + virtual ~EnumParam() { if (regenum) delete regenum; }; diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h index 2f8c766bd..fc5a16a5b 100644 --- a/src/live_effects/parameter/path.h +++ b/src/live_effects/parameter/path.h @@ -35,7 +35,7 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, const gchar * default_value = "M0,0 L1,1"); - ~PathParam(); + virtual ~PathParam(); Gtk::Widget * param_getWidget(); diff --git a/src/live_effects/parameter/point.h b/src/live_effects/parameter/point.h index c3ed876f7..25cdedb9d 100644 --- a/src/live_effects/parameter/point.h +++ b/src/live_effects/parameter/point.h @@ -33,7 +33,7 @@ public: Inkscape::UI::Widget::Registry* wr, Effect* effect, Geom::Point default_value = Geom::Point(0,0)); - ~PointParam(); + virtual ~PointParam(); Gtk::Widget * param_getWidget(); |
