mirror of
https://github.com/YACReader/yacreader
synced 2025-05-27 10:50:27 -04:00
Don't use a custom signal at all
QThread::finished should be enough in all the cases.
This commit is contained in:
parent
9c16d1ad81
commit
561203d2f1
@ -96,7 +96,6 @@ void LibraryCreator::updateFolder(const QString &source, const QString &target,
|
|||||||
QString error = "Unable to find database at: " + _target;
|
QString error = "Unable to find database at: " + _target;
|
||||||
QLOG_ERROR() << error;
|
QLOG_ERROR() << error;
|
||||||
emit failedOpeningDB(error);
|
emit failedOpeningDB(error);
|
||||||
emit completed();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -164,7 +163,6 @@ void LibraryCreator::run()
|
|||||||
if (!_database.isOpen()) {
|
if (!_database.isOpen()) {
|
||||||
QLOG_ERROR() << "Unable to create data base" << _database.lastError().databaseText() + "-" + _database.lastError().driverText();
|
QLOG_ERROR() << "Unable to create data base" << _database.lastError().databaseText() + "-" + _database.lastError().driverText();
|
||||||
emit failedCreatingDB(_database.lastError().databaseText() + "-" + _database.lastError().driverText());
|
emit failedCreatingDB(_database.lastError().databaseText() + "-" + _database.lastError().driverText());
|
||||||
emit completed();
|
|
||||||
creation = false;
|
creation = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -193,7 +191,6 @@ void LibraryCreator::run()
|
|||||||
QString error = "Unable to find database at: " + _target;
|
QString error = "Unable to find database at: " + _target;
|
||||||
QLOG_ERROR() << error;
|
QLOG_ERROR() << error;
|
||||||
emit failedOpeningDB(error);
|
emit failedOpeningDB(error);
|
||||||
emit completed();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -203,7 +200,6 @@ void LibraryCreator::run()
|
|||||||
if (!_database.open()) {
|
if (!_database.open()) {
|
||||||
QLOG_ERROR() << "Unable to open database" << _database.lastError().databaseText() + "-" + _database.lastError().driverText();
|
QLOG_ERROR() << "Unable to open database" << _database.lastError().databaseText() + "-" + _database.lastError().driverText();
|
||||||
emit failedOpeningDB(_database.lastError().databaseText() + "-" + _database.lastError().driverText());
|
emit failedOpeningDB(_database.lastError().databaseText() + "-" + _database.lastError().driverText());
|
||||||
emit completed();
|
|
||||||
creation = false;
|
creation = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -255,7 +251,6 @@ void LibraryCreator::run()
|
|||||||
emit updatedCurrentFolder(folderDestinationModelIndex);
|
emit updatedCurrentFolder(folderDestinationModelIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
emit completed();
|
|
||||||
creation = false;
|
creation = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,6 @@ private:
|
|||||||
void cleanup(QSqlDatabase &db, const QString &target);
|
void cleanup(QSqlDatabase &db, const QString &target);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void completed();
|
|
||||||
void coverExtracted(QString);
|
void coverExtracted(QString);
|
||||||
void folderUpdated(QString);
|
void folderUpdated(QString);
|
||||||
void comicAdded(QString, QString);
|
void comicAdded(QString, QString);
|
||||||
|
@ -706,7 +706,7 @@ void LibraryWindow::createConnections()
|
|||||||
connect(createLibraryDialog, &CreateLibraryDialog::libraryExists, this, &LibraryWindow::libraryAlreadyExists);
|
connect(createLibraryDialog, &CreateLibraryDialog::libraryExists, this, &LibraryWindow::libraryAlreadyExists);
|
||||||
connect(importComicsInfoDialog, &QDialog::finished, this, &LibraryWindow::reloadCurrentLibrary);
|
connect(importComicsInfoDialog, &QDialog::finished, this, &LibraryWindow::reloadCurrentLibrary);
|
||||||
|
|
||||||
connect(libraryCreator, &LibraryCreator::completed, this, &LibraryWindow::showRootWidget);
|
connect(libraryCreator, &LibraryCreator::finished, this, &LibraryWindow::showRootWidget);
|
||||||
connect(libraryCreator, &LibraryCreator::updated, this, &LibraryWindow::reloadCurrentLibrary);
|
connect(libraryCreator, &LibraryCreator::updated, this, &LibraryWindow::reloadCurrentLibrary);
|
||||||
connect(libraryCreator, &LibraryCreator::created, this, &LibraryWindow::openLastCreated);
|
connect(libraryCreator, &LibraryCreator::created, this, &LibraryWindow::openLastCreated);
|
||||||
connect(libraryCreator, &LibraryCreator::updatedCurrentFolder, this, &LibraryWindow::reloadAfterCopyMove);
|
connect(libraryCreator, &LibraryCreator::updatedCurrentFolder, this, &LibraryWindow::reloadAfterCopyMove);
|
||||||
|
Loading…
Reference in New Issue
Block a user