Commit a merge to trunk, with probabal errors

(bzr r11073.1.36)

1 files changed, 14 insertions, 11 deletions

diff --git a/src/line-geometry.cpp b/src/line-geometry.cpp
index 39f18dca4..982762a12 100644
--- a/src/line-geometry.cpp
+++ b/src/line-geometry.cpp
@@ -1,5 +1,3 @@
-#define __LINE_GEOMETRY_C__
-
 /*
  * Routines for dealing with lines (intersections, etc.)
  *
@@ -17,7 +15,11 @@
 #include "desktop-style.h"
 #include "desktop-handles.h"
 #include "display/sp-canvas.h"
+#include "display/sp-ctrlline.h"
 #include "display/sodipodi-ctrl.h"
+#include "ui/control-manager.h"
+
+using Inkscape::ControlManager;
 
 namespace Box3D {
 
@@ -26,8 +28,9 @@ namespace Box3D {
  * of the segment. Otherwise interpret it as the direction of the line.
  * FIXME: Think of a better way to distinguish between the two constructors of lines.
  */
-Line::Line(Geom::Point const &start, Geom::Point const &vec, bool is_endpoint) {
-    pt = start;
+Line::Line(Geom::Point const &start, Geom::Point const &vec, bool is_endpoint):
+    pt(start)
+{
     if (is_endpoint)
         v_dir = vec - start;
     else
@@ -36,11 +39,12 @@ Line::Line(Geom::Point const &start, Geom::Point const &vec, bool is_endpoint) {
     d0 = Geom::dot(normal, pt);
 }
 
-Line::Line(Line const &line) {
-    pt = line.pt;
-    v_dir = line.v_dir;
-    normal = line.normal;
-    d0 = line.d0;
+Line::Line(Line const &line):
+    pt(line.pt),
+    v_dir(line.v_dir),
+    normal(line.normal),
+    d0(line.d0)
+{
 }
 
 Line &Line::operator=(Line const &line) {
@@ -211,8 +215,7 @@ void create_canvas_point(Geom::Point const &pos, double size, guint32 rgba)
 void create_canvas_line(Geom::Point const &p1, Geom::Point const &p2, guint32 rgba)
 {
     SPDesktop *desktop = inkscape_active_desktop();
-    SPCtrlLine *line = SP_CTRLLINE(sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLLINE, NULL));
-    line->setCoords(p1, p2);
+    SPCtrlLine *line = ControlManager::getManager().createControlLine(sp_desktop_controls(desktop), p1, p2);
     line->setRgba32(rgba);
     sp_canvas_item_show(line);
 }