diff -r 96907930389d -r 12af337248b1 calendarui/controller/src/calendeletingstate.cpp
--- a/calendarui/controller/src/calendeletingstate.cpp	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/controller/src/calendeletingstate.cpp	Tue Aug 31 15:13:43 2010 +0300
@@ -11,18 +11,21 @@
 *
 * Contributors:
 *
-* Description:   Calendar state machine
+* Description:  Calendar state machine
 *
 */
 
 
-
 // includes
 #include "calendeletingstate.h"
 #include "calendarui_debug.h"           // Debug macros
 #include "calencontroller.h"
 #include "calenstatemachine.h"
 #include "calennotifier.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calendeletingstateTraces.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // CCalenDeletingState::NewLC
@@ -31,14 +34,14 @@
 CCalenDeletingState* CCalenDeletingState::NewLC( CCalenController& aController,
                                                       RHashSet<TCalenNotification>&  aOutstandingNotifications )
     {
-    TRACE_ENTRY_POINT;
-
+    OstTraceFunctionEntry0( CCALENDELETINGSTATE_NEWLC_ENTRY );
+    
     CCalenDeletingState* self = new( ELeave ) CCalenDeletingState( aController,aOutstandingNotifications );
 
     CleanupStack::PushL( self );
     self->ConstructL();
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENDELETINGSTATE_NEWLC_EXIT );
     return self;
     }
 
@@ -48,10 +51,11 @@
 // ----------------------------------------------------------------------------
 void CCalenDeletingState::ConstructL()
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENDELETINGSTATE_CONSTRUCTL_ENTRY );
+    
     BaseConstructL();
   
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENDELETINGSTATE_CONSTRUCTL_EXIT );
     }
     
 // ----------------------------------------------------------------------------
@@ -62,9 +66,9 @@
                                                     RHashSet<TCalenNotification>&  aOutstandingNotifications )
     : CCalenState( aController, aOutstandingNotifications )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENDELETINGSTATE_CCALENDELETINGSTATE_ENTRY );
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENDELETINGSTATE_CCALENDELETINGSTATE_EXIT );
     }
     
 // ----------------------------------------------------------------------------
@@ -73,19 +77,19 @@
 // ----------------------------------------------------------------------------    
 CCalenDeletingState::~CCalenDeletingState()
     {
-    TRACE_ENTRY_POINT;
-    
-    TRACE_EXIT_POINT;
+    OstTraceFunctionEntry0( DUP1_CCALENDELETINGSTATE_CCALENDELETINGSTATE_ENTRY );
+
+    OstTraceFunctionExit0( DUP1_CCALENDELETINGSTATE_CCALENDELETINGSTATE_EXIT );
     }
 
 // ----------------------------------------------------------------------------
 // CCalenDeletingState::HandleCommandL
-// From CCalenState
+// From CCCalenState
 // ----------------------------------------------------------------------------    
 TBool CCalenDeletingState::HandleCommandL( const TCalenCommand& aCommand,
                                          CCalenStateMachine& aStateMachine )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENDELETINGSTATE_HANDLECOMMANDL_ENTRY );
     
     TInt cmd = aCommand.Command();
     MCalenCommandHandler* handler = iController.GetCommandHandlerL( cmd );
@@ -94,47 +98,31 @@
     
     TBool cmdUsed = EFalse;
     
-    if(ECalenDeleteEntryWithoutQuery == cmd)
+    if( cmd == ECalenDeleteEntryWithoutQuery )
         {
         RequestCallbackL( handler, aCommand );
         cmdUsed = ETrue;
         }
-    else if(ECalenFasterAppExit == cmd)
+    else if( ECalenFasterAppExit == cmd )
     	{
         SetCurrentState( aStateMachine, CCalenStateMachine::ECalenIdleState );
         ActivateCurrentStateL(aStateMachine);
         RequestCallbackL( handler, aCommand );
         cmdUsed = ETrue;
     	}
-    else if(ECalenStartActiveStep == cmd)
-        {
-        RequestCallbackL( handler, aCommand );
-        cmdUsed = ETrue;
-        }
-    
-    else if(ECalenMissedEventViewFromIdle == cmd)
-        {
-        RequestCallbackL( handler, aCommand );
-        cmdUsed = ETrue;
-        }
-    else if(ECalenMissedAlarmsViewFromIdle == cmd)
-        {
-        RequestCallbackL( handler, aCommand );
-        cmdUsed = ETrue;
-        }
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENDELETINGSTATE_HANDLECOMMANDL_EXIT );
     return cmdUsed;
     }
 
 // ----------------------------------------------------------------------------
 // CCalenDeletingState::HandleNotificationL
-// From CCalenState
+// From CCCalenState
 // ----------------------------------------------------------------------------        
 void CCalenDeletingState::HandleNotificationL(const TCalenNotification& aNotification,
                                               CCalenStateMachine& aStateMachine )
     {
-    TRACE_ENTRY_POINT;
+    OstTraceFunctionEntry0( CCALENDELETINGSTATE_HANDLENOTIFICATIONL_ENTRY );
     
     switch( aNotification )
         {
@@ -167,7 +155,7 @@
             break;
         }
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENDELETINGSTATE_HANDLENOTIFICATIONL_EXIT );
     }
  
  // end of file