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)

1 files changed, 8 insertions, 8 deletions

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 8a1035eb3..9951f5956 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -109,7 +109,7 @@ DocumentProperties::init()
 {
     update();
 
-    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));
     repr->addListener (&_repr_events, this);
 
     _doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced));
@@ -126,7 +126,7 @@ DocumentProperties::init()
 
 DocumentProperties::~DocumentProperties() 
 {
-    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));
     repr->removeListenerByData (this);
     _doc_replaced_connection.disconnect();
 }
@@ -361,7 +361,7 @@ DocumentProperties::update()
     if (_wr.isUpdating()) return;
     
     SPDesktop *dt = SP_ACTIVE_DESKTOP;
-    SPNamedView *nv = SP_DT_NAMEDVIEW(dt);
+    SPNamedView *nv = sp_desktop_namedview(dt);
     _wr.setUpdating (true);
     set_sensitive (true);
 
@@ -375,8 +375,8 @@ DocumentProperties::update()
     if (nv->doc_units) 
         _rum_deflt.setUnit (nv->doc_units);
 
-    double const doc_w_px = sp_document_width(SP_DT_DOCUMENT(dt));
-    double const doc_h_px = sp_document_height(SP_DT_DOCUMENT(dt));
+    double const doc_w_px = sp_document_width(sp_desktop_document(dt));
+    double const doc_h_px = sp_document_height(sp_desktop_document(dt));
     _page_sizer.setDim (doc_w_px, doc_h_px);
 
     //-----------------------------------------------------------grid page
@@ -462,7 +462,7 @@ on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
     if (!_instance)
         return;
 
-    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));
     repr->addListener (&_repr_events, _instance);
     _instance->_doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced));
     _instance->update();
@@ -474,7 +474,7 @@ on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
     if (!_instance)
         return;
 
-    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));
     repr->removeListenerByData (_instance);
     _instance->_doc_replaced_connection.disconnect();
 }
@@ -485,7 +485,7 @@ on_doc_replaced (SPDesktop* dt, SPDocument* doc)
     if (!_instance)
         return;
 
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(dt));
+    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt));
     repr->addListener (&_repr_events, _instance);
     _instance->update();
 }