Index: sources/canbus/messagebuilder.cpp
===================================================================
diff -u -rfeb3423b373dc2a2c4267ef9fcb4d924d738423d -r56d00a82669a7a2c00ab90109a89dbec8db27527
--- sources/canbus/messagebuilder.cpp	(.../messagebuilder.cpp)	(revision feb3423b373dc2a2c4267ef9fcb4d924d738423d)
+++ sources/canbus/messagebuilder.cpp	(.../messagebuilder.cpp)	(revision 56d00a82669a7a2c00ab90109a89dbec8db27527)
@@ -14,7 +14,6 @@
 #include "messagebuilder.h"
 
 // Qt
-#include <QDebug>
 
 // Project
 #include "logger.h"
@@ -39,7 +38,7 @@
  *                    so it has been passed and checked.
  * \return  list of frames of type FrameList
  */
-bool MessageBuilder::buildFrames(GuiActionType vAction, const QByteArray &vData, FrameList &vFrameList)
+bool MessageBuilder::buildFrames(Gui::GuiActionType vAction, const QByteArray &vData, FrameList &vFrameList)
 {
     QByteArray   mPayload ;
            addSyncByte (mPayload);                      // Sync Byte
@@ -83,9 +82,9 @@
  * \param   vAction  - The ActionID of the message which needs to be appended
  *          to the Payload vPayload
  */
-bool MessageBuilder::addActionId(QByteArray &vPayload, GuiActionType vAction)
+bool MessageBuilder::addActionId(QByteArray &vPayload, Gui::GuiActionType vAction)
 {
-    if (vAction != GuiActionType::Unknown) {
+    if (vAction != Gui::GuiActionType::Unknown) {
         quint16 mAction = static_cast<quint16>(vAction);
         vPayload += (mAction >> 8) & 0xFF; // high byte
         vPayload +=  mAction       & 0xFF; //  low byte
@@ -105,7 +104,7 @@
  * \param   vData    - The data which is going to be message payload.
  * \return  false if the vData of type QByteArray is not sufficient regarding vAction
  */
-bool MessageBuilder::addData(QByteArray &vPayload, GuiActionType vAction, const QByteArray &vData)
+bool MessageBuilder::addData(QByteArray &vPayload, Gui::GuiActionType vAction, const QByteArray &vData)
 {
     quint8 len = payloadLen[vAction];
     // if len has been set to max(255)
@@ -293,7 +292,7 @@
  * \note    Removes the 2 bytes of ActionID from vPayload
  *          It starts from the first byte so those 2 bytes should be the first 2 bytes.
  */
-GuiActionType MessageBuilder::getActionId(QByteArray &vPayload)
+Gui::GuiActionType MessageBuilder::getActionId(QByteArray &vPayload)
 {
     quint16 mActionId;
     mActionId = (vPayload[0] << 8) | vPayload[1];
@@ -302,7 +301,7 @@
     //return GuiActionType::Unknown;
 
     vPayload = vPayload.mid(eLenActionId);
-    return static_cast<GuiActionType>(mActionId);
+    return static_cast<Gui::GuiActionType>(mActionId);
 }
 
 /*!