--- a/analyzetool/commandlineengine/inc/CATParseTraceFile.h	Wed Sep 15 00:19:18 2010 +0300
+++ b/analyzetool/commandlineengine/inc/CATParseTraceFile.h	Wed Sep 15 13:53:27 2010 +0300
@@ -42,13 +42,21 @@
 	* @param pFileName A trace file name
 	* @param pOutputFileName Pointer to output file name
 	*/
-	bool StartParse( const char* pFileName, const char* pOutputFileName );
+	bool StartParse( const char* pFileName, const char* pOutputFileName, const char* pCleanedTraceFile = NULL );
 
 	/**
 	* Get data saver
 	* @return CATDataSaver*
 	*/
-	CATDataSaver* GetDataSaver(void);	
+	CATDataSaver* GetDataSaver(void);
+	
+	/**
+	* Get time from timestamp in microseconds as string
+	* @param iTimeStamp Timestamp for current message
+	* @param iTimeSpan Timespan for current process
+	* @return string Acquired time in microseconds(as string)
+	*/
+	static string GetTimeFromTimeStamp( unsigned __int64 iTimeStamp, unsigned __int64 iTimeSpan );
 
 #ifndef MODULE_TEST
 private:
@@ -56,36 +64,4 @@
 	CATDataSaver m_DataSaver; /** Data saver */
 };
 
-/**
-* Represents data of a single subtest.
-*/
-class CSubTestData : public CATAllocs
-{
-public:
-	// Members
-
-	bool bRunning; /** Is sub test running */
-	vector<string> vData; /** data */
-	string sSubTestName; /** test name */
-	string sStartTime; /** start time */
-	string sEndTime; /** end time */
-	string sSubTestStartHandleCount; /** handle count at start */
-	string sSubTestEndHandleCount; /** handle count at end */
-};
-
-/**
-* Represents data of a single run.
-*/
-class CProcessData : public CATAllocs
-{
-public:
-	// Members
-
-	bool bProcessOnGoing; /** is process on going */
-	int iProcessID; /** process id (pid)*/
-	vector<string> vData; /** data */
-	vector<string> vHandleLeaks; /** handle leak(s) */
-	vector<CSubTestData> vSubTests; /** process sub test(s) */
-};
-
 #endif