diff -r c84cf270c54f -r 92ab7f8d0eab phoneapp/phoneuicontrol/src/cphonestatemachine.cpp --- a/phoneapp/phoneuicontrol/src/cphonestatemachine.cpp Tue Feb 02 00:10:04 2010 +0200 +++ b/phoneapp/phoneuicontrol/src/cphonestatemachine.cpp Fri Mar 19 09:28:42 2010 +0200 @@ -44,7 +44,7 @@ iViewCommandHandle( aViewCommandHandle ) { __ASSERT_ALWAYS( aViewCommandHandle, - Panic( EPhoneCtrlParameterNotInitialized ) ); + Panic( EPhoneCtrlParameterNotInitialized ) ); } // ----------------------------------------------------------- @@ -55,35 +55,35 @@ // EXPORT_C CPhoneStateMachine::~CPhoneStateMachine() { - if( iState == iIdleState ) - { - delete iState; - iState = NULL; - iIdleState = NULL; - } - else - { - if( iState ) - { - delete iState; - iState = NULL; - } - if( iIdleState ) - { - delete iIdleState; - iIdleState = NULL; - } - } - if( iPhoneEngine ) - { - delete iPhoneEngine; - iPhoneEngine = NULL; - } - if( iPhoneStorage ) - { - delete iPhoneStorage; - iPhoneStorage = NULL; - } + if( iState == iIdleState ) + { + delete iState; + iState = NULL; + iIdleState = NULL; + } + else + { + if( iState ) + { + delete iState; + iState = NULL; + } + if( iIdleState ) + { + delete iIdleState; + iIdleState = NULL; + } + } + if( iPhoneEngine ) + { + delete iPhoneEngine; + iPhoneEngine = NULL; + } + if( iPhoneStorage ) + { + delete iPhoneStorage; + iPhoneStorage = NULL; + } } // --------------------------------------------------------- @@ -95,7 +95,7 @@ { __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateMachine::SetPhoneEngine "); __ASSERT_ALWAYS( aPhoneEngine, - Panic( EPhoneCtrlParameterNotInitialized ) ); + Panic( EPhoneCtrlParameterNotInitialized ) ); iPhoneEngine = aPhoneEngine; }