diff -r c7c26511138f -r 360bd6b35136 imgtools/imgcheck/libimgutils/inc/imagereader.h
--- a/imgtools/imgcheck/libimgutils/inc/imagereader.h	Wed Jun 16 16:51:40 2010 +0300
+++ b/imgtools/imgcheck/libimgutils/inc/imagereader.h	Wed Jun 23 16:56:47 2010 +0800
@@ -1,63 +1,63 @@
-/*
-* Copyright (c) 2007-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: 
-* @internalComponent
-* @released
-*
-*/
-
-
-#ifndef IMAGEREADER_H
-#define IMAGEREADER_H
-
-#include "typedefs.h"
-
-class TRomNode;
-
-/**
-Base class to read and process the image(ROFS/ROM/E32)
-
-@internalComponent
-@released
-*/
-class ImageReader
-{
-protected:
-	String	iImgFileName;
-	Ifstream iInputStream;
-	StringList iExecutableList;
-	StringList iHiddenExeList;
-	unsigned int iImageSize;
-    ExeVsIdDataMap iExeVsIdData;
-	ExeNamesVsDepListMap iImageVsDepList;
-	bool iExeAvailable;
-
-public:
-	ImageReader(const char* aFile);
-	virtual ~ImageReader(void);
-	virtual void ReadImage(void) = 0;
-	virtual void ProcessImage(void) = 0;
-	virtual void PrepareExecutableList(void);
-	virtual ExeNamesVsDepListMap& GatherDependencies(void) = 0;
-    virtual void PrepareExeVsIdMap(void) = 0;
-    virtual const ExeVsIdDataMap& GetExeVsIdMap(void) const = 0;
-    
-	const StringList& GetExecutableList(void) const;
-	const StringList& GetHiddenExeList(void) const;
-	String& ImageName(void);
-	static EImageType ReadImageType(const String aImageName);
-	bool ExecutableAvailable(void);
-};
-
-#endif //IMAGEREADER_H
+/*
+* Copyright (c) 2007-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: 
+* @internalComponent
+* @released
+*
+*/
+
+
+#ifndef IMAGEREADER_H
+#define IMAGEREADER_H
+
+#include "typedefs.h"
+
+class TRomNode;
+
+/**
+Base class to read and process the image(ROFS/ROM/E32)
+
+@internalComponent
+@released
+*/
+class ImageReader
+{
+protected:
+	string	iImgFileName;
+	ifstream iInputStream;
+	StringList iExecutableList;
+	StringList iHiddenExeList;
+	unsigned int iImageSize;
+    ExeVsIdDataMap iExeVsIdData;
+	ExeNamesVsDepListMap iImageVsDepList;
+	bool iExeAvailable;
+
+public:
+	ImageReader(const char* aFile);
+	virtual ~ImageReader(void);
+	virtual void ReadImage(void) = 0;
+	virtual void ProcessImage(void) = 0;
+	virtual void PrepareExecutableList(void);
+	virtual ExeNamesVsDepListMap& GatherDependencies(void) = 0;
+    virtual void PrepareExeVsIdMap(void) = 0;
+    virtual const ExeVsIdDataMap& GetExeVsIdMap(void) const = 0;
+    
+	const StringList& GetExecutableList(void) const;
+	const StringList& GetHiddenExeList(void) const;
+	const char* ImageName(void) const ;
+	static EImageType ReadImageType(const string aImageName);
+	bool ExecutableAvailable(void);
+};
+
+#endif //IMAGEREADER_H