--- a/calendarui/controller/src/calenstate.cpp Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/controller/src/calenstate.cpp Tue Aug 31 15:13:43 2010 +0300
@@ -11,12 +11,11 @@
*
* Contributors:
*
-* Description: Calendar state machine
+* Description: Calendar state machine
*
*/
-
// includes
#include "calendarui_debug.h" // Debug macros
#include "calenstate.h" // Calendar States
@@ -24,6 +23,10 @@
#include "calenstatemachine.h"
#include "calennotifier.h"
#include "calenasynccallback.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenstateTraces.h"
+#endif
// ----------------------------------------------------------------------------
// CCalenState::CCalenState
@@ -34,9 +37,9 @@
iOutstandingNotifications( aOutstandingNotifications ),
iPreviousState( CCalenStateMachine::ECalenIdleState )
{
- TRACE_ENTRY_POINT;
-
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_CCALENSTATE_ENTRY );
+
+ OstTraceFunctionExit0( CCALENSTATE_CCALENSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -45,13 +48,13 @@
// ----------------------------------------------------------------------------
void CCalenState::BaseConstructL()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_BASECONSTRUCTL_ENTRY );
TCalenCommand command;
MCalenCommandHandler* handler( NULL );
- iCallBackPackage = new( ELeave ) CCalenCallbackPackage( this, command, handler );
+ iCallBackPackage = new( ELeave ) CalenCallbackPackage( this, command, handler );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_BASECONSTRUCTL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -60,13 +63,13 @@
// ----------------------------------------------------------------------------
CCalenState::~CCalenState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( DUP1_CCALENSTATE_CCALENSTATE_ENTRY );
delete iCallBackPackage;
iCallBackPackage = NULL;
delete iCmdCallback;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( DUP1_CCALENSTATE_CCALENSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -75,14 +78,14 @@
// ----------------------------------------------------------------------------
void CCalenState::RequestCallbackL( MCalenCommandHandler* aCommandHandler, const TCalenCommand& aCommand )
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_REQUESTCALLBACKL_ENTRY );
+
iCallBackPackage->SetCommandHandler(this, aCommand, aCommandHandler);
if( !iCmdCallback )
{
TCallBack callback( CommandCallback, iCallBackPackage );
- iCmdCallback = CCalenAsyncCallBack::NewL( callback, CActive::EPriorityHigh , iController );
+ iCmdCallback = CalenAsyncCallBack::NewL( callback, CActive::EPriorityHigh , iController );
}
TCallBack callback( CommandCallback, iCallBackPackage );
@@ -91,7 +94,7 @@
iCmdCallback->Set( callback );
iCmdCallback->CallBack();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_REQUESTCALLBACKL_EXIT );
}
@@ -102,13 +105,14 @@
// ----------------------------------------------------------------------------
TInt CCalenState::CommandCallback( TAny* aCommandStruct )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_COMMANDCALLBACK_ENTRY );
+
TBool continueCommand(EFalse);
- CCalenCallbackPackage* package = static_cast<CCalenCallbackPackage*>( aCommandStruct );
+ CalenCallbackPackage* package = static_cast<CalenCallbackPackage*>( aCommandStruct );
continueCommand = package->HandleCallBack();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_COMMANDCALLBACK_EXIT );
return continueCommand;
}
@@ -121,23 +125,18 @@
void CCalenState::HandleNotificationL(const TCalenNotification& aNotification,
CCalenStateMachine& aStateMachine )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_HANDLENOTIFICATIONL_ENTRY );
switch( aNotification )
{
case ECalenNotifyAppBackgrounded:
{
CCalenStateMachine::TCalenStateIndex cachedState = aStateMachine.GetCurrentState();
- // Never send calendar to background state in MapState as maps will
- // launched in cahin mode not in stand alone mode
- if((cachedState != CCalenStateMachine::ECalenMapState) &&
- (cachedState != CCalenStateMachine::ECalenPopulationState))
- {
- aStateMachine.SetCurrentState(CCalenStateMachine::ECalenBackgroundState);
- aStateMachine.SetCurrentPreviousState(cachedState);
- iOutstandingNotifications.InsertL(aNotification);
- aStateMachine.ActivateCurrentStateL();
- }
+ aStateMachine.SetCurrentState(CCalenStateMachine::ECalenBackgroundState);
+ aStateMachine.SetCurrentPreviousState(cachedState);
+ iOutstandingNotifications.InsertL(aNotification);
+ aStateMachine.ActivateCurrentStateL();
+
}
break;
default:
@@ -145,9 +144,7 @@
break;
}
-
- TRACE_EXIT_POINT;
-
+ OstTraceFunctionExit0( CCALENSTATE_HANDLENOTIFICATIONL_EXIT );
}
@@ -157,9 +154,9 @@
// ----------------------------------------------------------------------------
CCalenStateMachine::TCalenStateIndex CCalenState::PreviousState()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_PREVIOUSSTATE_ENTRY );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_PREVIOUSSTATE_EXIT );
return iPreviousState;
}
@@ -169,11 +166,11 @@
// ----------------------------------------------------------------------------
void CCalenState::SetPreviousState(const CCalenStateMachine::TCalenStateIndex& aPreviousState )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_SETPREVIOUSSTATE_ENTRY );
iPreviousState = aPreviousState;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_SETPREVIOUSSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -182,52 +179,55 @@
// ----------------------------------------------------------------------------
void CCalenState::CommandExecuting()
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_COMMANDEXECUTING_ENTRY );
+
+ OstTraceFunctionExit0( CCALENSTATE_COMMANDEXECUTING_EXIT );
}
// ----------------------------------------------------------------------------
-// CCalenState::CCalenCallbackPackage::CCalenCallbackPackage
+// CCalenState::CalenCallbackPackage::CalenCallbackPackage
// C++ constructor
// ----------------------------------------------------------------------------
-CCalenState::CCalenCallbackPackage::CCalenCallbackPackage( CCalenState* aSelf,
+CCalenState::CalenCallbackPackage::CalenCallbackPackage( CCalenState* aSelf,
TCalenCommand aCommand, MCalenCommandHandler* aCommandHandler)
: iSelf( aSelf ), iCommand( aCommand ), iCommandHandler( aCommandHandler )
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
+ OstTraceFunctionEntry0( CALENCALLBACKPACKAGE_CALENCALLBACKPACKAGE_ENTRY );
+
+ OstTraceFunctionExit0( CALENCALLBACKPACKAGE_CALENCALLBACKPACKAGE_EXIT );
}
// ----------------------------------------------------------------------------
-// CCalenState::CCalenCallbackPackage::HandleCallBack
+// CCalenState::CalenCallbackPackage::HandleCallBack
// Handles a callback
// ----------------------------------------------------------------------------
-TBool CCalenState::CCalenCallbackPackage::HandleCallBack()
+TBool CCalenState::CalenCallbackPackage::HandleCallBack()
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CALENCALLBACKPACKAGE_HANDLECALLBACK_ENTRY );
+
TBool continueCommand(EFalse);
iSelf->CommandExecuting();
PIM_TRAPD_HANDLE ( continueCommand = iCommandHandler->HandleCommandL( iCommand ) );
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENCALLBACKPACKAGE_HANDLECALLBACK_EXIT );
return continueCommand;
}
// ----------------------------------------------------------------------------
-// CCalenState::CCalenCallbackPackage::SetCommandHandler
+// CCalenState::CalenCallbackPackage::SetCommandHandler
// Sets the command handler and command
// ----------------------------------------------------------------------------
-void CCalenState::CCalenCallbackPackage::SetCommandHandler(CCalenState* aSelf,
+void CCalenState::CalenCallbackPackage::SetCommandHandler(CCalenState* aSelf,
TCalenCommand aCommand, MCalenCommandHandler* aCommandHandler)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CALENCALLBACKPACKAGE_SETCOMMANDHANDLER_ENTRY );
+
iSelf = aSelf;
iCommand = aCommand;
iCommandHandler = aCommandHandler;
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CALENCALLBACKPACKAGE_SETCOMMANDHANDLER_EXIT );
}
// ----------------------------------------------------------------------------
@@ -237,7 +237,7 @@
// ----------------------------------------------------------------------------
void CCalenState::HandleStateActivationL(CCalenStateMachine& /*aStateMachine*/)
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_HANDLESTATEACTIVATIONL_ENTRY );
// Can only issue one of the following Notifications
// ECalenNotifySettingsChanged or
@@ -264,7 +264,7 @@
iOutstandingNotifications.Close();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_HANDLESTATEACTIVATIONL_EXIT );
}
// ----------------------------------------------------------------------------
@@ -274,11 +274,11 @@
void CCalenState::SetCurrentState(CCalenStateMachine& aStateMachine,
const CCalenStateMachine::TCalenStateIndex& aState )
{
- TRACE_ENTRY_POINT;
+ OstTraceFunctionEntry0( CCALENSTATE_SETCURRENTSTATE_ENTRY );
aStateMachine.SetCurrentState(aState);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_SETCURRENTSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -288,9 +288,9 @@
CCalenStateMachine::TCalenStateIndex CCalenState::GetCurrentState(
CCalenStateMachine& aStateMachine)
{
- TRACE_ENTRY_POINT;
- TRACE_EXIT_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_GETCURRENTSTATE_ENTRY );
+
+ OstTraceFunctionExit0( CCALENSTATE_GETCURRENTSTATE_EXIT );
return aStateMachine.GetCurrentState();
}
@@ -301,11 +301,11 @@
void CCalenState::SetCurrentPreviousState(CCalenStateMachine& aStateMachine,
const CCalenStateMachine::TCalenStateIndex& aState)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_SETCURRENTPREVIOUSSTATE_ENTRY );
+
aStateMachine.SetCurrentPreviousState(aState);
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_SETCURRENTPREVIOUSSTATE_EXIT );
}
// ----------------------------------------------------------------------------
@@ -314,11 +314,11 @@
// ----------------------------------------------------------------------------
void CCalenState::ActivateCurrentStateL(CCalenStateMachine& aStateMachine)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_ACTIVATECURRENTSTATEL_ENTRY );
+
aStateMachine.ActivateCurrentStateL();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_ACTIVATECURRENTSTATEL_EXIT );
}
// ----------------------------------------------------------------------------
// CCalenState::CancelPreviousCmd
@@ -326,11 +326,11 @@
// ----------------------------------------------------------------------------
void CCalenState::CancelPreviousCmd(CCalenStateMachine& aStateMachine)
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_CANCELPREVIOUSCMD_ENTRY );
+
aStateMachine.CancelPreviousCmd();
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_CANCELPREVIOUSCMD_EXIT );
}
// ----------------------------------------------------------------------------
@@ -339,13 +339,13 @@
// ----------------------------------------------------------------------------
void CCalenState::CancelExecutingCmd()
{
- TRACE_ENTRY_POINT;
-
+ OstTraceFunctionEntry0( CCALENSTATE_CANCELEXECUTINGCMD_ENTRY );
+
if(iCmdCallback)
{
iCmdCallback->Cancel();
}
- TRACE_EXIT_POINT;
+ OstTraceFunctionExit0( CCALENSTATE_CANCELEXECUTINGCMD_EXIT );
}
// End of file