removed double signal emitting from barseries/set

1 files changed, 32 insertions, 32 deletions

diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
index 91a63ba9..8f64f00e 100644
--- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
+++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
@@ -110,7 +110,7 @@ void tst_QStackedBarSeries::mouseclicked()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
-    QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int)));
+    QSignalSpy seriesSpy(series,SIGNAL(clicked(int, QBarSet*)));
 
     QChartView view(new QChart());
     view.resize(400,300);
@@ -126,9 +126,9 @@ void tst_QStackedBarSeries::mouseclicked()
     QCOMPARE(seriesSpy.count(), 1);
 
     QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
-    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
-    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
-    QVERIFY(seriesSpyArg.at(1).toInt() == 0);
+    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1);
+    QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
+    QVERIFY(seriesSpyArg.at(0).toInt() == 0);
 
 //====================================================================================
 // barset 1, category test2
@@ -138,9 +138,9 @@ void tst_QStackedBarSeries::mouseclicked()
     QCOMPARE(seriesSpy.count(), 1);
 
     seriesSpyArg = seriesSpy.takeFirst();
-    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
-    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
-    QVERIFY(seriesSpyArg.at(1).toInt() == 1);
+    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1);
+    QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
+    QVERIFY(seriesSpyArg.at(0).toInt() == 1);
 
 //====================================================================================
 // barset 1, category test3
@@ -150,9 +150,9 @@ void tst_QStackedBarSeries::mouseclicked()
     QCOMPARE(seriesSpy.count(), 1);
 
     seriesSpyArg = seriesSpy.takeFirst();
-    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
-    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
-    QVERIFY(seriesSpyArg.at(1).toInt() == 2);
+    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1);
+    QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
+    QVERIFY(seriesSpyArg.at(0).toInt() == 2);
 
 //====================================================================================
 // barset 2, category test1
@@ -162,9 +162,9 @@ void tst_QStackedBarSeries::mouseclicked()
     QCOMPARE(seriesSpy.count(), 1);
 
     seriesSpyArg = seriesSpy.takeFirst();
-    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
-    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
-    QVERIFY(seriesSpyArg.at(1).toInt() == 0);
+    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2);
+    QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
+    QVERIFY(seriesSpyArg.at(0).toInt() == 0);
 
 //====================================================================================
 // barset 2, category test2
@@ -174,9 +174,9 @@ void tst_QStackedBarSeries::mouseclicked()
     QCOMPARE(seriesSpy.count(), 1);
 
     seriesSpyArg = seriesSpy.takeFirst();
-    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
-    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
-    QVERIFY(seriesSpyArg.at(1).toInt() == 1);
+    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2);
+    QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
+    QVERIFY(seriesSpyArg.at(0).toInt() == 1);
 
 //====================================================================================
 // barset 2, category test3
@@ -186,9 +186,9 @@ void tst_QStackedBarSeries::mouseclicked()
     QCOMPARE(seriesSpy.count(), 1);
 
     seriesSpyArg = seriesSpy.takeFirst();
-    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
-    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
-    QVERIFY(seriesSpyArg.at(1).toInt() == 2);
+    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2);
+    QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int);
+    QVERIFY(seriesSpyArg.at(0).toInt() == 2);
 }
 
 void tst_QStackedBarSeries::mousehovered_data()
@@ -208,7 +208,7 @@ void tst_QStackedBarSeries::mousehovered()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
-    QSignalSpy seriesSpy(series,SIGNAL(hovered(QBarSet*,bool)));
+    QSignalSpy seriesSpy(series,SIGNAL(hovered(bool, QBarSet*)));
 
     QChartView view(new QChart());
     view.resize(400,300);
@@ -231,9 +231,9 @@ void tst_QStackedBarSeries::mousehovered()
     TRY_COMPARE(seriesSpy.count(), 1);
 
     QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
-    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
-    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
-    QVERIFY(seriesSpyArg.at(1).toBool() == true);
+    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1);
+    QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool);
+    QVERIFY(seriesSpyArg.at(0).toBool() == true);
 
 //=======================================================================
 // move mouse from top of set1 to top of set2
@@ -242,15 +242,15 @@ void tst_QStackedBarSeries::mousehovered()
 
     // should leave set1
     seriesSpyArg = seriesSpy.takeFirst();
-    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
-    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
-    QVERIFY(seriesSpyArg.at(1).toBool() == false);
+    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set1);
+    QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool);
+    QVERIFY(seriesSpyArg.at(0).toBool() == false);
 
     // should enter set2
     seriesSpyArg = seriesSpy.takeFirst();
-    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
-    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
-    QVERIFY(seriesSpyArg.at(1).toBool() == true);
+    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2);
+    QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool);
+    QVERIFY(seriesSpyArg.at(0).toBool() == true);
 
 //=======================================================================
 // move mouse from top of set2 to background
@@ -259,9 +259,9 @@ void tst_QStackedBarSeries::mousehovered()
 
     // should leave set2
     seriesSpyArg = seriesSpy.takeFirst();
-    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
-    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
-    QVERIFY(seriesSpyArg.at(1).toBool() == false);
+    QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(1)), set2);
+    QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool);
+    QVERIFY(seriesSpyArg.at(0).toBool() == false);
 }
 
 QTEST_MAIN(tst_QStackedBarSeries)