diff options
31 files changed, 217 insertions, 224 deletions
diff --git a/.qmake.conf b/.qmake.conf index 858804d5..715105c4 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.14.2 +MODULE_VERSION = 5.15.0 diff --git a/examples/charts/chartinteractions/chart.h b/examples/charts/chartinteractions/chart.h index 9da392e5..2ab2430b 100644 --- a/examples/charts/chartinteractions/chart.h +++ b/examples/charts/chartinteractions/chart.h @@ -39,7 +39,7 @@ class Chart : public QChart { Q_OBJECT public: - explicit Chart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0, QLineSeries *series = 0); + explicit Chart(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = {}, QLineSeries *series = nullptr); ~Chart(); public slots: diff --git a/examples/charts/donutbreakdown/donutbreakdownchart.h b/examples/charts/donutbreakdown/donutbreakdownchart.h index ebf071db..1ce22f51 100644 --- a/examples/charts/donutbreakdown/donutbreakdownchart.h +++ b/examples/charts/donutbreakdown/donutbreakdownchart.h @@ -37,7 +37,7 @@ QT_CHARTS_USE_NAMESPACE class DonutBreakdownChart : public QChart { public: - DonutBreakdownChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + DonutBreakdownChart(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = {}); void addBreakdownSeries(QPieSeries *series, QColor color); private: diff --git a/examples/charts/dynamicspline/chart.h b/examples/charts/dynamicspline/chart.h index 954a0946..c6cd12f0 100644 --- a/examples/charts/dynamicspline/chart.h +++ b/examples/charts/dynamicspline/chart.h @@ -45,7 +45,7 @@ class Chart: public QChart { Q_OBJECT public: - Chart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + Chart(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = {}); virtual ~Chart(); public slots: diff --git a/examples/charts/piechartdrilldown/drilldownchart.h b/examples/charts/piechartdrilldown/drilldownchart.h index 54f5aaa5..53748b21 100644 --- a/examples/charts/piechartdrilldown/drilldownchart.h +++ b/examples/charts/piechartdrilldown/drilldownchart.h @@ -42,7 +42,7 @@ class DrilldownChart : public QChart { Q_OBJECT public: - explicit DrilldownChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + explicit DrilldownChart(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = {}); ~DrilldownChart(); void changeSeries(QAbstractSeries *series); diff --git a/examples/charts/stackedbarchartdrilldown/drilldownchart.h b/examples/charts/stackedbarchartdrilldown/drilldownchart.h index 7544bae5..61fdbc6e 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownchart.h +++ b/examples/charts/stackedbarchartdrilldown/drilldownchart.h @@ -45,7 +45,7 @@ class DrilldownChart : public QChart { Q_OBJECT public: - explicit DrilldownChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + explicit DrilldownChart(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = {}); void changeSeries(DrilldownBarSeries *series); diff --git a/examples/charts/zoomlinechart/chart.h b/examples/charts/zoomlinechart/chart.h index b49c4c54..3ea75938 100644 --- a/examples/charts/zoomlinechart/chart.h +++ b/examples/charts/zoomlinechart/chart.h @@ -43,7 +43,7 @@ class Chart : public QChart //![1] { public: - explicit Chart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + explicit Chart(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = {}); ~Chart(); protected: diff --git a/src/charts/axis/horizontalaxis.cpp b/src/charts/axis/horizontalaxis.cpp index 821961c7..3bbc5ebe 100644 --- a/src/charts/axis/horizontalaxis.cpp +++ b/src/charts/axis/horizontalaxis.cpp @@ -485,12 +485,12 @@ void HorizontalAxis::updateMinorTickGeometry() qreal minorArrowLineItemY2; switch (axis()->alignment()) { case Qt::AlignTop: - minorArrowLineItemY1 = gridGeometry().bottom(); - minorArrowLineItemY2 = gridGeometry().bottom() - labelPadding() / 2.0; + minorArrowLineItemY1 = gridGeometry().top(); + minorArrowLineItemY2 = gridGeometry().top() - labelPadding() / 2.0; break; case Qt::AlignBottom: - minorArrowLineItemY1 = gridGeometry().top(); - minorArrowLineItemY2 = gridGeometry().top() + labelPadding() / 2.0; + minorArrowLineItemY1 = gridGeometry().bottom(); + minorArrowLineItemY2 = gridGeometry().bottom() + labelPadding() / 2.0; break; default: minorArrowLineItemY1 = 0.0; diff --git a/src/charts/axis/qabstractaxis.cpp b/src/charts/axis/qabstractaxis.cpp index c1e55f83..8671b518 100644 --- a/src/charts/axis/qabstractaxis.cpp +++ b/src/charts/axis/qabstractaxis.cpp @@ -999,31 +999,16 @@ void QAbstractAxis::setReverse(bool reverse) QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis *q) : q_ptr(q), - m_chart(0), - m_alignment(0), - m_orientation(Qt::Orientation(0)), - m_visible(true), - m_arrowVisible(true), m_axisPen(QChartPrivate::defaultPen()), m_axisBrush(QChartPrivate::defaultBrush()), - m_gridLineVisible(true), m_gridLinePen(QChartPrivate::defaultPen()), - m_minorGridLineVisible(true), m_minorGridLinePen(QChartPrivate::defaultPen()), - m_labelsVisible(true), - m_labelsEditable(false), m_labelsBrush(QChartPrivate::defaultBrush()), m_labelsFont(QChartPrivate::defaultFont()), - m_labelsAngle(0), - m_titleVisible(true), m_titleBrush(QChartPrivate::defaultBrush()), m_titleFont(QChartPrivate::defaultFont()), - m_shadesVisible(false), m_shadesPen(QChartPrivate::defaultPen()), - m_shadesBrush(QChartPrivate::defaultBrush()), - m_shadesOpacity(1.0), - m_dirty(false), - m_reverse(false) + m_shadesBrush(QChartPrivate::defaultBrush()) { } diff --git a/src/charts/axis/qabstractaxis_p.h b/src/charts/axis/qabstractaxis_p.h index cbc8e85e..03f0f714 100644 --- a/src/charts/axis/qabstractaxis_p.h +++ b/src/charts/axis/qabstractaxis_p.h @@ -96,45 +96,45 @@ Q_SIGNALS: protected: QAbstractAxis *q_ptr; - QChart *m_chart; + QChart *m_chart = nullptr; QScopedPointer<ChartAxisElement> m_item; private: QList<QAbstractSeries*> m_series; Qt::Alignment m_alignment; - Qt::Orientation m_orientation; + Qt::Orientation m_orientation = Qt::Orientation(0); - bool m_visible; + bool m_visible = true; - bool m_arrowVisible; + bool m_arrowVisible = true; QPen m_axisPen; QBrush m_axisBrush; - bool m_gridLineVisible; + bool m_gridLineVisible = true; QPen m_gridLinePen; - bool m_minorGridLineVisible; + bool m_minorGridLineVisible = true; QPen m_minorGridLinePen; - bool m_labelsVisible; - bool m_labelsEditable; + bool m_labelsVisible = true; + bool m_labelsEditable = false; QBrush m_labelsBrush; QFont m_labelsFont; - int m_labelsAngle; + int m_labelsAngle = 0; - bool m_titleVisible; + bool m_titleVisible = true; QBrush m_titleBrush; QFont m_titleFont; QString m_title; - bool m_shadesVisible; + bool m_shadesVisible = false; QPen m_shadesPen; QBrush m_shadesBrush; - qreal m_shadesOpacity; + qreal m_shadesOpacity = 1; - bool m_dirty; + bool m_dirty = false; - bool m_reverse; + bool m_reverse = false; friend class QAbstractAxis; friend class ChartDataSet; diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp index 56b48773..5cae977e 100644 --- a/src/charts/barchart/abstractbarchartitem.cpp +++ b/src/charts/barchart/abstractbarchartitem.cpp @@ -55,7 +55,7 @@ AbstractBarChartItem::AbstractBarChartItem(QAbstractBarSeries *series, QGraphics m_orientation(Qt::Horizontal), m_resetAnimation(true) { - setAcceptedMouseButtons(0); + setAcceptedMouseButtons({}); setFlag(ItemClipsChildrenToShape); setFlag(QGraphicsItem::ItemIsSelectable); connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged())); diff --git a/src/charts/boxplotchart/boxplotchartitem.cpp b/src/charts/boxplotchart/boxplotchartitem.cpp index 701cc88b..a18d7d46 100644 --- a/src/charts/boxplotchart/boxplotchartitem.cpp +++ b/src/charts/boxplotchart/boxplotchartitem.cpp @@ -43,7 +43,7 @@ BoxPlotChartItem::BoxPlotChartItem(QBoxPlotSeries *series, QGraphicsItem *item) m_series(series), m_animation(0) { - setAcceptedMouseButtons(0); + setAcceptedMouseButtons({}); connect(series, SIGNAL(boxsetsRemoved(QList<QBoxSet *>)), this, SLOT(handleBoxsetRemove(QList<QBoxSet *>))); connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged())); connect(series, SIGNAL(opacityChanged()), this, SLOT(handleOpacityChanged())); diff --git a/src/charts/candlestickchart/candlestickchartitem.cpp b/src/charts/candlestickchart/candlestickchartitem.cpp index 3be2ca6c..4c525974 100644 --- a/src/charts/candlestickchart/candlestickchartitem.cpp +++ b/src/charts/candlestickchart/candlestickchartitem.cpp @@ -45,7 +45,7 @@ CandlestickChartItem::CandlestickChartItem(QCandlestickSeries *series, QGraphics m_timePeriod(0.0), m_animation(nullptr) { - setAcceptedMouseButtons(0); + setAcceptedMouseButtons({}); connect(series, SIGNAL(candlestickSetsAdded(QList<QCandlestickSet *>)), this, SLOT(handleCandlestickSetsAdd(QList<QCandlestickSet *>))); connect(series, SIGNAL(candlestickSetsRemoved(QList<QCandlestickSet *>)), diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp index 4fec0ae1..2b2eda17 100644 --- a/src/charts/chartdataset.cpp +++ b/src/charts/chartdataset.cpp @@ -332,8 +332,8 @@ void ChartDataSet::createDefaultAxes() if (m_seriesList.isEmpty()) return; - QAbstractAxis::AxisTypes typeX(0); - QAbstractAxis::AxisTypes typeY(0); + QAbstractAxis::AxisTypes typeX; + QAbstractAxis::AxisTypes typeY; // Remove possibly existing axes deleteAllAxes(); diff --git a/src/charts/qpolarchart.cpp b/src/charts/qpolarchart.cpp index dbfd3a58..767fda76 100644 --- a/src/charts/qpolarchart.cpp +++ b/src/charts/qpolarchart.cpp @@ -98,7 +98,7 @@ QPolarChart::~QPolarChart() */ QList<QAbstractAxis *> QPolarChart::axes(PolarOrientations polarOrientation, QAbstractSeries *series) const { - Qt::Orientations orientation(0); + Qt::Orientations orientation; if (polarOrientation.testFlag(PolarOrientationAngular)) orientation |= Qt::Horizontal; if (polarOrientation.testFlag(PolarOrientationRadial)) diff --git a/tests/auto/inc/tst_definitions.h b/tests/auto/inc/tst_definitions.h index a35d53e4..7e0cfcff 100644 --- a/tests/auto/inc/tst_definitions.h +++ b/tests/auto/inc/tst_definitions.h @@ -67,7 +67,7 @@ QT_END_NAMESPACE b.show(); \ QTest::qWaitForWindowShown(&b); \ QSignalSpy spy(&b, SIGNAL(clicked())); \ - QTest::mouseClick(&b, Qt::LeftButton, 0, b.rect().center()); \ + QTest::mouseClick(&b, Qt::LeftButton, {}, b.rect().center()); \ QApplication::processEvents(); \ if (spy.count() == 0) \ QSKIP("Cannot test mouse events in this environment"); \ diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index 68c94934..c20032dd 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -526,7 +526,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -544,7 +544,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -562,7 +562,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -580,7 +580,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -598,7 +598,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -616,7 +616,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1052,7 +1052,7 @@ void tst_QBarSeries::mousePressed() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1070,7 +1070,7 @@ void tst_QBarSeries::mousePressed() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1088,7 +1088,7 @@ void tst_QBarSeries::mousePressed() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1106,7 +1106,7 @@ void tst_QBarSeries::mousePressed() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1124,7 +1124,7 @@ void tst_QBarSeries::mousePressed() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1142,7 +1142,7 @@ void tst_QBarSeries::mousePressed() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1217,7 +1217,7 @@ void tst_QBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1235,7 +1235,7 @@ void tst_QBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1253,7 +1253,7 @@ void tst_QBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1271,7 +1271,7 @@ void tst_QBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1289,7 +1289,7 @@ void tst_QBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1307,7 +1307,7 @@ void tst_QBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1381,7 +1381,7 @@ void tst_QBarSeries::mouseDoubleClicked() } // barset 1, bar 0 - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); diff --git a/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp b/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp index a7b00836..c02aa915 100644 --- a/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp +++ b/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp @@ -618,7 +618,7 @@ void tst_QCandlestickSeries::mouseClicked() plotArea.top(), candlestickWidth, candlestickHeight)); // Click set 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.value(set1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -633,7 +633,7 @@ void tst_QCandlestickSeries::mouseClicked() QVERIFY(setSpy1.takeFirst().isEmpty()); // Click set 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.value(set2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -797,7 +797,7 @@ void tst_QCandlestickSeries::mousePressed() plotArea.top(), candlestickWidth, candlestickHeight)); // Press set 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.value(set1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -812,7 +812,7 @@ void tst_QCandlestickSeries::mousePressed() QVERIFY(setSpy1.takeFirst().isEmpty()); // Press set 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.value(set2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -860,7 +860,7 @@ void tst_QCandlestickSeries::mouseReleased() plotArea.top(), candlestickWidth, candlestickHeight)); // Release mouse over set 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.value(set1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -875,7 +875,7 @@ void tst_QCandlestickSeries::mouseReleased() QVERIFY(setSpy1.takeFirst().isEmpty()); // Release mouse over set 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.value(set2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.value(set2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -923,7 +923,7 @@ void tst_QCandlestickSeries::mouseDoubleClicked() plotArea.top(), candlestickWidth, candlestickHeight)); // Double-click set 1 - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, layout.value(set1).center().toPoint()); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.value(set1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp index dc70d7cb..f93e50d6 100644 --- a/tests/auto/qchartview/tst_qchartview.cpp +++ b/tests/auto/qchartview/tst_qchartview.cpp @@ -190,9 +190,9 @@ void tst_QChartView::rubberBand() QVERIFY(m_view->hasFocus()); QTest::mouseMove(m_view->viewport(), min + plotArea.topLeft().toPoint(), 100); - QTest::mousePress(m_view->viewport(), Qt::LeftButton, 0, min + plotArea.topLeft().toPoint(), 100); + QTest::mousePress(m_view->viewport(), Qt::LeftButton, {}, min + plotArea.topLeft().toPoint(), 100); QTest::mouseMove(m_view->viewport(), plotArea.bottomRight().toPoint() - max, 100); - QTest::mouseRelease(m_view->viewport(), Qt::LeftButton, 0, plotArea.bottomRight().toPoint() - max, 100); + QTest::mouseRelease(m_view->viewport(), Qt::LeftButton, {}, plotArea.bottomRight().toPoint() - max, 100); QApplication::processEvents(); TRY_COMPARE(spy0.count(), Xcount); diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp index 87f45816..b3c5d0c3 100644 --- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp +++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp @@ -459,7 +459,7 @@ void tst_QHorizontalBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -477,7 +477,7 @@ void tst_QHorizontalBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -495,7 +495,7 @@ void tst_QHorizontalBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -513,7 +513,7 @@ void tst_QHorizontalBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -531,7 +531,7 @@ void tst_QHorizontalBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -549,7 +549,7 @@ void tst_QHorizontalBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -944,7 +944,7 @@ void tst_QHorizontalBarSeries::mousePressed() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -962,7 +962,7 @@ void tst_QHorizontalBarSeries::mousePressed() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -980,7 +980,7 @@ void tst_QHorizontalBarSeries::mousePressed() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -998,7 +998,7 @@ void tst_QHorizontalBarSeries::mousePressed() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1016,7 +1016,7 @@ void tst_QHorizontalBarSeries::mousePressed() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1034,7 +1034,7 @@ void tst_QHorizontalBarSeries::mousePressed() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1109,7 +1109,7 @@ void tst_QHorizontalBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1127,7 +1127,7 @@ void tst_QHorizontalBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1145,7 +1145,7 @@ void tst_QHorizontalBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1163,7 +1163,7 @@ void tst_QHorizontalBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1181,7 +1181,7 @@ void tst_QHorizontalBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1199,7 +1199,7 @@ void tst_QHorizontalBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1273,7 +1273,7 @@ void tst_QHorizontalBarSeries::mouseDoubleClicked() } // barset 1, bar 0 - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp index b7d760de..7bbe221d 100644 --- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp +++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp @@ -242,7 +242,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -254,7 +254,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -266,7 +266,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -278,7 +278,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -290,7 +290,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -302,7 +302,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -691,7 +691,7 @@ void tst_QHorizontalPercentBarSeries::mousePressed() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -709,7 +709,7 @@ void tst_QHorizontalPercentBarSeries::mousePressed() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -727,7 +727,7 @@ void tst_QHorizontalPercentBarSeries::mousePressed() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -745,7 +745,7 @@ void tst_QHorizontalPercentBarSeries::mousePressed() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -763,7 +763,7 @@ void tst_QHorizontalPercentBarSeries::mousePressed() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -781,7 +781,7 @@ void tst_QHorizontalPercentBarSeries::mousePressed() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -856,7 +856,7 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -874,7 +874,7 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -892,7 +892,7 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -910,7 +910,7 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -928,7 +928,7 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -946,7 +946,7 @@ void tst_QHorizontalPercentBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1020,7 +1020,7 @@ void tst_QHorizontalPercentBarSeries::mouseDoubleClicked() } // barset 1, bar 0 - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp index caacea4e..7c455aba 100644 --- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp +++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp @@ -246,7 +246,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -258,7 +258,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -270,7 +270,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -282,7 +282,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -294,7 +294,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -306,7 +306,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -684,7 +684,7 @@ void tst_QHorizontalStackedBarSeries::mousePressed() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -702,7 +702,7 @@ void tst_QHorizontalStackedBarSeries::mousePressed() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -720,7 +720,7 @@ void tst_QHorizontalStackedBarSeries::mousePressed() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -738,7 +738,7 @@ void tst_QHorizontalStackedBarSeries::mousePressed() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -756,7 +756,7 @@ void tst_QHorizontalStackedBarSeries::mousePressed() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -774,7 +774,7 @@ void tst_QHorizontalStackedBarSeries::mousePressed() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -854,7 +854,7 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -872,7 +872,7 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -890,7 +890,7 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -908,7 +908,7 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -926,7 +926,7 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -944,7 +944,7 @@ void tst_QHorizontalStackedBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1023,7 +1023,7 @@ void tst_QHorizontalStackedBarSeries::mouseDoubleClicked() } // barset 1, bar 0 - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); diff --git a/tests/auto/qlineseries/tst_qlineseries.cpp b/tests/auto/qlineseries/tst_qlineseries.cpp index 394b192f..e1c3d29a 100644 --- a/tests/auto/qlineseries/tst_qlineseries.cpp +++ b/tests/auto/qlineseries/tst_qlineseries.cpp @@ -137,7 +137,7 @@ void tst_QLineSeries::pressedSignal() QSignalSpy seriesSpy(lineSeries, SIGNAL(pressed(QPointF))); QPointF checkPoint = view.chart()->mapToPosition(linePoint); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -169,7 +169,7 @@ void tst_QLineSeries::releasedSignal() QSignalSpy seriesSpy(lineSeries, SIGNAL(released(QPointF))); QPointF checkPoint = view.chart()->mapToPosition(linePoint); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -224,8 +224,8 @@ void tst_QLineSeries::doubleClickedSignal() QPointF checkPoint = view.chart()->mapToPosition(linePoint); // mouseClick needed first to save the position - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp index f5dc3548..ee9fcc0c 100644 --- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp +++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp @@ -244,7 +244,7 @@ void tst_QPercentBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -256,7 +256,7 @@ void tst_QPercentBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -268,7 +268,7 @@ void tst_QPercentBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -280,7 +280,7 @@ void tst_QPercentBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -292,7 +292,7 @@ void tst_QPercentBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -304,7 +304,7 @@ void tst_QPercentBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -696,7 +696,7 @@ void tst_QPercentBarSeries::mousePressed() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -714,7 +714,7 @@ void tst_QPercentBarSeries::mousePressed() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -732,7 +732,7 @@ void tst_QPercentBarSeries::mousePressed() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -750,7 +750,7 @@ void tst_QPercentBarSeries::mousePressed() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -768,7 +768,7 @@ void tst_QPercentBarSeries::mousePressed() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -786,7 +786,7 @@ void tst_QPercentBarSeries::mousePressed() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -863,7 +863,7 @@ void tst_QPercentBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -881,7 +881,7 @@ void tst_QPercentBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -899,7 +899,7 @@ void tst_QPercentBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -917,7 +917,7 @@ void tst_QPercentBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -935,7 +935,7 @@ void tst_QPercentBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -953,7 +953,7 @@ void tst_QPercentBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1029,7 +1029,7 @@ void tst_QPercentBarSeries::mouseDoubleClicked() } // barset 1, bar 0 - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); diff --git a/tests/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp index 64b871fe..e8542272 100644 --- a/tests/auto/qpieseries/tst_qpieseries.cpp +++ b/tests/auto/qpieseries/tst_qpieseries.cpp @@ -529,10 +529,10 @@ void tst_qpieseries::clickedSignal() m_series->setPieSize(1.0); QRectF pieRect = m_view->chart()->plotArea(); QList<QPoint> points = slicePoints(pieRect); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(0)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(1)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(2)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(3)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(0)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); TRY_COMPARE(clickSpy.count(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); @@ -546,10 +546,10 @@ void tst_qpieseries::clickedSignal() m_series->setHorizontalPosition(0.25); pieRect = QRectF(m_view->chart()->plotArea().topLeft(), m_view->chart()->plotArea().center()); points = slicePoints(pieRect); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(0)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(1)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(2)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(3)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(0)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); TRY_COMPARE(clickSpy.count(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); @@ -684,10 +684,10 @@ void tst_qpieseries::pressedSignal() m_series->setPieSize(1.0); QRectF pieRect = m_view->chart()->plotArea(); QList<QPoint> points = slicePoints(pieRect); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(0)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(1)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(2)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(3)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(0)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); TRY_COMPARE(clickSpy.count(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); @@ -701,10 +701,10 @@ void tst_qpieseries::pressedSignal() m_series->setHorizontalPosition(0.25); pieRect = QRectF(m_view->chart()->plotArea().topLeft(), m_view->chart()->plotArea().center()); points = slicePoints(pieRect); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(0)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(1)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(2)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(3)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(0)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); TRY_COMPARE(clickSpy.count(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); @@ -737,10 +737,10 @@ void tst_qpieseries::releasedSignal() m_series->setPieSize(1.0); QRectF pieRect = m_view->chart()->plotArea(); QList<QPoint> points = slicePoints(pieRect); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(0)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(1)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(2)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(3)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(0)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); TRY_COMPARE(clickSpy.count(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); @@ -754,10 +754,10 @@ void tst_qpieseries::releasedSignal() m_series->setHorizontalPosition(0.25); pieRect = QRectF(m_view->chart()->plotArea().topLeft(), m_view->chart()->plotArea().center()); points = slicePoints(pieRect); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(0)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(1)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(2)); - QTest::mouseClick(m_view->viewport(), Qt::LeftButton, 0, points.at(3)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(0)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(1)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(2)); + QTest::mouseClick(m_view->viewport(), Qt::LeftButton, {}, points.at(3)); TRY_COMPARE(clickSpy.count(), 4); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(1).at(0)), s2); @@ -787,7 +787,7 @@ void tst_qpieseries::doubleClickedSignal() m_series->setPieSize(1.0); QRectF pieRect = m_view->chart()->plotArea(); QList<QPoint> points = slicePoints(pieRect); - QTest::mouseDClick(m_view->viewport(), Qt::LeftButton, 0, points.at(0)); + QTest::mouseDClick(m_view->viewport(), Qt::LeftButton, {}, points.at(0)); TRY_COMPARE(clickSpy.count(), 1); QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy.at(0).at(0)), s1); } diff --git a/tests/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp index 977ed35b..668b660e 100644 --- a/tests/auto/qpieslice/tst_qpieslice.cpp +++ b/tests/auto/qpieslice/tst_qpieslice.cpp @@ -273,10 +273,10 @@ void tst_qpieslice::clickedSignal() series->setPieSize(1.0); QRectF pieRect = view.chart()->plotArea(); QList<QPoint> points = slicePoints(pieRect); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(0)); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(1)); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(2)); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(3)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(0)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(1)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(2)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(3)); QCOMPARE(clickSpy1.count(), 1); QCOMPARE(clickSpy2.count(), 1); QCOMPARE(clickSpy3.count(), 1); @@ -391,10 +391,10 @@ void tst_qpieslice::pressedSignal() series->setPieSize(1.0); QRectF pieRect = view.chart()->plotArea(); QList<QPoint> points = slicePoints(pieRect); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(0)); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(1)); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(2)); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(3)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(0)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(1)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(2)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(3)); QCOMPARE(clickSpy1.count(), 1); QCOMPARE(clickSpy2.count(), 1); QCOMPARE(clickSpy3.count(), 1); @@ -432,10 +432,10 @@ void tst_qpieslice::releasedSignal() series->setPieSize(1.0); QRectF pieRect = view.chart()->plotArea(); QList<QPoint> points = slicePoints(pieRect); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(0)); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(1)); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(2)); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, points.at(3)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(0)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(1)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(2)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, points.at(3)); QCOMPARE(clickSpy1.count(), 1); QCOMPARE(clickSpy2.count(), 1); QCOMPARE(clickSpy3.count(), 1); @@ -467,7 +467,7 @@ void tst_qpieslice::doubleClickedSignal() series->setPieSize(1.0); QRectF pieRect = view.chart()->plotArea(); QList<QPoint> points = slicePoints(pieRect); - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, points.at(0)); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, points.at(0)); QCOMPARE(clickSpy1.count(), 1); } diff --git a/tests/auto/qscatterseries/tst_qscatterseries.cpp b/tests/auto/qscatterseries/tst_qscatterseries.cpp index 8b156851..a27de871 100644 --- a/tests/auto/qscatterseries/tst_qscatterseries.cpp +++ b/tests/auto/qscatterseries/tst_qscatterseries.cpp @@ -160,7 +160,7 @@ void tst_QScatterSeries::pressedSignal() QSignalSpy seriesSpy(scatterSeries, SIGNAL(pressed(QPointF))); QPointF checkPoint = view.chart()->mapToPosition(scatterPoint); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -192,7 +192,7 @@ void tst_QScatterSeries::releasedSignal() QSignalSpy seriesSpy(scatterSeries, SIGNAL(released(QPointF))); QPointF checkPoint = view.chart()->mapToPosition(scatterPoint); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -224,7 +224,7 @@ void tst_QScatterSeries::doubleClickedSignal() QSignalSpy seriesSpy(scatterSeries, SIGNAL(doubleClicked(QPointF))); QPointF checkPoint = view.chart()->mapToPosition(scatterPoint); - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); diff --git a/tests/auto/qsplineseries/tst_qsplineseries.cpp b/tests/auto/qsplineseries/tst_qsplineseries.cpp index 18e554c8..ac4031e2 100644 --- a/tests/auto/qsplineseries/tst_qsplineseries.cpp +++ b/tests/auto/qsplineseries/tst_qsplineseries.cpp @@ -129,7 +129,7 @@ void tst_QSplineSeries::pressedSignal() QSignalSpy seriesSpy(splineSeries, SIGNAL(pressed(QPointF))); QPointF checkPoint = view.chart()->mapToPosition(splinePoint); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -161,7 +161,7 @@ void tst_QSplineSeries::releasedSignal() QSignalSpy seriesSpy(splineSeries, SIGNAL(released(QPointF))); QPointF checkPoint = view.chart()->mapToPosition(splinePoint); - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -194,8 +194,8 @@ void tst_QSplineSeries::doubleClickedSignal() QPointF checkPoint = view.chart()->mapToPosition(splinePoint); // mouseClick needed first to save the position - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, checkPoint.toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, checkPoint.toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp index 5fca334c..82287e39 100644 --- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp +++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp @@ -246,7 +246,7 @@ void tst_QStackedBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -258,7 +258,7 @@ void tst_QStackedBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -270,7 +270,7 @@ void tst_QStackedBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -282,7 +282,7 @@ void tst_QStackedBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -294,7 +294,7 @@ void tst_QStackedBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -306,7 +306,7 @@ void tst_QStackedBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -685,7 +685,7 @@ void tst_QStackedBarSeries::mousePressed() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -703,7 +703,7 @@ void tst_QStackedBarSeries::mousePressed() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -721,7 +721,7 @@ void tst_QStackedBarSeries::mousePressed() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -739,7 +739,7 @@ void tst_QStackedBarSeries::mousePressed() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -757,7 +757,7 @@ void tst_QStackedBarSeries::mousePressed() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -775,7 +775,7 @@ void tst_QStackedBarSeries::mousePressed() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -855,7 +855,7 @@ void tst_QStackedBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -873,7 +873,7 @@ void tst_QStackedBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(2).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -891,7 +891,7 @@ void tst_QStackedBarSeries::mouseReleased() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(4).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -909,7 +909,7 @@ void tst_QStackedBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -927,7 +927,7 @@ void tst_QStackedBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(3).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -945,7 +945,7 @@ void tst_QStackedBarSeries::mouseReleased() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint()); + QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, layout.at(5).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -1024,7 +1024,7 @@ void tst_QStackedBarSeries::mouseDoubleClicked() } // barset 1, bar 0 - QTest::mouseDClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint()); + QTest::mouseDClick(view.viewport(), Qt::LeftButton, {}, layout.at(0).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); diff --git a/tests/manual/chartviewer/window.cpp b/tests/manual/chartviewer/window.cpp index 4d41da64..85a6c956 100644 --- a/tests/manual/chartviewer/window.cpp +++ b/tests/manual/chartviewer/window.cpp @@ -70,6 +70,7 @@ Window::Window(const QVariantHash ¶meters, QWidget *parent) m_openGLCheckBox(0), m_zoomCheckBox(0), m_scrollCheckBox(0), + m_gridCheckBox(0), m_baseLayout(new QGraphicsLinearLayout()), m_menu(createMenu()), m_template(0), @@ -95,6 +96,7 @@ Window::Window(const QVariantHash ¶meters, QWidget *parent) settingsLayout->addItem(m_widgetHash["templateComboBox"]); settingsLayout->addItem(m_widgetHash["scrollCheckBox"]); settingsLayout->addItem(m_widgetHash["zoomCheckBox"]); + settingsLayout->addItem(m_widgetHash["gridCheckBox"]); settingsLayout->addItem(m_widgetHash["xTickLabel"]); settingsLayout->addItem(m_widgetHash["xTickSpinBox"]); settingsLayout->addItem(m_widgetHash["yTickLabel"]); @@ -147,6 +149,7 @@ void Window::connectSignals() QObject::connect(m_openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI())); QObject::connect(m_zoomCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI())); QObject::connect(m_scrollCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI())); + QObject::connect(m_gridCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI())); QObject::connect(m_animatedComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI())); QObject::connect(m_legendComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI())); QObject::connect(m_templateComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI())); @@ -171,6 +174,7 @@ void Window::createProxyWidgets() m_openGLCheckBox = new QCheckBox(tr("OpenGL")); m_zoomCheckBox = new QCheckBox(tr("Zoom")); m_scrollCheckBox = new QCheckBox(tr("Scroll")); + m_gridCheckBox = new QCheckBox(tr("Grid lines")); m_templateComboBox = createTempleteBox(); m_widgetHash["viewLabel"] = m_scene->addWidget(new QLabel("View")); m_widgetHash["viewComboBox"] = m_scene->addWidget(m_viewComboBox); @@ -194,6 +198,7 @@ void Window::createProxyWidgets() m_widgetHash["templateComboBox"] = m_scene->addWidget(m_templateComboBox); m_widgetHash["zoomCheckBox"] = m_scene->addWidget(m_zoomCheckBox); m_widgetHash["scrollCheckBox"] = m_scene->addWidget(m_scrollCheckBox); + m_widgetHash["gridCheckBox"] = m_scene->addWidget(m_gridCheckBox); } QComboBox *Window::createThemeBox() @@ -354,7 +359,7 @@ void Window::checkXTick() foreach (QChart *chart, m_grid->charts()) { if (qobject_cast<QValueAxis *>(chart->axisX())) { QValueAxis *valueAxis = qobject_cast<QValueAxis *>(chart->axisX()); - valueAxis->setGridLineVisible(); + valueAxis->setGridLineVisible(m_gridCheckBox->isChecked()); valueAxis->setTickCount(m_xTickSpinBox->value()); } } @@ -365,7 +370,7 @@ void Window::checkYTick() foreach (QChart *chart, m_grid->charts()) { if (qobject_cast<QValueAxis *>(chart->axisY())) { QValueAxis *valueAxis = qobject_cast<QValueAxis *>(chart->axisY()); - valueAxis->setGridLineVisible(); + valueAxis->setGridLineVisible(m_gridCheckBox->isChecked()); valueAxis->setTickCount(m_yTickSpinBox->value()); } } @@ -376,7 +381,8 @@ void Window::checkMinorXTick() foreach (QChart *chart, m_grid->charts()) { if (qobject_cast<QValueAxis *>(chart->axisX())) { QValueAxis *valueAxis = qobject_cast<QValueAxis *>(chart->axisX()); - valueAxis->setMinorGridLineVisible(); + valueAxis->setMinorGridLineVisible(m_gridCheckBox->isChecked()); + valueAxis->setGridLineVisible(m_gridCheckBox->isChecked()); valueAxis->setMinorTickCount(m_minorXTickSpinBox->value()); } } @@ -387,7 +393,8 @@ void Window::checkMinorYTick() foreach (QChart *chart, m_grid->charts()) { if (qobject_cast<QValueAxis *>(chart->axisY())) { QValueAxis *valueAxis = qobject_cast<QValueAxis *>(chart->axisY()); - valueAxis->setMinorGridLineVisible(); + valueAxis->setMinorGridLineVisible(m_gridCheckBox->isChecked()); + valueAxis->setGridLineVisible(m_gridCheckBox->isChecked()); valueAxis->setMinorTickCount(m_minorYTickSpinBox->value()); } } diff --git a/tests/manual/chartviewer/window.h b/tests/manual/chartviewer/window.h index ea04fedc..8c9de07e 100644 --- a/tests/manual/chartviewer/window.h +++ b/tests/manual/chartviewer/window.h @@ -108,6 +108,7 @@ private: QCheckBox *m_openGLCheckBox; QCheckBox *m_zoomCheckBox; QCheckBox *m_scrollCheckBox; + QCheckBox *m_gridCheckBox; QGraphicsLinearLayout *m_baseLayout; QMenu *m_menu; int m_template; |