Merging from trunk

[inkscape.git] / src / connector-context.cpp

diff --git a/src/connector-context.cpp b/src/connector-context.cpp
index c982a8c89d527856a8ad24835d257aa32eeb8533..527ba720f97a087043c6b2b335cfd98c7a341028 100644 (file)
--- a/src/connector-context.cpp
+++ b/src/connector-context.cpp
@@ -1148,9 +1148,9 @@ static void cc_set_active_shape(SPConnectorContext *cc, SPItem *item)
     }
 
 
-    boost::optional<NR::Rect> bbox = sp_item_bbox_desktop(cc->active_shape);
+    boost::optional<Geom::Rect> bbox = sp_item_bbox_desktop(cc->active_shape);
     if (bbox) {
-        NR::Point center = bbox->midpoint();
+        Geom::Point center = bbox->midpoint();
         sp_knot_set_position(cc->connpthandle, center, 0);
         sp_knot_show(cc->connpthandle);
     } else {