diff -r c7c26511138f -r 360bd6b35136 imgtools/imglib/patchdataprocessor/include/patchdataprocessor.h
--- a/imgtools/imglib/patchdataprocessor/include/patchdataprocessor.h	Wed Jun 16 16:51:40 2010 +0300
+++ b/imgtools/imglib/patchdataprocessor/include/patchdataprocessor.h	Wed Jun 23 16:56:47 2010 +0800
@@ -1,98 +1,90 @@
-/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Class for Patching Exported Data 
-* @internalComponents
-* @released
-*
-*/
-
-
-#ifndef PATCHDATAPROCESSOR_H
-#define PATCHDATAPROCESSOR_H
-
-#ifdef _MSC_VER
-	#pragma warning(disable: 4786) // identifier was truncated to '255' characters in the debug information
-#endif
-
-#include <e32def.h>
-
-#ifdef _L
-#undef _L
-#endif
-
-#include <iostream>
-#include <vector>
-#include <map>
-#include <sstream>
-
-typedef std::string String;
-typedef std::vector<String> StringVector;
-typedef std::vector<StringVector> VectorOfStringVector;
-typedef std::map<String,String> MapOfString;
-typedef std::map<String,String>::iterator MapOfStringIterator;
-typedef std::ostringstream OutputStringStream; 
-
-/**
-Class for patching exported data.
-
-@internalComponent
-@released
-*/
-class CPatchDataProcessor
-{
-	VectorOfStringVector iPatchDataStatements; // Vector of string containing patchdata statements.
-	MapOfString iRenamedFileMap; // Map containing information of renamed files. 
-
-public:	
-	void AddPatchDataStatement(StringVector aPatchDataStatement);
-	void AddToRenamedFileMap(String aCurrentName, String aNewName);
-	VectorOfStringVector GetPatchDataStatements() const;
-	MapOfString GetRenamedFileMap() const;		
-};
-
-
-class TRomNode;
-
-/**
-Class to form a patchdata linked-list contatining symbol size, address/ordinal 
-new value to be patched.
-
-@internalComponent
-@released
-*/
-class DllDataEntry
-{
-	
-public:
-	DllDataEntry(TUint32 aSize, TUint32 aNewValue) :
-				 iSize(aSize), iDataAddress((TUint32)-1), iOrdinal((TUint32)-1), iOffset(0),
-				 iNewValue(aNewValue), iRomNode(NULL), iNextDllEntry(NULL)
-	{
-	}
-
-
-	TUint32			iSize;
-	TLinAddr		iDataAddress;
-	TUint32			iOrdinal;
-	TUint32			iOffset;
-	TUint32			iNewValue;
-	TRomNode*		iRomNode;
-	DllDataEntry*	iNextDllEntry;
- 
- 	void			AddDllDataEntry(DllDataEntry*);
-	DllDataEntry*	NextDllDataEntry() const;
-};
-
-#endif //PATCHDATAPROCESSOR_H
+/*
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+* Class for Patching Exported Data 
+* @internalComponents
+* @released
+*
+*/
+
+
+#ifndef PATCHDATAPROCESSOR_H
+#define PATCHDATAPROCESSOR_H
+
+#include <e32def.h>
+#include <string> 
+#include <iostream>
+#include <vector>
+#include <map>
+#include <sstream>
+
+
+using namespace std;
+typedef vector<string> StringVector;
+typedef vector<StringVector> VectorOfStringVector;
+typedef map<string,string> MapOfString;
+typedef map<string,string>::iterator MapOfStringIterator; 
+
+/**
+Class for patching exported data.
+
+@internalComponent
+@released
+*/
+class CPatchDataProcessor
+{
+	VectorOfStringVector iPatchDataStatements; // Vector of string containing patchdata statements.
+	MapOfString iRenamedFileMap; // Map containing information of renamed files. 
+
+public:	
+	void AddPatchDataStatement(StringVector aPatchDataStatement);
+	void AddToRenamedFileMap(string aCurrentName, string aNewName);
+	VectorOfStringVector GetPatchDataStatements() const;
+	MapOfString GetRenamedFileMap() const;		
+};
+
+
+class TRomNode;
+
+/**
+Class to form a patchdata linked-list contatining symbol size, address/ordinal 
+new value to be patched.
+
+@internalComponent
+@released
+*/
+class DllDataEntry
+{
+	
+public:
+	DllDataEntry(TUint32 aSize, TUint32 aNewValue) :
+				 iSize(aSize), iDataAddress((TUint32)-1), iOrdinal((TUint32)-1), iOffset(0),
+				 iNewValue(aNewValue), iRomNode(NULL), iNextDllEntry(NULL)
+	{
+	}
+
+
+	TUint32			iSize;
+	TLinAddr		iDataAddress;
+	TUint32			iOrdinal;
+	TUint32			iOffset;
+	TUint32			iNewValue;
+	TRomNode*		iRomNode;
+	DllDataEntry*	iNextDllEntry;
+ 
+ 	void			AddDllDataEntry(DllDataEntry*);
+	DllDataEntry*	NextDllDataEntry() const;
+};
+
+#endif //PATCHDATAPROCESSOR_H