Index: sources/gui/guiview.cpp =================================================================== diff -u -rd6c7d6c382fe56e19d132f6ba0bcbbc1e6b2060f -r2085b749d1d0aafe823e840f5aa0bc88a340798a --- sources/gui/guiview.cpp (.../guiview.cpp) (revision d6c7d6c382fe56e19d132f6ba0bcbbc1e6b2060f) +++ sources/gui/guiview.cpp (.../guiview.cpp) (revision 2085b749d1d0aafe823e840f5aa0bc88a340798a) @@ -26,48 +26,29 @@ GuiView::GuiView(QQuickItem *parent) { Q_UNUSED(parent) - connection(); + initConnections(); } -void GuiView::connection() +void GuiView::initConnections() { - connect(_GuiController, SIGNAL(didActionConfirm(GuiActionType, GuiActionData)), - this , SLOT( onActionConfirm(GuiActionType, GuiActionData))); + connect(_GuiController, SIGNAL(didActionReceive (GuiActionType, GuiActionData)), + this , SLOT( onActionReceive (GuiActionType, GuiActionData))); - 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(didActionPerform(GuiActionType,GuiActionData)), - _GuiController, SLOT( doActionPerform(GuiActionType,GuiActionData))); + connect(this , SIGNAL(didActionTransmit(GuiActionType,GuiActionData)), + _GuiController, SLOT( doActionTransmit(GuiActionType,GuiActionData))); } -void GuiView::onActionConfirm(GuiActionType vAction, GuiActionData vData) +void GuiView::onActionReceive (GuiActionType vAction, GuiActionData vData) { // process the evaluation and notify GUI // process ... - emit didActionConfirm(vAction, vData); + emit didActionReceive (vAction, vData); } -void GuiView::onActionCommand(GuiActionType vAction) +void GuiView::doActionTransmit(GuiActionType vAction, GuiActionData vData) { - // process the commanded action and notify GUI - // process ... - emit didActionCommand(vAction); - + emit didActionTransmit(vAction, vData); } - -void GuiView::doActionRequest(GuiActionType vAction) -{ - emit didActionRequest(vAction); -} - -void GuiView::doActionPerform(GuiActionType vAction, GuiActionData vData) -{ - emit didActionPerform(vAction, vData); -}