diff -r 96907930389d -r 12af337248b1 calendarui/controller/src/calenasynccallback.cpp
--- a/calendarui/controller/src/calenasynccallback.cpp	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/controller/src/calenasynccallback.cpp	Tue Aug 31 15:13:43 2010 +0300
@@ -11,82 +11,88 @@
 *
 * Contributors:
 *
-* Description:   Calendar async callback implementation
+* Description:  Calendar async callback implementation
  *
 */
 
-
  
  // INCLUDE FILES
  
 #include "calenasynccallback.h"
-#include "calendarui_debug.h" 
+#include "calendarui_debug.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calenasynccallbackTraces.h"
+#endif
+ 
 
 
 // ---------------------------------------------------------------------------
-// CCalenAsyncCallBack::CCalenAsyncCallBack
+// CalenAsyncCallBack::CalenAsyncCallBack
 // C++ constructor
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
-CCalenAsyncCallBack::CCalenAsyncCallBack(TCallBack& aCallBack, CActive::TPriority  aPriority,
+CalenAsyncCallBack::CalenAsyncCallBack(TCallBack& aCallBack, CActive::TPriority  aPriority,
                                          CCalenController& aController)
     :CAsyncCallBack(aCallBack, aPriority),
     iController(aController)
     {
-    TRACE_ENTRY_POINT;
-    TRACE_EXIT_POINT;    
+    OstTraceFunctionEntry0( CALENASYNCCALLBACK_CALENASYNCCALLBACK_ENTRY );
+     
+    OstTraceFunctionExit0( CALENASYNCCALLBACK_CALENASYNCCALLBACK_EXIT );
     }
 
 // ---------------------------------------------------------------------------
-// CCalenAsyncCallBack::NewL
+// CalenAsyncCallBack::NewL
 // First phase construction
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //  
-CCalenAsyncCallBack* CCalenAsyncCallBack::NewL(TCallBack& aCallBack, CActive::TPriority  aPriority,
+CalenAsyncCallBack* CalenAsyncCallBack::NewL(TCallBack& aCallBack, CActive::TPriority  aPriority,
                              CCalenController& aController)
     {
-    TRACE_ENTRY_POINT;
-  
-    CCalenAsyncCallBack* self = new( ELeave ) CCalenAsyncCallBack( aCallBack, aPriority , aController );
+    OstTraceFunctionEntry0( CALENASYNCCALLBACK_NEWL_ENTRY );
+    
+    CalenAsyncCallBack* self = new( ELeave ) CalenAsyncCallBack( aCallBack, aPriority , aController );
 
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CALENASYNCCALLBACK_NEWL_EXIT );
     return self;
     }
 // ---------------------------------------------------------------------------
-// CCalenAsyncCallBack::~CCalenAsyncCallBack
+// CalenAsyncCallBack::~CalenAsyncCallBack
 // C++ Destructor
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //	
-CCalenAsyncCallBack::~CCalenAsyncCallBack()
+CalenAsyncCallBack::~CalenAsyncCallBack()
 	{
-	TRACE_ENTRY_POINT;
-    TRACE_EXIT_POINT;
+	OstTraceFunctionEntry0( DUP1_CALENASYNCCALLBACK_CALENASYNCCALLBACK_ENTRY );
+	
+	OstTraceFunctionExit0( DUP1_CALENASYNCCALLBACK_CALENASYNCCALLBACK_EXIT );
 	}
 
 // ---------------------------------------------------------------------------
-// CCalenAsyncCallBack::BaseConstructL
+// CalenAsyncCallBack::BaseConstructL
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
-void CCalenAsyncCallBack::BaseConstructL()
+void CalenAsyncCallBack::BaseConstructL()
 	{
-	TRACE_ENTRY_POINT;
+	OstTraceFunctionEntry0( CALENASYNCCALLBACK_BASECONSTRUCTL_ENTRY );
 
-    TRACE_EXIT_POINT;
+	OstTraceFunctionExit0( CALENASYNCCALLBACK_BASECONSTRUCTL_EXIT );
 	}
 	
 // ---------------------------------------------------------------------------
-// CCalenAsyncCallBack::RunL
+// CalenAsyncCallBack::RunL
 // Handle Completion
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //	
-void CCalenAsyncCallBack::RunL()
+void CalenAsyncCallBack::RunL()
 	{
-	TRACE_ENTRY_POINT;
+	OstTraceFunctionEntry0( CALENASYNCCALLBACK_RUNL_ENTRY );
 	
 	if(iCallBack.CallBack())
 	    {
@@ -94,8 +100,8 @@
 	    // request for continuing the executing command
 	    CallBack();
 	    }
-        
-	TRACE_EXIT_POINT;
+	
+	OstTraceFunctionExit0( CALENASYNCCALLBACK_RUNL_EXIT );
 	}