Define worker as usual qobject. Thread functionality not necessary anymore:
remove corresponding run() method, i.e. privateTupdate().
This commit is contained in:
@@ -429,11 +429,11 @@ void Worker::stopProgressLoop() {
|
|||||||
displayProgressInMainWindow(MainWindow::STOP_PROGRESS_LOOP);
|
displayProgressInMainWindow(MainWindow::STOP_PROGRESS_LOOP);
|
||||||
}
|
}
|
||||||
|
|
||||||
static std::once_flag once;
|
//static std::once_flag once;
|
||||||
void Worker::run() {
|
//void Worker::run() {
|
||||||
// user should not start the update process several times
|
// user should not start the update process several times
|
||||||
std::call_once(once, &Worker::privateUpdate, this);
|
// std::call_once(once, &Worker::privateUpdate, this);
|
||||||
}
|
//}
|
||||||
|
|
||||||
bool Worker::isRepositoryCorrupted() {
|
bool Worker::isRepositoryCorrupted() {
|
||||||
QDir customerRepository(m_customerRepository);
|
QDir customerRepository(m_customerRepository);
|
||||||
@@ -480,6 +480,7 @@ bool Worker::repairCorruptedRepository() {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
void Worker::privateUpdate() {
|
void Worker::privateUpdate() {
|
||||||
if (!m_mainWindow) {
|
if (!m_mainWindow) {
|
||||||
Utils::printCriticalErrorMsg("m_mainWindow NOT SET");
|
Utils::printCriticalErrorMsg("m_mainWindow NOT SET");
|
||||||
@@ -757,6 +758,7 @@ void Worker::privateUpdate() {
|
|||||||
// final messages: see destructor of UpdateProcessRunning subclass
|
// final messages: see destructor of UpdateProcessRunning subclass
|
||||||
m_lastFailedUpdateStep = UPDATE_STEP::NONE;
|
m_lastFailedUpdateStep = UPDATE_STEP::NONE;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
bool Worker::updateTriggerSet() {
|
bool Worker::updateTriggerSet() {
|
||||||
// repository is existent and not corrupted. check now if the ISMAS-trigger
|
// repository is existent and not corrupted. check now if the ISMAS-trigger
|
||||||
|
Reference in New Issue
Block a user