Merging from trunk

(bzr r6884)

1 files changed, 7 insertions, 7 deletions

diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 9432d4b5a..994171d13 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -1723,15 +1723,15 @@ GrDrag::updateLevels ()
 
     for (GSList const* i = this->selection->itemList(); i != NULL; i = i->next) {
         SPItem *item = SP_ITEM(i->data);
-        boost::optional<NR::Rect> rect = sp_item_bbox_desktop (item);
+        boost::optional<Geom::Rect> rect = sp_item_bbox_desktop (item);
         if (rect) {
             // Remember the edges of the bbox and the center axis
-            hor_levels.push_back(rect->min()[NR::Y]);
-            hor_levels.push_back(rect->max()[NR::Y]);
-            hor_levels.push_back(0.5 * (rect->min()[NR::Y] + rect->max()[NR::Y]));
-            vert_levels.push_back(rect->min()[NR::X]);
-            vert_levels.push_back(rect->max()[NR::X]);
-            vert_levels.push_back(0.5 * (rect->min()[NR::X] + rect->max()[NR::X]));
+            hor_levels.push_back(rect->min()[Geom::Y]);
+            hor_levels.push_back(rect->max()[Geom::Y]);
+            hor_levels.push_back(0.5 * (rect->min()[Geom::Y] + rect->max()[Geom::Y]));
+            vert_levels.push_back(rect->min()[Geom::X]);
+            vert_levels.push_back(rect->max()[Geom::X]);
+            vert_levels.push_back(0.5 * (rect->min()[Geom::X] + rect->max()[Geom::X]));
         }
     }
 }