Get rid of the SP_DT_* macros which do nothing more than provide additional, confusing, names for other functions. If shorter names are desired, the actual functions should be renamed -- or better, made into member functions.

(bzr r532)

6 files changed, 41 insertions, 41 deletions

diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index a8cdba61e..883370aec 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -117,7 +117,7 @@ sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp)
     (ptr->_preview).setRgba32 (rgba);
 
     if (ptr->_undo && SP_ACTIVE_DESKTOP)
-        sp_document_done(SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP));
+        sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP));
 
     ptr->on_changed (rgba);
     ptr->_changed_signal.emit (rgba);
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 1073fa1d2..31390b676 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -285,7 +285,7 @@ PageSizer::setDoc (double w, double h)
     if (!SP_ACTIVE_DESKTOP || _wr->isUpdating())
         return;
 
-    SPDocument *doc = SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP);
+    SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
     sp_document_set_width (doc, _rusw.getSU()->getValue("px"), &_px_unit);
     sp_document_set_height (doc, _rush.getSU()->getValue("px"), &_px_unit);
     sp_document_done (doc);
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index bed44ae16..1bfcb1f84 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -88,9 +88,9 @@ RegisteredCheckButton::on_toggled()
         return;
     }
 
-    SPDocument *doc = SP_DT_DOCUMENT(dt);
+    SPDocument *doc = sp_desktop_document(dt);
 
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt));
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
     _wr->setUpdating (true);
 
     gboolean saved = sp_document_get_undo_sensitive (doc);
@@ -149,10 +149,10 @@ RegisteredUnitMenu::on_changed()
 
     _wr->setUpdating (true);
 
-    SPDocument *doc = SP_DT_DOCUMENT(dt);
+    SPDocument *doc = sp_desktop_document(dt);
     gboolean saved = sp_document_get_undo_sensitive (doc);
     sp_document_set_undo_sensitive (doc, FALSE);
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt));
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
     repr->setAttribute(_key.c_str(), os.str().c_str());
     doc->rroot->setAttribute("sodipodi:modified", "true");
     sp_document_set_undo_sensitive (doc, saved);
@@ -216,10 +216,10 @@ RegisteredScalarUnit::on_value_changed()
 
     _wr->setUpdating (true);
 
-    SPDocument *doc = SP_DT_DOCUMENT(dt);
+    SPDocument *doc = sp_desktop_document(dt);
     gboolean saved = sp_document_get_undo_sensitive (doc);
     sp_document_set_undo_sensitive (doc, FALSE);
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt));
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
     repr->setAttribute(_key.c_str(), os.str().c_str());
     doc->rroot->setAttribute("sodipodi:modified", "true");
     sp_document_set_undo_sensitive (doc, saved);
@@ -272,7 +272,7 @@ RegisteredColorPicker::on_changed (guint32 rgba)
         return;
 
     _wr->setUpdating (true);
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP));
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
     gchar c[32];
     sp_svg_write_color(c, 32, rgba);
     repr->setAttribute(_ckey.c_str(), c);
@@ -327,13 +327,13 @@ RegisteredSuffixedInteger::on_value_changed()
     _wr->setUpdating (true);
     
     SPDesktop* dt = SP_ACTIVE_DESKTOP;
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(dt));
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt));
     Inkscape::SVGOStringStream os;
     int value = int(_adj.get_value());
     os << value;
 
     repr->setAttribute(_key.c_str(), os.str().c_str());
-    sp_document_done(SP_DT_DOCUMENT(dt));
+    sp_document_done(sp_desktop_document(dt));
     
     _wr->setUpdating (false);
 }
@@ -389,10 +389,10 @@ RegisteredRadioButtonPair::on_value_changed()
     _wr->setUpdating (true);
     
     bool second = _rb2->get_active();
-    SPDocument *doc = SP_DT_DOCUMENT(dt);
+    SPDocument *doc = sp_desktop_document(dt);
     gboolean saved = sp_document_get_undo_sensitive (doc);
     sp_document_set_undo_sensitive (doc, FALSE);
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt));
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
     repr->setAttribute(_key.c_str(), second ? "true" : "false");
     doc->rroot->setAttribute("sodipodi:modified", "true");
     sp_document_set_undo_sensitive (doc, saved);
diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index f2a59338d..02a532a5a 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -150,7 +150,7 @@ Ruler::on_button_release_event(GdkEventButton *evb)
             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_DT_DOCUMENT(_dt));
+            sp_document_done(sp_desktop_document(_dt));
         }
         _dt->set_coordinate_status(event_dt);
     }
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index f5b1fa08f..57a4d20d1 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -373,7 +373,7 @@ SelectedStyle::setDesktop(SPDesktop *desktop)
     _desktop = desktop;
     gtk_object_set_data (GTK_OBJECT(_opacity_sb.gobj()), "dtw", _desktop->canvas);
 
-    Inkscape::Selection *selection = SP_DT_SELECTION (desktop);
+    Inkscape::Selection *selection = sp_desktop_selection (desktop);
 
     selection_changed_connection = new sigc::connection (selection->connectChanged(
         sigc::bind (
@@ -391,7 +391,7 @@ SelectedStyle::setDesktop(SPDesktop *desktop)
             this )
     ));
 
-    //_sw_unit = (SPUnit *) SP_DT_NAMEDVIEW(desktop)->doc_units;
+    //_sw_unit = (SPUnit *) sp_desktop_namedview(desktop)->doc_units;
 }
 
 void SelectedStyle::dragDataReceived( GtkWidget *widget,
@@ -424,7 +424,7 @@ void SelectedStyle::dragDataReceived( GtkWidget *widget,
                 sp_repr_css_set_property( css, (tracker->item == SS_FILL) ? "fill":"stroke", c );
                 sp_desktop_set_style( tracker->parent->_desktop, css );
                 sp_repr_css_attr_unref( css );
-                sp_document_done( SP_DT_DOCUMENT(tracker->parent->_desktop) );
+                sp_document_done( sp_desktop_document(tracker->parent->_desktop) );
             }
         }
         break;
@@ -436,7 +436,7 @@ void SelectedStyle::on_fill_remove() {
     sp_repr_css_set_property (css, "fill", "none");
     sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_stroke_remove() {
@@ -444,7 +444,7 @@ void SelectedStyle::on_stroke_remove() {
     sp_repr_css_set_property (css, "stroke", "none");
     sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_fill_unset() {
@@ -452,7 +452,7 @@ void SelectedStyle::on_fill_unset() {
     sp_repr_css_unset_property (css, "fill");
     sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_stroke_unset() {
@@ -460,7 +460,7 @@ void SelectedStyle::on_stroke_unset() {
     sp_repr_css_unset_property (css, "stroke");
     sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_fill_opaque() {
@@ -468,7 +468,7 @@ void SelectedStyle::on_fill_opaque() {
     sp_repr_css_set_property (css, "fill-opacity", "1");
     sp_desktop_set_style (_desktop, css, true);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_stroke_opaque() {
@@ -476,7 +476,7 @@ void SelectedStyle::on_stroke_opaque() {
     sp_repr_css_set_property (css, "stroke-opacity", "1");
     sp_desktop_set_style (_desktop, css, true);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_fill_lastused() {
@@ -487,7 +487,7 @@ void SelectedStyle::on_fill_lastused() {
     sp_repr_css_set_property (css, "fill", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_stroke_lastused() {
@@ -498,7 +498,7 @@ void SelectedStyle::on_stroke_lastused() {
     sp_repr_css_set_property (css, "stroke", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_fill_lastselected() {
@@ -508,7 +508,7 @@ void SelectedStyle::on_fill_lastselected() {
     sp_repr_css_set_property (css, "fill", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_stroke_lastselected() {
@@ -518,7 +518,7 @@ void SelectedStyle::on_stroke_lastselected() {
     sp_repr_css_set_property (css, "stroke", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_fill_invert() {
@@ -537,7 +537,7 @@ void SelectedStyle::on_fill_invert() {
     sp_repr_css_set_property (css, "fill", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_stroke_invert() {
@@ -556,7 +556,7 @@ void SelectedStyle::on_stroke_invert() {
     sp_repr_css_set_property (css, "stroke", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 } 
 
 void SelectedStyle::on_fill_white() {
@@ -567,7 +567,7 @@ void SelectedStyle::on_fill_white() {
     sp_repr_css_set_property (css, "fill-opacity", "1");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_stroke_white() {
@@ -578,7 +578,7 @@ void SelectedStyle::on_stroke_white() {
     sp_repr_css_set_property (css, "stroke-opacity", "1");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_fill_black() {
@@ -589,7 +589,7 @@ void SelectedStyle::on_fill_black() {
     sp_repr_css_set_property (css, "fill-opacity", "1.0");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_stroke_black() {
@@ -600,7 +600,7 @@ void SelectedStyle::on_stroke_black() {
     sp_repr_css_set_property (css, "stroke-opacity", "1.0");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_fill_copy() {
@@ -642,7 +642,7 @@ void SelectedStyle::on_fill_paste() {
         sp_repr_css_set_property (css, "fill", text.c_str());
         sp_desktop_set_style (_desktop, css);
         sp_repr_css_attr_unref (css);
-        sp_document_done (SP_DT_DOCUMENT(_desktop));
+        sp_document_done (sp_desktop_document(_desktop));
     }
 }
 
@@ -659,7 +659,7 @@ void SelectedStyle::on_stroke_paste() {
         sp_repr_css_set_property (css, "stroke", text.c_str());
         sp_desktop_set_style (_desktop, css);
         sp_repr_css_attr_unref (css);
-        sp_document_done (SP_DT_DOCUMENT(_desktop));
+        sp_document_done (sp_desktop_document(_desktop));
     }
 }
 
@@ -714,7 +714,7 @@ void SelectedStyle::on_fillstroke_swap() {
 
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void SelectedStyle::on_fill_edit() {
@@ -781,7 +781,7 @@ SelectedStyle::on_opacity_click(GdkEventButton *event)
         sp_repr_css_set_property (css, "opacity", opacity);
         sp_desktop_set_style (_desktop, css);
         sp_repr_css_attr_unref (css);
-        sp_document_done (SP_DT_DOCUMENT (_desktop));
+        sp_document_done (sp_desktop_document (_desktop));
         return true;
     }
 
@@ -814,7 +814,7 @@ void SelectedStyle::on_popup_preset(int i) {
     sp_repr_css_set_property (css, "stroke-width", os.str().c_str());
     sp_desktop_set_style (_desktop, css, true);
     sp_repr_css_attr_unref (css);
-    sp_document_done (SP_DT_DOCUMENT(_desktop));
+    sp_document_done (sp_desktop_document(_desktop));
 }
 
 void
@@ -1054,7 +1054,7 @@ void SelectedStyle::on_opacity_changed () {
     sp_repr_css_set_property (css, "opacity", os.str().c_str());
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_maybe_done (SP_DT_DOCUMENT (_desktop), "fillstroke:opacity");
+    sp_document_maybe_done (sp_desktop_document (_desktop), "fillstroke:opacity");
     spinbutton_defocus(GTK_OBJECT(_opacity_sb.gobj()));
     _opacity_blocked = false;
 }
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 25d332c59..654936814 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -162,10 +162,10 @@ ToleranceSlider::update (double val)
 
     _wr->setUpdating (true);
 
-    SPDocument *doc = SP_DT_DOCUMENT(dt);
+    SPDocument *doc = sp_desktop_document(dt);
     gboolean saved = sp_document_get_undo_sensitive (doc);
     sp_document_set_undo_sensitive (doc, FALSE);
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt));
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
     repr->setAttribute(_key.c_str(), os.str().c_str());
     doc->rroot->setAttribute("sodipodi:modified", "true");
     sp_document_set_undo_sensitive (doc, saved);