diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2019-06-18 12:00:17 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2019-06-18 12:00:19 +0200 |
commit | 1a69eaec6ec24f2097b52ee8522e44505b20088f (patch) | |
tree | ec0b2d666162a420b493a50b03edd1eb6b6d27bc /src/shared/qtgradienteditor/qtgradientwidget.cpp | |
parent | fb217099b4e03aaa2893e59470a4fe3ec125c9a7 (diff) | |
download | qttools-1a69eaec6ec24f2097b52ee8522e44505b20088f.tar.gz |
Eradicate some easy Java-style iterators
Java-style iterators are scheduled for deprecation, or at the very
least banned from use in Qt code. There are two more complicated ones
left in the code for a later commit.
Change-Id: I0c843ddcf2c67793b56ab99a219d36a0694c7b09
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/shared/qtgradienteditor/qtgradientwidget.cpp')
-rw-r--r-- | src/shared/qtgradienteditor/qtgradientwidget.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/shared/qtgradienteditor/qtgradientwidget.cpp b/src/shared/qtgradienteditor/qtgradientwidget.cpp index 08e83419e..9db1b82e6 100644 --- a/src/shared/qtgradienteditor/qtgradientwidget.cpp +++ b/src/shared/qtgradienteditor/qtgradientwidget.cpp @@ -203,11 +203,9 @@ void QtGradientWidgetPrivate::setupDrag(QtGradientStop *stop, int x) int viewportX = qRound(toViewport(stop->position())); m_dragOffset = x - viewportX; - QList<QtGradientStop *> stops = m_stops; + const QList<QtGradientStop *> stops = m_stops; m_stops.clear(); - QListIterator<QtGradientStop *> itStop(stops); - while (itStop.hasNext()) { - QtGradientStop *s = itStop.next(); + for (QtGradientStop *s : stops) { if (m_model->isSelected(s) || s == stop) { m_dragStops[s] = s->position() - stop->position(); m_stops.append(s); @@ -215,9 +213,7 @@ void QtGradientWidgetPrivate::setupDrag(QtGradientStop *stop, int x) m_dragOriginal[s->position()] = s->color(); } } - itStop.toFront(); - while (itStop.hasNext()) { - QtGradientStop *s = itStop.next(); + for (QtGradientStop *s : stops) { if (!m_model->isSelected(s)) m_stops.append(s); } |