--- a/src/hbservers/hbthemeserver/hbthemewatcher_symbian_p.h	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemewatcher_symbian_p.h	Mon Oct 04 00:38:12 2010 +0300
@@ -30,6 +30,7 @@
 
 #include "hbthemecommon_p.h"
 
+#include <QFileSystemWatcher>
 #include <e32property.h>
 #include <e32base.h>
 #include <f32file.h>
@@ -37,32 +38,30 @@
 class HbThemeServerPrivate;
 
 //**********************************
-//CHbThemeWatcher
+//HbThemeWatcher
 //**********************************
 /**
 This class is for watching changes in active theme e.g. ejection of the MMC.
 */
-class CHbThemeWatcher : public CActive
+
+class HbThemeWatcher : public QObject
 {
+    Q_OBJECT
 public:
-    static CHbThemeWatcher* NewL(HbThemeServerPrivate& aObserver);
-    ~CHbThemeWatcher();
-    void startWatchingL(const QString &file);
+    HbThemeWatcher(HbThemeServerPrivate &observer);
+    ~HbThemeWatcher();
 
-protected: // From CActive
-    void RunL();
-    void DoCancel();
+    void startWatching(const QString &file);
+
+private slots:
+    void fileChanged(const QString &file);
 
 private:
-    CHbThemeWatcher(HbThemeServerPrivate& aObserver);
-    void ConstructL();    
-
-private: // data
-    RFs iFs;
-    QString iFile;
-    HbThemeServerPrivate& iObserver;
+    QFileSystemWatcher mWatcher;
+    QString mFile;
+    HbThemeServerPrivate &mObserver;
 };
-
+    
 //**********************************
 //CHbThemeChangeNotificationListener
 //**********************************