| @@ -297,14 +297,9 CatalogueController::eventsForMimeData(const QByteArray &mimeData) const | |||
|
|
297 | 297 | |
|
|
298 | 298 | void CatalogueController::initialize() |
|
|
299 | 299 | { |
|
|
300 | <<<<<<< HEAD | |
|
|
301 | qCDebug(LOG_CatalogueController()) << tr("CatalogueController init") | |
|
|
302 | << QThread::currentThread(); | |
|
|
303 | impl->m_WorkingMutex.lock(); | |
|
|
304 | ======= | |
|
|
305 | 300 | qCDebug(LOG_CatalogueController()) |
|
|
306 | 301 | << tr("CatalogueController init") << QThread::currentThread(); |
|
|
307 | >>>>>>> 286decc... unthread the catalogue controller | |
|
|
302 | ||
|
|
308 | 303 | impl->m_CatalogueDao.initialize(); |
|
|
309 | 304 | auto defaultRepositoryLocation |
|
|
310 | 305 | = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); |
General Comments 0
You need to be logged in to leave comments.
Login now