summaryrefslogtreecommitdiffstats
path: root/src/sp-flowtext.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/sp-flowtext.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/sp-flowtext.cpp')
-rw-r--r--src/sp-flowtext.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index 83fa5a1b4..79988bdc2 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -72,7 +72,7 @@ void SPFlowtext::update(SPCtx* ctx, unsigned int flags) {
GSList *l = NULL;
- for (auto& child: _children) {
+ for (auto& child: children) {
sp_object_ref(&child);
l = g_slist_prepend(l, &child);
}
@@ -135,7 +135,7 @@ void SPFlowtext::modified(unsigned int flags) {
}
}
- for (auto& o: _children) {
+ for (auto& o: children) {
if (dynamic_cast<SPFlowregion *>(&o)) {
region = &o;
break;
@@ -223,7 +223,7 @@ Inkscape::XML::Node* SPFlowtext::write(Inkscape::XML::Document* doc, Inkscape::X
GSList *l = NULL;
- for (auto& child: _children) {
+ for (auto& child: children) {
Inkscape::XML::Node *c_repr = NULL;
if ( dynamic_cast<SPFlowdiv *>(&child) || dynamic_cast<SPFlowpara *>(&child) || dynamic_cast<SPFlowregion *>(&child) || dynamic_cast<SPFlowregionExclude *>(&child)) {
@@ -241,7 +241,7 @@ Inkscape::XML::Node* SPFlowtext::write(Inkscape::XML::Document* doc, Inkscape::X
l = g_slist_remove(l, l->data);
}
} else {
- for (auto& child: _children) {
+ for (auto& child: children) {
if ( dynamic_cast<SPFlowdiv *>(&child) || dynamic_cast<SPFlowpara *>(&child) || dynamic_cast<SPFlowregion *>(&child) || dynamic_cast<SPFlowregionExclude *>(&child)) {
child.updateRepr(flags);
}
@@ -390,7 +390,7 @@ void SPFlowtext::_buildLayoutInput(SPObject *root, Shape const *exclusion_shape,
*pending_line_break_object = NULL;
}
- for (auto& child: root->_children) {
+ for (auto& child: root->children) {
SPString *str = dynamic_cast<SPString *>(&child);
if (str) {
if (*pending_line_break_object) {
@@ -440,7 +440,7 @@ Shape* SPFlowtext::_buildExclusionShape() const
Shape *shape = new Shape();
Shape *shape_temp = new Shape();
- for (auto& child: _children) {
+ for (auto& child: children) {
// RH: is it right that this shouldn't be recursive?
SPFlowregionExclude *c_child = dynamic_cast<SPFlowregionExclude *>(const_cast<SPObject*>(&child));
if ( c_child && c_child->computed && c_child->computed->hasEdges() ) {
@@ -593,7 +593,7 @@ SPItem *SPFlowtext::get_frame(SPItem const *after)
SPItem *frame = 0;
SPObject *region = 0;
- for (auto& o: _children) {
+ for (auto& o: children) {
if (dynamic_cast<SPFlowregion *>(&o)) {
region = &o;
break;
@@ -603,7 +603,7 @@ SPItem *SPFlowtext::get_frame(SPItem const *after)
if (region) {
bool past = false;
- for (auto& o: region->_children) {
+ for (auto& o: region->children) {
SPItem *item = dynamic_cast<SPItem *>(&o);
if (item) {
if ( (after == NULL) || past ) {
@@ -707,7 +707,7 @@ Geom::Affine SPFlowtext::set_transform (Geom::Affine const &xform)
}
SPObject *region = NULL;
- for (auto& o: _children) {
+ for (auto& o: children) {
if (dynamic_cast<SPFlowregion *>(&o)) {
region = &o;
break;