Remove unnecessary dependencies for some of the lpe parameters.

diff --git a/src/live_effects/lpe-curvestitch.cpp b/src/live_effects/lpe-curvestitch.cpp
index 8dbd9feb153335edcc6e8651c1da8e334b8da671..e72f1aac15026d7b57f63ca547c997f329b7849a 100644 (file)
--- 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 bc13e596adbb50fa6d12bf47c3a2760a087e4503..ede645eea5ffaba295ebee08f39e99cd0ff3e35d 100644 (file)
--- 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 336f42425b020b43869fd4852221cecfdebe0d5c..3a99622d32c744b6f0b6fe000c39aa090d6edcd7 100644 (file)
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -12,13 +12,11 @@
 #include "svg/stringstream.h"
 #include <gtkmm.h>
 #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 55197721dd299468cd080b94eb80fe450963c89e..400f8cc479628d592d2d3bcc527f3f5d768b85f7 100644 (file)
--- a/src/live_effects/parameter/bool.h
+++ b/src/live_effects/parameter/bool.h
@@ -11,9 +11,6 @@
 
 #include <glib/gtypes.h>
 
-#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 a0174f858cb7207f7ffeb1f4b576832689553b1b..daba43784401d85e36cd0dc59feb57156a22b842 100644 (file)
--- a/src/live_effects/parameter/enum.h
+++ b/src/live_effects/parameter/enum.h
@@ -11,7 +11,6 @@
 
 #include <glib/gtypes.h>
 
-#include "ui/widget/registry.h"
 #include "ui/widget/registered-enums.h"
 #include <gtkmm/tooltips.h>
 

diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h
index 0f125cbb511e3186f363c8dfd8d283691fbf8c40..0bb65b77ce4cebb5aa59a8124b1b92551fdea12a 100644 (file)
--- a/src/live_effects/parameter/path.h
+++ b/src/live_effects/parameter/path.h
@@ -12,7 +12,6 @@
 #include <glib/gtypes.h>
 #include <2geom/path.h>
 
-#include "ui/widget/registry.h"
 #include <gtkmm/tooltips.h>
 
 #include "live_effects/parameter/parameter.h"

diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index ca188da806a252f2627390bb4af7f5d7e43a043e..c2a09d1f1e6e3ba3ea56c80c89d4bf77a7a62074 100644 (file)
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -13,7 +13,7 @@
 #include <gtkmm.h>
 #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 1137a8f1a725fa11677b0a67eb185b0acfd81d27..a6866f7df6082cde66d9df5bf55d9bdc31463e12 100644 (file)
--- a/src/live_effects/parameter/point.h
+++ b/src/live_effects/parameter/point.h
@@ -12,8 +12,6 @@
 #include <glib/gtypes.h>
 #include <2geom/point.h>
 
-#include "ui/widget/registry.h"
-#include "ui/widget/registered-widget.h"
 #include <gtkmm/tooltips.h>
 
 #include "live_effects/parameter/parameter.h"

diff --git a/src/live_effects/parameter/random.h b/src/live_effects/parameter/random.h
index 6583ca55624d86a4097b11e3c186ba56959fe4ed..c59a9d00ec4029abfc649353a47b0067aa99d560 100644 (file)
--- 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 {