--- a/calendarui/controller/inc/calenstatemachine.h	Tue Aug 31 15:13:43 2010 +0300
+++ b/calendarui/controller/inc/calenstatemachine.h	Wed Sep 01 12:32:31 2010 +0100
@@ -22,15 +22,14 @@
 // INCLUDES
 #include <e32base.h>
 #include <e32hashtab.h>
-#include "calennotificationhandler.h"
-#include "calencommandhandler.h"
+#include <calencommandhandler.h>
+#include <calennotificationhandler.h>
 #include "calenhashfunctions.inl"       // HashFunctions 
 
 class CCalenState;
 class CCalenController;
 
 // CLASS DEFINITIONS
-
 /**
  * 
  */
@@ -43,16 +42,19 @@
             // If you change the array order or add/remove items,
             // update CCalenStateMachine::ConstructL too.
 	        ECalenIdleState,
-	        ECalenPopulationState,	        
+	        ECalenPopulationState,
 	        ECalenBackgroundState,
 	        ECalenViewingState,
-	        ECalenEditingState,	
+	        ECalenEditingState,
 	        ECalenDeletingState,
 	        ECalenPrintingState,
 	        ECalenSendingState,
 	        ECalenSettingsState,
 	        ECalenHelpState,
-	        ECalenExitingState,	       
+	        ECalenExitingState,
+	        ECalenMapState,
+	        ECalenAttachmentState,
+			ECalenAlarmState,
 	        KCalenLastState  // Must be last
 	        };
 
@@ -75,11 +77,6 @@
 		 * Handles Notifications 
  		 */
         void HandleNotification(const TCalenNotification aNotification );
-        
-        /*
-         * Returns the current state in which calendar is.
-         */
-        TCalenStateIndex CurrentState();
 
     private:  // Construction and destruction