--- a/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidget.h	Mon May 03 12:24:59 2010 +0300
+++ b/homescreenapp/widgetplugins/hsclockwidgetplugin/inc/hsclockwidget.h	Fri May 14 15:43:04 2010 +0300
@@ -18,69 +18,54 @@
 #ifndef HSCLOCKWIDGET_H
 #define HSCLOCKWIDGET_H
 
-#include <QGraphicsSvgItem>
-#include <QTime>
-#include <QWidget>
-#include <QGraphicsWidget>
-#include <QImage>
-#include <hbwidget.h>
+#include <HbWidget>
+
 #include <hstest_global.h>
 
 HOMESCREEN_TEST_CLASS(TestClockWidget)
 
 class HbWidget;
 class QGraphicsLinearLayout;
+#ifdef Q_OS_SYMBIAN
+class HsClockSettingsNotifier;
+#endif //Q_OS_SYMBIAN
 
 class HsClockWidget : public HbWidget
 {
     Q_OBJECT
-    Q_PROPERTY(QString clockType READ clockType WRITE setClockType)
-
+    
 public:
-
     HsClockWidget(QGraphicsItem *parent = 0, Qt::WindowFlags flags = 0);
     ~HsClockWidget();
 
-    QString clockType() const;
-    void setClockType(const QString &type);
+signals:
+    void setPreferences(const QStringList &names);
 
 public slots:
-
     void onInitialize();
     void onShow();
     void onHide();
     void onUninitialize();
 
     void updateTime();
-    void onTypeChanged(QString type);
-    
-signals:
-    void setPreferences(const QStringList &names);
-
-protected:
-
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event) }
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *aEvent);
+    void onSettingsChanged(const QString &clockFormat, const QString &timeFormat);
+    void onClockTapped();
 
 private:
-    void toggleClockType();
+    Q_DISABLE_COPY(HsClockWidget)
     HbWidget *loadClockWidget();
 
 private:
-
-    QTimer *mTimer;
-    QString mClockType;
     HbWidget *mWidget;
     QGraphicsLinearLayout *mLayout;
-    bool mWidgetShown;
-
-    Q_DISABLE_COPY(HsClockWidget)
-
+    QTimer *mTimer;
+    QString mClockType;
+    QString mTimeType;        
+#ifdef Q_OS_SYMBIAN
+    HsClockSettingsNotifier *mClockSettingsNotifier;
+#endif //Q_OS_SYMBIAN
+    
     HOMESCREEN_TEST_FRIEND_CLASS(TestClockWidget)
-
 };
 
-
-
-
 #endif