summaryrefslogtreecommitdiffstats
path: root/src/sp-lpe-item.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <mc@localhost.localdomain>2015-02-17 02:00:37 +0000
committerMarc Jeanmougin <mc@localhost.localdomain>2015-02-17 02:00:37 +0000
commita7f2b2ba3f13ceb60376802f4a31e104153839e8 (patch)
tree6db393e9e5a0a9ab7916a0e7ed29d875efa39ea1 /src/sp-lpe-item.cpp
parentdevice-manager: Get rid of GLists (diff)
downloadinkscape-a7f2b2ba3f13ceb60376802f4a31e104153839e8.tar.gz
inkscape-a7f2b2ba3f13ceb60376802f4a31e104153839e8.zip
At first, I was thinking "I just have to go to the selection file, and change that GSList* with a std::list, then resolve the few problems"
So, i tried that. And I will continue tomorrow, and the days after, on and on. (bzr r13922.1.1)
Diffstat (limited to 'src/sp-lpe-item.cpp')
-rw-r--r--src/sp-lpe-item.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index f059ab531..1305efd83 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -353,9 +353,9 @@ sp_lpe_item_create_original_path_recursive(SPLPEItem *lpeitem)
sp_lpe_item_create_original_path_recursive(SP_LPE_ITEM(clipPath->firstChild()));
}
if (SP_IS_GROUP(lpeitem)) {
- GSList const *item_list = sp_item_group_item_list(SP_GROUP(lpeitem));
- for ( GSList const *iter = item_list; iter; iter = iter->next ) {
- SPObject *subitem = static_cast<SPObject *>(iter->data);
+ SelContainer item_list = sp_item_group_item_list(SP_GROUP(lpeitem));
+ for ( SelContainer::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+ SPObject *subitem = static_cast<SPObject *>(*iter);
if (SP_IS_LPE_ITEM(subitem)) {
sp_lpe_item_create_original_path_recursive(SP_LPE_ITEM(subitem));
}
@@ -387,9 +387,9 @@ sp_lpe_item_cleanup_original_path_recursive(SPLPEItem *lpeitem)
sp_lpe_item_cleanup_original_path_recursive(SP_LPE_ITEM(clipPath->firstChild()));
}
}
- GSList const *item_list = sp_item_group_item_list(SP_GROUP(lpeitem));
- for ( GSList const *iter = item_list; iter; iter = iter->next ) {
- SPObject *subitem = static_cast<SPObject *>(iter->data);
+ SelContainer item_list = sp_item_group_item_list(SP_GROUP(lpeitem));
+ for ( SelContainer::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+ SPObject *subitem = static_cast<SPObject *>(*iter);
if (SP_IS_LPE_ITEM(subitem)) {
sp_lpe_item_cleanup_original_path_recursive(SP_LPE_ITEM(subitem));
}
@@ -680,9 +680,9 @@ SPLPEItem::apply_to_clippath(SPItem *item)
}
}
if(SP_IS_GROUP(item)){
- GSList const *item_list = sp_item_group_item_list(SP_GROUP(item));
- for ( GSList const *iter = item_list; iter; iter = iter->next ) {
- SPObject *subitem = static_cast<SPObject *>(iter->data);
+ SelContainer item_list = sp_item_group_item_list(SP_GROUP(item));
+ for ( SelContainer::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+ SPObject *subitem = static_cast<SPObject *>(*iter);
apply_to_clippath(SP_ITEM(subitem));
}
}
@@ -732,9 +732,9 @@ SPLPEItem::apply_to_mask(SPItem *item)
}
}
if(SP_IS_GROUP(item)){
- GSList const *item_list = sp_item_group_item_list(SP_GROUP(item));
- for ( GSList const *iter = item_list; iter; iter = iter->next ) {
- SPObject *subitem = static_cast<SPObject *>(iter->data);
+ SelContainer item_list = sp_item_group_item_list(SP_GROUP(item));
+ for ( SelContainer::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+ SPObject *subitem = static_cast<SPObject *>(*iter);
apply_to_mask(SP_ITEM(subitem));
}
}
@@ -746,9 +746,9 @@ SPLPEItem::apply_to_clip_or_mask_group(SPItem *group, SPItem *item)
if (!SP_IS_GROUP(group)) {
return;
}
- GSList *item_list = sp_item_group_item_list(SP_GROUP(group));
- for ( GSList *iter = item_list; iter; iter = iter->next ) {
- SPObject *subitem = static_cast<SPObject *>(iter->data);
+ SelContainer item_list = sp_item_group_item_list(SP_GROUP(group));
+ for ( SelContainer::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+ SPObject *subitem = static_cast<SPObject *>(*iter);
if (SP_IS_GROUP(subitem)) {
apply_to_clip_or_mask_group(SP_ITEM(subitem), item);
} else if (SP_IS_SHAPE(subitem)) {