--- a/contentstorage/casrv/cawidgetscanner/inc/cawidgetscannerplugin.h	Fri Apr 16 15:16:09 2010 +0300
+++ b/contentstorage/casrv/cawidgetscanner/inc/cawidgetscannerplugin.h	Mon May 03 12:48:45 2010 +0300
@@ -22,16 +22,16 @@
 #include <casrvplugin.h>
 #include <f32file.h>
 #include "cawidgetdescription.h"
-#include "cawidgetmmcwatcher.h"
+#include "cammcwatcher.h"
 
 class TPluginParams;
 class CCaWidgetScannerParser;
 class CCaWidgetScannerInstallNotifier;
 class CCaWidgetStorageHandler;
 
-class CCaWidgetScannerPlugin : public CCaSrvPlugin, MWidgetMmcWatcherCallback
+class CCaWidgetScannerPlugin : public CCaSrvPlugin, MMmcWatcherCallback
     {
-    
+
 public:
     // Constructors and destructor
 
@@ -45,7 +45,7 @@
      * C++ destructor
      */
     ~CCaWidgetScannerPlugin();
-    
+
     /**
      * SynchronizeL
      */
@@ -53,12 +53,12 @@
 
 private:
 //from MWidgetMmcWatcherCallback
-    
+
     /**
      * MmcChangeL is called when the MMC is removed or inserted.
      */
     void MmcChangeL();
-    
+
 private:
 
     /**
@@ -72,7 +72,7 @@
     void ConstructL( TPluginParams* aPluginParams );
 
 private:
-   
+
     /**
      * File session. Own
      */
@@ -92,12 +92,12 @@
      * Content Storage Handler. Own.
      */
     CCaWidgetStorageHandler* iStorageHandler;
-    
+
     /**
      * Mmc watcher. Own.
      */
-    CCaWidgetMmcWatcher* iMmcWatcher;
-    
+    CCaMmcWatcher* iMmcWatcher;
+
     };
 
 #endif      // C_CAWIDGETSCANNERPLUGIN_H