Merge and cleanup of GSoC C++-ification project.

[inkscape.git] / src / ui / widget / ruler.cpp

diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index c6fb4395f88b47edb9468caeea931e0658d36484..107f4e8c6ef248088299a21f9094b280f5b2dee1 100644 (file)
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -6,6 +6,8 @@
  * Authors:
  *   Ralf Stephan <ralf@ark.in-berlin.de>
  *   Lauris Kaplinski
+ *   Jon A. Cruz <jon@joncruz.org>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2005 Ralf Stephan
  *
@@ -84,13 +86,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 +100,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 +122,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 +138,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);
@@ -145,15 +147,15 @@ Ruler::on_button_release_event(GdkEventButton *evb)
         _dragging = false;
 
         if ( (_horiz_f ? wy : wx ) >= 0 ) {
-            Inkscape::XML::Document *xml_doc = sp_document_repr_doc(_dt->doc());
+            Inkscape::XML::Document *xml_doc = _dt->doc()->getReprDoc();
             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);
-            sp_document_done(sp_desktop_document(_dt), SP_VERB_NONE, 
-                             /* TODO: annotate */ "ruler.cpp:157");
+            DocumentUndo::done(sp_desktop_document(_dt), SP_VERB_NONE, 
+                               /* TODO: annotate */ "ruler.cpp:157");
         }
         _dt->set_coordinate_status(event_dt);
     }
@@ -197,4 +199,4 @@ VRuler::~VRuler()
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :