Index: sources/gui/guicontroller.h =================================================================== diff -u -r9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d -rc933552983a659ca4cc351ff4d43d07319adab1e --- sources/gui/guicontroller.h (.../guicontroller.h) (revision 9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d) +++ sources/gui/guicontroller.h (.../guicontroller.h) (revision c933552983a659ca4cc351ff4d43d07319adab1e) @@ -18,7 +18,7 @@ // Project #include "main.h" -#include "guiactions.h" +#include "guiglobals.h" // define #define _GuiController GuiController::I() @@ -35,22 +35,19 @@ void init(); private: - void connection(); + void initConnections(); + bool handleTransmit(GuiActionType vAction, const QVariantList &vData); + public slots: - void doActionRequest (GuiActionType vAction); // UI => HD/DG - void doActionPerform (GuiActionType vAction, GuiActionInfo vInfo); // UI => HD/DG + void doActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG private slots: // Should be private for thread safety and is connected internally. - void onActionConfirm (GuiActionType vAction, GuiActionInfo vInfo); // UI <= HD/DG - void onActionCommand (GuiActionType vAction); // UI <= HD/DG + void onActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG signals: - void didActionRequest(GuiActionType vAction ); // UI => HD/DG - void didActionConfirm(GuiActionType vAction, GuiActionInfo vInfo); // UI <= HD/DG - - void didActionCommand(GuiActionType vAction ); // UI <= HD/DG - void didActionPerform(GuiActionType vAction, GuiActionInfo vInfo); // UI => HD/DG + void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG + void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG }; }