--- a/contentstorage/srvsrc/cammcwatcher.cpp	Mon Sep 13 13:26:33 2010 +0300
+++ b/contentstorage/srvsrc/cammcwatcher.cpp	Mon Sep 20 10:22:22 2010 +0300
@@ -21,10 +21,9 @@
 
 // ================= MEMBER FUNCTIONS =======================
 
-// ---------------------------------------------------------
-// CCaWidgetMmcWatcher::NewL
-// Second phase constructor
-// ---------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 EXPORT_C CCaMmcWatcher* CCaMmcWatcher::NewL( RFs& aFs,
         MMmcWatcherCallback* aObserver )
@@ -34,10 +33,9 @@
     return self;
     }
 
-// ---------------------------------------------------------
-// CCaWidgetMmcWatcher::NewLC
-// Second phase constructor
-// ---------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 EXPORT_C CCaMmcWatcher* CCaMmcWatcher::NewLC( RFs& aFs,
         MMmcWatcherCallback* aObserver )
@@ -49,20 +47,18 @@
     return self;
     }
 
-// ---------------------------------------------------------
-// CCaWidgetMmcWatcher::~CCaWidgetMmcWatcher
-// Destructor
-// ---------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 CCaMmcWatcher::~CCaMmcWatcher()
     {
     Cancel();
     }
 
-// ---------------------------------------------------------
-// CCaWidgetMmcWatcher::CCaWidgetMmcWatcher
-// Default constructor
-// ---------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 CCaMmcWatcher::CCaMmcWatcher( RFs& aFs,
         MMmcWatcherCallback* aObserver )
@@ -73,20 +69,18 @@
     CActiveScheduler::Add(this);
     }
 
-// ---------------------------------------------------------
-// CCaWidgetMmcWatcher::ConstructL
-// default Symbian OS constructor
-// ---------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 void CCaMmcWatcher::ConstructL()
     {
     WaitForChangeL();
     }
 
-// ---------------------------------------------------------
-// CCaWidgetMmcWatcher::WaitForChangeL
-// Request notification for disk change
-// ---------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 void CCaMmcWatcher::WaitForChangeL()
     {
@@ -98,9 +92,9 @@
     SetActive();
     }
 
-// ---------------------------------------------------------
-// CCaWidgetMmcWatcher::DoCancel
-// ---------------------------------------------------------
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
 //
 void CCaMmcWatcher::DoCancel()
     {
@@ -111,7 +105,7 @@
 #pragma CTC SKIP
 #endif //COVERAGE_MEASUREMENT (error is ignored)
 // ---------------------------------------------------------------------------
-// CCaWidgetMmcWatcher::RunError
+// 
 // ---------------------------------------------------------------------------
 //
 TInt CCaMmcWatcher::RunError( TInt /*aError*/ )
@@ -126,9 +120,9 @@
 #ifdef COVERAGE_MEASUREMENT
 #pragma CTC SKIP
 #endif //COVERAGE_MEASUREMENT (memory card removal)
-// ---------------------------------------------------------
-// CCaWidgetMmcWatcher::RunL
-// ---------------------------------------------------------
+// ---------------------------------------------------------------------------
+// 
+// ---------------------------------------------------------------------------
 //
 void CCaMmcWatcher::RunL()
     {