summaryrefslogtreecommitdiffstats
path: root/src/sp-switch.cpp
diff options
context:
space:
mode:
authorJabiertxof <jtx@jtx>2017-01-21 23:33:24 +0000
committerJabiertxof <jtx@jtx>2017-01-21 23:33:24 +0000
commiteeb5405c1b2734322ca9ed506e8a8e16a87c2a4f (patch)
tree5f98cdb1ee5633b69ec1f5c21d0d5e69f8770ad2 /src/sp-switch.cpp
parentOrganize doeffect function (diff)
parentFix "swap fill and stroke" for multiple objects in selection (diff)
downloadinkscape-eeb5405c1b2734322ca9ed506e8a8e16a87c2a4f.tar.gz
inkscape-eeb5405c1b2734322ca9ed506e8a8e16a87c2a4f.zip
Update to trunk
(bzr r13645.1.165)
Diffstat (limited to 'src/sp-switch.cpp')
-rw-r--r--src/sp-switch.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp
index d2dcde15d..d6ab1e904 100644
--- a/src/sp-switch.cpp
+++ b/src/sp-switch.cpp
@@ -18,7 +18,6 @@
#include "display/drawing-group.h"
#include "conditions.h"
-#include <sigc++/functors/ptr_fun.h>
#include <sigc++/adaptors/bind.h>
SPSwitch::SPSwitch() : SPGroup() {
@@ -32,9 +31,10 @@ SPSwitch::~SPSwitch() {
SPObject *SPSwitch::_evaluateFirst() {
SPObject *first = 0;
- for (SPObject *child = this->firstChild() ; child && !first ; child = child->getNext() ) {
- if (SP_IS_ITEM(child) && sp_item_evaluate(SP_ITEM(child))) {
- first = child;
+ for (auto& child: children) {
+ if (SP_IS_ITEM(&child) && sp_item_evaluate(SP_ITEM(&child))) {
+ first = &child;
+ break;
}
}