--- a/analyzetool/dynamicmemoryhook/inc/analyzetooleventhandler.h	Wed Sep 15 13:53:27 2010 +0300
+++ b/analyzetool/dynamicmemoryhook/inc/analyzetooleventhandler.h	Wed Oct 13 16:17:58 2010 +0300
@@ -21,10 +21,9 @@
 
 // INCLUDES
 #include <e32cmn.h>
-#include <e32base.h>
 #include "codeblock.h"
+#include <analyzetool/atstorageserverclnt.h>
 #include <analyzetool/analyzetool.h>
-#include "analyzetoolfilelog.h"
 
 // FORWARD DECLARATIONS
 class MAnalyzeToolEventhandlerNotifier;
@@ -44,6 +43,9 @@
         * @param aAnalyzeTool A reference to the <code>RAnalyzeTool</code> 
                  which is used to observe kernel events 
         * @param aCodeblocks A reference to array of code segments
+        * @param aStorageServer A reference to the 
+        *                       <code>RATStorageServer</code> which is 
+        *                       used to store kernel events
         * @param aProcessId A reference to the observed process id
         * @param aMutex A reference to mutex to schedule access to the 
         *                   shared resources
@@ -52,12 +54,12 @@
         * @param aLogOption Current used log option on allocator.
         */
         CLibraryEventHandler( RAnalyzeTool& aAnalyzeTool, 
-                RArray<TCodeblock>& aCodeblocks,
+                RArray<TCodeblock>& aCodeblocks, 
+                RATStorageServer& aStorageServer, 
                 TUint aProcessId,
                 RMutex& aMutex,
                 MAnalyzeToolEventhandlerNotifier& aNotifier,
-                TUint32 aLogOption,
-                RATFileLog& iLogFile );
+                TUint32 aLogOption );
 
         /**
         * Destructor.
@@ -93,6 +95,9 @@
         /* A reference to codeblocks of the observed process */
         RArray<TCodeblock>& iCodeblocks;
 
+        /* Handle to the storage server*/
+        RATStorageServer& iStorageServer;
+
         /* The observered process id */ 
         TUint iProcessId;
 
@@ -110,10 +115,6 @@
 
         /* Current used log option */
         TUint32 iLogOption;
-        
-        // TODO comment
-		/* */
-		RATFileLog& iLogFile;
     };
 
 #endif // ANALYZETOOLEVENTHANDLER_H