--- a/alarmui/inc/AlmAlarmControl.h Thu Aug 19 09:53:43 2010 +0300
+++ b/alarmui/inc/AlmAlarmControl.h Tue Aug 31 15:13:43 2010 +0300
@@ -30,15 +30,17 @@
#include "pim_trace.h"
#include "PropertyObserver.h"
#include "AlmAlertVariant.hrh"
+#include "alarmalertobserver.h"
#include <akndialogcontroller.h>
#include <AlarmObserver.h>
-#include <missedalarmstore.h>
+// #include <missedalarmstore.h>
// FORWARD DECLARATIONS
class CAknAlarmService;
class CAlarmUtils;
+class AlarmAlertWidget;
// CLASS DECLARATION
@@ -52,7 +54,8 @@
NONSHARABLE_CLASS( CAlmAlarmControl ) : public CCoeControl,
public MEikServAlarm,
public MPropertyChangeHandler,
- public MNotifierDialogObserver
+ public MNotifierDialogObserver,
+ public AlarmAlertObserver
{
public: // Constructors and destructor
/**
@@ -105,11 +108,6 @@
* @since 5.0
**/
TBool CanSnooze();
- /**
- * Returns handle to alarmutils
- * @since TB9.2
- **/
- CAlarmUtils* AlarmUtils() const;
private: // New functions
/**
* Alarm UI Panic.
@@ -158,14 +156,6 @@
*/
void StoreMissedAlarmDataL();
- /**
- * Checks for calendar type alarm needed to be stored as missed alarm
- * Stops the alarm and enters to missed alarm table. If the calendar type
- * is clock, then snoozes the alarm.
- */
-
- void StopOrSnoozeAlarm();
-
public: // from MEikServAlarm
/**
* From MEikServAlarm.
@@ -252,6 +242,12 @@
* @param None
*/
TBool IsStopFromContext();
+
+public: // From AlarmAlertObserver
+
+ void alertCompleted(AlarmCommand command);
+ void alertDisplayed(AlarmCommand command);
+ void alertCancelled(AlarmCommand command);
private: // From MPropertyChangeHandler
/**