Index: sources/storage/logger.cpp
===================================================================
diff -u -r5963f00ffd2c557d3ae06a5deea05032a3a3bd68 -rfeb3423b373dc2a2c4267ef9fcb4d924d738423d
--- sources/storage/logger.cpp	(.../logger.cpp)	(revision 5963f00ffd2c557d3ae06a5deea05032a3a3bd68)
+++ sources/storage/logger.cpp	(.../logger.cpp)	(revision feb3423b373dc2a2c4267ef9fcb4d924d738423d)
@@ -18,8 +18,11 @@
 #include <QDebug>
 #include <QDir>
 #include <QApplication>
+#include <QtConcurrent/QtConcurrent>
+#include <QFuture>
 
 // Project
+#include "storageglobals.h"
 #include "filehandler.h"
 
 using namespace Storage;
@@ -33,6 +36,7 @@
 bool Logger::init()
 {
     checkLogPath();
+    qRegisterMetaType<LogType>("LogType");
     initConnections();
     return true;
 }
@@ -54,20 +58,20 @@
         _dir.setPath(qApp->applicationDirPath());
         qDebug() << "WARNING :" << tr("Application Dir Path used for events logging (%1)").arg(_dir.path());
     } else {
-        _dir.setPath(_logBasePathName);
+        _dir.setPath(Log_Base_Path_Name);
     }
 }
 
 bool Logger::setLogPath()
 {
     bool ok = true;
-    ok = ok && setLogPath(eLogDatum);
-    ok = ok && setLogPath(eLogEvent);
-    ok = ok && setLogPath(eLogError);
+    ok = ok && setLogPath(LogType::eLogDatum);
+    ok = ok && setLogPath(LogType::eLogEvent);
+    ok = ok && setLogPath(LogType::eLogError);
     return ok;
 }
 
-bool Logger::setLogPath(Logger::LogType_Enum vLogType)
+bool Logger::setLogPath(LogType vLogType)
 {
     _logPathNames[vLogType] = _dir.path() + "/" + _logBasePathNames[vLogType];
     if ( ! _dir.exists(_logBasePathNames[vLogType]) ) {
@@ -82,7 +86,9 @@
     return true;
 }
 
-bool Logger::log(const QString &vContent, LogType_Enum vLogType) {
+bool Logger::log(const QString &vContent, LogType vLogType) {
+    //qDebug() << QThread::currentThread()->objectName();
+
     QString date = QDate::currentDate().toString(_dateFormat);
     QString mContent;
 
@@ -97,19 +103,20 @@
     mContent += _logPrefix[vLogType];
     mContent += _prefixSeparator;
     mContent += QTime::currentTime().toString(_timeFormat);
-    mContent += _timeSeparator + vContent + "\r\n";
-    QString fileName = date + _dateSeparator + _logFileName;
-    _FileHandler->doWrite(_logPathNames[vLogType] + fileName, mContent);
-    qDebug() << mContent;
+    mContent += _timeSeparator + vContent;
+    QString fileName = date + _dateSeparator + Log_File_Name;
+    _FileHandler->onWrite(_logPathNames[vLogType] + fileName, mContent + "\r\n");
+    qDebug().noquote() << mContent;
+
     return true;
 }
 
-void Logger::doLog(const QString &vContent, LogType_Enum vLogType)
+void Logger::doLog(const QString &vContent, LogType vLogType)
 {
-    emit didLog(log(vContent, vLogType));
-}
+    // // QMetaObject::invokeMethod(this, "log", Qt::AutoConnection, Q_ARG(QString, vContent) , Q_ARG(LogType, vLogType));
 
-void Logger::doExportLog()
-{
-    _FileHandler->doExportFolder(_logBasePathNameExport);
+    // /* QFuture<bool> future = */QtConcurrent::run(this,&Logger::log, vContent, vLogType);
+    // // qDebug() << future.result();
+
+    log(vContent, vLogType);
 }