Merging from trunk

(bzr r6884)

1 files changed, 7 insertions, 7 deletions

diff --git a/src/graphlayout/graphlayout.cpp b/src/graphlayout/graphlayout.cpp
index 2fb641316..d0ba2d20e 100644
--- a/src/graphlayout/graphlayout.cpp
+++ b/src/graphlayout/graphlayout.cpp
@@ -68,7 +68,7 @@ struct CheckProgress : TestConvergence {
                 NR::Rect const item_box(sp_item_bbox_desktop(u));
                 NR::Point const curr(item_box.midpoint());
                 NR::Point const dest(r->getCentreX(),r->getCentreY());
-                sp_item_move_rel(u, NR::translate(dest - curr));
+                sp_item_move_rel(u, Geom::Translate(dest - curr));
             }
         }
         */
@@ -124,10 +124,10 @@ void graphlayout(GSList const *const items) {
 		++i)
 	{
 		SPItem *u=*i;
-		boost::optional<NR::Rect> const item_box(sp_item_bbox_desktop(u));
+		boost::optional<Geom::Rect> const item_box(sp_item_bbox_desktop(u));
         if(item_box) {
-            NR::Point ll(item_box->min());
-            NR::Point ur(item_box->max());
+            Geom::Point ll(item_box->min());
+            Geom::Point ur(item_box->max());
             nodelookup[u->id]=rs.size();
             rs.push_back(new Rectangle(ll[0]-spacing,ur[0]+spacing,
                         ll[1]-spacing,ur[1]+spacing));
@@ -226,10 +226,10 @@ void graphlayout(GSList const *const items) {
 			map<string,unsigned>::iterator i=nodelookup.find(u->id);
 			if(i!=nodelookup.end()) {
                 Rectangle* r=rs[i->second];
-                boost::optional<NR::Rect> item_box(sp_item_bbox_desktop(u));
+                boost::optional<Geom::Rect> item_box(sp_item_bbox_desktop(u));
                 if(item_box) {
-                    NR::Point const curr(item_box->midpoint());
-                    NR::Point const dest(r->getCentreX(),r->getCentreY());
+                    Geom::Point const curr(item_box->midpoint());
+                    Geom::Point const dest(r->getCentreX(),r->getCentreY());
                     sp_item_move_rel(u, Geom::Translate(dest - curr));
                 }
             }