Index: sources/storage/Logger.cpp =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -r8b044d8ef7db6f72c65aa6109d5f29a79bca92a2 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 8b044d8ef7db6f72c65aa6109d5f29a79bca92a2) @@ -340,8 +340,9 @@ * into USB drive folder (Storage::USB_Mount_Point) * \return true if at least one file has been exported */ -bool Logger::exportLogs() +bool Logger::exportLogs(const Gui::GuiStringIndexMap &vExportList) { + // DEBUG: qDebug() << __FUNCTION__ << vExportList; return false; // qDebug() << " ~~~~~~~~~~ " << QThread::currentThread()->objectName(); int result = 0; static QString mOSource; @@ -365,8 +366,9 @@ * into USB drive folder (Storage::USB_Mount_Point) * \return true if at least one file has been exported */ -bool Logger::exportErrs() +bool Logger::exportErrs(const Gui::GuiStringIndexMap &vExportList) { + // DEBUG: qDebug() << __FUNCTION__ << vExportList; return false; // qDebug() << " ~~~~~~~~~~ " << QThread::currentThread()->objectName(); int result = 0; QString mDestination = USB_Mount_Point; @@ -382,8 +384,9 @@ * into USB drive folder (Storage::USB_Mount_Point) * \return true if at least one file has been exported */ -bool Logger::exportTrts() +bool Logger::exportTrts(const Gui::GuiStringIndexMap &vExportList) { + // DEBUG: qDebug() << __FUNCTION__ << vExportList; return false; // qDebug() << " ~~~~~~~~~~ " << QThread::currentThread()->objectName(); int result = 0; QString mDestination = USB_Mount_Point; @@ -413,13 +416,13 @@ * \return always returns true for now. * \note This method uses QtConcurrent run to execute the FileHandler copyFolder method. */ -bool Logger::concurrentExportLogs() +bool Logger::concurrentExportLogs(const Gui::GuiStringIndexMap &vExportList) { if ( ! concurrentExportIsOk() ) return false; _exportLogsType = eLogEvent; LOG_DEBUG(QString("Export %1 start").arg(_logNames[_exportLogsType])); - QFuture future = QtConcurrent::run(this, &Logger::exportLogs); + QFuture future = QtConcurrent::run(this, &Logger::exportLogs, vExportList); _exportLogsWatcher.setFuture(future); return true; } @@ -430,13 +433,13 @@ * \return always returns true for now. * \note This method uses QtConcurrent run to execute the FileHandler copyFolder method. */ -bool Logger::concurrentExportErrs() +bool Logger::concurrentExportErrs(const Gui::GuiStringIndexMap &vExportList) { if ( ! concurrentExportIsOk() ) return false; _exportLogsType = eLogDebug; LOG_DEBUG(QString("Export %1 start").arg(_logNames[_exportLogsType])); - QFuture future = QtConcurrent::run(this, &Logger::exportErrs); + QFuture future = QtConcurrent::run(this, &Logger::exportErrs, vExportList); _exportLogsWatcher.setFuture(future); return true; } @@ -447,13 +450,13 @@ * \return always returns true for now. * \note This method uses QtConcurrent run to execute the FileHandler copyFolder method. */ -bool Logger::concurrentExportTrts() +bool Logger::concurrentExportTrts(const Gui::GuiStringIndexMap &vExportList) { if ( ! concurrentExportIsOk() ) return false; _exportLogsType = eLogTrtmt; LOG_DEBUG(QString("Export %1 start").arg(_logNames[_exportLogsType])); - QFuture future = QtConcurrent::run(this, &Logger::exportTrts); + QFuture future = QtConcurrent::run(this, &Logger::exportTrts, vExportList); _exportLogsWatcher.setFuture(future); return true; }