Merge from trunk

(bzr r9508.1.89)

6 files changed, 117 insertions, 52 deletions

diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index 70e8cbaf8..3bca16715 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -1,37 +1,115 @@
-ADD_SUBDIRECTORY(parameter)
 
-SET(live_effects_SRC
-bezctx.cpp
-effect.cpp
-lpe-bendpath.cpp
-lpe-boolops.cpp
-lpe-circle_with_radius.cpp
-lpe-constructgrid.cpp
-lpe-curvestitch.cpp
-lpe-envelope.cpp
-lpe-gears.cpp
-lpegroupbbox.cpp
-lpe-interpolate.cpp
-lpe-knot.cpp
-lpe-rough-hatches.cpp
-lpe-lattice.cpp
-lpe-mirror_symmetry.cpp
-lpeobject.cpp
-lpeobject-reference.cpp
-lpe-patternalongpath.cpp
-lpe-perp_bisector.cpp
-lpe-perspective_path.cpp
-lpe-powerstroke.cpp
-lpe-skeleton.cpp
-lpe-sketch.cpp
-lpe-spiro.cpp
-lpe-tangent_to_curve.cpp
-lpe-test-doEffect-stack.cpp
-lpe-vonkoch.cpp
-lpe-dynastroke.cpp
-spiro.cpp
-${live_effects_parameter_SRC}
+set(live_effects_SRC
+	bezctx.cpp
+	effect.cpp
+	lpe-angle_bisector.cpp
+	lpe-bendpath.cpp
+	lpe-boolops.cpp
+	lpe-circle_3pts.cpp
+	lpe-circle_with_radius.cpp
+	lpe-constructgrid.cpp
+	lpe-copy_rotate.cpp
+	lpe-curvestitch.cpp
+	lpe-dynastroke.cpp
+	lpe-envelope.cpp
+	lpe-extrude.cpp
+	lpe-gears.cpp
+	lpe-interpolate.cpp
+	lpe-knot.cpp
+	lpe-lattice.cpp
+	lpe-line_segment.cpp
+	lpe-mirror_symmetry.cpp
+	lpe-offset.cpp
+	lpe-parallel.cpp
+	lpe-path_length.cpp
+	lpe-patternalongpath.cpp
+	lpe-perp_bisector.cpp
+	lpe-perspective_path.cpp
+	lpe-powerstroke.cpp
+	lpe-recursiveskeleton.cpp
+	lpe-rough-hatches.cpp
+	lpe-ruler.cpp
+	# lpe-skeleton.cpp
+	lpe-sketch.cpp
+	lpe-spiro.cpp
+	lpe-tangent_to_curve.cpp
+	lpe-test-doEffect-stack.cpp
+	lpe-text_label.cpp
+	lpe-vonkoch.cpp
+	lpegroupbbox.cpp
+	lpeobject-reference.cpp
+	lpeobject.cpp
+	spiro.cpp
+
+	parameter/array.cpp
+	parameter/bool.cpp
+	parameter/parameter.cpp
+	parameter/path.cpp
+	parameter/path-reference.cpp
+	parameter/point.cpp
+	parameter/powerstrokepointarray.cpp
+	parameter/random.cpp
+	parameter/text.cpp
+	parameter/unit.cpp
+	parameter/vector.cpp
+
+	# -------
+	# Headers
+	bezctx.h
+	bezctx_intf.h
+	effect-enum.h
+	effect.h
+	lpe-angle_bisector.h
+	lpe-bendpath.h
+	lpe-boolops.h
+	lpe-circle_3pts.h
+	lpe-circle_with_radius.h
+	lpe-constructgrid.h
+	lpe-copy_rotate.h
+	lpe-curvestitch.h
+	lpe-dynastroke.h
+	lpe-envelope.h
+	lpe-extrude.h
+	lpe-gears.h
+	lpe-interpolate.h
+	lpe-knot.h
+	lpe-lattice.h
+	lpe-line_segment.h
+	lpe-mirror_symmetry.h
+	lpe-offset.h
+	lpe-parallel.h
+	lpe-path_length.h
+	lpe-patternalongpath.h
+	lpe-perp_bisector.h
+	lpe-perspective_path.h
+	lpe-powerstroke.h
+	lpe-recursiveskeleton.h
+	lpe-rough-hatches.h
+	lpe-ruler.h
+	lpe-skeleton.h
+	lpe-sketch.h
+	lpe-spiro.h
+	lpe-tangent_to_curve.h
+	lpe-test-doEffect-stack.h
+	lpe-text_label.h
+	lpe-vonkoch.h
+	lpegroupbbox.h
+	lpeobject-reference.h
+	lpeobject.h
+	parameter/array.h
+	parameter/bool.h
+	parameter/enum.h
+	parameter/parameter.h
+	parameter/path-reference.h
+	parameter/path.h
+	parameter/point.h
+	parameter/powerstrokepointarray.h
+	parameter/random.h
+	parameter/text.h
+	parameter/unit.h
+	parameter/vector.h
+	spiro.h
 )
-ADD_LIBRARY(live_effects STATIC ${live_effects_SRC})
-TARGET_LINK_LIBRARIES(live_effects
-2geom ${INKSCAPE_LIBS})
\ No newline at end of file
+
+# add_inkscape_lib(live_effects_LIB "${live_effects_SRC}")
+add_inkscape_source("${live_effects_SRC}")
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index ed0d162ac..10abef4a1 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -262,7 +262,7 @@ void Effect::createAndApply(const char* name, SPDocument *doc, SPItem *item)
     Inkscape::XML::Node *repr = xml_doc->createElement("inkscape:path-effect");
     repr->setAttribute("effect", name);
 
-    SP_DOCUMENT_DEFS(doc)->getRepr()->addChild(repr, NULL); // adds to <defs> and assigns the 'id' attribute
+    doc->getDefs()->getRepr()->addChild(repr, NULL); // adds to <defs> and assigns the 'id' attribute
     const gchar * repr_id = repr->attribute("id");
     Inkscape::GC::release(repr);
 
diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index 7fe4e9348..91d09fef6 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -157,7 +157,7 @@ protected:
     LivePathEffectObject *lpeobj;
 
     // this boolean defaults to false, it concatenates the input path to one pwd2,
-    // instead of normally 'splitting' the path into continuous pwd2 paths.
+    // instead of normally 'splitting' the path into continuous pwd2 paths and calling doEffect_pwd2 for each.
     bool concatenate_before_pwd2;
 
 private:
diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp
index 1b5ed1d49..3e4e40198 100644
--- a/src/live_effects/lpeobject.cpp
+++ b/src/live_effects/lpeobject.cpp
@@ -253,7 +253,7 @@ LivePathEffectObject *LivePathEffectObject::fork_private_if_necessary(unsigned i
         Inkscape::XML::Document *xml_doc = doc->getReprDoc();
         Inkscape::XML::Node *dup_repr = this->getRepr()->duplicate(xml_doc);
 
-        SP_DOCUMENT_DEFS(doc)->getRepr()->addChild(dup_repr, NULL);
+        doc->getDefs()->getRepr()->addChild(dup_repr, NULL);
         LivePathEffectObject *lpeobj_new = LIVEPATHEFFECT( doc->getObjectByRepr(dup_repr) );
 
         Inkscape::GC::release(dup_repr);
diff --git a/src/live_effects/parameter/CMakeLists.txt b/src/live_effects/parameter/CMakeLists.txt
deleted file mode 100644
index 8657b2bec..000000000
--- a/src/live_effects/parameter/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-SET(live_effects_parameter_SRC
-array.cpp
-bool.cpp
-parameter.cpp
-path.cpp
-path-reference.cpp
-point.cpp
-powerstrokepointarray.cpp
-random.cpp
-text.cpp
-unit.cpp
-vector.cpp
-)
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index d652dfd0c..bd9748fd6 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -15,7 +15,7 @@
 
 #include "ui/widget/point.h"
 #include "widgets/icon.h"
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include "selection-chemistry.h"
 #include "xml/repr.h"
 #include "desktop.h"