summaryrefslogtreecommitdiffstats
path: root/src/ui/clipboard.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <mc@localhost.localdomain>2015-02-27 02:10:36 +0000
committerMarc Jeanmougin <mc@localhost.localdomain>2015-02-27 02:10:36 +0000
commit9a7fa4d1899d30ec745107823f307b2a0bf3172f (patch)
tree216bd7b47a96425af53642e2c3869a70ebfa23e5 /src/ui/clipboard.cpp
parentshould replace buggy pot file (diff)
downloadinkscape-9a7fa4d1899d30ec745107823f307b2a0bf3172f.tar.gz
inkscape-9a7fa4d1899d30ec745107823f307b2a0bf3172f.zip
corrected the casts (hopefully)
(bzr r13922.1.10)
Diffstat (limited to 'src/ui/clipboard.cpp')
-rw-r--r--src/ui/clipboard.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 52bc24f5f..a38a52371 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -525,7 +525,7 @@ bool ClipboardManagerImpl::pasteSize(SPDesktop *desktop, bool separately, bool a
if (separately) {
std::vector<SPItem*> itemlist=selection->itemList();
for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
- SPItem *item = SP_ITEM(*i);
+ SPItem *item = *i;
if (item) {
Geom::OptRect obj_size = item->desktopVisualBounds();
if ( obj_size ) {
@@ -581,7 +581,7 @@ bool ClipboardManagerImpl::pastePathEffect(SPDesktop *desktop)
sp_selected_to_lpeitems(desktop);
std::vector<SPItem*> itemlist=selection->itemList();
for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
- SPItem *item = SP_ITEM(*i);
+ SPItem *item = *i;
_applyPathEffect(item, effectstack);
}
@@ -664,7 +664,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
// copy the defs used by all items
std::vector<SPItem*> itemlist=selection->itemList();
for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
- SPItem *item = SP_ITEM(*i);
+ SPItem *item = *i;
if (item) {
_copyUsedDefs(item);
} else {
@@ -677,7 +677,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
sort(sorted_items.begin(),sorted_items.end(),sp_object_compare_position);
for(std::vector<SPItem*>::const_iterator i=sorted_items.begin();i!=sorted_items.end();i++){
- SPItem *item = SP_ITEM(*i);
+ SPItem *item = *i;
if (item) {
Inkscape::XML::Node *obj = item->getRepr();
Inkscape::XML::Node *obj_copy = _copyNode(obj, _doc, _root);
@@ -706,7 +706,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
// copy style for Paste Style action
if (!sorted_items.empty()) {
- SPObject *object = static_cast<SPObject *>(sorted_items.front());
+ SPObject *object = static_cast<SPObject *>(sorted_items[0]);
SPItem *item = dynamic_cast<SPItem *>(object);
if (item) {
SPCSSAttr *style = take_style_from_item(item);