NR:: => Geom:: for much of src/ui and src/widgets

(bzr r6561)

5 files changed, 14 insertions, 13 deletions

diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 088af176a..638f1a70c 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -117,7 +117,7 @@ ObjectCompositeSettings::_blendBlurValueChanged()
     NR::Maybe<NR::Rect> bbox = _subject->getBounds(SPItem::GEOMETRIC_BBOX);
     double radius;
     if (bbox) {
-        double perimeter = bbox->extent(NR::X) + bbox->extent(NR::Y);
+        double perimeter = bbox->extent(Geom::X) + bbox->extent(Geom::Y);
         radius = _fe_cb.get_blur_value() * perimeter / 400;
     } else {
         radius = 0;
@@ -262,7 +262,7 @@ ObjectCompositeSettings::_subjectChanged() {
             case QUERY_STYLE_MULTIPLE_SAME:
                 NR::Maybe<NR::Rect> bbox = _subject->getBounds(SPItem::GEOMETRIC_BBOX);
                 if (bbox) {
-                    double perimeter = bbox->extent(NR::X) + bbox->extent(NR::Y);
+                    double perimeter = bbox->extent(Geom::X) + bbox->extent(Geom::Y);
                     _fe_cb.set_blur_sensitive(true);
                     //update blur widget value
                     float radius = query->filter_gaussianBlur_deviation.value;
diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp
index 8615df7a9..396280aee 100644
--- a/src/ui/widget/rotateable.cpp
+++ b/src/ui/widget/rotateable.cpp
@@ -86,7 +86,7 @@ guint Rotateable::get_single_modifier(guint old, guint state) {
 
 bool Rotateable::on_motion(GdkEventMotion *event) {
 		if (dragging) {
-        double dist = NR::L2(NR::Point(event->x, event->y) - NR::Point(drag_started_x, drag_started_y));
+        double dist = Geom::L2(Geom::Point(event->x, event->y) - Geom::Point(drag_started_x, drag_started_y));
         double angle = atan2(event->y - drag_started_y, event->x - drag_started_x);
         if (dist > 20) {
             working = true;
diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index c6fb4395f..0afc0da3e 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -84,13 +84,13 @@ Ruler::canvas_get_pointer(int &x, int &y)
     (void) _canvas_widget->get_window()->get_pointer(x, y, mask);
 }
 
-NR::Point
+Geom::Point
 Ruler::get_event_dt()
 {
     int wx, wy;
     canvas_get_pointer(wx, wy);
-    NR::Point const event_win(wx, wy);
-    NR::Point const event_w(sp_canvas_window_to_world(_dt->canvas, event_win));
+    Geom::Point const event_win(wx, wy);
+    Geom::Point const event_w(sp_canvas_window_to_world(_dt->canvas, event_win));
     return _dt->w2d(event_w);
 }
 
@@ -98,7 +98,7 @@ bool
 Ruler::on_button_press_event(GdkEventButton *evb)
 {
     g_assert(_dt);
-    NR::Point const &event_dt = get_event_dt();
+    Geom::Point const &event_dt = get_event_dt();
     Inkscape::XML::Node *repr = SP_OBJECT_REPR(_dt->namedview);
 
     if (evb->button == 1) {
@@ -120,7 +120,7 @@ bool
 Ruler::on_motion_notify_event(GdkEventMotion *)
 {
     g_assert(_dt);
-    NR::Point const &event_dt = get_event_dt();
+    Geom::Point const &event_dt = get_event_dt();
 
     if (_dragging) {
         sp_guideline_set_position(SP_GUIDELINE(_guide), event_dt);
@@ -136,7 +136,7 @@ Ruler::on_button_release_event(GdkEventButton *evb)
     g_assert(_dt);
     int wx, wy;
     canvas_get_pointer(wx, wy);
-    NR::Point const &event_dt = get_event_dt();
+    Geom::Point const &event_dt = get_event_dt();
 
     if (_dragging && evb->button == 1) {
         Gdk::Window::pointer_ungrab(evb->time);
@@ -148,7 +148,7 @@ Ruler::on_button_release_event(GdkEventButton *evb)
             Inkscape::XML::Document *xml_doc = sp_document_repr_doc(_dt->doc());
             Inkscape::XML::Node *repr = xml_doc->createElement("sodipodi:guide");
             repr->setAttribute("orientation", _horiz_f ? "horizontal" : "vertical");
-            double const guide_pos_dt = event_dt[ _horiz_f ? NR::Y : NR::X ];
+            double const guide_pos_dt = event_dt[ _horiz_f ? Geom::Y : Geom::X ];
             sp_repr_set_svg_double(repr, "position", guide_pos_dt);
             SP_OBJECT_REPR(_dt->namedview)->appendChild(repr);
             Inkscape::GC::release(repr);
diff --git a/src/ui/widget/ruler.h b/src/ui/widget/ruler.h
index 74dbf028c..c315418d8 100644
--- a/src/ui/widget/ruler.h
+++ b/src/ui/widget/ruler.h
@@ -49,7 +49,7 @@ protected:
 
 private:
     void canvas_get_pointer (int&, int&);
-    NR::Point get_event_dt();
+    Geom::Point get_event_dt();
 };
 
 /// Horizontal ruler
diff --git a/src/ui/widget/zoom-status.cpp b/src/ui/widget/zoom-status.cpp
index e7320102c..fbe7c0642 100644
--- a/src/ui/widget/zoom-status.cpp
+++ b/src/ui/widget/zoom-status.cpp
@@ -20,6 +20,7 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "widgets/spw-utilities.h"
+#include "libnr/nr-convert2geom.h"
 
 namespace Inkscape {
 namespace UI {
@@ -107,8 +108,8 @@ ZoomStatus::on_value_changed()
     _upd_f = true;
     g_assert(_dt);
     double zoom_factor = pow(2, get_value());
-    NR::Rect const d =_dt->get_display_area();
-    _dt->zoom_absolute(d.midpoint()[NR::X], d.midpoint()[NR::Y], zoom_factor);
+    Geom::Rect const d = to_2geom(_dt->get_display_area());
+    _dt->zoom_absolute(d.midpoint()[Geom::X], d.midpoint()[Geom::Y], zoom_factor);
     gtk_widget_grab_focus(static_cast<GtkWidget*>((void*)_dt->canvas));   /// \todo this no love song
     _upd_f = false;
 }