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

[inkscape.git] / src / ui / dialog / guides.cpp

diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 9c3422167facc854e6b4821e9d8cd434b2173b02..1ab0d51bc6f1a86bdfe3c95c264901c8883c65d8 100644 (file)
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -5,6 +5,7 @@
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   Andrius R. <knutux@gmail.com>
  *   Johan Engelen
+ *   Abhishek Sharma
  *
  * Copyright (C) 1999-2007 Authors
  *
@@ -108,8 +109,8 @@ void GuidelinePropertiesDialog::_onApply()
 
     sp_guide_moveto(*_guide, newpos, true);
 
-    SPDocumentUndo::done(SP_OBJECT_DOCUMENT(_guide), SP_VERB_NONE, 
-                     _("Set guide properties"));
+    DocumentUndo::done(SP_OBJECT_DOCUMENT(_guide), SP_VERB_NONE, 
+                       _("Set guide properties"));
 }
 
 void GuidelinePropertiesDialog::_onOK()
@@ -121,8 +122,8 @@ void GuidelinePropertiesDialog::_onDelete()
 {
     SPDocument *doc = SP_OBJECT_DOCUMENT(_guide);
     sp_guide_remove(_guide);
-    SPDocumentUndo::done(doc, SP_VERB_NONE, 
-                     _("Delete guide"));
+    DocumentUndo::done(doc, SP_VERB_NONE, 
+                       _("Delete guide"));
 }
 
 void GuidelinePropertiesDialog::_response(gint response)
@@ -225,9 +226,9 @@ void GuidelinePropertiesDialog::_setup() {
 
     // initialize dialog
     _oldpos = _guide->point_on_line;
-    if (_guide->is_vertical()) {
+    if (_guide->isVertical()) {
         _oldangle = 90;
-    } else if (_guide->is_horizontal()) {
+    } else if (_guide->isHorizontal()) {
         _oldangle = 0;
     } else {
         _oldangle = Geom::rad_to_deg( std::atan2( - _guide->normal_to_line[Geom::X], _guide->normal_to_line[Geom::Y] ) );
@@ -282,4 +283,4 @@ void GuidelinePropertiesDialog::_setup() {
   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 :