diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2017-08-02 16:50:03 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2017-08-11 11:23:35 +0000 |
commit | 1f47b1a7ae58702dccc57a9ccbaa905441f4fecb (patch) | |
tree | 523666bcfdb7d92d53bf226976f328e9234f3504 /examples/charts/chartthemes/themewidget.cpp | |
parent | 8847c9049daf91f5a9f71840cc499c1cbb2668ac (diff) |
Use range-for instead of foreach in examples
Task-number: QTBUG-60662
Change-Id: Ief9264e2b6670466bd74278dbd194a7be81d614f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'examples/charts/chartthemes/themewidget.cpp')
-rw-r--r-- | examples/charts/chartthemes/themewidget.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/examples/charts/chartthemes/themewidget.cpp b/examples/charts/chartthemes/themewidget.cpp index 32779bb9..982c50e0 100644 --- a/examples/charts/chartthemes/themewidget.cpp +++ b/examples/charts/chartthemes/themewidget.cpp @@ -233,7 +233,7 @@ QChart *ThemeWidget::createBarChart(int valueCount) const QStackedBarSeries *series = new QStackedBarSeries(chart); for (int i(0); i < m_dataTable.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); - foreach (Data data, m_dataTable[i]) + for (const Data &data : m_dataTable[i]) *set << data.first.y(); series->append(set); } @@ -250,9 +250,9 @@ QChart *ThemeWidget::createLineChart() const QString name("Series "); int nameIndex = 0; - foreach (DataList list, m_dataTable) { + for (const DataList &list : m_dataTable) { QLineSeries *series = new QLineSeries(chart); - foreach (Data data, list) + for (const Data &data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -271,7 +271,7 @@ QChart *ThemeWidget::createPieChart() const qreal pieSize = 1.0 / m_dataTable.count(); for (int i = 0; i < m_dataTable.count(); i++) { QPieSeries *series = new QPieSeries(chart); - foreach (Data data, m_dataTable[i]) { + for (const Data &data : m_dataTable[i]) { QPieSlice *slice = series->append(data.second, data.first.y()); if (data == m_dataTable[i].first()) { slice->setLabelVisible(); @@ -295,9 +295,9 @@ QChart *ThemeWidget::createSplineChart() const chart->setTitle("Spline chart"); QString name("Series "); int nameIndex = 0; - foreach (DataList list, m_dataTable) { + for (const DataList &list : m_dataTable) { QSplineSeries *series = new QSplineSeries(chart); - foreach (Data data, list) + for (const Data &data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -314,9 +314,9 @@ QChart *ThemeWidget::createScatterChart() const chart->setTitle("Scatter chart"); QString name("Series "); int nameIndex = 0; - foreach (DataList list, m_dataTable) { + for (const DataList &list : m_dataTable) { QScatterSeries *series = new QScatterSeries(chart); - foreach (Data data, list) + for (const Data &data : list) series->append(data.first); series->setName(name + QString::number(nameIndex)); nameIndex++; @@ -331,8 +331,9 @@ void ThemeWidget::updateUI() QChart::ChartTheme theme = static_cast<QChart::ChartTheme>( m_themeComboBox->itemData(m_themeComboBox->currentIndex()).toInt()); + const auto charts = m_charts; if (m_charts.at(0)->chart()->theme() != theme) { - foreach (QChartView *chartView, m_charts) + for (QChartView *chartView : charts) chartView->chart()->setTheme(theme); QPalette pal = window()->palette(); @@ -365,23 +366,23 @@ void ThemeWidget::updateUI() } bool checked = m_antialiasCheckBox->isChecked(); - foreach (QChartView *chart, m_charts) + for (QChartView *chart : charts) chart->setRenderHint(QPainter::Antialiasing, checked); QChart::AnimationOptions options( m_animatedComboBox->itemData(m_animatedComboBox->currentIndex()).toInt()); if (m_charts.at(0)->chart()->animationOptions() != options) { - foreach (QChartView *chartView, m_charts) + for (QChartView *chartView : charts) chartView->chart()->setAnimationOptions(options); } Qt::Alignment alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt()); if (!alignment) { - foreach (QChartView *chartView, m_charts) + for (QChartView *chartView : charts) chartView->chart()->legend()->hide(); } else { - foreach (QChartView *chartView, m_charts) { + for (QChartView *chartView : charts) { chartView->chart()->legend()->setAlignment(alignment); chartView->chart()->legend()->show(); } |