--- a/securitydialogs/lockclient/src/keyguardaccessapi.cpp	Thu May 27 13:44:17 2010 +0300
+++ b/securitydialogs/lockclient/src/keyguardaccessapi.cpp	Fri Jun 11 14:28:40 2010 +0300
@@ -31,8 +31,7 @@
 // ---------------------------------------------------------------------------
 EXPORT_C CKeyguardAccessApi* CKeyguardAccessApi::NewL( )
     {
-    qDebug() << "============= CKeyguardAccessApi::NewL";
-    RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+    RDEBUG("0", 0);
 
     CKeyguardAccessApi* self = new (ELeave) CKeyguardAccessApi( );
     CleanupStack::PushL( self );
@@ -46,8 +45,7 @@
 // ---------------------------------------------------------------------------
 CKeyguardAccessApi::CKeyguardAccessApi()
     {
-    qDebug() << "============= CKeyguardAccessApi::CKeyguardAccessApi";
-    RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+    RDEBUG("0", 0);
     }
 
 // ---------------------------------------------------------------------------
@@ -68,8 +66,7 @@
 // ---------------------------------------------------------------------------
 void CKeyguardAccessApi::ConstructL( )
     {
-    qDebug() << "============= CKeyguardAccessApi::ConstructL";
-    RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+    RDEBUG("0", 0);
     iLockAccessExtension = new (ELeave) RLockAccessExtension;
     }
 
@@ -79,7 +76,7 @@
 EXPORT_C TBool CKeyguardAccessApi::IsKeylockEnabled()
     {
 
-		qDebug() << "============= CKeyguardAccessApi::IsKeylockEnabled";
+		RDEBUG("0", 0);
     TInt value;
     TInt err = RProperty::Get(KPSUidAvkonDomain, KAknKeyguardStatus, value);
     if ( err == KErrNone )
@@ -105,9 +102,7 @@
 // ---------------------------------------------------------------------------
 EXPORT_C TBool CKeyguardAccessApi::IsKeyguardEnabled()
     {
-    qDebug() << "============= CKeyguardAccessApi::IsKeyguardEnabled";
-    RDebug::Printf( "%s %s (%u) value=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
-
+    RDEBUG("0", 0);
     TInt value;
     TInt err = RProperty::Get(KPSUidAvkonDomain, KAknKeyguardStatus, value);
     if ( err == KErrNone )
@@ -148,16 +143,15 @@
 // ---------------------------------------------------------------------------
 EXPORT_C TInt CKeyguardAccessApi::DisableKeyguard( TBool aWithNote )
     {
-		qDebug() << "============= CKeyguardAccessApi::DisableKeyguard";
+		RDEBUG("aWithNote", aWithNote);
     if ( iLockAccessExtension )
         {
-        		qDebug() << "============= CKeyguardAccessApi::DisableKeyguard 1";
+        RDEBUG("0", 1);
         return iLockAccessExtension->SendMessage( ELockAppDisableKeyguard, aWithNote );
         }
     else
         {
-        			qDebug() << "============= CKeyguardAccessApi::DisableKeyguard 0";
-
+        RDEBUG("0", 0);
         return KErrNotFound;
         }
     }
@@ -167,6 +161,7 @@
 // ---------------------------------------------------------------------------
 EXPORT_C TInt CKeyguardAccessApi::OfferKeyguard()
     {
+   	RDEBUG("0", 0);
     if ( iLockAccessExtension )
         {
         return iLockAccessExtension->SendMessage( ELockAppOfferKeyguard );
@@ -182,7 +177,7 @@
 // ---------------------------------------------------------------------------
 EXPORT_C TInt CKeyguardAccessApi::ShowKeysLockedNote()
     {
-    qDebug() << "============= CKeyguardAccessApi::ShowKeysLockedNote";
+    RDEBUG("0", 0);
     if ( iLockAccessExtension )
         {
         return iLockAccessExtension->SendMessage( ELockAppShowKeysLockedNote );