Index: sources/storage/Logger.cpp =================================================================== diff -u -r6ac0e78ba8a65d86f67ce866ed879430fe2b2703 -r322c96960f4828abdd6cf9914d2a0797c2887e12 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 6ac0e78ba8a65d86f67ce866ed879430fe2b2703) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 322c96960f4828abdd6cf9914d2a0797c2887e12) @@ -73,13 +73,10 @@ */ bool Logger::init(QThread &vThread) { - // disabled coco begin validated: Application is not running in multi-threaded mode for testing - // it has been tested and works perfectly fine in normal run. if ( ! init() ) return false; initThread(vThread); return true; } -// disabled coco end /*! * \brief Logger::postInit @@ -119,11 +116,8 @@ */ void Logger::quit() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// disabled coco end /*! * \brief Logger::initConnections @@ -171,17 +165,14 @@ */ void Logger::initThread(QThread &vThread) { - // disabled coco begin validated: Application is not running in multi-threaded mode for testing - // it has been tested and works perfectly fine in normal run. - // runs in main thread Q_ASSERT_X(QThread::currentThread() == qApp->thread() , __func__, "The Class initialization must be done in Main Thread" ); _thread = &vThread; _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className())); connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit())); _thread->start(); moveToThread(_thread); } -// disabled coco end + /*! * \brief Logger::quitThread * \details Moves this object to main thread to be handled by QApplication @@ -521,8 +512,6 @@ */ void Logger::onExportLogs() { - // disabled coco begin validated: This needs user interaction to export to USB device - // has been tested manually LOG_DEBUG(QString("Export %1 ended: %2").arg(_logNames[_exportLogsType]).arg(_exportLogsWatcher.result())); //DEBUG: qDebug()<< "_exportLogsWatcher.result()" << _exportLogsWatcher.result(); @@ -532,7 +521,6 @@ } emit didExportLogs(); } -// disabled coco end /*! * \brief CloudSyncController::onActionReceive @@ -668,15 +656,12 @@ */ bool Logger::concurrentRemoveLogs(LogType vLogType) { - // disabled coco begin validated: This needs user interaction to check the old files deleted - // has been tested manually LOG_DEBUG("Remove Logs Starting"); emit didRemoveLogs(true); QFuture mFuture = QtConcurrent::run(this, &Logger::removeLogs, vLogType); _removeLogsWatcher.setFuture(mFuture); return true; } -// disabled coco end /*! * \brief Logger::onRemoveLogs @@ -712,8 +697,6 @@ */ void Logger::onSDCardSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent) { - // disabled coco begin validated: This needs user interaction to change the SD card files system. - // has been tested manually Q_UNUSED(vTotal ) Q_UNUSED(vAvailable ) if ( ! vReady ) return; @@ -723,9 +706,7 @@ concurrentRemoveLogs(); } } -// disabled coco end - /*! * \brief Logger::onSettingsPartitionStateChange * \details handle the state change of the settings partition @@ -751,8 +732,6 @@ */ void Logger::onSettingsPartitionSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent) { - // disabled coco begin validated: This needs user interaction to change the SD card files system. - // has been tested manually Q_UNUSED(vTotal ) Q_UNUSED(vAvailable ) if ( ! vReady ) return; @@ -762,16 +741,13 @@ concurrentRemoveLogs(eLogTrtmt); } } -// disabled coco end - /*! * \brief Logger::enableConsoleOut * \details Enables or Disables the console output and logs the status * \param vEnabled - Enable console output if true */ void Logger::enableConsoleOut(bool vEnabled) { - // disabled coco begin validated: This code meant to be used only for debugging and tested manually if (_enableConsoleOut == vEnabled) return; _enableConsoleOut = vEnabled; if (_enableConsoleOut) { @@ -780,7 +756,6 @@ LOG_DEBUG("Console out Logging disabled"); } } -// disabled coco end /*! * \brief Logger::logPath