--- a/clock/clockui/clockviews/inc/clockmainview.h	Mon May 03 12:30:32 2010 +0300
+++ b/clock/clockui/clockviews/inc/clockmainview.h	Fri May 14 15:51:09 2010 +0300
@@ -38,8 +38,8 @@
 class AlarmClient;
 class TimezoneClient;
 class SettingsUtility;
-class SkinnableClock;
 class ClockAlarmListModel;
+class ClockWidget;
 
 class ClockMainView : public HbView
 {
@@ -52,11 +52,10 @@
 public:
 	CLOCKVIEWS_EXPORT void setupView(
 			ClockAppControllerIf &controllerIf, ClockDocLoader *docLoader);
-
-public slots:
-	void handleAlarmStatusChanged(int row);
+	CLOCKVIEWS_EXPORT void setupAfterViewReady();
 
 private slots:
+	void handleAlarmStatusChanged(int row);
 	void refreshMainView();
 	void displayWorldClockView();
 	void addNewAlarm();
@@ -64,15 +63,19 @@
 	void handleActivated(const QModelIndex &index);
 	void handleLongPress(HbAbstractViewItem *item, const QPointF &coords);
 	void deleteAlarm();
-	void updateDateLabel();
-	void updatePlaceLabel();
-	void updateClockWidget();
+	void updateView();
+	void updatePlaceLabel(int autoTimeUpdate = -1);
 	void handleAlarmListDisplay();
 	void checkOrientationAndLoadSection(Qt::Orientation orientation);
+	void selectedMenuAction(HbAction *action);
+	void handleMenuClosed();
 
 private:
 	void setmodel();
 	void hideAlarmList(bool show);
+	void removeSnoozedAlarm();
+	void updateDateLabel();
+	void updateClockWidget();
 
 private:
 	QTimer *mTickTimer;
@@ -81,10 +84,11 @@
 	HbAction *mDisplayWorldClockView;
 	HbAction *mAddNewAlarm;
 	HbAction *mSettingsAction;
+	HbAction *mDeleteAction;
 
 	HbLabel *mDayLabel;
 	HbLabel *mPlaceLabel;
-	SkinnableClock *mClockWidget;
+	ClockWidget *mClockWidget;
 	HbLabel *mNoAlarmLabel;
 	HbListView *mAlarmList;
 
@@ -97,6 +101,7 @@
 
 	int mSelectedItem;
 	bool mHideAlarmList;
+	bool mIsLongTop;
 };
 
 #endif // CLOCKMAINVIEW_H