Some bug fix to prepare merge

(bzr r15392.1.9)

5 files changed, 6 insertions, 3 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 3cfeface8..a0ab0d41c 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -70,6 +70,8 @@
 #include "ui/tools/node-tool.h"
 #include "ui/tools-switch.h"
 #include "knotholder.h"
+#include "path-chemistry.h"
+#include "xml/sp-css-attr.h"
 #include "live_effects/lpeobject.h"
 #include "display/curve.h"
 
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 33c4d6e5b..b81451487 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -20,7 +20,6 @@
 #include "display/curve.h"
 #include "svg/path-string.h"
 #include "svg/svg.h"
-#include "path-chemistry.h"
 #include "style.h"
 #include "helper/geom.h"
 #include "xml/sp-css-attr.h"
diff --git a/src/live_effects/lpe-measure-line.cpp b/src/live_effects/lpe-measure-line.cpp
index 38f93ebb4..ef87be81c 100644
--- a/src/live_effects/lpe-measure-line.cpp
+++ b/src/live_effects/lpe-measure-line.cpp
@@ -664,7 +664,6 @@ LPEMeasureLine::doBeforeEffect (SPLPEItem const* lpeitem)
     }
 }
 
-//TODO: Migrate the tree next function to effect.cpp/h to avoid duplication
 void
 LPEMeasureLine::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/)
 {
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index 76aa05bae..befac4df1 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -198,6 +198,9 @@ ScalarParam::param_set_increments(double step, double page)
     inc_page = page;
 }
 
+
+
+
 } /* namespace LivePathEffect */
 } /* namespace Inkscape */
 
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index 7266233dc..f66d5cbf2 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -50,7 +50,7 @@ class Registry;
 template <class W>
 class RegisteredWidget : public W {
 public:
-    void set_undo_parameters(const unsigned int _event_type, Glib::ustring const _event_description)
+    void set_undo_parameters(const unsigned int _event_type, Glib::ustring _event_description)
     {
         event_type = _event_type;
         event_description = _event_description;