##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

normalize signal/slot signatures
Jani Honkonen -
r2110:a93a773ef512
parent child
Show More
Side by Side Unified
Context file:
r2110:a93a773ef512 Loading diff...:
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
@@ -170,9 +170,9 void tst_QBarCategoriesAxis::append()
170 QBarCategoryAxis axis;
170 QBarCategoryAxis axis;
171
171
172 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
172 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
173 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&)));
173 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
174 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&)));
174 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
175 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&)));
175 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
176
176
177 axis.append(categories);
177 axis.append(categories);
178
178
@@ -212,9 +212,9 void tst_QBarCategoriesAxis::at()
212 axis.append(categories);
212 axis.append(categories);
213
213
214 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
214 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
215 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&)));
215 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
216 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&)));
216 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
217 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&)));
217 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
218
218
219 QCOMPARE(axis.at(index), string);
219 QCOMPARE(axis.at(index), string);
220
220
@@ -247,9 +247,9 void tst_QBarCategoriesAxis::categories()
247 QBarCategoryAxis axis;
247 QBarCategoryAxis axis;
248
248
249 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
249 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
250 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&)));
250 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
251 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&)));
251 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
252 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&)));
252 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
253
253
254 axis.setCategories(categories);
254 axis.setCategories(categories);
255 QCOMPARE(axis.categories(), categories);
255 QCOMPARE(axis.categories(), categories);
@@ -287,9 +287,9 void tst_QBarCategoriesAxis::clear()
287 QCOMPARE(axis.categories(), categories);
287 QCOMPARE(axis.categories(), categories);
288
288
289 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
289 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
290 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&)));
290 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
291 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&)));
291 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
292 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&)));
292 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
293
293
294 axis.clear();
294 axis.clear();
295 QCOMPARE(axis.categories(), QStringList());
295 QCOMPARE(axis.categories(), QStringList());
@@ -333,9 +333,9 void tst_QBarCategoriesAxis::count()
333 axis.setCategories(categories);
333 axis.setCategories(categories);
334
334
335 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
335 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
336 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&)));
336 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
337 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&)));
337 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
338 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&)));
338 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
339
339
340 QCOMPARE(axis.count(), count);
340 QCOMPARE(axis.count(), count);
341
341
@@ -370,9 +370,9 void tst_QBarCategoriesAxis::insert()
370 axis.append(categories);
370 axis.append(categories);
371
371
372 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
372 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
373 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&)));
373 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
374 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&)));
374 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
375 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&)));
375 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
376
376
377 axis.insert(index, category);
377 axis.insert(index, category);
378 QCOMPARE(axis.at(index),category);
378 QCOMPARE(axis.at(index),category);
@@ -410,9 +410,9 void tst_QBarCategoriesAxis::remove()
410 int rangeCount = maxCount + minCount;
410 int rangeCount = maxCount + minCount;
411
411
412 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
412 QSignalSpy spy0(&axis, SIGNAL(categoriesChanged()));
413 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&)));
413 QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString)));
414 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString const&)));
414 QSignalSpy spy2(&axis, SIGNAL(minChanged(QString)));
415 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString const&, QString const&)));
415 QSignalSpy spy3(&axis, SIGNAL(rangeChanged(QString,QString)));
416
416
417 axis.remove(category);
417 axis.remove(category);
418 QCOMPARE(axis.categories(),result);
418 QCOMPARE(axis.categories(),result);
@@ -437,9 +437,9 void tst_QBarCategoriesAxis::max_raw()
437 QFETCH(QString, max);
437 QFETCH(QString, max);
438
438
439 QSignalSpy spy0(m_baraxis, SIGNAL(categoriesChanged()));
439 QSignalSpy spy0(m_baraxis, SIGNAL(categoriesChanged()));
440 QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString const&)));
440 QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString)));
441 QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString const&)));
441 QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString)));
442 QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString const&, QString const&)));
442 QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString,QString)));
443
443
444 m_baraxis->setMax(max);
444 m_baraxis->setMax(max);
445 QCOMPARE(m_baraxis->max(), max);
445 QCOMPARE(m_baraxis->max(), max);
@@ -488,9 +488,9 void tst_QBarCategoriesAxis::min_raw()
488 QFETCH(QString, min);
488 QFETCH(QString, min);
489
489
490 QSignalSpy spy0(m_baraxis, SIGNAL(categoriesChanged()));
490 QSignalSpy spy0(m_baraxis, SIGNAL(categoriesChanged()));
491 QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString const&)));
491 QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString)));
492 QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString const&)));
492 QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString)));
493 QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString const&, QString const&)));
493 QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString,QString)));
494
494
495 m_baraxis->setMin(min);
495 m_baraxis->setMin(min);
496 QCOMPARE(m_baraxis->min(), min);
496 QCOMPARE(m_baraxis->min(), min);
@@ -543,9 +543,9 void tst_QBarCategoriesAxis::range_raw()
543 QFETCH(QString, max);
543 QFETCH(QString, max);
544
544
545 QSignalSpy spy0(m_baraxis, SIGNAL(categoriesChanged()));
545 QSignalSpy spy0(m_baraxis, SIGNAL(categoriesChanged()));
546 QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString const&)));
546 QSignalSpy spy1(m_baraxis, SIGNAL(maxChanged(QString)));
547 QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString const&)));
547 QSignalSpy spy2(m_baraxis, SIGNAL(minChanged(QString)));
548 QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString const&, QString const&)));
548 QSignalSpy spy3(m_baraxis, SIGNAL(rangeChanged(QString,QString)));
549
549
550 m_baraxis->setRange(min, max);
550 m_baraxis->setRange(min, max);
551 QCOMPARE(m_baraxis->min(), min);
551 QCOMPARE(m_baraxis->min(), min);
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
Show file before | Show file after | Hide comments
@@ -97,7 +97,7 void tst_QXYSeries::append_raw_data()
97 void tst_QXYSeries::append_raw()
97 void tst_QXYSeries::append_raw()
98 {
98 {
99 QFETCH(QList<QPointF>, points);
99 QFETCH(QList<QPointF>, points);
100 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
100 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF)));
101 QSignalSpy addedSpy(m_series, SIGNAL(pointAdded(int)));
101 QSignalSpy addedSpy(m_series, SIGNAL(pointAdded(int)));
102 m_series->append(points);
102 m_series->append(points);
103 TRY_COMPARE(spy0.count(), 0);
103 TRY_COMPARE(spy0.count(), 0);
@@ -160,7 +160,7 void tst_QXYSeries::count_raw()
160 {
160 {
161 QFETCH(int, count);
161 QFETCH(int, count);
162
162
163 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
163 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF)));
164
164
165 for(int i=0 ; i< count; ++i)
165 for(int i=0 ; i< count; ++i)
166 m_series->append(i,i);
166 m_series->append(i,i);
@@ -177,7 +177,7 void tst_QXYSeries::remove_raw_data()
177 void tst_QXYSeries::remove_raw()
177 void tst_QXYSeries::remove_raw()
178 {
178 {
179 QFETCH(QList<QPointF>, points);
179 QFETCH(QList<QPointF>, points);
180 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
180 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF)));
181 m_series->append(points);
181 m_series->append(points);
182 TRY_COMPARE(spy0.count(), 0);
182 TRY_COMPARE(spy0.count(), 0);
183 QCOMPARE(m_series->points(), points);
183 QCOMPARE(m_series->points(), points);
@@ -231,7 +231,7 void tst_QXYSeries::clear_raw_data()
231 void tst_QXYSeries::clear_raw()
231 void tst_QXYSeries::clear_raw()
232 {
232 {
233 QFETCH(QList<QPointF>, points);
233 QFETCH(QList<QPointF>, points);
234 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
234 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF)));
235 m_series->append(points);
235 m_series->append(points);
236 TRY_COMPARE(spy0.count(), 0);
236 TRY_COMPARE(spy0.count(), 0);
237 QCOMPARE(m_series->points(), points);
237 QCOMPARE(m_series->points(), points);
@@ -360,7 +360,7 void tst_QXYSeries::oper()
360 {
360 {
361 QFETCH(QList<QPointF>, points);
361 QFETCH(QList<QPointF>, points);
362
362
363 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
363 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF)));
364
364
365 foreach (const QPointF& point,points)
365 foreach (const QPointF& point,points)
366 {
366 {
@@ -385,7 +385,7 void tst_QXYSeries::pen()
385 {
385 {
386 QFETCH(QPen, pen);
386 QFETCH(QPen, pen);
387
387
388 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
388 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF)));
389 m_series->setPen(pen);
389 m_series->setPen(pen);
390
390
391 TRY_COMPARE(spy0.count(), 0);
391 TRY_COMPARE(spy0.count(), 0);
@@ -418,7 +418,7 void tst_QXYSeries::pointsVisible_raw_data()
418 void tst_QXYSeries::pointsVisible_raw()
418 void tst_QXYSeries::pointsVisible_raw()
419 {
419 {
420 QFETCH(bool, pointsVisible);
420 QFETCH(bool, pointsVisible);
421 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
421 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF)));
422 m_series->setPointsVisible(pointsVisible);
422 m_series->setPointsVisible(pointsVisible);
423 TRY_COMPARE(spy0.count(), 0);
423 TRY_COMPARE(spy0.count(), 0);
424 QCOMPARE(m_series->pointsVisible(), pointsVisible);
424 QCOMPARE(m_series->pointsVisible(), pointsVisible);
Show file before | Show file after | Hide comments
@@ -265,7 +265,7 void Engine::setupXYSeries(QXYSeries *xyseries, const QList<int>& columns, int c
265 mapper->setRowCount(maxRow - minRow + 1);
265 mapper->setRowCount(maxRow - minRow + 1);
266 m_chart->addSeries(xyseries);
266 m_chart->addSeries(xyseries);
267 xyseries->setName(QString("Series %1").arg(m_chart->series().count()));
267 xyseries->setName(QString("Series %1").arg(m_chart->series().count()));
268 QObject::connect(xyseries,SIGNAL(clicked(const QPointF&)),this,SIGNAL(selected()));
268 QObject::connect(xyseries,SIGNAL(clicked(QPointF)),this,SIGNAL(selected()));
269 const QModelIndexList& list = m_selection->selectedIndexes();
269 const QModelIndexList& list = m_selection->selectedIndexes();
270 QModelIndexList result;
270 QModelIndexList result;
271 foreach (const QModelIndex& index, list) {
271 foreach (const QModelIndex& index, list) {
Show file before | Show file after | Hide comments
@@ -223,7 +223,7 void MainWindow::createTable()
223 {
223 {
224 m_table->setModel(m_engine->model());
224 m_table->setModel(m_engine->model());
225 m_table->setSelectionModel(m_engine->selectionModel());
225 m_table->setSelectionModel(m_engine->selectionModel());
226 QObject::connect(m_table->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this,SLOT(updateUI()));
226 QObject::connect(m_table->selectionModel(),SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this,SLOT(updateUI()));
227 }
227 }
228
228
229 void MainWindow::updateUI()
229 void MainWindow::updateUI()
General Comments 0
You need to be logged in to leave comments. Login now