@@ -33,7 +33,7 @@ class TestTask : public QgsTask
33
33
TestTask ( const QString& desc, const QgsTask::Flags& flags ) : QgsTask( desc, flags ), runCalled( false ) {}
34
34
35
35
void emitProgressChanged ( double progress ) { setProgress ( progress ); }
36
- void emitTaskStopped () { stopped (); }
36
+ void emitTaskStopped () { terminated (); }
37
37
void emitTaskCompleted () { completed (); }
38
38
39
39
bool runCalled;
@@ -153,8 +153,8 @@ void TestQgsTaskManager::task()
153
153
QVERIFY ( task->canCancel () );
154
154
QVERIFY ( task->flags () & QgsTask::CanReportProgress );
155
155
156
- QSignalSpy startedSpy ( task.data (), SIGNAL ( begun () ) );
157
- QSignalSpy statusSpy ( task.data (), SIGNAL ( statusChanged ( int ) ) );
156
+ QSignalSpy startedSpy ( task.data (), &QgsTask:: begun );
157
+ QSignalSpy statusSpy ( task.data (), &QgsTask:: statusChanged );
158
158
159
159
task->start ();
160
160
QCOMPARE ( task->status (), QgsTask::Running );
@@ -165,7 +165,7 @@ void TestQgsTaskManager::task()
165
165
QCOMPARE ( static_cast < QgsTask::TaskStatus >( statusSpy.last ().at ( 0 ).toInt () ), QgsTask::Running );
166
166
167
167
// test that calling stopped sets correct state
168
- QSignalSpy stoppedSpy ( task.data (), SIGNAL ( taskStopped () ) );
168
+ QSignalSpy stoppedSpy ( task.data (), &QgsTask::taskTerminated );
169
169
task->emitTaskStopped ();
170
170
QCOMPARE ( task->status (), QgsTask::Terminated );
171
171
QVERIFY ( !task->isActive () );
@@ -175,8 +175,8 @@ void TestQgsTaskManager::task()
175
175
176
176
// test that calling completed sets correct state
177
177
task.reset ( new TestTask () );
178
- QSignalSpy completeSpy ( task.data (), SIGNAL ( taskCompleted () ) );
179
- QSignalSpy statusSpy2 ( task.data (), SIGNAL ( statusChanged ( int ) ) );
178
+ QSignalSpy completeSpy ( task.data (), &QgsTask:: taskCompleted );
179
+ QSignalSpy statusSpy2 ( task.data (), &QgsTask:: statusChanged );
180
180
task->emitTaskCompleted ();
181
181
QCOMPARE ( task->status (), QgsTask::Complete );
182
182
QVERIFY ( !task->isActive () );
@@ -208,7 +208,7 @@ void TestQgsTaskManager::taskResult()
208
208
{
209
209
QScopedPointer< TestTask > task ( new SuccessTask () );
210
210
QCOMPARE ( task->status (), QgsTask::Queued );
211
- QSignalSpy statusSpy ( task.data (), SIGNAL ( statusChanged ( int ) ) );
211
+ QSignalSpy statusSpy ( task.data (), &QgsTask:: statusChanged );
212
212
213
213
task->start ();
214
214
QCOMPARE ( statusSpy.count (), 2 );
@@ -218,7 +218,7 @@ void TestQgsTaskManager::taskResult()
218
218
219
219
task.reset ( new FailTask () );
220
220
QCOMPARE ( task->status (), QgsTask::Queued );
221
- QSignalSpy statusSpy2 ( task.data (), SIGNAL ( statusChanged ( int ) ) );
221
+ QSignalSpy statusSpy2 ( task.data (), &QgsTask:: statusChanged );
222
222
223
223
task->start ();
224
224
QCOMPARE ( statusSpy2.count (), 2 );
@@ -243,7 +243,7 @@ void TestQgsTaskManager::addTask()
243
243
QCOMPARE ( manager.count (), 0 );
244
244
QVERIFY ( !manager.task ( 0L ) );
245
245
246
- QSignalSpy spy ( &manager, SIGNAL ( taskAdded ( long ) ) );
246
+ QSignalSpy spy ( &manager, &QgsTaskManager:: taskAdded );
247
247
248
248
// add a task
249
249
TestTask* task = new TestTask ();
@@ -284,7 +284,7 @@ void TestQgsTaskManager::deleteTask()
284
284
manager.addTask ( task2 );
285
285
manager.addTask ( task3 );
286
286
287
- QSignalSpy spy ( &manager, SIGNAL ( taskAboutToBeDeleted ( long ) ) );
287
+ QSignalSpy spy ( &manager, &QgsTaskManager:: taskAboutToBeDeleted );
288
288
289
289
// try deleting a non-existant task
290
290
QVERIFY ( !manager.deleteTask ( 56 ) );
@@ -407,7 +407,7 @@ void TestQgsTaskManager::statusChanged()
407
407
manager.addTask ( task );
408
408
manager.addTask ( task2 );
409
409
410
- QSignalSpy spy ( &manager, SIGNAL ( statusChanged ( long , int ) ) );
410
+ QSignalSpy spy ( &manager, &QgsTaskManager:: statusChanged );
411
411
412
412
task->start ();
413
413
QCOMPARE ( spy.count (), 1 );
@@ -435,7 +435,7 @@ void TestQgsTaskManager::allTasksFinished()
435
435
manager.addTask ( task2 );
436
436
while ( task2->status () != QgsTask::Running ) { }
437
437
438
- QSignalSpy spy ( &manager, SIGNAL ( allTasksFinished () ) );
438
+ QSignalSpy spy ( &manager, &QgsTaskManager:: allTasksFinished );
439
439
440
440
task->emitTaskStopped ();
441
441
while ( task->status () == QgsTask::Running ) { }
@@ -470,7 +470,7 @@ void TestQgsTaskManager::activeTasks()
470
470
QgsTaskManager manager;
471
471
TestTask* task = new TestTask ();
472
472
TestTask* task2 = new TestTask ();
473
- QSignalSpy spy ( &manager, SIGNAL ( countActiveTasksChanged ( int ) ) );
473
+ QSignalSpy spy ( &manager, &QgsTaskManager:: countActiveTasksChanged );
474
474
manager.addTask ( task );
475
475
QCOMPARE ( manager.activeTasks ().toSet (), ( QList< QgsTask* >() << task ).toSet () );
476
476
QCOMPARE ( manager.countActiveTasks (), 1 );
0 commit comments