Index: unittests/tst_canbus.cpp
===================================================================
diff -u -re1605219ac2baf49ef21d0889f845ac53d59c3c1 -r56d00a82669a7a2c00ab90109a89dbec8db27527
--- unittests/tst_canbus.cpp	(.../tst_canbus.cpp)	(revision e1605219ac2baf49ef21d0889f845ac53d59c3c1)
+++ unittests/tst_canbus.cpp	(.../tst_canbus.cpp)	(revision 56d00a82669a7a2c00ab90109a89dbec8db27527)
@@ -13,17 +13,13 @@
  */
 #include "tst_canbus.h"
 
-//using namespace Can;
 // Project
-#include "guiglobals.h"
 #include "caninterface.h"
 #include "frameinterface.h"
 #include "messagedispatcher.h"
-#include "applicationcontroller.h"
-#include "guicontroller.h"
-#include "maintimer.h"
-#include "format.h"
 
+using namespace Can;
+
 tst_canbus::tst_canbus(QObject *parent) : QObject(parent) { }
 
 void tst_canbus::initTestCase()
@@ -41,35 +37,37 @@
 
 void tst_canbus::tst_CanInterface_Connect_Error_Interface()
 {
-    QString mTr = tr("Error: Connection");
-    Can::_CanInterface  ._canInterface = "can1";
-    Can::_CanInterface  .init();
-    Can::_CanInterface  .enableConsoleOut(false);
-    QCOMPARE(Can::_CanInterface.status().left(mTr.length()), mTr);
+    QString mTr = tr("Connection");
+    _CanInterface._canInterface = "can1";
+    _CanInterface._init = false;
+    _CanInterface.init();
+    _CanInterface.enableConsoleOut(false);
+    QCOMPARE(_CanInterface.status().left(mTr.length()), mTr);
 }
 
 void tst_canbus::tst_CanInterface_Connect_NoError()
 {
-    Can::_CanInterface._canInterface = "can0";
-    Can::_CanInterface.init();
-    Can::_CanInterface.enableConsoleOut(true);
+    _CanInterface._canInterface = "can0";
+    _CanInterface._init = false;
+    _CanInterface.init();
+    _CanInterface.enableConsoleOut(true);
     QString mTr = tr("Connected");
-    QCOMPARE(Can::_CanInterface.status().left(mTr.length()), mTr);
+    QCOMPARE(_CanInterface.status().left(mTr.length()), mTr);
 
-    Can::_CanInterface.onFrameReceive ();
+    _CanInterface.onFrameReceive ();
 }
 
 void tst_canbus::tst_FrameInterface_Init()
 {
-    Can::_FrameInterface    .init();
-    Can::_MessageDispatcher .init();
-    Can::_MessageDispatcher .enableConsoleOut(true);
+    _FrameInterface    .init();
+    _MessageDispatcher .init();
+    _MessageDispatcher .enableConsoleOut(true);
 
-    connect(Can::_MessageDispatcher, &Can::MessageDispatcher::didFrameTransmit, [=](Can_Id        vCanId   , const QByteArray   &vPayload) {
+    connect(&_MessageDispatcher, &MessageDispatcher::didFrameTransmit, [=](Can::Can_Id        vCanId   , const QByteArray   &vPayload) {
         _emited = true;
         QCOMPARE(Format::toHexString(vPayload), _expected);
     });
-    connect(Can::_MessageDispatcher, &Can::MessageDispatcher::didActionReceive, [=](GuiActionType vAction  , const QVariantList &vData   ) {
+    connect(&_MessageDispatcher, &MessageDispatcher::didActionReceive, [=](Gui::GuiActionType vAction  , const QVariantList &vData   ) {
         _emited = true;
         QVERIFY(vAction == _action);
         for (int i = 0; i < vData.length(); i++) {
@@ -145,10 +143,10 @@
     _data   = {0};
     QCanBusFrame mFrame;
     QString      mPayload;
-    mFrame.setFrameId(Can::Can_Id::eChlid_HD);
+    mFrame.setFrameId(Can_Id::eChlid_HD);
     mPayload = "A5.01.00.01.00.6F.00.00";
     mFrame.setPayload(QByteArray::fromHex(mPayload.remove(QLatin1Char('.')).toLatin1()));
-    emit Can::_CanInterface.didFrameReceive(mFrame);
+    emit _CanInterface.didFrameReceive(mFrame);
     QVERIFY(_emited);
 }
 
@@ -158,10 +156,10 @@
     _data   = {1};
     QCanBusFrame mFrame;
     QString      mPayload;
-    mFrame.setFrameId(Can::Can_Id::eChlid_HD);
+    mFrame.setFrameId(Can_Id::eChlid_HD);
     mPayload = "A5.01.00.01.01.5E.00.00";
     mFrame.setPayload(QByteArray::fromHex(mPayload.remove(QLatin1Char('.')).toLatin1()));
-    emit Can::_CanInterface.didFrameReceive(mFrame);
+    emit _CanInterface.didFrameReceive(mFrame);
     QVERIFY(_emited);
 }
 
@@ -171,10 +169,10 @@
     _data   = {1};
     QCanBusFrame mFrame;
     QString      mPayload;
-    mFrame.setFrameId(Can::Can_Id::eChlid_HD_DG);
+    mFrame.setFrameId(Can_Id::eChlid_HD_DG);
     mPayload = "A5.01.00.01.01.5E.00.00";
     mFrame.setPayload(QByteArray::fromHex(mPayload.remove(QLatin1Char('.')).toLatin1()));
-    emit Can::_CanInterface.didFrameReceive(mFrame);
+    emit _CanInterface.didFrameReceive(mFrame);
     QCOMPARE(_emited, false); // should not be emitted due to not listening channel
 }
 
@@ -187,7 +185,7 @@
     mFrame.setFrameId(0x999);
     mPayload = "A5.01.00.01.01.5E.00.00";
     mFrame.setPayload(QByteArray::fromHex(mPayload.remove(QLatin1Char('.')).toLatin1()));
-    emit Can::_CanInterface.didFrameReceive(mFrame);
+    emit _CanInterface.didFrameReceive(mFrame);
     QCOMPARE(_emited, false); // should not be emitted due to not listening channel
 }
 
@@ -197,10 +195,10 @@
     _data   = {0};
     QCanBusFrame mFrame;
     QString      mPayload;
-    mFrame.setFrameId(Can::Can_Id::eChlid_HD);
+    mFrame.setFrameId(Can_Id::eChlid_HD);
     mPayload = "A5.01.00.01.00.66.00.00";
     mFrame.setPayload(QByteArray::fromHex(mPayload.remove(QLatin1Char('.')).toLatin1()));
-    emit Can::_CanInterface.didFrameReceive(mFrame);
+    emit _CanInterface.didFrameReceive(mFrame);
     QCOMPARE(_emited, false); // Should not emit due to crc error
 }
 
@@ -210,10 +208,10 @@
     _data   = {0};
     QCanBusFrame mFrame;
     QString      mPayload;
-    mFrame.setFrameId(Can::Can_Id::eChlid_HD);
+    mFrame.setFrameId(Can_Id::eChlid_HD);
     mPayload = "A5.01.00.01.00.6F";
     mFrame.setPayload(QByteArray::fromHex(mPayload.remove(QLatin1Char('.')).toLatin1()));
-    emit Can::_CanInterface.didFrameReceive(mFrame);
+    emit _CanInterface.didFrameReceive(mFrame);
     QVERIFY(_emited); // Should not emit due to crc error
 }
 
@@ -223,10 +221,10 @@
     _data   = {0};
     QCanBusFrame mFrame;
     QString      mPayload;
-    mFrame.setFrameId(Can::Can_Id::eChlid_HD);
+    mFrame.setFrameId(Can_Id::eChlid_HD);
     mPayload = "A5.01.00.01.00.6F.FF.FF.FF";
     mFrame.setPayload(QByteArray::fromHex(mPayload.remove(QLatin1Char('.')).toLatin1()));
-    emit Can::_CanInterface.didFrameReceive(mFrame);
+    emit _CanInterface.didFrameReceive(mFrame);
     QVERIFY(_emited); // Should not emit due to crc error
 }
 
@@ -235,7 +233,7 @@
     _action = Gui::GuiActionType::BloodFlow;
     _data   = { -400, -397.50f, -26.20f, -2000.00f, -2002.50f, 648.75f, 62.50f };
     QCanBusFrame mFrame;
-    mFrame.setFrameId(Can::Can_Id::eChlid_HD_Sync);
+    mFrame.setFrameId(Can_Id::eChlid_HD_Sync);
     QStringList mPayloadList {
         "a5.05.00.1c.70.fe.ff.ff" ,
         "00.c0.c6.c3.9a.99.d1.c1" ,
@@ -245,7 +243,7 @@
     };
     for ( QString payload : mPayloadList ) {
         mFrame.setPayload(QByteArray::fromHex(payload.remove(QLatin1Char('.')).toLatin1()));
-        emit Can::_CanInterface.didFrameReceive(mFrame);
+        emit _CanInterface.didFrameReceive(mFrame);
     }
     QVERIFY(_emited); // Should not emit due to crc error
 }
@@ -255,7 +253,7 @@
     _action = Gui::GuiActionType::BloodFlow;
     _data   = { -400, -397.50f, -26.20f, -2000.00f, -2002.50f, 648.75f, 62.50f };
     QCanBusFrame mFrame;
-    mFrame.setFrameId(Can::Can_Id::eChlid_HD_Sync);
+    mFrame.setFrameId(Can_Id::eChlid_HD_Sync);
     QStringList mPayloadList {
         "a5.05.00.1c.70.fe.ff.ff" ,
         "00.c0.c6.c3.9a.99.d1.c1" ,
@@ -264,23 +262,18 @@
     };
     for ( QString payload : mPayloadList ) {
         mFrame.setPayload(QByteArray::fromHex(payload.remove(QLatin1Char('.')).toLatin1()));
-        emit Can::_CanInterface.didFrameReceive(mFrame);
+        emit _CanInterface.didFrameReceive(mFrame);
     }
     QCOMPARE(_emited, false); // Should not emit due to - ERROR : "Incorrect data for Message ID (HD) '0x0500'"
 }
 
 void tst_canbus::cleanup()
 {
-    //disconnect(Can::_FrameInterface     );
-    //disconnect(Can::_MessageDispatcher  );
-    //Can::_CanInterface      ->initConnections();
-    //Can::_FrameInterface    ->initConnections();
-    //Can::_MessageDispatcher ->initConnections();
 }
 
 void tst_canbus::cleanupTestCase()
 {
-    Can::_CanInterface.quit();
+    _CanInterface.quitDevice();
     QString mTr = tr("Disconnected");
-    QCOMPARE(Can::_CanInterface.status().left(mTr.length()), mTr);
+    QCOMPARE(_CanInterface.status().left(mTr.length()), mTr);
 }