summaryrefslogtreecommitdiffstats
path: root/src/display/drawing-group.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2019-01-02 09:41:30 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2019-01-02 09:41:30 +0000
commit169dff19d4da8d76e69b8e896aa25b0013639c03 (patch)
treea0c070fa95188b5cde708ac285e6a2db9df4a83f /src/display/drawing-group.cpp
parentAvoid creating a new document before opening an old document. (diff)
downloadinkscape-169dff19d4da8d76e69b8e896aa25b0013639c03.tar.gz
inkscape-169dff19d4da8d76e69b8e896aa25b0013639c03.zip
modernize loops
Diffstat (limited to 'src/display/drawing-group.cpp')
-rw-r--r--src/display/drawing-group.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/display/drawing-group.cpp b/src/display/drawing-group.cpp
index 3a2eeb018..0d6a2edfc 100644
--- a/src/display/drawing-group.cpp
+++ b/src/display/drawing-group.cpp
@@ -73,14 +73,14 @@ DrawingGroup::_updateItem(Geom::IntRect const &area, UpdateContext const &ctx, u
if (_child_transform) {
child_ctx.ctm = *_child_transform * ctx.ctm;
}
- for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
- i->update(area, child_ctx, flags, reset);
+ for (auto & i : _children) {
+ i.update(area, child_ctx, flags, reset);
}
if (beststate & STATE_BBOX) {
_bbox = Geom::OptIntRect();
- for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
- if (i->visible()) {
- _bbox.unionWith(outline ? i->geometricBounds() : i->visualBounds());
+ for (auto & i : _children) {
+ if (i.visible()) {
+ _bbox.unionWith(outline ? i.geometricBounds() : i.visualBounds());
}
}
}
@@ -92,23 +92,23 @@ DrawingGroup::_renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigne
{
if (stop_at == nullptr) {
// normal rendering
- for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
- i->setAntialiasing(_antialias);
- i->render(dc, area, flags, stop_at);
+ for (auto & i : _children) {
+ i.setAntialiasing(_antialias);
+ i.render(dc, area, flags, stop_at);
}
} else {
// background rendering
- for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
- if (&*i == stop_at) return RENDER_OK; // do not render the stop_at item at all
- if (i->isAncestorOf(stop_at)) {
+ for (auto & i : _children) {
+ if (&i == stop_at) return RENDER_OK; // do not render the stop_at item at all
+ if (i.isAncestorOf(stop_at)) {
// render its ancestors without masks, opacity or filters
- i->setAntialiasing(_antialias);
- i->render(dc, area, flags | RENDER_FILTER_BACKGROUND, stop_at);
+ i.setAntialiasing(_antialias);
+ i.render(dc, area, flags | RENDER_FILTER_BACKGROUND, stop_at);
// stop further rendering
return RENDER_OK;
} else {
- i->setAntialiasing(_antialias);
- i->render(dc, area, flags, stop_at);
+ i.setAntialiasing(_antialias);
+ i.render(dc, area, flags, stop_at);
}
}
}
@@ -118,16 +118,16 @@ DrawingGroup::_renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigne
void
DrawingGroup::_clipItem(DrawingContext &dc, Geom::IntRect const &area)
{
- for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
- i->clip(dc, area);
+ for (auto & i : _children) {
+ i.clip(dc, area);
}
}
DrawingItem *
DrawingGroup::_pickItem(Geom::Point const &p, double delta, unsigned flags)
{
- for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
- DrawingItem *picked = i->pick(p, delta, flags);
+ for (auto & i : _children) {
+ DrawingItem *picked = i.pick(p, delta, flags);
if (picked) {
return _pick_children ? picked : this;
}