diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-07-16 07:42:39 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-07-16 07:42:39 +0000 |
| commit | 2be2cf32db0668dc64512a98f6c2394152bd10cc (patch) | |
| tree | 8e25abb2f884e06692d861e6a1471440d6554946 /src/ui | |
| parent | added WITH_GNOME_VFS as an option for cmake (diff) | |
| download | inkscape-2be2cf32db0668dc64512a98f6c2394152bd10cc.tar.gz inkscape-2be2cf32db0668dc64512a98f6c2394152bd10cc.zip | |
Cleanup of oudated/redundant SP_ITEM() macro use.
(bzr r10461)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/icon-preview.cpp | 9 | ||||
| -rw-r--r-- | src/ui/tool/path-manipulator.cpp | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp index 4d98793bb..38ec6d1be 100644 --- a/src/ui/dialog/icon-preview.cpp +++ b/src/ui/dialog/icon-preview.cpp @@ -356,11 +356,10 @@ void IconPreviewPanel::refreshPreview() GSList const *items = sel->itemList(); while ( items && !target ) { SPItem* item = SP_ITEM( items->data ); - SPObject * obj = item; - gchar const *id = obj->getId(); + gchar const *id = item->getId(); if ( id ) { targetId = id; - target = obj; + target = item; } items = g_slist_next(items); @@ -447,7 +446,7 @@ void IconPreviewPanel::renderPreview( SPObject* obj ) /* Create ArenaItem and set transform */ unsigned int visionkey = SPItem::display_key_new(1); - root = SP_ITEM( doc->getRoot() )->invoke_show( arena, visionkey, SP_ITEM_SHOW_DISPLAY ); + root = doc->getRoot()->invoke_show( arena, visionkey, SP_ITEM_SHOW_DISPLAY ); for ( int i = 0; i < numEntries; i++ ) { unsigned unused; @@ -465,7 +464,7 @@ void IconPreviewPanel::renderPreview( SPObject* obj ) } updateMagnify(); - SP_ITEM(doc->getRoot())->invoke_hide(visionkey); + doc->getRoot()->invoke_hide(visionkey); nr_object_unref((NRObject *) arena); renderTimer->stop(); minDelay = std::max( 0.1, renderTimer->elapsed() * 3.0 ); diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index 52286c6cc..9afcf6323 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -120,7 +120,7 @@ PathManipulator::PathManipulator(MultiPathManipulator &mpm, SPPath *path, , _lpe_key(lpe_key) { if (_lpe_key.empty()) { - _i2d_transform = SP_ITEM(path)->i2d_affine(); + _i2d_transform = path->i2d_affine(); } else { _i2d_transform = Geom::identity(); } @@ -976,7 +976,7 @@ void PathManipulator::_externalChange(unsigned type) } break; case PATH_CHANGE_TRANSFORM: { Geom::Affine i2d_change = _d2i_transform; - _i2d_transform = SP_ITEM(_path)->i2d_affine(); + _i2d_transform = _path->i2d_affine(); _d2i_transform = _i2d_transform.inverse(); i2d_change *= _i2d_transform; for (SubpathList::iterator i = _subpaths.begin(); i != _subpaths.end(); ++i) { |