diff -r 22c3c67e5001 -r c45d4fe2ff0a bearermanagement/S60MCPR/inc/s60mcpractivities.h --- a/bearermanagement/S60MCPR/inc/s60mcpractivities.h Tue Apr 27 17:03:25 2010 +0300 +++ b/bearermanagement/S60MCPR/inc/s60mcpractivities.h Tue May 11 16:35:05 2010 +0300 @@ -608,22 +608,7 @@ NetStateMachine::MStateFork, TContext ) virtual TInt TransitionTag(); - DECLARE_SMELEMENT_FOOTER( TNoTagOrInformMigrationAvailableBackwardsOrErrorOrCancel ) - - /** - * FORK/DECISION: - * 1. Inform that the migration complete or go to error - * 2. Error - * @return - */ - DECLARE_SMELEMENT_HEADER( TInformMigrationCompletedOrError, - MeshMachine::TStateFork, - NetStateMachine::MStateFork, - TContext ) - virtual TInt TransitionTag(); - DECLARE_SMELEMENT_FOOTER( TInformMigrationCompletedOrError ) - - + DECLARE_SMELEMENT_FOOTER( TNoTagOrInformMigrationAvailableBackwardsOrErrorOrCancel ) /** * Class that is responsible for managing mobility on MCPR side. @@ -802,21 +787,6 @@ CS60MobilityActivity::TContext ) virtual TInt TransitionTag(); DECLARE_SMELEMENT_FOOTER( TNoTagOrApplicationRejectedMigrationOrCancel ) - - /** - * FORK/DECISION: - * 1. Proceed to reconnection - * 2. Re-establish connection to the same IAP, inform data client that migration is complete - * 3. Error - * @return - */ - DECLARE_SMELEMENT_HEADER( TNoTagOrRequestReConnectToCurrentSPOrErrorTag, - MeshMachine::TStateFork, - NetStateMachine::MStateFork, - TContext ) - virtual TInt TransitionTag(); - DECLARE_SMELEMENT_FOOTER( TNoTagOrRequestReConnectToCurrentSPOrErrorTag ) - /** * Mutex protected TRANSITION.