From 805747f6b136ad2e89f5ca1020ca43506d2b5391 Mon Sep 17 00:00:00 2001 From: MenTaLguY Date: Mon, 17 Apr 2006 04:46:51 +0000 Subject: 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) --- src/sp-flowtext.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sp-flowtext.cpp') diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp index e078013aa..a16123901 100644 --- a/src/sp-flowtext.cpp +++ b/src/sp-flowtext.cpp @@ -502,7 +502,7 @@ void SPFlowtext::_clearFlow(NRArenaGroup *in_arena) void SPFlowtext::convert_to_text() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); SPItem *item = selection->singleItem(); if (!SP_IS_FLOWTEXT(item)) return; @@ -601,7 +601,7 @@ void SPFlowtext::convert_to_text() Inkscape::XML::Node *parent = SP_OBJECT_REPR(item)->parent(); parent->appendChild(repr); - SPItem *new_item = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr); + SPItem *new_item = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr); sp_item_write_transform(new_item, repr, item->transform); SP_OBJECT(new_item)->updateRepr(); @@ -609,7 +609,7 @@ void SPFlowtext::convert_to_text() selection->set(new_item); item->deleteObject(); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } SPItem *SPFlowtext::get_frame(SPItem *after) @@ -660,7 +660,7 @@ bool SPFlowtext::has_internal_frame() SPItem *create_flowtext_with_internal_frame (SPDesktop *desktop, NR::Point p0, NR::Point p1) { - SPDocument *doc = SP_DT_DOCUMENT (desktop); + SPDocument *doc = sp_desktop_document (desktop); Inkscape::XML::Node *root_repr = sp_repr_new("svg:flowRoot"); root_repr->setAttribute("xml:space", "preserve"); // we preserve spaces in the text objects we create -- cgit v1.2.3