summaryrefslogtreecommitdiffstats
path: root/src/text-editing.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2015-04-29 21:14:01 +0000
committerMarc Jeanmougin <mc@M0nst3r.bouyguesbox.fr>2015-04-29 21:14:01 +0000
commit9b7af8caac08ad42a48214518bc004e258eb5873 (patch)
treedcaaac56217eb5da334ab420f5e791cf7eb70f23 /src/text-editing.cpp
parentBetter solution picking (diff)
parentcorrected test file (diff)
downloadinkscape-9b7af8caac08ad42a48214518bc004e258eb5873.tar.gz
inkscape-9b7af8caac08ad42a48214518bc004e258eb5873.zip
bzr merge lp:~mc.../inkscape/SelContainer
The main change of this branch is that the container for selections is now a std::vector and not a GSList. This change propagates in most of the codebase. Normally, there are no changes of semantics, except the following: -> childList is now in the intuitive order (childList()[0] is now firstChild) -> sp_selection_paste_impl is now in the opposite order (change is local to selection-chemistry.cpp, and simplify a few things there) -> selection.setReprList now takes the list in the opposite order. It was always the case (the list was always reversed before handing to it) -> a few comparison functions now work "the c++ way": the C way was to return -1 if a<b, 0 if a==b and 1 if a>b, now they return (bool)(a<b) so they can be used with std::sort (bzr r14074)
Diffstat (limited to 'src/text-editing.cpp')
-rw-r--r--src/text-editing.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index 4a962ab4c..050e223eb 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -67,12 +67,11 @@ static void te_update_layout_now (SPItem *item)
void te_update_layout_now_recursive(SPItem *item)
{
if (SP_IS_GROUP(item)) {
- GSList *item_list = sp_item_group_item_list(SP_GROUP(item));
- for(GSList* elem = item_list; elem; elem = elem->next) {
- SPItem* list_item = static_cast<SPItem*>(elem->data);
+ std::vector<SPItem*> item_list = sp_item_group_item_list(SP_GROUP(item));
+ for(std::vector<SPItem*>::const_iterator i=item_list.begin();i!=item_list.end();i++){
+ SPItem* list_item = *i;
te_update_layout_now_recursive(list_item);
}
- g_slist_free(item_list);
} else if (SP_IS_TEXT(item))
SP_TEXT(item)->rebuildLayout();
else if (SP_IS_FLOWTEXT (item))