Index: sources/applicationcontroller.cpp =================================================================== diff -u -rd6c7d6c382fe56e19d132f6ba0bcbbc1e6b2060f -r2085b749d1d0aafe823e840f5aa0bc88a340798a --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision d6c7d6c382fe56e19d132f6ba0bcbbc1e6b2060f) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 2085b749d1d0aafe823e840f5aa0bc88a340798a) @@ -41,84 +41,47 @@ { if (!_fileHandler ->init()) return false; if (!_applicationPost->init()) return false; - connection(); + initConnections(); return true; } /*! * \brief GUI Controller connections definition */ -void ApplicationController::connection() +void ApplicationController::initConnections() { // From GUI - connect(_GuiController , SIGNAL(didActionRequest(GuiActionType)), - this , SLOT( onActionRequest(GuiActionType))); - // From GUI - connect(_GuiController , SIGNAL(didActionPerform(GuiActionType,GuiActionData)), - this , SLOT( onActionPerform(GuiActionType, GuiActionData))); - + connect(_GuiController , SIGNAL(didActionTransmit(GuiActionType, GuiActionData)), + this , SLOT( onActionTransmit(GuiActionType, GuiActionData))); // From HD/DG - connect(_MessageHandler, SIGNAL(didActionCommand(GuiActionType)), - this , SLOT( onActionCommand(GuiActionType))); - // From HD/DG - connect(_MessageHandler, SIGNAL(didActionConfirm(GuiActionType,GuiActionData)), - this , SLOT( onActionConfirm(GuiActionType, GuiActionData))); + connect(_MessageHandler, SIGNAL(didActionReceive (GuiActionType, GuiActionData)), + this , SLOT( onActionReceive (GuiActionType, GuiActionData))); } - /*! * \brief Process the requested action * \details Processes the requested action * \param vAction - User requested Action */ -void ApplicationController::onActionRequest(GuiActionType vAction) +void ApplicationController::onActionTransmit(GuiActionType vAction, GuiActionData vData) { - // qDebug() << "ApplicationController.actionRequested : " << vAction; - // Process the requested action by GUI - // Process ... - emit didActionRequest(vAction); -} - -/*! - * \brief Process the performed action - * \details An action which has been commanded by HD has been performed by GUI.\n - * GUI notifies that the action has been performed - * \param vAction - * \param vData - */ -void ApplicationController::onActionPerform(GuiActionType vAction, GuiActionData vData) -{ // qDebug() << "ApplicationController.actionPerformed : " << vAction << vData; // Process the performed action by GUI // Process ... - emit didActionPerform(vAction, vData); + emit didActionTransmit(vAction, vData); } /*! - * \brief Action commanded by HD - * \details An action has been commanded by HD, - * GUI requires to be notified to perform the action. - * \param vAction - */ -void ApplicationController::onActionCommand(GuiActionType vAction) -{ - // qDebug() << "ApplicationController.actionCommanded : " << vAction; - // Process the command and notify GUI Controller - // Process ... - emit didActionCommand(vAction); -} - -/*! * \brief An action has been confirmed * \details GUI requested an action. * In response HD confirmed the action. * \param vAction * \param vData */ -void ApplicationController::onActionConfirm(GuiActionType vAction, GuiActionData vData) +void ApplicationController::onActionReceive (GuiActionType vAction, GuiActionData vData) { // qDebug() << "ApplicationController.actionConfirmed : " << vAction; // Process the command and notify GUI Controller // Process ... - emit didActionConfirm(vAction, vData); + emit didActionReceive (vAction, vData); }