Index: sources/applicationcontroller.cpp
===================================================================
diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -rd2035a8728794afeefaa244bf8d1597926d945f5
--- sources/applicationcontroller.cpp	(.../applicationcontroller.cpp)	(revision 44a85c96ab55e424866ec4cca0270aa218355f82)
+++ sources/applicationcontroller.cpp	(.../applicationcontroller.cpp)	(revision d2035a8728794afeefaa244bf8d1597926d945f5)
@@ -20,7 +20,7 @@
 #include "maintimer.h"
 #include "messagedispatcher.h"
 #include "logger.h"
-#include "usbwatcher.h"
+#include "DriveWatcher.h"
 #include "filehandler.h"
 #include "guicontroller.h"
 
@@ -47,7 +47,7 @@
     // coco begin validated: The class ApplicationPost has not been implemented Yet.
     if (!_applicationPost->init()) return false;
     // coco end
-    LOG_EVENT(QObject::tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_EVENT("UI," + tr("%1 Initialized").arg(metaObject()->className()));
 
     return true;
 }
@@ -103,15 +103,15 @@
 
     connect(&_GuiController , SIGNAL(didUSBDriveUmount()),
             this            ,   SLOT( onUSBDriveUmount()));
-    connect(&_USBWatcher    , SIGNAL(didUSBDriveMount ()),
+    connect(&_DriveWatcher  , SIGNAL(didUSBDriveMount ()),
             this            ,   SLOT( onUSBDriveMount ()));
-    connect(&_USBWatcher    , SIGNAL(didUSBDriveRemove()),
+    connect(&_DriveWatcher  , SIGNAL(didUSBDriveRemove()),
             this            ,   SLOT( onUSBDriveRemove()));
 
     connect(&_GuiController , SIGNAL(didExportLog()),
             this            ,   SLOT( onExportLog()));
 
-    connect(&_Logger        , SIGNAL(didExport()),
+    connect(&_Logger        , SIGNAL(didExportLogs()),
             this            ,   SLOT( onExport()));
 
     // ---- Signal/Slots
@@ -199,7 +199,7 @@
 
 /*!
  * \brief   ApplicationController::onUSBDriveMount
- * \details This is the slot which connects to the _USBWatcher didUSBDriveMount signal
+ * \details This is the slot which connects to the _DriveWatcher didUSBDriveMount signal
  *          and notifies the other classes (GuiController) by emitting its signal didUSBDriveMount
  */
 void ApplicationController::onUSBDriveMount ()
@@ -213,7 +213,7 @@
 /*!
  * \brief   ApplicationController::onUSBDriveRemove
  * \details This is the slot which connects to the _GuiController didUSBDriveUmount signal
- *          and notifies the other classes (USBWatcher) by emitting its signal didUSBDriveUmount
+ *          and notifies the other classes (DriveWatcher) by emitting its signal didUSBDriveUmount
  */
 void ApplicationController::onUSBDriveUmount()
 {
@@ -225,7 +225,7 @@
 
 /*!
  * \brief   ApplicationController::onUSBDriveRemove
- * \details This is the slot which connects to the _USBWatcher didUSBDriveRemove signal
+ * \details This is the slot which connects to the _DriveWatcher didUSBDriveRemove signal
  *          and notifies the other classes (GuiController) by emitting its signal didUSBDriveRemove
  */
 void ApplicationController::onUSBDriveRemove()
@@ -284,7 +284,7 @@
     else {
         mData += static_cast<quint8>(GuiActionData::NoData);
     }
-    onActionTransmit(GuiActionType::KeepAlive, mData);
+    onActionTransmit(GuiActionType::ID_KeepAlive, mData);
 #endif
 }