--- a/alarmui/inc/alarmutils.h	Tue Feb 02 10:12:19 2010 +0200
+++ b/alarmui/inc/alarmutils.h	Fri Apr 16 14:57:40 2010 +0300
@@ -35,6 +35,8 @@
 #include <caltime.h>
 #include <calprogresscallback.h>
 
+#include "alarmcommon.h"
+
 // FORWARD DECLARATIONS
 
 class CCalSession;
@@ -49,6 +51,7 @@
 class MProfileEngine;
 class CNotifierDialogController;
 class CAknAlarmService;
+class AlarmAlert;
 
 // CLASS DECLARATION
 
@@ -240,7 +243,8 @@
     * @since S60 3.2
     * @return Pointer to CNotifierDialogController.
     */
-    CNotifierDialogController* NotifierDialogController();
+    // CNotifierDialogController* NotifierDialogController();
+    AlarmAlert *NotifierDialogController();
 
     /**
     * Stop the active alarm and reset the snooze count.
@@ -476,6 +480,13 @@
 	* @return ETrue if viewer is open.
     */
     TBool IsCalendarAlarmViewer();
+    
+    /**
+     * @brief Gets the alarm information for the alarm that is
+     * about to expire
+     * @return The alarm information 
+     */
+    SAlarmInfo* GetAlarmInfo();
 
 private:
 
@@ -626,7 +637,8 @@
     * Pointer to global note API.
     * Not own.
     */
-    CNotifierDialogController* iNotifierDialogController;
+    // CNotifierDialogController* iNotifierDialogController;
+    AlarmAlert* iAlarmAlert;
 
     /**
     * Plays alarm tones according to user settings.