diff options
author | Jani Honkonen <jani.honkonen@digia.com> | 2012-09-26 14:27:13 +0300 |
---|---|---|
committer | Jani Honkonen <jani.honkonen@digia.com> | 2012-09-26 14:28:07 +0300 |
commit | a93a773ef5120bc796637e46b69288eb4e1bd724 (patch) | |
tree | 49c1d1d5ba6970fa50b0052a2ca5ba39e943862c | |
parent | 69472ec64f97f4a2296a5a2dbe9dc052a5dbe60c (diff) |
normalize signal/slot signatures
-rw-r--r-- | examples/piechartdrilldown/main.cpp | 4 | ||||
-rw-r--r-- | examples/stackedbarchartdrilldown/main.cpp | 4 | ||||
-rw-r--r-- | plugins/declarative/declarativechart.cpp | 12 | ||||
-rw-r--r-- | src/barchart/abstractbarchartitem.cpp | 8 | ||||
-rw-r--r-- | tests/auto/chartdataset/tst_chartdataset.cpp | 60 | ||||
-rw-r--r-- | tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp | 64 | ||||
-rw-r--r-- | tests/auto/qbarseries/tst_qbarseries.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp | 6 | ||||
-rw-r--r-- | tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp | 6 | ||||
-rw-r--r-- | tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qvalueaxis/tst_qvalueaxis.cpp | 14 | ||||
-rw-r--r-- | tests/auto/qxyseries/tst_qxyseries.cpp | 14 | ||||
-rw-r--r-- | tests/chartdesigner/engine.cpp | 2 | ||||
-rw-r--r-- | tests/chartdesigner/mainwindow.cpp | 2 |
17 files changed, 107 insertions, 107 deletions
diff --git a/examples/piechartdrilldown/main.cpp b/examples/piechartdrilldown/main.cpp index ee47ca93..d1460d96 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 *)), chart, SLOT(handleSliceClicked(QPieSlice *))); + QObject::connect(series, SIGNAL(clicked(QPieSlice*)), chart, SLOT(handleSliceClicked(QPieSlice*))); *yearSeries << new DrilldownSlice(series->sum(), name, series); } - QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice *)), chart, SLOT(handleSliceClicked(QPieSlice *))); + QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice*)), chart, SLOT(handleSliceClicked(QPieSlice*))); chart->changeSeries(yearSeries); diff --git a/examples/stackedbarchartdrilldown/main.cpp b/examples/stackedbarchartdrilldown/main.cpp index f7d6c498..8cc7ed9d 100644 --- a/examples/stackedbarchartdrilldown/main.cpp +++ b/examples/stackedbarchartdrilldown/main.cpp @@ -68,11 +68,11 @@ int main(int argc, char *argv[]) } // Use clicked signal to implement drilldown - QObject::connect(weeklySeries, SIGNAL(clicked(int, QBarSet *)), drilldownChart, SLOT(handleClicked(int, QBarSet *))); + QObject::connect(weeklySeries, SIGNAL(clicked(int,QBarSet*)), drilldownChart, SLOT(handleClicked(int,QBarSet*))); } // Enable drilldown from season series using clicked signal - QObject::connect(seasonSeries, SIGNAL(clicked(int, QBarSet *)), drilldownChart, SLOT(handleClicked(int, QBarSet *))); + QObject::connect(seasonSeries, SIGNAL(clicked(int,QBarSet*)), drilldownChart, SLOT(handleClicked(int,QBarSet*))); //! [3] //! [4] diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp index 50e8bd41..297dee14 100644 --- a/plugins/declarative/declarativechart.cpp +++ b/plugins/declarative/declarativechart.cpp @@ -253,12 +253,12 @@ DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent) m_margins->setLeft(m_chart->margins().left()); m_margins->setRight(m_chart->margins().right()); m_margins->setBottom(m_chart->margins().bottom()); - connect(m_margins, SIGNAL(topChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int))); - connect(m_margins, SIGNAL(bottomChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int))); - connect(m_margins, SIGNAL(leftChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int))); - connect(m_margins, SIGNAL(rightChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int))); - connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)), this, SLOT(handleSeriesAdded(QAbstractSeries *, Domain *))); - connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)), this, SIGNAL(seriesRemoved(QAbstractSeries *))); + connect(m_margins, SIGNAL(topChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int))); + connect(m_margins, SIGNAL(bottomChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int))); + connect(m_margins, SIGNAL(leftChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int))); + connect(m_margins, SIGNAL(rightChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int))); + connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*)), this, SLOT(handleSeriesAdded(QAbstractSeries*,Domain*))); + connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SIGNAL(seriesRemoved(QAbstractSeries*))); } void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series, Domain *domain) diff --git a/src/barchart/abstractbarchartitem.cpp b/src/barchart/abstractbarchartitem.cpp index eda9a951..ec2d7d6a 100644 --- a/src/barchart/abstractbarchartitem.cpp +++ b/src/barchart/abstractbarchartitem.cpp @@ -144,10 +144,10 @@ void AbstractBarChartItem::handleDataStructureChanged() // Bars Bar *bar = new Bar(set, c, this); m_bars.append(bar); - connect(bar, SIGNAL(clicked(int, QBarSet*)), m_series, SIGNAL(clicked(int, QBarSet*))); - connect(bar, SIGNAL(hovered(bool, QBarSet*)), m_series, SIGNAL(hovered(bool, QBarSet*))); - connect(bar, SIGNAL(clicked(int, QBarSet*)), set, SIGNAL(clicked(int))); - connect(bar, SIGNAL(hovered(bool, QBarSet*)), set, SIGNAL(hovered(bool))); + connect(bar, SIGNAL(clicked(int,QBarSet*)), m_series, SIGNAL(clicked(int,QBarSet*))); + connect(bar, SIGNAL(hovered(bool,QBarSet*)), m_series, SIGNAL(hovered(bool,QBarSet*))); + connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int))); + connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool))); m_layout.append(QRectF(0, 0, 0, 0)); // Labels diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp index bdc339db..5773aed4 100644 --- a/tests/auto/chartdataset/tst_chartdataset.cpp +++ b/tests/auto/chartdataset/tst_chartdataset.cpp @@ -179,10 +179,10 @@ void tst_ChartDataSet::addSeries() QFETCH(QAbstractSeries*, series); - QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*, Domain *))); + QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*))); QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*))); - QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *))); - QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *))); + QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*))); + QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*))); m_dataset->addSeries(series); m_dataset->createDefaultAxes(); @@ -236,10 +236,10 @@ void tst_ChartDataSet::setAxisX() Q_ASSERT(seriesList.count() == axisList.count()); - QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *,Domain*))); - QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *))); - QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *,Domain*))); - QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *))); + QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*))); + QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*))); + QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*))); + QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*))); foreach (QAbstractSeries* series, seriesList){ m_dataset->addSeries(series); @@ -252,8 +252,8 @@ void tst_ChartDataSet::setAxisX() QSignalSpy spy4(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*))); QSignalSpy spy5(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*))); - QSignalSpy spy6(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *,Domain*))); - QSignalSpy spy7(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *))); + QSignalSpy spy6(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*))); + QSignalSpy spy7(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*))); for(int i=0 ; i < seriesList.count(); i++){ m_dataset->setAxis(seriesList.at(i),axisList.at(i),Qt::Horizontal); @@ -284,8 +284,8 @@ void tst_ChartDataSet::setAxisY() QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*))); QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*))); - QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *,Domain*))); - QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *))); + QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*))); + QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*))); foreach (QAbstractSeries* series, seriesList){ m_dataset->addSeries(series); @@ -298,8 +298,8 @@ void tst_ChartDataSet::setAxisY() QSignalSpy spy4(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*))); QSignalSpy spy5(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*))); - QSignalSpy spy6(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *,Domain*))); - QSignalSpy spy7(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *))); + QSignalSpy spy6(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*))); + QSignalSpy spy7(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*))); for(int i=0 ; i < seriesList.count(); i++){ m_dataset->setAxis(seriesList.at(i),axisList.at(i),Qt::Vertical); @@ -327,10 +327,10 @@ void tst_ChartDataSet::removeSeries() m_dataset->addSeries(series); m_dataset->createDefaultAxes(); - QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*, Domain *))); + QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*))); QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*))); - QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *))); - QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *))); + QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*))); + QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*))); m_dataset->removeSeries(series); @@ -373,10 +373,10 @@ void tst_ChartDataSet::removeAllSeries() m_dataset->setAxis(seriesList.at(i), axisList.at(i),Qt::Horizontal); } - QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *, Domain *))); - QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *))); - QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *))); - QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *))); + QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*))); + QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*))); + QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*))); + QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*))); m_dataset->removeAllSeries(); @@ -405,10 +405,10 @@ void tst_ChartDataSet::seriesCount() m_dataset->addSeries(series); } - QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *, Domain *))); - QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *))); - QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *))); - QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *))); + QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*))); + QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*))); + QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*))); + QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*))); QCOMPARE(m_dataset->seriesCount(seriesList.at(0)->type()),seriesCount); TRY_COMPARE(spy0.count(), 0); @@ -434,8 +434,8 @@ void tst_ChartDataSet::seriesIndex() m_dataset->addSeries(series); } - QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *,Domain*))); - QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *))); + QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*))); + QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*))); QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*))); QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*))); @@ -520,10 +520,10 @@ void tst_ChartDataSet::domain() { QFETCH(QAbstractSeries*, series); - QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *, Domain *))); - QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *))); - QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *))); - QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *))); + QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*))); + QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*))); + QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*))); + QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*))); m_dataset->addSeries(series); QVERIFY(m_dataset->domain(series)); diff --git a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp index 2be7a7c5..47bb0183 100644 --- a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp +++ b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp @@ -170,9 +170,9 @@ void tst_QBarCategoriesAxis::append() QBarCategoryAxis axis; QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); - QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); - QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&))); - QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&))); + QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString))); + QSignalSpy spy2(&axis, SIGNAL(minChanged(QString))); + QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString))); axis.append(categories); @@ -212,9 +212,9 @@ void tst_QBarCategoriesAxis::at() axis.append(categories); QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); - QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); - QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&))); - QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&))); + QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString))); + QSignalSpy spy2(&axis, SIGNAL(minChanged(QString))); + QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString))); QCOMPARE(axis.at(index), string); @@ -247,9 +247,9 @@ void tst_QBarCategoriesAxis::categories() QBarCategoryAxis axis; QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); - QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); - QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&))); - QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&))); + QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString))); + QSignalSpy spy2(&axis, SIGNAL(minChanged(QString))); + QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString))); axis.setCategories(categories); QCOMPARE(axis.categories(), categories); @@ -287,9 +287,9 @@ void tst_QBarCategoriesAxis::clear() QCOMPARE(axis.categories(), categories); QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); - QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); - QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&))); - QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&))); + QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString))); + QSignalSpy spy2(&axis, SIGNAL(minChanged(QString))); + QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString))); axis.clear(); QCOMPARE(axis.categories(), QStringList()); @@ -333,9 +333,9 @@ void tst_QBarCategoriesAxis::count() axis.setCategories(categories); QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); - QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); - QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&))); - QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&))); + QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString))); + QSignalSpy spy2(&axis, SIGNAL(minChanged(QString))); + QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString))); QCOMPARE(axis.count(), count); @@ -370,9 +370,9 @@ void tst_QBarCategoriesAxis::insert() axis.append(categories); QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); - QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); - QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&))); - QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&))); + QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString))); + QSignalSpy spy2(&axis, SIGNAL(minChanged(QString))); + QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString))); axis.insert(index, category); QCOMPARE(axis.at(index),category); @@ -410,9 +410,9 @@ void tst_QBarCategoriesAxis::remove() int rangeCount = maxCount + minCount; QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); - QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); - QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&))); - QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&))); + QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString))); + QSignalSpy spy2(&axis, SIGNAL(minChanged(QString))); + QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString))); axis.remove(category); QCOMPARE(axis.categories(),result); @@ -437,9 +437,9 @@ void tst_QBarCategoriesAxis::max_raw() QFETCH(QString, max); QSignalSpy spy0(m_baraxis, SIGNAL(categoriesChanged())); - QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString const&))); - QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString const&))); - QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString const&, QString const&))); + QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString))); + QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString))); + QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString,QString))); m_baraxis->setMax(max); QCOMPARE(m_baraxis->max(), max); @@ -488,9 +488,9 @@ void tst_QBarCategoriesAxis::min_raw() QFETCH(QString, min); QSignalSpy spy0(m_baraxis, SIGNAL(categoriesChanged())); - QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString const&))); - QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString const&))); - QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString const&, QString const&))); + QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString))); + QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString))); + QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString,QString))); m_baraxis->setMin(min); QCOMPARE(m_baraxis->min(), min); @@ -543,9 +543,9 @@ void tst_QBarCategoriesAxis::range_raw() QFETCH(QString, max); QSignalSpy spy0(m_baraxis, SIGNAL(categoriesChanged())); - QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString const&))); - QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString const&))); - QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString const&, QString const&))); + QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString))); + QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString))); + QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString,QString))); m_baraxis->setRange(min, max); QCOMPARE(m_baraxis->min(), min); @@ -598,7 +598,7 @@ void tst_QBarCategoriesAxis::noautoscale() QSignalSpy spy0(m_baraxis, SIGNAL(maxChanged(QString))); QSignalSpy spy1(m_baraxis, SIGNAL(minChanged(QString))); - QSignalSpy spy2(m_baraxis, SIGNAL(rangeChanged(QString, QString))); + QSignalSpy spy2(m_baraxis, SIGNAL(rangeChanged(QString,QString))); m_baraxis->setRange(min, max); QCOMPARE(m_baraxis->min(),min); @@ -627,7 +627,7 @@ void tst_QBarCategoriesAxis::autoscale() QSignalSpy spy0(m_baraxis, SIGNAL(maxChanged(QString))); QSignalSpy spy1(m_baraxis, SIGNAL(minChanged(QString))); - QSignalSpy spy2(m_baraxis, SIGNAL(rangeChanged(QString, QString))); + QSignalSpy spy2(m_baraxis, SIGNAL(rangeChanged(QString,QString))); QCOMPARE(m_baraxis->min(),QString()); QCOMPARE(m_baraxis->max(),QString()); diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index 4474103b..da63bcc4 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -221,7 +221,7 @@ void tst_QBarSeries::take() QVERIFY(m_barseries_with_sets->count() == count); QSignalSpy countSpy(m_barseries_with_sets,SIGNAL(countChanged())); - QSignalSpy removedSpy(m_barseries_with_sets,SIGNAL(barsetsRemoved(QList<QBarSet *>))); + QSignalSpy removedSpy(m_barseries_with_sets,SIGNAL(barsetsRemoved(QList<QBarSet*>))); for (int i=0; i<m_testSets.count(); i++) { QBarSet* set = m_testSets.at(i); diff --git a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp index 4c7e7c20..cb0a67ab 100644 --- a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp +++ b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp @@ -124,7 +124,7 @@ void tst_QCategoryAxis::max_raw() QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal))); QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal))); - QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal))); m_categoryaxis->setMax(max); QVERIFY2(qFuzzyIsNull(m_categoryaxis->max() - max), "Not equal"); @@ -172,7 +172,7 @@ void tst_QCategoryAxis::min_raw() QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal))); QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal))); - QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal))); m_categoryaxis->setMin(min); QVERIFY2(qFuzzyIsNull(m_categoryaxis->min() - min), "Not equal"); @@ -225,7 +225,7 @@ void tst_QCategoryAxis::range_raw() QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal))); QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal))); - QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal))); m_categoryaxis->setRange(min, max); QVERIFY2(qFuzzyIsNull(m_categoryaxis->min() - min), "Min not equal"); diff --git a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp index 347dfe46..4613f3b2 100644 --- a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp +++ b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp @@ -134,7 +134,7 @@ void tst_QDateTimeAxis::max_raw() QSignalSpy spy0(m_dateTimeAxisX, SIGNAL(maxChanged(QDateTime))); QSignalSpy spy1(m_dateTimeAxisX, SIGNAL(minChanged(QDateTime))); - QSignalSpy spy2(m_dateTimeAxisX, SIGNAL(rangeChanged(QDateTime, QDateTime))); + QSignalSpy spy2(m_dateTimeAxisX, SIGNAL(rangeChanged(QDateTime,QDateTime))); m_dateTimeAxisX->setMax(max); @@ -193,7 +193,7 @@ void tst_QDateTimeAxis::min_raw() QSignalSpy spy0(m_dateTimeAxisX, SIGNAL(maxChanged(QDateTime))); QSignalSpy spy1(m_dateTimeAxisX, SIGNAL(minChanged(QDateTime))); - QSignalSpy spy2(m_dateTimeAxisX, SIGNAL(rangeChanged(QDateTime, QDateTime))); + QSignalSpy spy2(m_dateTimeAxisX, SIGNAL(rangeChanged(QDateTime,QDateTime))); m_dateTimeAxisX->setMin(min); @@ -269,7 +269,7 @@ void tst_QDateTimeAxis::range_raw() QSignalSpy spy0(m_dateTimeAxisX, SIGNAL(maxChanged(QDateTime))); QSignalSpy spy1(m_dateTimeAxisX, SIGNAL(minChanged(QDateTime))); - QSignalSpy spy2(m_dateTimeAxisX, SIGNAL(rangeChanged(QDateTime, QDateTime))); + QSignalSpy spy2(m_dateTimeAxisX, SIGNAL(rangeChanged(QDateTime,QDateTime))); m_dateTimeAxisX->setRange(min, max); diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp index 9fe84da6..cba6b1fb 100644 --- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp +++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp @@ -114,7 +114,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked() QList<QBarSet*> barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(clicked(int, QBarSet*))); + QSignalSpy seriesSpy(series,SIGNAL(clicked(int,QBarSet*))); QChartView view(new QChart()); view.resize(400,300); @@ -247,7 +247,7 @@ void tst_QHorizontalPercentBarSeries::mousehovered() QList<QBarSet*> barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool, QBarSet*))); + QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*))); QChartView view(new QChart()); view.resize(400,300); diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp index 900d36a1..30cf16f8 100644 --- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp +++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp @@ -114,7 +114,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked() QList<QBarSet*> barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(clicked(int, QBarSet*))); + QSignalSpy seriesSpy(series,SIGNAL(clicked(int,QBarSet*))); QChartView view(new QChart()); view.resize(400,300); @@ -252,7 +252,7 @@ void tst_QHorizontalStackedBarSeries::mousehovered() QList<QBarSet*> barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool, QBarSet*))); + QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*))); QChartView view(new QChart()); view.resize(400,300); diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp index 3bc1fc63..2bcab9de 100644 --- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp +++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp @@ -114,7 +114,7 @@ void tst_QPercentBarSeries::mouseclicked() QList<QBarSet*> barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(clicked(int, QBarSet*))); + QSignalSpy seriesSpy(series,SIGNAL(clicked(int,QBarSet*))); QChartView view(new QChart()); view.resize(400,300); @@ -249,7 +249,7 @@ void tst_QPercentBarSeries::mousehovered() QList<QBarSet*> barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool, QBarSet*))); + QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*))); QChartView view(new QChart()); view.resize(400,300); diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp index f77989d3..8f9d28b1 100644 --- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp +++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp @@ -114,7 +114,7 @@ void tst_QStackedBarSeries::mouseclicked() QList<QBarSet*> barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(clicked(int, QBarSet*))); + QSignalSpy seriesSpy(series,SIGNAL(clicked(int,QBarSet*))); QChartView view(new QChart()); view.resize(400,300); @@ -252,7 +252,7 @@ void tst_QStackedBarSeries::mousehovered() QList<QBarSet*> barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool, QBarSet*))); + QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*))); QChartView view(new QChart()); view.resize(400,300); diff --git a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp index 6112cd3d..079c053a 100644 --- a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp +++ b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp @@ -132,7 +132,7 @@ void tst_QValueAxis::max_raw() QSignalSpy spy0(m_valuesaxis, SIGNAL(maxChanged(qreal))); QSignalSpy spy1(m_valuesaxis, SIGNAL(minChanged(qreal))); - QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal,qreal))); m_valuesaxis->setMax(max); QVERIFY2(qFuzzyIsNull(m_valuesaxis->max() - max), "Not equal"); @@ -181,7 +181,7 @@ void tst_QValueAxis::min_raw() QSignalSpy spy0(m_valuesaxis, SIGNAL(maxChanged(qreal))); QSignalSpy spy1(m_valuesaxis, SIGNAL(minChanged(qreal))); - QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal,qreal))); m_valuesaxis->setMin(min); QVERIFY2(qFuzzyIsNull(m_valuesaxis->min() - min), "Not equal"); @@ -250,7 +250,7 @@ void tst_QValueAxis::niceNumbersEnabled() QSignalSpy spy0(m_valuesaxis, SIGNAL(maxChanged(qreal))); QSignalSpy spy1(m_valuesaxis, SIGNAL(minChanged(qreal))); - QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal,qreal))); m_valuesaxis->setNiceNumbersEnabled(niceNumbersEnabled); QCOMPARE(m_valuesaxis->niceNumbersEnabled(), niceNumbersEnabled); @@ -284,7 +284,7 @@ void tst_QValueAxis::range_raw() QSignalSpy spy0(m_valuesaxis, SIGNAL(maxChanged(qreal))); QSignalSpy spy1(m_valuesaxis, SIGNAL(minChanged(qreal))); - QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal,qreal))); m_valuesaxis->setRange(min, max); QVERIFY2(qFuzzyIsNull(m_valuesaxis->min() - min), "Min not equal"); @@ -336,7 +336,7 @@ void tst_QValueAxis::ticksCount() QSignalSpy spy0(m_valuesaxis, SIGNAL(maxChanged(qreal))); QSignalSpy spy1(m_valuesaxis, SIGNAL(minChanged(qreal))); - QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal,qreal))); m_valuesaxis->setTickCount(ticksCount); QCOMPARE(m_valuesaxis->tickCount(), ticksCount); @@ -368,7 +368,7 @@ void tst_QValueAxis::noautoscale() QSignalSpy spy0(m_valuesaxis, SIGNAL(maxChanged(qreal))); QSignalSpy spy1(m_valuesaxis, SIGNAL(minChanged(qreal))); - QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal,qreal))); m_valuesaxis->setRange(min, max); QVERIFY2(qFuzzyIsNull(m_valuesaxis->min() - min), "Min not equal"); @@ -394,7 +394,7 @@ void tst_QValueAxis::autoscale() { QSignalSpy spy0(m_valuesaxis, SIGNAL(maxChanged(qreal))); QSignalSpy spy1(m_valuesaxis, SIGNAL(minChanged(qreal))); - QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal, qreal))); + QSignalSpy spy2(m_valuesaxis, SIGNAL(rangeChanged(qreal,qreal))); QVERIFY2(qFuzzyIsNull(m_valuesaxis->min()), "Min not equal"); QVERIFY2(qFuzzyIsNull(m_valuesaxis->max()), "Max not equal"); diff --git a/tests/auto/qxyseries/tst_qxyseries.cpp b/tests/auto/qxyseries/tst_qxyseries.cpp index ae5fddc1..ce68e113 100644 --- a/tests/auto/qxyseries/tst_qxyseries.cpp +++ b/tests/auto/qxyseries/tst_qxyseries.cpp @@ -97,7 +97,7 @@ void tst_QXYSeries::append_raw_data() void tst_QXYSeries::append_raw() { QFETCH(QList<QPointF>, points); - QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&))); + QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); QSignalSpy addedSpy(m_series, SIGNAL(pointAdded(int))); m_series->append(points); TRY_COMPARE(spy0.count(), 0); @@ -160,7 +160,7 @@ void tst_QXYSeries::count_raw() { QFETCH(int, count); - QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&))); + QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); for(int i=0 ; i< count; ++i) m_series->append(i,i); @@ -177,7 +177,7 @@ void tst_QXYSeries::remove_raw_data() void tst_QXYSeries::remove_raw() { QFETCH(QList<QPointF>, points); - QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&))); + QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); m_series->append(points); TRY_COMPARE(spy0.count(), 0); QCOMPARE(m_series->points(), points); @@ -231,7 +231,7 @@ void tst_QXYSeries::clear_raw_data() void tst_QXYSeries::clear_raw() { QFETCH(QList<QPointF>, points); - QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&))); + QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); m_series->append(points); TRY_COMPARE(spy0.count(), 0); QCOMPARE(m_series->points(), points); @@ -360,7 +360,7 @@ void tst_QXYSeries::oper() { QFETCH(QList<QPointF>, points); - QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&))); + QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); foreach (const QPointF& point,points) { @@ -385,7 +385,7 @@ void tst_QXYSeries::pen() { QFETCH(QPen, pen); - QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&))); + QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); m_series->setPen(pen); TRY_COMPARE(spy0.count(), 0); @@ -418,7 +418,7 @@ void tst_QXYSeries::pointsVisible_raw_data() void tst_QXYSeries::pointsVisible_raw() { QFETCH(bool, pointsVisible); - QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&))); + QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF))); m_series->setPointsVisible(pointsVisible); TRY_COMPARE(spy0.count(), 0); QCOMPARE(m_series->pointsVisible(), pointsVisible); diff --git a/tests/chartdesigner/engine.cpp b/tests/chartdesigner/engine.cpp index 01fb483d..06c39c17 100644 --- a/tests/chartdesigner/engine.cpp +++ b/tests/chartdesigner/engine.cpp @@ -265,7 +265,7 @@ void Engine::setupXYSeries(QXYSeries *xyseries, const QList<int>& columns, int c mapper->setRowCount(maxRow - minRow + 1); m_chart->addSeries(xyseries); xyseries->setName(QString("Series %1").arg(m_chart->series().count())); - QObject::connect(xyseries,SIGNAL(clicked(const QPointF&)),this,SIGNAL(selected())); + QObject::connect(xyseries,SIGNAL(clicked(QPointF)),this,SIGNAL(selected())); const QModelIndexList& list = m_selection->selectedIndexes(); QModelIndexList result; foreach (const QModelIndex& index, list) { diff --git a/tests/chartdesigner/mainwindow.cpp b/tests/chartdesigner/mainwindow.cpp index 95980462..ee3e3643 100644 --- a/tests/chartdesigner/mainwindow.cpp +++ b/tests/chartdesigner/mainwindow.cpp @@ -223,7 +223,7 @@ void MainWindow::createTable() { m_table->setModel(m_engine->model()); m_table->setSelectionModel(m_engine->selectionModel()); - QObject::connect(m_table->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this,SLOT(updateUI())); + QObject::connect(m_table->selectionModel(),SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this,SLOT(updateUI())); } void MainWindow::updateUI() |