Skip to content
Snippets Groups Projects
Commit ef309679 authored by Emmanuel Lepage's avatar Emmanuel Lepage
Browse files

[ #7901 ] Cleanup the changes

parent 479a3c28
Branches
Tags
No related merge requests found
...@@ -493,7 +493,7 @@ call_state Call::actionPerformed(call_action action) ...@@ -493,7 +493,7 @@ call_state Call::actionPerformed(call_action action)
if (previousState < 11 && action < 5) { if (previousState < 11 && action < 5) {
changeCurrentState(actionPerformedStateMap[previousState][action]); changeCurrentState(actionPerformedStateMap[previousState][action]);
//execute the action associated with this transition //execute the action associated with this transition
(this->*(actionPerformedFunctionMap[previousState][action]))(); //WARNING BUG //WARNING SEGFAULT //TODO remove this node, it was not a good idea, it is not stable (this->*(actionPerformedFunctionMap[previousState][action]))();
qDebug() << "Calling action " << action << " on call with state " << previousState << ". Become " << m_CurrentState; qDebug() << "Calling action " << action << " on call with state " << previousState << ". Become " << m_CurrentState;
//return the new state //return the new state
} }
......
...@@ -277,8 +277,9 @@ template<typename CallWidget, typename Index> void CallModel<CallWidget,Index>:: ...@@ -277,8 +277,9 @@ template<typename CallWidget, typename Index> void CallModel<CallWidget,Index>::
///Transfer this call to "target" number ///Transfer this call to "target" number
template<typename CallWidget, typename Index> void CallModel<CallWidget,Index>::transfer(Call* toTransfer, QString target) template<typename CallWidget, typename Index> void CallModel<CallWidget,Index>::transfer(Call* toTransfer, QString target)
{ {
qDebug() << "Transferring call " << target; qDebug() << "\n\n\n\n\nTransferring call " << toTransfer->getCallId() << target << "\n\n\n\n\n";
toTransfer->setTransferNumber(target); toTransfer->setTransferNumber(target);
toTransfer->changeCurrentState(CALL_STATE_TRANSFER);
toTransfer->actionPerformed(CALL_ACTION_ACCEPT); toTransfer->actionPerformed(CALL_ACTION_ACCEPT);
toTransfer->changeCurrentState(CALL_STATE_OVER); toTransfer->changeCurrentState(CALL_STATE_OVER);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment