3 files changed, 10 insertions, 20 deletions

diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp
index 36bf81e9..56b48773 100644
--- a/src/charts/barchart/abstractbarchartitem.cpp
+++ b/src/charts/barchart/abstractbarchartitem.cpp
@@ -207,12 +207,9 @@ void AbstractBarChartItem::handleLayoutChanged()
 void AbstractBarChartItem::handleLabelsVisibleChanged(bool visible)
 {
     bool newVisible = visible && m_series->isVisible();
-    QMapIterator<QBarSet *, QList<Bar *> > i(m_barMap);
-    while (i.hasNext()) {
-        i.next();
-        const QList<Bar *> &bars = i.value();
-        for (int j = 0; j < bars.size(); j++) {
-            QGraphicsTextItem *label = bars.at(j)->labelItem();
+    for (const QList<Bar *> &bars : qAsConst(m_barMap)) {
+        for (Bar *bar :  bars) {
+            QGraphicsTextItem *label = bar->labelItem();
             if (label)
                 label->setVisible(newVisible);
         }
@@ -235,9 +232,7 @@ void AbstractBarChartItem::handleVisibleChanged()
     bool visible = m_series->isVisible();
     handleLabelsVisibleChanged(m_series->isLabelsVisible());
 
-    QMapIterator<QBarSet *, QList<Bar *> > i(m_barMap);
-    while (i.hasNext()) {
-        i.next();
+    for (auto i = m_barMap.cbegin(), end = m_barMap.cend(); i != end; ++i) {
         const QList<Bar *> &bars = i.value();
         for (int j = 0; j < bars.size(); j++) {
             Bar *bar = bars.at(j);
@@ -505,17 +500,14 @@ void AbstractBarChartItem::createLabelItems()
 
     m_labelItemsMissing = false;
 
-    QMapIterator<QBarSet *, QList<Bar *> > i(m_barMap);
-    while (i.hasNext()) {
-        i.next();
-        const QList<Bar *> &bars = i.value();
-        for (int j = 0; j < bars.size(); j++) {
-            QGraphicsTextItem *label = bars.at(j)->labelItem();
+    for (const QList<Bar *> &bars : qAsConst(m_barMap)) {
+        for (Bar *bar :  bars) {
+            QGraphicsTextItem *label = bar->labelItem();
             if (!label) {
                 QGraphicsTextItem *newLabel = new QGraphicsTextItem(this);
                 newLabel->setAcceptHoverEvents(false);
                 newLabel->document()->setDocumentMargin(ChartPresenter::textMargin());
-                bars.at(j)->setLabelItem(newLabel);
+                bar->setLabelItem(newLabel);
             }
         }
     }
diff --git a/src/charts/glwidget.cpp b/src/charts/glwidget.cpp
index ff22050f..105e489a 100644
--- a/src/charts/glwidget.cpp
+++ b/src/charts/glwidget.cpp
@@ -327,10 +327,9 @@ void GLWidget::render(bool selection)
     QOpenGLVertexArrayObject::Binder vaoBinder(&m_vao);
     m_program->bind();
 
-    GLXYDataMapIterator i(m_xyDataManager->dataMap());
     int counter = 0;
-    while (i.hasNext()) {
-        i.next();
+    const auto &dataMap = m_xyDataManager->dataMap();
+    for (auto i = dataMap.begin(), end = dataMap.end(); i != end; ++i) {
         QOpenGLBuffer *vbo = m_seriesBufferMap.value(i.key());
         GLXYSeriesData *data = i.value();
 
diff --git a/src/charts/xychart/glxyseriesdata_p.h b/src/charts/xychart/glxyseriesdata_p.h
index 006a810c..2db3e490 100644
--- a/src/charts/xychart/glxyseriesdata_p.h
+++ b/src/charts/xychart/glxyseriesdata_p.h
@@ -77,7 +77,6 @@ public:
 };
 
 typedef QMap<const QXYSeries *, GLXYSeriesData *> GLXYDataMap;
-typedef QMapIterator<const QXYSeries *, GLXYSeriesData *> GLXYDataMapIterator;
 
 class Q_CHARTS_PRIVATE_EXPORT GLXYSeriesDataManager : public QObject
 {