--- a/usbclasses/usbobexclasscontroller/src/obexsmwatcher.cpp	Tue Aug 31 16:13:57 2010 +0300
+++ b/usbclasses/usbobexclasscontroller/src/obexsmwatcher.cpp	Wed Sep 01 12:20:49 2010 +0100
@@ -18,15 +18,18 @@
 #include "obexsmwatcher.h"
 #include <e32base.h>
 #include <obexservicemanprop.h>
-#include "debug.h"
+#include <usb/usblogger.h>
 
+#ifdef __FLOG_ACTIVE
+_LIT8(KLogComponent, "UsbObexCcSMW");
+#endif
 
 /**
  * @since S60 V5.2
  */
 CObexSMWatcher* CObexSMWatcher::NewL(MObexSMObserver& aObserver)
     {
-    LOG_FUNC
+    LOG_STATIC_FUNC_ENTRY
 
     CObexSMWatcher* self = new (ELeave) CObexSMWatcher(aObserver);
     CleanupStack::PushL( self);
@@ -76,7 +79,7 @@
     {
     LOG_FUNC 
     
-    LOG1("iStatus=%d", iStatus.Int());
+    LOGTEXT2(_L8(">>CObexSMWatcher::RunL [iStatus=%d]"), iStatus.Int());
     
     iObexSMPostInit.Subscribe( iStatus );
     SetActive();
@@ -86,8 +89,9 @@
     if (err == KErrNone && value != KErrNone)
         {
         iObserver.MosmError(value);
-        }    
-
+        }
+    
+    LOGTEXT(_L8("<<CObexSMWatcher::RunL"));
     }
 
 /**