summaryrefslogtreecommitdiffstats
path: root/src/gradient-drag.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/gradient-drag.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/gradient-drag.cpp')
-rw-r--r--src/gradient-drag.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index cb2bd737f..169710114 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -2082,9 +2082,9 @@ void GrDrag::updateDraggers()
this->draggers = NULL;
g_return_if_fail(this->selection != NULL);
-
- for (GSList const* i = this->selection->itemList(); i != NULL; i = i->next) {
- SPItem *item = SP_ITEM(i->data);
+ std::vector<SPItem*> list = this->selection->itemList();
+ for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); i++) {
+ SPItem *item = *i;
SPStyle *style = item->style;
if (style && (style->fill.isPaintserver())) {
@@ -2151,9 +2151,9 @@ void GrDrag::updateLines()
g_return_if_fail(this->selection != NULL);
- for (GSList const* i = this->selection->itemList(); i != NULL; i = i->next) {
-
- SPItem *item = SP_ITEM(i->data);
+ std::vector<SPItem*> list = this->selection->itemList();
+ for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); i++) {
+ SPItem *item = *i;
SPStyle *style = item->style;
@@ -2295,8 +2295,9 @@ void GrDrag::updateLevels()
g_return_if_fail (this->selection != NULL);
- for (GSList const* i = this->selection->itemList(); i != NULL; i = i->next) {
- SPItem *item = SP_ITEM(i->data);
+ std::vector<SPItem*> list = this->selection->itemList();
+ for (std::vector<SPItem*>::const_iterator i = list.begin(); i != list.end(); i++) {
+ SPItem *item = *i;
Geom::OptRect rect = item->desktopVisualBounds();
if (rect) {
// Remember the edges of the bbox and the center axis