Index: sources/canbus/messagebuilder.h
===================================================================
diff -u -rc5389647e2259e67f8e6d923f3481d7d3f4eab68 -r56d00a82669a7a2c00ab90109a89dbec8db27527
--- sources/canbus/messagebuilder.h	(.../messagebuilder.h)	(revision c5389647e2259e67f8e6d923f3481d7d3f4eab68)
+++ sources/canbus/messagebuilder.h	(.../messagebuilder.h)	(revision 56d00a82669a7a2c00ab90109a89dbec8db27527)
@@ -15,13 +15,12 @@
 
 // Qt
 #include <QObject>
-#include <QHash>
+//#include <QHash>
 
 // Project
 #include "guiglobals.h"
 #include "messageglobals.h"
 
-using namespace Gui;
 namespace Can {
 
 /*!
@@ -50,31 +49,31 @@
 {
     Q_OBJECT
 
-    bool           _enableConsoleOut   = false;
+    bool                _enableConsoleOut   = false;
 
-    void          addSyncByte (      QByteArray &vPayload);
-    bool          addActionId (      QByteArray &vPayload, GuiActionType vAction)                           __attribute_warn_unused_result__;
-    bool          addData     (      QByteArray &vPayload, GuiActionType vAction, const QByteArray &vData)  __attribute_warn_unused_result__;
-    void          addCRC      (      QByteArray &vPayload);
-    void          addPadding  (      QByteArray &vPayload);
+    void                addSyncByte (      QByteArray &vPayload);
+    bool                addActionId (      QByteArray &vPayload, Gui::GuiActionType vAction)                           __attribute_warn_unused_result__;
+    bool                addData     (      QByteArray &vPayload, Gui::GuiActionType vAction, const QByteArray &vData)  __attribute_warn_unused_result__;
+    void                addCRC      (      QByteArray &vPayload);
+    void                addPadding  (      QByteArray &vPayload);
 
-    quint8        calcCRC     (const QByteArray &vData   );
-    bool          checkCRC    (const QByteArray &vData   , quint8 &vExpected, quint8 &vBeenRead);
+    quint8              calcCRC     (const QByteArray &vData   );
+    bool                checkCRC    (const QByteArray &vData   , quint8 &vExpected, quint8 &vBeenRead);
 
-    bool          hasSyncByte (      QByteArray &vPayload);
-    QByteArray    getHeader   (const QByteArray &vPayload);
-    GuiActionType getActionId (      QByteArray &vPayload);
-    int           getLength   (      QByteArray &vPayload);
-    QByteArray    getData     (const QByteArray &vPayload, int vLen);
+    bool                hasSyncByte (      QByteArray &vPayload);
+    QByteArray          getHeader   (const QByteArray &vPayload);
+    Gui::GuiActionType  getActionId (      QByteArray &vPayload);
+    int                 getLength   (      QByteArray &vPayload);
+    QByteArray          getData     (const QByteArray &vPayload, int vLen);
 
-    void          printPayload(const QByteArray &vPayload, bool vIsHeader, Can_Id vCan_Id, bool vUseColor = true);
-    void          consoleOut  (const QByteArray &vPayload, bool vIsHeader, Can_Id vCan_Id, bool vUseColor = true);
+    void                printPayload(const QByteArray &vPayload, bool vIsHeader, Can_Id vCan_Id, bool vUseColor = true);
+    void                consoleOut  (const QByteArray &vPayload, bool vIsHeader, Can_Id vCan_Id, bool vUseColor = true);
 
 public:
     explicit MessageBuilder(QObject *parent = nullptr);
 
     // build message to be sent frame by frame
-    bool           buildFrames(GuiActionType vAction , const QByteArray &vData, FrameList &vFrameList)      __attribute_warn_unused_result__;
+    bool           buildFrames(Gui::GuiActionType vAction , const QByteArray &vData, FrameList &vFrameList)      __attribute_warn_unused_result__;
     // build message from received frames
     bool          buildMessage(const QByteArray   &vPayload, Message &vMessage, Can_Id vCan_Id)             __attribute_warn_unused_result__;