summaryrefslogtreecommitdiffstats
path: root/src/live_effects/lpeobject.h
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-04-07 16:28:22 +0000
committerMarkus Engel <markus.engel@tum.de>2013-04-07 16:28:22 +0000
commit27e2102f96a5554bcd5310ec11435d155773b279 (patch)
treee5f982c25aed199f9027a6277b17302f97b4c80c /src/live_effects/lpeobject.h
parentMerged FilterPrimitive and subclasses. (diff)
downloadinkscape-27e2102f96a5554bcd5310ec11435d155773b279.tar.gz
inkscape-27e2102f96a5554bcd5310ec11435d155773b279.zip
Merge Object and subclasses. Merging of SP- and C-classes complete.
(bzr r11608.1.86)
Diffstat (limited to 'src/live_effects/lpeobject.h')
-rw-r--r--src/live_effects/lpeobject.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/live_effects/lpeobject.h b/src/live_effects/lpeobject.h
index d5aaa09bf..28ed93f1a 100644
--- a/src/live_effects/lpeobject.h
+++ b/src/live_effects/lpeobject.h
@@ -25,7 +25,7 @@ namespace Inkscape {
#define LIVEPATHEFFECT(obj) ((LivePathEffectObject*)obj)
#define IS_LIVEPATHEFFECT(obj) (dynamic_cast<const LivePathEffectObject*>((SPObject*)obj))
-class LivePathEffectObject : public SPObject, public CObject {
+class LivePathEffectObject : public SPObject {
public:
LivePathEffectObject();
virtual ~LivePathEffectObject();