Index: sources/gui/guiview.cpp =================================================================== diff -u -r9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d -rc933552983a659ca4cc351ff4d43d07319adab1e --- sources/gui/guiview.cpp (.../guiview.cpp) (revision 9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d) +++ sources/gui/guiview.cpp (.../guiview.cpp) (revision c933552983a659ca4cc351ff4d43d07319adab1e) @@ -15,6 +15,7 @@ // Project #include "guicontroller.h" +#include "guiglobals.h" // namespace using namespace Gui; @@ -26,48 +27,37 @@ GuiView::GuiView(QQuickItem *parent) { Q_UNUSED(parent) - connection(); + initConnections(); } -void GuiView::connection() +void GuiView::initConnections() { - connect(_GuiController, SIGNAL(didActionConfirm(GuiActionType, GuiActionInfo)), - this , SLOT( onActionConfirm(GuiActionType, GuiActionInfo))); + connect(_GuiController, SIGNAL(didActionReceive (GuiActionType, const QVariantList &)), + this , SLOT( onActionReceive (GuiActionType, const QVariantList &))); - connect(_GuiController, SIGNAL(didActionCommand(GuiActionType )), - this , SLOT( onActionCommand(GuiActionType ))); - // since we don't have access to GuiView object because it is created in Qml. // Connection to the GuiController made here // It should be defined in the class which wants to connect to signal. - connect(this , SIGNAL(didActionRequest(GuiActionType)), - _GuiController, SLOT( doActionRequest(GuiActionType))); + connect(this , SIGNAL(didActionTransmit(GuiActionType,const QVariantList &)), + _GuiController, SLOT( doActionTransmit(GuiActionType,const QVariantList &))); - connect(this , SIGNAL(didActionPerform(GuiActionType,GuiActionInfo)), - _GuiController, SLOT( doActionPerform(GuiActionType,GuiActionInfo))); } -void GuiView::onActionConfirm(GuiActionType vAction, GuiActionInfo vInfo) +void GuiView::onActionReceive (GuiActionType vAction, const QVariantList &vData) { // process the evaluation and notify GUI // process ... - emit didActionConfirm(vAction, vInfo); + emit didActionReceive (vAction, vData); } -void GuiView::onActionCommand(GuiActionType vAction) +void GuiView::doActionTransmit(GuiActionType vAction, const QVariantList &vData) { - // process the commanded action and notify GUI - // process ... - emit didActionCommand(vAction); - + emit didActionTransmit(vAction, vData); } -void GuiView::doActionRequest(GuiActionType vAction) +void GuiView::doActionTransmit(GuiActionType vAction, const QVariant &vData) { - emit didActionRequest(vAction); + QVariantList mData; + mData += vData; + emit didActionTransmit(vAction, mData); } - -void GuiView::doActionPerform(GuiActionType vAction, GuiActionInfo vInfo) -{ - emit didActionPerform(vAction, vInfo); -}