summaryrefslogtreecommitdiffstats
path: root/src/display/drawing-text.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-text.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-text.cpp')
-rw-r--r--src/display/drawing-text.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index d809e8dcb..9d81d736d 100644
--- a/src/display/drawing-text.cpp
+++ b/src/display/drawing-text.cpp
@@ -446,8 +446,8 @@ unsigned DrawingText::_renderItem(DrawingContext &dc, Geom::IntRect const &/*are
dc.setSource(rgba);
dc.setTolerance(0.5); // low quality, but good enough for outline mode
- for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
- DrawingGlyphs *g = dynamic_cast<DrawingGlyphs *>(&*i);
+ for (auto & i : _children) {
+ DrawingGlyphs *g = dynamic_cast<DrawingGlyphs *>(&i);
if (!g) throw InvalidItemException();
Inkscape::DrawingContext::Save save(dc);
@@ -512,9 +512,9 @@ unsigned DrawingText::_renderItem(DrawingContext &dc, Geom::IntRect const &/*are
double leftmost = DBL_MAX;
bool first_y = true;
double start_y = 0.0;
- for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
+ for (auto & i : _children) {
- DrawingGlyphs *g = dynamic_cast<DrawingGlyphs *>(&*i);
+ DrawingGlyphs *g = dynamic_cast<DrawingGlyphs *>(&i);
if (!g) throw InvalidItemException();
if (!invset) {
@@ -576,8 +576,8 @@ unsigned DrawingText::_renderItem(DrawingContext &dc, Geom::IntRect const &/*are
}
// accumulate the path that represents the glyphs
- for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
- DrawingGlyphs *g = dynamic_cast<DrawingGlyphs *>(&*i);
+ for (auto & i : _children) {
+ DrawingGlyphs *g = dynamic_cast<DrawingGlyphs *>(&i);
if (!g) throw InvalidItemException();
Inkscape::DrawingContext::Save save(dc);
@@ -678,8 +678,8 @@ void DrawingText::_clipItem(DrawingContext &dc, Geom::IntRect const &/*area*/)
}
}
- for (ChildrenList::iterator i = _children.begin(); i != _children.end(); ++i) {
- DrawingGlyphs *g = dynamic_cast<DrawingGlyphs *>(&*i);
+ for (auto & i : _children) {
+ DrawingGlyphs *g = dynamic_cast<DrawingGlyphs *>(&i);
if (!g) {
throw InvalidItemException();
}