--- a/calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp	Tue Aug 31 15:13:43 2010 +0300
@@ -21,21 +21,26 @@
 //debug
 #include "calendarui_debug.h"
 
-#include "calensolarterms.h"
+#include "CalenSolarTerms.h"
 
-#include "calenlunarpaths.h"
+#include "CalenLunarPaths.h"
 
 #include <f32file.h>
 #include <s32file.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calensolartermsTraces.h"
+#endif
+
 
 
 // CONSTANTS
 _LIT(KSolarTermsFile, "SolarItems");
 // search path for solar item file
 //Uncomment for emulator
-_LIT( KSolarTermsPath, "//private//10005901//" );  
+_LIT( KSolarTermsPath, "\\private\\10005901\\" );
 
-//_LIT( KSolarTermsPath, "//Data//calenlunarchinese//" );
+//_LIT( KSolarTermsPath, "\\data\\" );
 const TInt KFirstSolarTermYear(1900);
 const TInt KLastSolarTermYear(2100);
 
@@ -47,16 +52,15 @@
 // 
 // ---------------------------------------------------------------------------
 //
-CCalenSolarTerms* CCalenSolarTerms::NewL(RFs& aFs)
+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;
     }
 
@@ -65,10 +69,10 @@
 //
 // ---------------------------------------------------------------------------
 //
-CCalenSolarTerms::~CCalenSolarTerms()
+EXPORT_C CCalenSolarTerms::~CCalenSolarTerms()
     {
-    TRACE_ENTRY_POINT;
-    TRACE_EXIT_POINT;
+    OstTraceFunctionEntry0( CCALENSOLARTERMS_CCALENSOLARTERMS_ENTRY );
+    OstTraceFunctionExit0( CCALENSOLARTERMS_CCALENSOLARTERMS_EXIT );
     }
 
 
@@ -76,10 +80,9 @@
 // 
 // ---------------------------------------------------------------------------
 //
-TInt CCalenSolarTerms::CheckSolarTermDateL( const TDateTime& aDate )
+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;
         }
 
@@ -180,10 +181,11 @@
     if (iCachedYear != year)
         {
         RFile file;
-        RFs& fs = iFs;
-        TFindFile ffile(fs);
+        TFindFile ffile(iFs);
         User::LeaveIfError(ffile.FindByDir(KSolarTermsFile, KSolarTermsPath));
-        User::LeaveIfError(file.Open(fs,
+       // User::LeaveIfError(ffile.FindByPath(KSolarTermsFile, KSolarTermsPath));
+        
+        User::LeaveIfError(file.Open(iFs,
                                      ffile.File(), EFileRead));
         CleanupClosePushL(file);
 
@@ -204,6 +206,5 @@
         CleanupStack::PopAndDestroy(2); // readStream, file
         iCachedYear = year;
         }
-    
-    TRACE_EXIT_POINT;
+    OstTraceFunctionExit0( DUP1_CCALENSOLARTERMS_READSOLARTERMSL_EXIT );
     }