diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2012-04-07 14:24:51 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2012-04-07 14:24:51 +0000 |
| commit | a239540f0ae3f19e8af2d85acdf12ad40563087a (patch) | |
| tree | fa08868e3cdd2a23c5315f09e7daac4d991b414f /src | |
| parent | cleanup knotholder code for LPEs (diff) | |
| download | inkscape-a239540f0ae3f19e8af2d85acdf12ad40563087a.tar.gz inkscape-a239540f0ae3f19e8af2d85acdf12ad40563087a.zip | |
remove no longer needed knotholderentity complication
(bzr r11171)
Diffstat (limited to 'src')
| -rw-r--r-- | src/knot-holder-entity.h | 8 | ||||
| -rw-r--r-- | src/knotholder.cpp | 8 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/knot-holder-entity.h b/src/knot-holder-entity.h index f1513779a..ec936d464 100644 --- a/src/knot-holder-entity.h +++ b/src/knot-holder-entity.h @@ -48,12 +48,6 @@ public: SPKnotModeType mode = SP_KNOT_MODE_XOR, guint32 color = 0xffffff00); - /* derived classes used for LPE knotholder handles use this to indicate that they - must not be deleted when a knotholder is destroyed */ - // TODO: it would be nice to ditch this but then we need to dynamically create instances of different - // KnotHolderEntity classes in Effect::addKnotHolderEntities. How to do this??? - virtual bool isDeletable() { return true; } - /* the get/set/click handlers are virtual functions; each handler class for a knot should be derived from KnotHolderEntity and override these functions */ virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) = 0; @@ -93,8 +87,6 @@ public: LPEKnotHolderEntity(Inkscape::LivePathEffect::Effect *effect) : _effect(effect) {}; protected: Inkscape::LivePathEffect::Effect *_effect; -private: - virtual bool isDeletable() { return false; } }; /* pattern manipulation */ diff --git a/src/knotholder.cpp b/src/knotholder.cpp index 91013ad2e..513c02834 100644 --- a/src/knotholder.cpp +++ b/src/knotholder.cpp @@ -68,13 +68,7 @@ KnotHolder::~KnotHolder() { g_object_unref(G_OBJECT(item)); for(std::list<KnotHolderEntity *>::iterator i = entity.begin(); i != entity.end(); ++i) { KnotHolderEntity* e = (*i); - if (e->isDeletable()) { - delete (*i); - } else { - // we must not delete the entity (since it's attached to an LPE parameter), - // but the handle should be destroyed - g_object_unref(e->knot); - } + delete (*i); (*i) = NULL; } entity.clear(); // is this necessary? |