--- a/calendarui/regionalplugins/calenregionalutil/inc/calenlunarlocalizer.h	Thu Aug 19 09:53:43 2010 +0300
+++ b/calendarui/regionalplugins/calenregionalutil/inc/calenlunarlocalizer.h	Tue Aug 31 15:13:43 2010 +0300
@@ -22,10 +22,11 @@
 
 #include <e32base.h>
 #include <badesca.h>
-#include "calenlunarlocalizedinfo.h"
+#include "CalenLunarLocalizedInfo.h"
 #include "CalendarVariant.hrh"
 #include "calendarui_debug.h"
 
+class QStringList;
 class CEikonEnv;
 class TCalenLunarInfo;
 class TChineseDate;
@@ -41,11 +42,7 @@
     
     IMPORT_C virtual CCalenLunarLocalizedInfo* LocalizeL( TCalenLunarInfo& aInfo );
     
-    IMPORT_C virtual TPtrC GetExtraRowTextL( CCalenLunarLocalizedInfo& aLocInfo, 
-                                    TInt aMaxWidth, 
-                                    const CFont& aFont,
-									TBool aTwoLines
-                                  );
+    IMPORT_C virtual TPtrC GetExtraRowTextL( CCalenLunarLocalizedInfo& aLocInfo );
     
 
 protected:
@@ -68,49 +65,40 @@
      * Localized names of lunar festivals
      * Own.
      */
-    CDesCArray* iFestivalNames;
-    
+    QStringList iFestivalNames;
+
     /**
      * Localized names of solar terms 
      * Own.
      */
-    CDesCArray* iSolarTermNames;
+    QStringList iSolarTermNames;
 
     /**
      * Localized names of animal years
      * Own.
      */
-    CDesCArray* iAnimalYearNames;
+    QStringList iAnimalYearNames;
 
     /**
      * Localized names of heavenly stems
      * Own.
      */
-    CDesCArray* iHeavenlyStemNames;
+    QStringList iHeavenlyStemNames;
 
     /**
      * Localized names of terrestial branches
      * Own.
      */
-    CDesCArray* iTerrestialBranchNames;
+    QStringList iTerrestialBranchNames;
 
 
-    /**
-     * Format string for western date.
-     * Own.
-     */
-    HBufC* iGregorianDateFormat;
-
     TBuf<1000> iLunarExtraRowText;
 
-
     /**
      * Language independent formatter of extra row information.
      */
     CCalenExtraRowFormatter* iRowFormatter;
     
-    TInt  iResourceFileOffset;
-
     };
 
 #endif // __CALENLUNARLOCALIZER_H__