--- a/analyzetool/commandlineengine/inc/CATModule2.h	Wed Sep 15 00:19:18 2010 +0300
+++ b/analyzetool/commandlineengine/inc/CATModule2.h	Wed Sep 15 13:53:27 2010 +0300
@@ -74,6 +74,7 @@
 	/**
 	* Create AT temporary cpp file for module.
 	* @param sS60FileName.
+	* @param sS60FileName.
 	* @param eLoggingMode.
 	* @param eBuildType.
 	* @param iAllocCallStackSize.
@@ -81,12 +82,19 @@
 	* @return true if successful.
 	*/
 	bool CreateTempCpp(const string& sS60FileName
+		, const string& sS60FilePath
 		, int eLoggingMode
 		, int eBuildType
 		, int iAllocCallStackSize
 		, int iFreeCallStackSize );
 
 	/**
+	* returns default data file name without extension in format processName.targetType
+	* @return string with default file name
+	*/
+	string GetDefaultFileName();
+
+	/**
 	* Add AT changes to modules mmp file.
 	* @return true if successful.
 	*/
@@ -287,6 +295,12 @@
 	string GetS60FileName() const;
 
 	/**
+	* Set S60 logging file name.
+	* @param aFileName s60 logging file name.
+	*/
+	void SetS60FileName( const string& aFileName );
+
+	/**
 	* Set target binary name.
 	* @param sTarget binary file name.
 	*/
@@ -514,6 +528,10 @@
 	vector<MAP_FUNC_INFO> m_vMapFileFuncList;
 	// File logging mode filename.
 	string m_sS60FileName;
+	// true if file name not empty and %processname% string replaced
+	bool m_bS60FileNameResolved;
+	// File logging mode file path.
+	string m_sS60FilePath;
 	// Is all data loaded for address to code line functions.
 	bool m_bAddressToLineInitialized;
 	// Read listing files (armv5 platform).