Skip to content

Commit

Permalink
COMP: Fix Qt4/C++98 ctkDICOMIndexerPrivate build using literal signal…
Browse files Browse the repository at this point in the history
…/slot
  • Loading branch information
jcfr committed Jul 13, 2023
1 parent 0f3c87e commit 7bb0d9f
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Libs/DICOM/Core/ctkDICOMIndexer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -297,15 +297,15 @@ ctkDICOMIndexerPrivate::ctkDICOMIndexerPrivate(ctkDICOMIndexer& o)
ctkDICOMIndexerPrivateWorker* worker = new ctkDICOMIndexerPrivateWorker(&this->RequestQueue);
worker->moveToThread(&this->WorkerThread);

connect(&this->WorkerThread, &QThread::finished, worker, &QObject::deleteLater);
connect(this, &ctkDICOMIndexerPrivate::startWorker, worker, &ctkDICOMIndexerPrivateWorker::start);
connect(&this->WorkerThread, SIGNAL("finished()"), worker, SLOT("deleteLater()"));
connect(this, SIGNAL("startWorker()"), worker, SLOT("start()"));

// Progress report
connect(worker, &ctkDICOMIndexerPrivateWorker::progress, q_ptr, &ctkDICOMIndexer::progress);
connect(worker, &ctkDICOMIndexerPrivateWorker::progressDetail, q_ptr, &ctkDICOMIndexer::progressDetail);
connect(worker, &ctkDICOMIndexerPrivateWorker::progressStep, q_ptr, &ctkDICOMIndexer::progressStep);
connect(worker, &ctkDICOMIndexerPrivateWorker::updatingDatabase, q_ptr, &ctkDICOMIndexer::updatingDatabase);
connect(worker, &ctkDICOMIndexerPrivateWorker::indexingComplete, q_ptr, &ctkDICOMIndexer::indexingComplete);
connect(worker, SIGNAL("progress(int)"), q_ptr, SLOT("progress(int)"));
connect(worker, SIGNAL("progressDetail(QString)"), q_ptr, SLOT("progressDetail(QString)"));
connect(worker, SIGNAL("progressStep(QString)"), q_ptr, SLOT("progressStep(QString)"));
connect(worker, SIGNAL("updatingDatabase(bool)"), q_ptr, SLOT("updatingDatabase(bool)"));
connect(worker, SIGNAL("indexingComplete(int,int,int,int)"), q_ptr, SLOT("indexingComplete(int,int,int,int)"));

this->WorkerThread.start();
}
Expand Down Expand Up @@ -653,10 +653,10 @@ void ctkDICOMIndexer::waitForImportFinished(int msecTimeout /*=-1*/)
QTimer timer;
timer.setSingleShot(true);
QEventLoop loop;
connect(this, &ctkDICOMIndexer::indexingComplete, &loop, &QEventLoop::quit);
connect(this, SIGNAL("indexingComplete(int,int,int,int)"), &loop, SLOT("quit()"));
if (msecTimeout >= 0)
{
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
connect(&timer, SIGNAL("timeout()"), &loop, SLOT("quit()"));
timer.start(msecTimeout);
}
if (!this->isImporting())
Expand Down

0 comments on commit 7bb0d9f

Please sign in to comment.