Index: sources/applicationcontroller.cpp =================================================================== diff -u -rde2f87e15fa05b1c45581cfedd8f1af0c47c2b48 -rd6c7d6c382fe56e19d132f6ba0bcbbc1e6b2060f --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision de2f87e15fa05b1c45581cfedd8f1af0c47c2b48) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision d6c7d6c382fe56e19d132f6ba0bcbbc1e6b2060f) @@ -54,15 +54,15 @@ connect(_GuiController , SIGNAL(didActionRequest(GuiActionType)), this , SLOT( onActionRequest(GuiActionType))); // From GUI - connect(_GuiController , SIGNAL(didActionPerform(GuiActionType,GuiActionInfo)), - this , SLOT( onActionPerform(GuiActionType, GuiActionInfo))); + connect(_GuiController , SIGNAL(didActionPerform(GuiActionType,GuiActionData)), + this , SLOT( onActionPerform(GuiActionType, GuiActionData))); // From HD/DG connect(_MessageHandler, SIGNAL(didActionCommand(GuiActionType)), this , SLOT( onActionCommand(GuiActionType))); // From HD/DG - connect(_MessageHandler, SIGNAL(didActionConfirm(GuiActionType,GuiActionInfo)), - this , SLOT( onActionConfirm(GuiActionType, GuiActionInfo))); + connect(_MessageHandler, SIGNAL(didActionConfirm(GuiActionType,GuiActionData)), + this , SLOT( onActionConfirm(GuiActionType, GuiActionData))); } @@ -84,14 +84,14 @@ * \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 vInfo + * \param vData */ -void ApplicationController::onActionPerform(GuiActionType vAction, GuiActionInfo vInfo) +void ApplicationController::onActionPerform(GuiActionType vAction, GuiActionData vData) { - // qDebug() << "ApplicationController.actionPerformed : " << vAction << vInfo; + // qDebug() << "ApplicationController.actionPerformed : " << vAction << vData; // Process the performed action by GUI // Process ... - emit didActionPerform(vAction, vInfo); + emit didActionPerform(vAction, vData); } /*! @@ -113,12 +113,12 @@ * \details GUI requested an action. * In response HD confirmed the action. * \param vAction - * \param vInfo + * \param vData */ -void ApplicationController::onActionConfirm(GuiActionType vAction, GuiActionInfo vInfo) +void ApplicationController::onActionConfirm(GuiActionType vAction, GuiActionData vData) { // qDebug() << "ApplicationController.actionConfirmed : " << vAction; // Process the command and notify GUI Controller // Process ... - emit didActionConfirm(vAction, vInfo); + emit didActionConfirm(vAction, vData); }