summaryrefslogtreecommitdiffstats
path: root/src/layer-fns.cpp
diff options
context:
space:
mode:
authorAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-07-14 11:17:21 +0000
committerAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-07-14 11:17:21 +0000
commit24d3f50003ca3cec6a03a7f5267cc4fe5588c69f (patch)
tree31b18bad74998d7b7042e737d28c08b063a8d383 /src/layer-fns.cpp
parentLast part of new SPObject children list (diff)
downloadinkscape-24d3f50003ca3cec6a03a7f5267cc4fe5588c69f.tar.gz
inkscape-24d3f50003ca3cec6a03a7f5267cc4fe5588c69f.zip
Renamed children list in SPObject
(bzr r14954.1.21)
Diffstat (limited to 'src/layer-fns.cpp')
-rw-r--r--src/layer-fns.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/layer-fns.cpp b/src/layer-fns.cpp
index d149089db..030ebc07e 100644
--- a/src/layer-fns.cpp
+++ b/src/layer-fns.cpp
@@ -36,7 +36,7 @@ bool is_layer(SPObject &object) {
* @returns NULL if there are no further layers under a parent
*/
SPObject *next_sibling_layer(SPObject *layer) {
- SPObject::ChildrenList &list = layer->parent->_children;
+ SPObject::ChildrenList &list = layer->parent->children;
auto l = std::find_if(++list.iterator_to(*layer), list.end(), &is_layer);
return l != list.end() ? &*l : nullptr;
}
@@ -48,7 +48,7 @@ SPObject *next_sibling_layer(SPObject *layer) {
SPObject *previous_sibling_layer(SPObject *layer) {
using Inkscape::Algorithms::find_last_if;
- SPObject::ChildrenList &list = layer->parent->_children;
+ SPObject::ChildrenList &list = layer->parent->children;
auto l = find_last_if(list.begin(), list.iterator_to(*layer), &is_layer);
return l != list.iterator_to(*layer) ? &*(l) : nullptr;
}
@@ -60,8 +60,8 @@ SPObject *previous_sibling_layer(SPObject *layer) {
SPObject *first_descendant_layer(SPObject *layer) {
SPObject *first_descendant = nullptr;
while (true) {
- auto tmp = std::find_if(layer->_children.begin(), layer->_children.end(), &is_layer);
- if (tmp != layer->_children.end()) {
+ auto tmp = std::find_if(layer->children.begin(), layer->children.end(), &is_layer);
+ if (tmp != layer->children.end()) {
first_descendant = layer;
} else {
break;
@@ -79,8 +79,8 @@ SPObject *first_descendant_layer(SPObject *layer) {
SPObject *last_child_layer(SPObject *layer) {
using Inkscape::Algorithms::find_last_if;
- auto l = find_last_if(layer->_children.begin(), layer->_children.end(), &is_layer);
- return l != layer->_children.end() ? &*l : nullptr;
+ auto l = find_last_if(layer->children.begin(), layer->children.end(), &is_layer);
+ return l != layer->children.end() ? &*l : nullptr;
}
SPObject *last_elder_layer(SPObject *root, SPObject *layer) {