Index: sources/gui/guiglobals.h =================================================================== diff -u -r272bb81655222b2bf0c3c7099523c0b658eb9cb8 -r1732e83d2a0308b9c706f37d6d7724a364bbff2a --- sources/gui/guiglobals.h (.../guiglobals.h) (revision 272bb81655222b2bf0c3c7099523c0b658eb9cb8) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision 1732e83d2a0308b9c706f37d6d7724a364bbff2a) @@ -27,18 +27,21 @@ Q_GADGET explicit GuiActions(); public: - enum GuiActionsType_Enum /*: quint16 QML doesn't support*/ { + enum class GuiActionsType_Enum /*: quint16 QML doesn't support*/ { Unknown = 0x0000, PowerOff = 0x0100, - Check_In = 0x0700, + KeepAlive = 0x0700, BloodFlow = 0x0500, + + String = 0xFFFF, }; - enum GuiActionsIndx_Enum { - PowerOff_Show = 0, + enum class GuiActionsIndx_Enum { + PowerOff_ShowHide = 0, + PowerOff_Response = 0, }; - enum GuiActionsData_Enum /*: quint8 QML doesn't support*/ { + enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ { NoData = 0x00, Command = 0x00, // HD=>UI : should be handled in receive @@ -63,8 +66,6 @@ typedef GuiActions::GuiActionsData_Enum GuiActionData; typedef GuiActions::GuiActionsIndx_Enum GuiActionIndx; - QByteArray fromVariant(const QVariant &vData); - void registerTypes(); void registerQmlTypes();