diff -r e26895079d7c -r 7fdc9a71d314 analyzetool/commandlineengine/inc/CATBase.h
--- a/analyzetool/commandlineengine/inc/CATBase.h	Wed Sep 15 00:19:18 2010 +0300
+++ b/analyzetool/commandlineengine/inc/CATBase.h	Wed Sep 15 13:53:27 2010 +0300
@@ -170,6 +170,13 @@
 	static string RemovePathAndExt( string sFileName, bool bReverseFindExt = false );
 
 	/**
+	* Returns time  stamp in microseconds parsed from start of trace message
+	* @param sLineStart
+	* @return int
+	*/
+	unsigned __int64 ParseTimeStamp( string sLineStart );
+
+	/**
 	* Check if given file exists.
 	* @param pFilename Pointer to file name.
 	* @return False If file does not exists.
@@ -283,6 +290,16 @@
 	static string GetStringUntilNextSpace( string& sInput, bool bEraseFromInput = true );
 
 	/**
+	* Function returns string from begin of given string until next atool's main id <AT>,
+	* characters until next space are removed from sInput string.
+	*
+	* @param sInput Line which contains main id.
+	* @param bEraseFromInput If true characters before main id will be removed.
+	* @return string String until main id.
+	*/
+	static string GetStringUntilMainId( string& sInput, bool bEraseFromInput = true );
+
+	/**
 	* Convert unix path to windows
 	* @param sPath
 	*/
@@ -293,6 +310,7 @@
 	* @param sId unique id to add in file name
 	* @param sPath where to create
 	* @param sS60FileName of the logging file
+	* @param sS60FilePath of the logging file
 	* @param iLogOption logging mode
 	* @param iIsDebug build type
 	* @param iAllocCallStackSize
@@ -302,6 +320,7 @@
 	static bool CreateTemporaryCpp( const string& sId
 								 ,const string& sPath
 								 ,const string& sS60FileName
+								 ,const string& sS60FilePath
 								 ,int iLogOption
 								 ,int iIsDebug
 								 ,int iAllocCallStackSize
@@ -345,6 +364,13 @@
 	static bool IsDataFile( string sFile );
 
 	/**
+	* checks given file is it binary log file
+	* @param sFile
+	* @return true if it is binary logfile
+	*/
+	static bool IsBinaryLogFile( string sFile );
+
+	/**
 	* Parses a path string containing ".." to a valid
 	* path without relations. If given string does
 	* not contain relations it will not be changed