diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-02-21 21:43:30 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-02-21 21:43:30 +0000 |
| commit | aa8c0d876949c952ab355c096017301a00734456 (patch) | |
| tree | 6aeabb3dc05451470bc8c6a0f72ca1634eed2ace /src/sp-use-reference.cpp | |
| parent | emf import. support for round rectangle (Bug 247695) (diff) | |
| download | inkscape-aa8c0d876949c952ab355c096017301a00734456.tar.gz inkscape-aa8c0d876949c952ab355c096017301a00734456.zip | |
Finished cleanup of outdated SP_OBJECT_PARENT C macro.
(bzr r10064)
Diffstat (limited to 'src/sp-use-reference.cpp')
| -rw-r--r-- | src/sp-use-reference.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sp-use-reference.cpp b/src/sp-use-reference.cpp index 0784f2dd1..ec03ffce6 100644 --- a/src/sp-use-reference.cpp +++ b/src/sp-use-reference.cpp @@ -27,8 +27,8 @@ bool SPUseReference::_acceptObject(SPObject * const obj) const { if (SP_IS_ITEM(obj)) { SPObject * const owner = getOwner(); - /* Refuse references to us or to an ancestor. */ - for ( SPObject *iter = owner ; iter ; iter = SP_OBJECT_PARENT(iter) ) { + // Refuse references to us or to an ancestor. + for ( SPObject *iter = owner ; iter ; iter = iter->parent ) { if ( iter == obj ) { return false; } @@ -107,7 +107,7 @@ SPUsePath::start_listening(SPObject* to) return; } sourceObject = to; - sourceRepr = SP_OBJECT_REPR(to); + sourceRepr = to->getRepr(); _delete_connection = to->connectDelete(sigc::bind(sigc::ptr_fun(&sp_usepath_delete_self), this)); _transformed_connection = SP_ITEM(to)->connectTransformed(sigc::bind(sigc::ptr_fun(&sp_usepath_move_compensate), this)); _modified_connection = to->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_usepath_source_modified), this)); @@ -135,7 +135,7 @@ sp_usepath_href_changed(SPObject */*old_ref*/, SPObject */*ref*/, SPUsePath *off offset->start_listening(refobj); } offset->sourceDirty=true; - SP_OBJECT(offset->owner)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + offset->owner->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } static void @@ -171,14 +171,14 @@ sp_usepath_move_compensate(Geom::Affine const *mp, SPItem *original, SPUsePath * // Commit the compensation. item->transform *= clone_move; - sp_item_write_transform(item, SP_OBJECT_REPR(item), item->transform, &advertized_move); + sp_item_write_transform(item, item->getRepr(), item->transform, &advertized_move); #else (void)mp; (void)original; #endif self->sourceDirty = true; - SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } static void |