diff -r a3a1ae9acec6 -r da5135c61bad meetingrequest/mrviewer/inc/cesmrviewerctrl.h
--- a/meetingrequest/mrviewer/inc/cesmrviewerctrl.h	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mrviewer/inc/cesmrviewerctrl.h	Wed Mar 31 21:08:33 2010 +0300
@@ -20,9 +20,10 @@
 #define CESMRVIEWERCTRL_H
 
 //  INCLUDES
-#include <MAgnEntryUi.h>
-#include <CMRUtils.h>
+#include <magnentryui.h>
+#include <cmrutils.h>
 #include <e32base.h>
+#include "mmrinfoprovider.h"
 
 // FORWARD DECLARATIONS
 class CCalEntry;
@@ -32,9 +33,10 @@
 class CMRMailboxUtils;
 class CActiveSchedulerWait;
 class CESMRUiFactory;
-class CESMREntryProcessor;
+class CMREntryProcessor;
 class MESMRTaskExtension;
 class CESMRPolicyManager;
+class MESMRCalDbMgr;
 
 // CLASS DECLARATION
 
@@ -45,7 +47,8 @@
 NONSHARABLE_CLASS(CESMRViewerController)  :
         public CBase,
         public MAgnEntryUiCallback,
-        public MMRUtilsObserver
+        public MMRUtilsObserver,
+        public MMRInfoProvider
     {
 public:  // Constructors and destructor
     /**
@@ -78,7 +81,11 @@
             TInt aPercentageCompleted,
             TInt aStatus );
 
-private: // Constructors
+protected: // From MMRInfoProvider
+    MMRPolicyProvider& PolicyProvider() const;
+    MESMRCalEntry* EntryL();
+    
+private: // Constructors and implementation
     CESMRViewerController(
             RPointerArray<CCalEntry>& aEntries,
             const MAgnEntryUi::TAgnEntryUiInParams& aParams,
@@ -89,6 +96,12 @@
             TInt aCommandId );
     void LaunchUIL();
     void LaunchCorrectOperationModeL();
+    TInt ProcessDefaultCommandL( TInt aCommandId );
+    TInt ProcessMeetingRequestCommandL( TInt aCommandId );
+    void ChangeEntryTypeL( TInt aCommandId );
+    void UpdateComparativeEntryInTypeChangeL( const CCalEntry& aOriginalEntry );
+    void CancelAndDeleteMRInEntryTypeChangeL( 
+            CCalEntry& entry, MESMRCalDbMgr& aDbMgr );
 
 private: // Data
     /// Own: Operation error value
@@ -108,11 +121,13 @@
     /// Own: UI factory
     CESMRUiFactory* iGuiFactory;
     /// Ref: Reference to entry processor
-    CESMREntryProcessor* iEntryProcessor;
+    CMREntryProcessor* iEntryProcessor;
     /// Ref: Reference to task extension
     MESMRTaskExtension* iTaskExt;
     /// Ref: Reference to policy manager
     CESMRPolicyManager* iPolicyMgr;
+    /// Own: Current calendar entry to be handled
+    CCalEntry* iCalEntry;
     };
 
 #endif      // CMRHANDLER_H