diff -r f979ecb2b13e -r c198609911f9 calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp --- a/calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp Tue Feb 02 10:12:19 2010 +0200 +++ b/calendarui/regionalplugins/calenregionalutil/src/calensolarterms.cpp Fri Apr 16 14:57:40 2010 +0300 @@ -21,9 +21,9 @@ //debug #include "calendarui_debug.h" -#include "calensolarterms.h" +#include "CalenSolarTerms.h" -#include "calenlunarpaths.h" +#include "CalenLunarPaths.h" #include #include @@ -33,9 +33,9 @@ _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); @@ -183,6 +183,8 @@ RFs& fs = iFs; TFindFile ffile(fs); User::LeaveIfError(ffile.FindByDir(KSolarTermsFile, KSolarTermsPath)); + // User::LeaveIfError(ffile.FindByPath(KSolarTermsFile, KSolarTermsPath)); + User::LeaveIfError(file.Open(fs, ffile.File(), EFileRead)); CleanupClosePushL(file);