From 61a2c985ffaddfaac2bf15af97fe79c0d02ce4d0 Mon Sep 17 00:00:00 2001 From: johanengelen Date: Thu, 28 Feb 2008 10:38:32 +0000 Subject: [PATCH] Remove unnecessary dependencies for some of the lpe parameters. --- src/live_effects/lpe-curvestitch.cpp | 1 + src/live_effects/lpeobject.h | 3 ++- src/live_effects/parameter/bool.cpp | 4 +--- src/live_effects/parameter/bool.h | 3 --- src/live_effects/parameter/enum.h | 1 - src/live_effects/parameter/path.h | 1 - src/live_effects/parameter/point.cpp | 2 +- src/live_effects/parameter/point.h | 2 -- src/live_effects/parameter/random.h | 2 -- 9 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp index 8dbd9feb1..e72f1aac1 100644 --- a/src/live_effects/lpe-curvestitch.cpp +++ b/src/live_effects/lpe-curvestitch.cpp @@ -19,6 +19,7 @@ #include "sp-item.h" #include "sp-path.h" #include "live_effects/n-art-bpath-2geom.h" +#include "xml/repr.h" #include <2geom/path.h> #include <2geom/piecewise.h> diff --git a/src/live_effects/lpeobject.h b/src/live_effects/lpeobject.h index bc13e596a..ede645eea 100644 --- a/src/live_effects/lpeobject.h +++ b/src/live_effects/lpeobject.h @@ -16,7 +16,8 @@ #define LIVEPATHEFFECT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), TYPE_LIVEPATHEFFECT, LivePathEffectObject)) #define IS_LIVEPATHEFFECT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), TYPE_LIVEPATHEFFECT)) -struct LivePathEffectObject : public SPObject { +class LivePathEffectObject : public SPObject { +public: Inkscape::LivePathEffect::EffectType effecttype; Inkscape::LivePathEffect::Effect *lpe; diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp index 336f42425..3a99622d3 100644 --- a/src/live_effects/parameter/bool.cpp +++ b/src/live_effects/parameter/bool.cpp @@ -12,13 +12,11 @@ #include "svg/stringstream.h" #include #include "widgets/icon.h" - +#include "widget/registered-widget.h" #include "inkscape.h" #include "verbs.h" #include "helper-fns.h" -#define noLPEBOOLPARAM_DEBUG - namespace Inkscape { namespace LivePathEffect { diff --git a/src/live_effects/parameter/bool.h b/src/live_effects/parameter/bool.h index 55197721d..400f8cc47 100644 --- a/src/live_effects/parameter/bool.h +++ b/src/live_effects/parameter/bool.h @@ -11,9 +11,6 @@ #include -#include "ui/widget/registry.h" -#include "ui/widget/registered-widget.h" - #include "live_effects/parameter/parameter.h" namespace Inkscape { diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h index a0174f858..daba43784 100644 --- a/src/live_effects/parameter/enum.h +++ b/src/live_effects/parameter/enum.h @@ -11,7 +11,6 @@ #include -#include "ui/widget/registry.h" #include "ui/widget/registered-enums.h" #include diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h index 0f125cbb5..0bb65b77c 100644 --- a/src/live_effects/parameter/path.h +++ b/src/live_effects/parameter/path.h @@ -12,7 +12,6 @@ #include #include <2geom/path.h> -#include "ui/widget/registry.h" #include #include "live_effects/parameter/parameter.h" diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp index ca188da80..c2a09d1f1 100644 --- a/src/live_effects/parameter/point.cpp +++ b/src/live_effects/parameter/point.cpp @@ -13,7 +13,7 @@ #include #include "ui/widget/point.h" #include "widgets/icon.h" - +#include "widget/registered-widget.h" #include "knot.h" #include "inkscape.h" #include "verbs.h" diff --git a/src/live_effects/parameter/point.h b/src/live_effects/parameter/point.h index 1137a8f1a..a6866f7df 100644 --- a/src/live_effects/parameter/point.h +++ b/src/live_effects/parameter/point.h @@ -12,8 +12,6 @@ #include #include <2geom/point.h> -#include "ui/widget/registry.h" -#include "ui/widget/registered-widget.h" #include #include "live_effects/parameter/parameter.h" diff --git a/src/live_effects/parameter/random.h b/src/live_effects/parameter/random.h index 6583ca556..c59a9d00e 100644 --- a/src/live_effects/parameter/random.h +++ b/src/live_effects/parameter/random.h @@ -14,8 +14,6 @@ #include <2geom/point.h> #include <2geom/path.h> -#include "ui/widget/registry.h" - namespace Inkscape { namespace LivePathEffect { -- 2.39.5