From 8223ac2745a8d149810d8aa83796d4e411737f61 2012-04-10 14:18:25 From: Michal Klocek Date: 2012-04-10 14:18:25 Subject: [PATCH] Normalizes signal slots connections --- diff --git a/demos/piechartcustomization/mainwidget.cpp b/demos/piechartcustomization/mainwidget.cpp index f235670..2e53c91 100644 --- a/demos/piechartcustomization/mainwidget.cpp +++ b/demos/piechartcustomization/mainwidget.cpp @@ -53,7 +53,7 @@ MainWidget::MainWidget(QWidget* parent) m_series->setLabelsVisible(); chart->addSeries(m_series); - connect(m_series, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), this, SLOT(handleSliceClicked(QPieSlice*, Qt::MouseButtons))); + connect(m_series, SIGNAL(clicked(QPieSlice*,Qt::MouseButtons)), this, SLOT(handleSliceClicked(QPieSlice*,Qt::MouseButtons))); // chart settings m_themeComboBox = new QComboBox(); diff --git a/examples/piechartdrilldown/main.cpp b/examples/piechartdrilldown/main.cpp index 8aa96e7..4a5d3bb 100644 --- a/examples/piechartdrilldown/main.cpp +++ b/examples/piechartdrilldown/main.cpp @@ -58,12 +58,12 @@ int main(int argc, char *argv[]) foreach (QString month, months) *series << new DrilldownSlice(qrand() % 1000, month, yearSeries); - QObject::connect(series, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*))); + QObject::connect(series, SIGNAL(clicked(QPieSlice*,Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*))); *yearSeries << new DrilldownSlice(series->sum(), name, series); } - QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*, Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*))); + QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*,Qt::MouseButtons)), chart, SLOT(handleSliceClicked(QPieSlice*))); chart->changeSeries(yearSeries); diff --git a/examples/presenterchart/chartview.cpp b/examples/presenterchart/chartview.cpp index 5004629..70f7f37 100644 --- a/examples/presenterchart/chartview.cpp +++ b/examples/presenterchart/chartview.cpp @@ -80,7 +80,7 @@ m_index(-1),m_chart(chart) //![4] foreach (QSeries* series, m_series) { - QObject::connect(series,SIGNAL(clicked(const QPointF&)),this,SLOT(handlePointClicked(const QPointF&))); + QObject::connect(series,SIGNAL(clicked(QPointF)),this,SLOT(handlePointClicked(QPointF))); } //![4] m_timer.start(); diff --git a/examples/scatterinteractions/mainwindow.cpp b/examples/scatterinteractions/mainwindow.cpp index eefdfe7..6cef450 100644 --- a/examples/scatterinteractions/mainwindow.cpp +++ b/examples/scatterinteractions/mainwindow.cpp @@ -40,7 +40,7 @@ MainWindow::MainWindow(QWidget *parent) chart->axisX()->setRange(0, 4.5); chart->axisY()->setRange(0, 4.5); - connect(m_scatter, SIGNAL(clicked(const QPointF&)), this, SLOT(handleClickedPoint(const QPointF&))); + connect(m_scatter, SIGNAL(clicked(QPointF)), this, SLOT(handleClickedPoint(QPointF))); QChartView *chartView = new QChartView(chart); chartView->setRenderHint(QPainter::Antialiasing); diff --git a/src/areachart/areachartitem.cpp b/src/areachart/areachartitem.cpp index af30ea3..7a776e9 100644 --- a/src/areachart/areachartitem.cpp +++ b/src/areachart/areachartitem.cpp @@ -44,7 +44,7 @@ AreaChartItem::AreaChartItem(QAreaSeries *areaSeries, ChartPresenter *presenter) m_lower = new AreaBoundItem(this,m_series->lowerSeries()); connect(m_series->d_func(),SIGNAL(updated()),this,SLOT(handleUpdated())); - connect(this,SIGNAL(clicked(const QPointF&)),areaSeries,SIGNAL(clicked(const QPointF&))); + connect(this,SIGNAL(clicked(QPointF)),areaSeries,SIGNAL(clicked(QPointF))); handleUpdated(); } diff --git a/src/axis/axis_p.h b/src/axis/axis_p.h index bdcf1d1..b138109 100644 --- a/src/axis/axis_p.h +++ b/src/axis/axis_p.h @@ -109,8 +109,8 @@ private: class AxisItem: public QGraphicsLineItem { -public: +public: AxisItem(Axis *axis, QGraphicsItem *parent = 0) : QGraphicsLineItem(parent), m_axis(axis) {} protected: diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp index 9797ead..1160d48 100644 --- a/src/barchart/qbarseries.cpp +++ b/src/barchart/qbarseries.cpp @@ -384,18 +384,18 @@ void QBarSeriesPrivate::setModelMapping(int categories, int bottomBoundry, int t if (m_mapOrientation == Qt::Vertical) { m_mapCount = m_model->rowCount() - m_mapFirst; connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), - this, SLOT(modelUpdated(QModelIndex, QModelIndex))); - connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), + this, SLOT(modelUpdated(QModelIndex,QModelIndex))); + connect(m_model,SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(modelDataAdded(QModelIndex,int,int))); - connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), + connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelDataRemoved(QModelIndex,int,int))); } else { m_mapCount = m_model->columnCount() - m_mapFirst; connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), - this, SLOT(modelUpdated(QModelIndex, QModelIndex))); - connect(m_model,SIGNAL(columnsInserted(QModelIndex, int, int)), + this, SLOT(modelUpdated(QModelIndex,QModelIndex))); + connect(m_model,SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(modelDataAdded(QModelIndex,int,int))); - connect(m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)), + connect(m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelDataRemoved(QModelIndex,int,int))); } diff --git a/src/chartconfig_p.h b/src/chartconfig_p.h index 49799f6..4601054 100644 --- a/src/chartconfig_p.h +++ b/src/chartconfig_p.h @@ -68,6 +68,6 @@ private: ChartConfig* ChartConfig::m_instance=0; -#endif - QTCOMMERCIALCHART_END_NAMESPACE + +#endif diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp index 8e53ca4..9be6e4a 100644 --- a/src/chartpresenter.cpp +++ b/src/chartpresenter.cpp @@ -132,7 +132,7 @@ void ChartPresenter::handleAxisAdded(QChartAxis* axis,Domain* domain) item->handleRangeChanged(domain->minY(),domain->maxY(),domain->tickYCount()); } - QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&))); + QObject::connect(this,SIGNAL(geometryChanged(QRectF)),item,SLOT(handleGeometryChanged(QRectF))); //initialize item->handleGeometryChanged(m_chartRect); m_axisItems.insert(axis, item); @@ -151,7 +151,7 @@ void ChartPresenter::handleSeriesAdded(QSeries* series,Domain* domain) { Chart *item = series->d_ptr->createGraphics(this); Q_ASSERT(item); - QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&))); + QObject::connect(this,SIGNAL(geometryChanged(QRectF)),item,SLOT(handleGeometryChanged(QRectF))); QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal))); //initialize item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY()); diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp index 32407ae..afa169c 100644 --- a/src/piechart/qpieseries.cpp +++ b/src/piechart/qpieseries.cpp @@ -499,13 +499,13 @@ void QPieSeries::setModelMapping(int modelValuesLine, int modelLabelsLine, Qt::O // connect the signals if (d->m_mapOrientation == Qt::Vertical) { - connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex, QModelIndex))); - connect(d->m_model, SIGNAL(rowsInserted(QModelIndex, int, int)), d, SLOT(modelDataAdded(QModelIndex,int,int))); - connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), d, SLOT(modelDataRemoved(QModelIndex,int,int))); + connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex))); + connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelDataAdded(QModelIndex,int,int))); + connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelDataRemoved(QModelIndex,int,int))); } else { - connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex, QModelIndex))); - connect(d->m_model, SIGNAL(columnsInserted(QModelIndex, int, int)), d, SLOT(modelDataAdded(QModelIndex,int,int))); - connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)), d, SLOT(modelDataRemoved(QModelIndex,int,int))); + connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex))); + connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelDataAdded(QModelIndex,int,int))); + connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelDataRemoved(QModelIndex,int,int))); } // create the initial slices set diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp index a15fe17..d1b2df0 100644 --- a/src/xychart/qxyseries.cpp +++ b/src/xychart/qxyseries.cpp @@ -563,17 +563,17 @@ void QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientat d->m_mapFirst = 0; d->m_mapOrientation = orientation; if (d->m_mapOrientation == Qt::Vertical) { - connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex))); - connect(d->m_model,SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int))); - connect(d->m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int))); - connect(d->m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int))); - connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int))); + connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex))); + connect(d->m_model,SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int))); + connect(d->m_model,SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(modelDataAdded(QModelIndex,int,int))); + connect(d->m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int))); + connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelDataRemoved(QModelIndex,int,int))); } else { - connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex))); - connect(d->m_model,SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int))); - connect(d->m_model,SIGNAL(columnsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int))); - connect(d->m_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int))); - connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int))); + connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex))); + connect(d->m_model,SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int))); + connect(d->m_model,SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(modelDataAdded(QModelIndex,int,int))); + connect(d->m_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int))); + connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelDataRemoved(QModelIndex,int,int))); } } diff --git a/src/xychart/xychartitem.cpp b/src/xychart/xychartitem.cpp index 49a9025..291c4e2 100644 --- a/src/xychart/xychartitem.cpp +++ b/src/xychart/xychartitem.cpp @@ -41,7 +41,7 @@ XYChartItem::XYChartItem(QXYSeries *series, ChartPresenter *presenter):ChartItem connect(series->d_func(),SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int))); connect(series->d_func(),SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int))); connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int))); - connect(this,SIGNAL(clicked(const QPointF&)),series,SIGNAL(clicked(const QPointF&))); + connect(this,SIGNAL(clicked(QPointF)),series,SIGNAL(clicked(QPointF))); } QPointF XYChartItem::calculateGeometryPoint(const QPointF &point) const diff --git a/test/auto/domain/tst_domain.cpp b/test/auto/domain/tst_domain.cpp index 20101cc..ca021ae 100644 --- a/test/auto/domain/tst_domain.cpp +++ b/test/auto/domain/tst_domain.cpp @@ -118,9 +118,9 @@ void tst_Domain::handleAxisRangeXChanged() Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.handleAxisXChanged(min, max); @@ -154,9 +154,9 @@ void tst_Domain::handleAxisRangeYChanged() Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.handleAxisYChanged(min, max, 5); @@ -217,9 +217,9 @@ void tst_Domain::maxX() Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.setMaxX(maxX1); QCOMPARE(domain.maxX(), maxX1); @@ -250,9 +250,9 @@ void tst_Domain::maxY() Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.setMaxY(maxY1); QCOMPARE(domain.maxY(), maxY1); @@ -282,9 +282,9 @@ void tst_Domain::minX() Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.setMinX(minX1); QCOMPARE(domain.minX(), minX1); @@ -314,9 +314,9 @@ void tst_Domain::minY() Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.setMinY(minY1); QCOMPARE(domain.minY(), minY1); @@ -364,9 +364,9 @@ void tst_Domain::operatorEquals() Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); QCOMPARE(*domain1==*domain2, equals); QCOMPARE(*domain1!=*domain2, notEquals); @@ -396,9 +396,9 @@ void tst_Domain::setRange() Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.setRange(minX, maxX, minY, maxY); @@ -429,9 +429,9 @@ void tst_Domain::setRangeX() Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.setRangeX(min, max); @@ -464,9 +464,9 @@ void tst_Domain::setRangeY() Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.setRangeY(min, max); @@ -502,9 +502,9 @@ void tst_Domain::spanX() domain.setRangeX(minX, maxX); - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); QCOMPARE(domain.spanX(), spanX); @@ -532,9 +532,9 @@ void tst_Domain::spanY() domain.setRangeY(minY, maxY); - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); QCOMPARE(domain.spanY(), spanY); @@ -574,9 +574,9 @@ void tst_Domain::zoom() domain.setRange(0, 1000, 0, 1000); - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); Domain domain0; domain0.setRange(domain.minX(), domain.maxX(), domain.minY(), domain.maxY()); @@ -621,9 +621,9 @@ void tst_Domain::move() domain.setRange(0, size.width(), 0, size.height()); - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.move(dx, dy, size); @@ -662,9 +662,9 @@ void tst_Domain::handleAxisXChanged() QFETCH(int, resultTickCount); Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.handleAxisXChanged(min, max, tickCount, niceNumbers); @@ -693,9 +693,9 @@ void tst_Domain::handleAxisYChanged() QFETCH(int, resultTickCount); Domain domain; - QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal, qreal, qreal, qreal))); - QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal, qreal,int ))); - QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal, qreal,int ))); + QSignalSpy spy0(&domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal))); + QSignalSpy spy1(&domain, SIGNAL(rangeXChanged(qreal,qreal,int))); + QSignalSpy spy2(&domain, SIGNAL(rangeYChanged(qreal,qreal,int))); domain.handleAxisYChanged(min, max, tickCount, niceNumbers); diff --git a/test/auto/qchartview/tst_qchartview.cpp b/test/auto/qchartview/tst_qchartview.cpp index a0c787e..422c898 100644 --- a/test/auto/qchartview/tst_qchartview.cpp +++ b/test/auto/qchartview/tst_qchartview.cpp @@ -146,9 +146,9 @@ void tst_QChartView::rubberBand() m_view->setMouseTracking(true); QChartAxis* axisY = m_view->chart()->axisY(); - QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal,qreal))); QChartAxis* axisX = m_view->chart()->axisX(); - QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal,qreal))); QTest::qWaitForWindowShown(m_view); QTest::qWait(500); @@ -198,9 +198,9 @@ void tst_QChartView::keys() m_view->show(); QChartAxis* axisY = m_view->chart()->axisY(); - QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal,qreal))); QChartAxis* axisX = m_view->chart()->axisX(); - QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal,qreal))); QTest::keyPress(m_view, key); QTest::keyRelease(m_view, key); diff --git a/test/chartwidgettest/mainwidget.cpp b/test/chartwidgettest/mainwidget.cpp index e783bf2..ca0167e 100644 --- a/test/chartwidgettest/mainwidget.cpp +++ b/test/chartwidgettest/mainwidget.cpp @@ -174,8 +174,8 @@ void MainWidget::addSeries() { if (!m_addSerieDialog) { m_addSerieDialog = new DataSerieDialog(this); - connect(m_addSerieDialog, SIGNAL(accepted(QString, int, int, QString, bool)), - this, SLOT(addSeries(QString, int, int, QString, bool))); + connect(m_addSerieDialog, SIGNAL(accepted(QString,int,int,QString,bool)), + this, SLOT(addSeries(QString,int,int,QString,bool))); } m_addSerieDialog->exec(); }