From ebc5bc3d8b2d7ea135a430d5cbc77f9f97cb78b0 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 1 Aug 2017 16:45:50 +0300 Subject: Minor coding style fixes to examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-60662 Change-Id: I0edd88328b403d09faa27d30b89ac91c802121dc Reviewed-by: André Hartmann Reviewed-by: Tomi Korpipää Reviewed-by: Miikka Heikkinen --- examples/charts/legendmarkers/mainwidget.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'examples/charts/legendmarkers/mainwidget.cpp') diff --git a/examples/charts/legendmarkers/mainwidget.cpp b/examples/charts/legendmarkers/mainwidget.cpp index 78f8bc74..4222b960 100644 --- a/examples/charts/legendmarkers/mainwidget.cpp +++ b/examples/charts/legendmarkers/mainwidget.cpp @@ -88,9 +88,8 @@ void MainWidget::addSeries() series->append(data); m_chart->addSeries(series); - if (m_series.count() == 1) { + if (m_series.count() == 1) m_chart->createDefaultAxes(); - } } void MainWidget::removeSeries() @@ -110,8 +109,9 @@ void MainWidget::connectMarkers() // Connect all markers to handler foreach (QLegendMarker* marker, m_chart->legend()->markers()) { // Disconnect possible existing connection to avoid multiple connections - QObject::disconnect(marker, SIGNAL(clicked()), this, SLOT(handleMarkerClicked())); - QObject::connect(marker, SIGNAL(clicked()), this, SLOT(handleMarkerClicked())); + QObject::disconnect(marker, &QLegendMarker::clicked, + this, &MainWidget::handleMarkerClicked); + QObject::connect(marker, &QLegendMarker::clicked, this, &MainWidget::handleMarkerClicked); } //![1] } @@ -120,7 +120,8 @@ void MainWidget::disconnectMarkers() { //![2] foreach (QLegendMarker* marker, m_chart->legend()->markers()) { - QObject::disconnect(marker, SIGNAL(clicked()), this, SLOT(handleMarkerClicked())); + QObject::disconnect(marker, &QLegendMarker::clicked, + this, &MainWidget::handleMarkerClicked); } //![2] } @@ -151,9 +152,8 @@ void MainWidget::handleMarkerClicked() // Dim the marker, if series is not visible qreal alpha = 1.0; - if (!marker->series()->isVisible()) { + if (!marker->series()->isVisible()) alpha = 0.5; - } QColor color; QBrush brush = marker->labelBrush(); -- cgit v1.2.3 From 1f47b1a7ae58702dccc57a9ccbaa905441f4fecb Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 2 Aug 2017 16:50:03 +0300 Subject: Use range-for instead of foreach in examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-60662 Change-Id: Ief9264e2b6670466bd74278dbd194a7be81d614f Reviewed-by: André Hartmann Reviewed-by: Tomi Korpipää Reviewed-by: Miikka Heikkinen --- examples/charts/legendmarkers/mainwidget.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'examples/charts/legendmarkers/mainwidget.cpp') diff --git a/examples/charts/legendmarkers/mainwidget.cpp b/examples/charts/legendmarkers/mainwidget.cpp index 4222b960..46b2b275 100644 --- a/examples/charts/legendmarkers/mainwidget.cpp +++ b/examples/charts/legendmarkers/mainwidget.cpp @@ -107,7 +107,8 @@ void MainWidget::connectMarkers() { //![1] // Connect all markers to handler - foreach (QLegendMarker* marker, m_chart->legend()->markers()) { + const auto markers = m_chart->legend()->markers(); + for (QLegendMarker *marker : markers) { // Disconnect possible existing connection to avoid multiple connections QObject::disconnect(marker, &QLegendMarker::clicked, this, &MainWidget::handleMarkerClicked); @@ -119,7 +120,8 @@ void MainWidget::connectMarkers() void MainWidget::disconnectMarkers() { //![2] - foreach (QLegendMarker* marker, m_chart->legend()->markers()) { + const auto markers = m_chart->legend()->markers(); + for (QLegendMarker *marker : markers) { QObject::disconnect(marker, &QLegendMarker::clicked, this, &MainWidget::handleMarkerClicked); } -- cgit v1.2.3