--- a/calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp	Mon Jul 12 02:32:28 2010 +0530
+++ b/calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp	Mon Jul 26 13:54:38 2010 +0530
@@ -27,6 +27,11 @@
 
 #include <f32file.h>
 #include <s32file.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calensolartermsTraces.h"
+#endif
+
 
 
 // CONSTANTS
@@ -49,14 +54,13 @@
 //
 EXPORT_C CCalenSolarTerms* CCalenSolarTerms::NewL(RFs& aFs)
     {
-    TRACE_ENTRY_POINT;
-    
+    OstTraceFunctionEntry0( CCALENSOLARTERMS_NEWL_ENTRY );
     CCalenSolarTerms* self = new (ELeave) CCalenSolarTerms(aFs);
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
     
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( CCALENSOLARTERMS_NEWL_EXIT );
     return self;
     }
 
@@ -67,8 +71,8 @@
 //
 EXPORT_C CCalenSolarTerms::~CCalenSolarTerms()
     {
-    TRACE_ENTRY_POINT;
-    TRACE_EXIT_POINT;
+    OstTraceFunctionEntry0( CCALENSOLARTERMS_CCALENSOLARTERMS_ENTRY );
+    OstTraceFunctionExit0( CCALENSOLARTERMS_CCALENSOLARTERMS_EXIT );
     }
 
 
@@ -78,8 +82,7 @@
 //
 EXPORT_C TInt CCalenSolarTerms::CheckSolarTermDateL( const TDateTime& aDate )
     {
-    TRACE_ENTRY_POINT;
-    
+    OstTraceFunctionEntry0( CCALENSOLARTERMS_CHECKSOLARTERMDATEL_ENTRY );
     ReadSolarTermsL( aDate );
     if ( HasSolarTermDataAvailable( aDate ) )
         {
@@ -103,17 +106,17 @@
                 i += KSolarTermCount - 2;
                 TInt foundIndex = i % KSolarTermCount;
                 
-                TRACE_EXIT_POINT;
+                OstTraceFunctionExit0( CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT );
                 return foundIndex;
                 }
             }
-        TRACE_EXIT_POINT;
+        OstTraceFunctionExit0( DUP1_CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT );
         return KErrNotFound;
         }
     else
         {
         // Solar festival data is NOT available for this date 
-        TRACE_EXIT_POINT;
+        OstTraceFunctionExit0( DUP2_CCALENSOLARTERMS_CHECKSOLARTERMDATEL_EXIT );
         return KErrNotSupported;
         }
     }
@@ -126,8 +129,8 @@
 //
 CCalenSolarTerms::CCalenSolarTerms(RFs& aFs) : iFs( aFs )
     {
-    TRACE_ENTRY_POINT;
-    TRACE_EXIT_POINT;
+    OstTraceFunctionEntry0( DUP1_CCALENSOLARTERMS_CCALENSOLARTERMS_ENTRY );
+    OstTraceFunctionExit0( DUP1_CCALENSOLARTERMS_CCALENSOLARTERMS_EXIT );
     }
 
 
@@ -137,8 +140,8 @@
 //
 void CCalenSolarTerms::ConstructL()
     {
-    TRACE_ENTRY_POINT;
-    TRACE_EXIT_POINT;
+    OstTraceFunctionEntry0( CCALENSOLARTERMS_CONSTRUCTL_ENTRY );
+    OstTraceFunctionExit0( CCALENSOLARTERMS_CONSTRUCTL_EXIT );
     }
 
 
@@ -148,13 +151,11 @@
 //
 TBool CCalenSolarTerms::HasSolarTermDataAvailable(const TDateTime& aDate) const
     {
-    TRACE_ENTRY_POINT;
-    
+    OstTraceFunctionEntry0( CCALENSOLARTERMS_HASSOLARTERMDATAAVAILABLE_ENTRY );
     // Note: day parameter for TDateTime starts from 0, not from 1
     const TDateTime KMinAvailable( KFirstSolarTermYear, EJanuary, 0, 0, 0, 0, 0 );
     const TDateTime KMaxAvailable( KLastSolarTermYear, EDecember, 31 - 1, 23, 59, 59, 0 );
     
-    TRACE_EXIT_POINT;
     return TTime(KMinAvailable) <= TTime(aDate) &&
            TTime(aDate) <= TTime(KMaxAvailable);
     }
@@ -167,11 +168,11 @@
 //
 void CCalenSolarTerms::ReadSolarTermsL(TDateTime aDate)
     {
-    TRACE_ENTRY_POINT;
-    
+    OstTraceFunctionEntry0( CCALENSOLARTERMS_READSOLARTERMSL_ENTRY );
     // Caches one year of solar items
     if ( ! HasSolarTermDataAvailable( aDate ) )
         {
+        OstTraceFunctionExit0( CCALENSOLARTERMS_READSOLARTERMSL_EXIT );
         return;
         }
 
@@ -205,6 +206,5 @@
         CleanupStack::PopAndDestroy(2); // readStream, file
         iCachedYear = year;
         }
-    
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( DUP1_CCALENSOLARTERMS_READSOLARTERMSL_EXIT );
     }