--- a/uifw/AvKon/src/AknWaitNoteWrapper.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/AvKon/src/AknWaitNoteWrapper.cpp	Fri Feb 19 23:04:46 2010 +0200
@@ -17,9 +17,11 @@
 
 
 // INCLUDE FILES
-#include    "AknWaitNoteWrapper.h"  // This class's declaration
-#include    <AknWaitDialog.h>
+
+#include <AknWaitDialog.h>
 #include <aknenv.h>
+#include "AknWaitNoteWrapper.h"  // This class's declaration
+#include "akntrace.h"
 
 
 // MODULE DATA STRUCTURES
@@ -43,24 +45,30 @@
 
 EXPORT_C CAknWaitNoteWrapper* CAknWaitNoteWrapper::NewL()
     {
+    _AKNTRACE_FUNC_ENTER;
     CAknWaitNoteWrapper* self = new(ELeave) CAknWaitNoteWrapper;
+    _AKNTRACE_FUNC_EXIT;
     return self;
     }
 
 EXPORT_C CAknWaitNoteWrapper::~CAknWaitNoteWrapper()
     {
+    _AKNTRACE_FUNC_ENTER;
     Cancel();
 	iTimer.Close();
     delete iWaitDialog;
+    _AKNTRACE_FUNC_EXIT;
     }
 
 EXPORT_C TBool CAknWaitNoteWrapper::ExecuteL
  (TInt aResId,MAknBackgroundProcess& aBackgroundProcess, 
     TBool aVisibilityDelayOff, const CAknNoteDialog::TTone& aTone)
     {
+    _AKNTRACE_FUNC_ENTER;
     iBackgroundProcess = &aBackgroundProcess;
     CreateDialogL(aVisibilityDelayOff,aTone);
     iWaitDialog->ExecuteLD(aResId);
+    _AKNTRACE_FUNC_EXIT;
     return NextCycleAndReturnL();
     }
 
@@ -68,25 +76,30 @@
  (TInt aResId,MAknBackgroundProcess& aBackgroundProcess, 
     const TDesC& aPrompt, TBool aVisibilityDelayOff, const CAknNoteDialog::TTone& aTone)
     {
+    _AKNTRACE_FUNC_ENTER;
     iBackgroundProcess = &aBackgroundProcess;
 	CreateDialogL(aVisibilityDelayOff,aTone);
     iWaitDialog->PrepareLC(aResId);
 	iWaitDialog->SetTextL(aPrompt);
     iWaitDialog->RunLD();
+    _AKNTRACE_FUNC_EXIT;
     return NextCycleAndReturnL();
     }
 
 void CAknWaitNoteWrapper::DoCancel()
     {
+    _AKNTRACE_FUNC_ENTER;
     if (IsActive())
         {
 		iTimer.Cancel();
         CAknEnv::StopSchedulerWaitWithBusyMessage(iWait);
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 void CAknWaitNoteWrapper::RunL()
     {
+    _AKNTRACE_FUNC_ENTER;
     if (iBackgroundProcess->IsProcessDone() || !iWaitDialog)
         {
         iBackgroundProcess->ProcessFinished();
@@ -104,6 +117,7 @@
         // Request next cycle
         NextCycle();
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 TInt CAknWaitNoteWrapper::RunError(TInt aError)
@@ -134,6 +148,7 @@
 
 TBool CAknWaitNoteWrapper::NextCycleAndReturnL()
 	{
+	_AKNTRACE_FUNC_ENTER;
     User::LeaveIfError(iTimer.CreateLocal());
 	iIsDialogCanceled = ETrue;
 
@@ -142,6 +157,8 @@
 	iTimer.Close();
 
     User::LeaveIfError(iRunError);
+    _AKNTRACE_FUNC_EXIT;
+
     return !iIsDialogCanceled;
 	}