--- a/analyzetool/commandlineengine/src/CATProject.cpp	Wed Sep 15 13:53:27 2010 +0300
+++ b/analyzetool/commandlineengine/src/CATProject.cpp	Wed Oct 13 16:17:58 2010 +0300
@@ -19,7 +19,6 @@
 #include "../inc/CATProject.h"
 #include "../inc/CATModule2.h"
 #include "../inc/CATParseTraceFile.h"
-#include "../inc/CATParseBinaryFile.h"
 #include "../inc/CATDatParser.h"
 
 //dbghelp.dll version function.
@@ -52,12 +51,10 @@
 	m_sDataFile = "";
 	m_sDataFileOutput = "";
 	m_sDataFileTemp = "";
-	m_sBinaryLogFileTemp = "";
 	m_sEpocRoot = "\\";
 	m_sMakeFile = "";
 	m_sPlatform = "";
 	m_sS60FileName = "";
-	m_sS60FilePath = "";
 	m_sTargetModule = "";
 	m_sVariant = "";
 
@@ -87,14 +84,6 @@
 		if ( FileExists( m_sDataFileTemp.c_str() ) )
 			FileDelete( m_sDataFileTemp, false );
 	}
-
-	// Temporary trace file
-	if ( !m_sBinaryLogFileTemp.empty() )
-	{
-		if ( FileExists( m_sBinaryLogFileTemp.c_str() ) )
-			FileDelete( m_sBinaryLogFileTemp, false );
-	}
-	
 }
 
 bool CATProject::SetArguments( ARGUMENTS& arguments )
@@ -191,14 +180,10 @@
 		bRet = false;
 	}
 
-	//Internal data file name.
+	//Internal data file.
 	if ( arguments.HOOK.bDataFileName )
 		SetS60FileName( arguments.HOOK.sDataFileName );
 
-	//Internal data file path.
-	if ( arguments.HOOK.bDataFilePath )
-		SetS60FilePath( arguments.HOOK.sDataFilePath );
-
 	//Build command.
 	if ( arguments.HOOK.sBuildCmd.empty() && ( 
 		GetMode() == CATProject::COMPILE ||
@@ -518,45 +503,15 @@
 {
 	LOG_FUNC_ENTRY("CATProject::RunAnalyze");
 
-	// Parse data file if it is not data file.
+	// Parse data file if it is trace.
 	if ( !IsDataFile( m_sDataFile ) )
 	{
 		m_sDataFileTemp.clear();
 		m_sDataFileTemp.append( m_sDataFile );
 		m_sDataFileTemp.append( ".atool" );
-
-		// make filename for file with cleaned timestamps
-		// <m_sDataFile>.cleaned in the same place as output file
-		string sTraceFileCleaned( GetPathOrFileName( false, m_sDataFileOutput ) );
-		sTraceFileCleaned.append( GetPathOrFileName( true, m_sDataFile ) );
-		sTraceFileCleaned.append( ".cleaned" );
-
-		//check if it is binary log file
-		if( IsBinaryLogFile( m_sDataFile ) )
-		{
-			// convert binary log file to ASCII trace format
-			m_sBinaryLogFileTemp.clear();
-		    m_sBinaryLogFileTemp.append( m_sDataFile );
-		    m_sBinaryLogFileTemp.append( ".totraces" );
-
-			cout << AT_MSG << "Parsing binary data file..." << endl;
-
-			CATParseBinaryFile Parser;
-			stringstream dataToParse;
-			if ( ! Parser.StartParse( m_sDataFile.c_str(), m_sBinaryLogFileTemp.c_str() ) )
-			{
-				return AT_RETURN_CODE::EMPTY_DATA_FILE;
-			}
-			m_sDataFile = m_sBinaryLogFileTemp;
-			
-		}
-		else
-		{
-			cout << AT_MSG << "Parsing trace file..." << endl;
-		}
-
+		cout << AT_MSG << "Parsing trace file..." << endl;
 		CATParseTraceFile Parser;
-		if ( ! Parser.StartParse( m_sDataFile.c_str(), m_sDataFileTemp.c_str(), sTraceFileCleaned.c_str() ) )
+		if ( ! Parser.StartParse( m_sDataFile.c_str(), m_sDataFileTemp.c_str() ) )
 		{
 			return AT_RETURN_CODE::EMPTY_DATA_FILE;
 		}
@@ -832,17 +787,14 @@
 			if ( m_eLoggingMode == CATProject::FILE 
 				&& m_vModules.at(i)->GetTargetType().compare("exe") == 0 )
 			{
-				cout << AT_BUILD_SUMMARY_DATA_FILE_NAME
+				if ( m_sS60FileName.empty() )
+					cout << AT_BUILD_SUMMARY_DATA_FILE_NAME
 						<< m_vModules.at(i)->GetS60FileName()
 						<< endl;
-
-				// if filePath not empty, use it for log file
-				if ( !m_sS60FilePath.empty() )
-				{
-					cout << AT_BUILD_SUMMARY_DATA_FILE_PATH
-					<< m_sS60FilePath
+				else
+					cout << AT_BUILD_SUMMARY_DATA_FILE_NAME
+					<< m_sS60FileName
 					<< endl;
-				}
 			}
 		}
 		else
@@ -1601,7 +1553,7 @@
 	for( size_t i = 0 ; i < m_vModules.size(); i++)
 	{
 		if( ! m_vModules.at(i)->CreateTempCpp(
-			m_sS60FileName, m_sS60FilePath, m_eLoggingMode, m_eBuildType, m_iAllocCallStackSize, m_iFreeCallStackSize ) )
+			m_sS60FileName, m_eLoggingMode, m_eBuildType, m_iAllocCallStackSize, m_iFreeCallStackSize ) )
 			bRet = false;
 	}
 	return bRet;
@@ -2003,7 +1955,6 @@
 		out << m_vTargetModules.at(i) << AT_PROJECT_ATTRIBUTES_SEPARATOR;
 	out << endl;
 	out << m_sBuildCommand << endl;
-	out << m_sS60FilePath << endl;
 	out.close();
 	return true;
 }
@@ -2059,7 +2010,6 @@
 		iSpot = sLine.find( AT_PROJECT_ATTRIBUTES_SEPARATOR );
 	}
 	in.getline( cLine, MAX_LINE_LENGTH ); m_sBuildCommand = cLine;
-	in.getline( cLine, MAX_LINE_LENGTH ); m_sS60FilePath = string( cLine );
 	in.close();
 	return true;
 }
@@ -2418,11 +2368,6 @@
 	LOG_FUNC_ENTRY("CATProject::SetS60FileName");
 	m_sS60FileName = sFileName;
 }
-void CATProject::SetS60FilePath( const string& sFilePath)
-{
-	LOG_FUNC_ENTRY("CATProject::SetS60FilePath");
-	m_sS60FilePath = sFilePath;
-}
 void CATProject::SetRomSymbolFiles(const vector<string>& vRomSymbolFiles)
 {
 	LOG_FUNC_ENTRY("CATProject::SetRomSymbolFiles");