summaryrefslogtreecommitdiffstats
path: root/src/sp-switch.cpp
diff options
context:
space:
mode:
authorkamalpreetgrewal <grewalkamal005@gmail.com>2016-08-15 03:59:18 +0000
committerkamalpreetgrewal <grewalkamal005@gmail.com>2016-08-15 03:59:18 +0000
commit25a9ed4f38121eeb59cf15dbf19391aaef45bba3 (patch)
treee123aeae50d98a52e1ad4575b29bf3c199619e33 /src/sp-switch.cpp
parentSolve crash when deleting CSS property (diff)
parentinkview: Convert to ApplicationWindow (diff)
downloadinkscape-25a9ed4f38121eeb59cf15dbf19391aaef45bba3.tar.gz
inkscape-25a9ed4f38121eeb59cf15dbf19391aaef45bba3.zip
Merge changes from trunk
(bzr r14949.1.64)
Diffstat (limited to 'src/sp-switch.cpp')
-rw-r--r--src/sp-switch.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp
index 1e0d81db9..d6ab1e904 100644
--- a/src/sp-switch.cpp
+++ b/src/sp-switch.cpp
@@ -31,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;
}
}