--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsanalogclockwidget.h	Mon May 03 12:24:59 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsanalogclockwidget.h	Fri May 14 15:43:04 2010 +0300
@@ -18,48 +18,48 @@
 #ifndef HSANALOGCLOCKWIDGET_H
 #define HSANALOGCLOCKWIDGET_H
 
-#include <QGraphicsSvgItem>
-#include <hbwidget.h>
+#include <HbWidget>
+
 #include <hstest_global.h>
 
 HOMESCREEN_TEST_CLASS(TestClockWidget)
 
 class HbIconItem;
+class HbTouchArea;
 
 class HsAnalogClockWidget : public HbWidget
 {
     Q_OBJECT
 
 public:
+    explicit HsAnalogClockWidget(QGraphicsItem *parent = 0);
+    ~HsAnalogClockWidget();
 
-    explicit HsAnalogClockWidget(QGraphicsItem *parent = 0);
-    virtual ~HsAnalogClockWidget();
+    bool eventFilter(QObject *watched, QEvent *event);
+
+signals:
+    void clockTapped();
 
 public slots:
-
     void tick();
 
 protected:
-
     void resizeEvent(QGraphicsSceneResizeEvent *event);
-    void polish(HbStyleParameters& params);
 
 private:
-
+    Q_DISABLE_COPY(HsAnalogClockWidget)
+    void createPrimitives();
     void updatePrimitives();
+    void handleMouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 
 private:
-
-    HbIconItem *mClockBackground;
-    HbIconItem *mClockHourHand;
-    HbIconItem *mClockMinuteHand;
-    
-    Q_DISABLE_COPY(HsAnalogClockWidget)
+    HbIconItem *mBackground;
+    HbIconItem *mHourHand;
+    HbIconItem *mMinuteHand;
+    HbIconItem *mSecondHand;
+    HbTouchArea *mTouchArea;
 
     HOMESCREEN_TEST_FRIEND_CLASS(TestClockWidget)
 };
 
-
-
-
 #endif