--- a/calendarui/editors/inc/calenunifiededitorcontrol.h	Wed Sep 15 12:11:35 2010 +0300
+++ b/calendarui/editors/inc/calenunifiededitorcontrol.h	Wed Oct 13 14:30:35 2010 +0300
@@ -24,7 +24,6 @@
 
 // user includes
 #include "CalenEditorDataHandler.h"
-#include "CalenEntryUtil.h"
 
 // forward declaration
 class CCalenUnifiedEditor;
@@ -36,8 +35,6 @@
 class CCalenDbField;
 class CCalenDescription;
 class MCalenServices;
-class CKoreanLunarDateEditor;
-class CKoreanLunarTypeField;
 
 /**
  * CCalenUnifiedEditorControl class declaration
@@ -150,7 +147,7 @@
          * @brief To set AllDay field value
          * @param aActive
          */
-        void SetAllDayEventL( TBool aActive );
+        void SetAllDayEvent( TBool aActive );
         
         /**
          * @brief Handles a state change in the control with id aControlId. 
@@ -172,12 +169,6 @@
          * @param aNewEventType Holds the new event type selected in editor
          */
         void OnEventTypeChangedL( CCalEntry::TType aNewEventType );
-
-        /**
-         * @brief Handles lunar event type changed 
-         * @param aNewEventType Holds the new event type selected in editor
-         */
-        void OnLunarTypeChangedL( TLunarCalendarType aNewEventType );
     
         /**
          * @brief Reads editor data mainly for collapsed editor
@@ -234,7 +225,7 @@
         /**
          * Reads the RRule and Rdates for the current CCalEntry.
          */
-        void ReadRruleL(TTime& startTime, TTime& endTime);
+        void ReadRrule(TTime& startTime, TTime& endTime);
         
         /**
          * @brief Get start date time from editor
@@ -347,17 +338,7 @@
          *        in updating the EndTime of editor on StartTime change.
          */
         void UpdateMeetingDurationL();
-
-        /**
-         * @brief Setups Lunar Fields
-         */
-        void SetupLunarFields();
-
-        /**
-         * @brief Updates Lunar Date Fields
-         */
-        void UpdateLunarDateFields();
-
+        
     private:
  
         /**
@@ -414,29 +395,6 @@
          */
         TTimeIntervalMinutes  iMeetingInterval;
         
-        /**
-         * @var iKoreanLunarDateEditor
-         * @brief Korean lunar data editor
-         */
-        CKoreanLunarDateEditor* iKoreanLunarDateEditor;
-        
-        /**
-         * @var iKoreanLunarTypeField
-         * @brief Korean lunar type field
-         */
-        CKoreanLunarTypeField* iKoreanLunarTypeField;
-        
-        /**
-         * @var iPrevLunarType
-         * @brief previous lunar type
-         */
-        TLunarCalendarType iPrevLunarType;
-        
-        /**
-    	* True if FeatureManager is initialized.
-    	*/
-    	TBool iFeatMgrInitialized;
-        
     };
 
 #endif // _CALENUNIFIEDEDITORCONTROL_H
\ No newline at end of file