diff -r c7c26511138f -r 360bd6b35136 imgtools/imgcheck/libimgutils/inc/dirreader.h
--- a/imgtools/imgcheck/libimgutils/inc/dirreader.h	Wed Jun 16 16:51:40 2010 +0300
+++ b/imgtools/imgcheck/libimgutils/inc/dirreader.h	Wed Jun 23 16:56:47 2010 +0800
@@ -1,57 +1,55 @@
-/*
-* 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 to read the directory
-* @internalComponent
-* @released
-*
-*/
-
-
-#ifndef DIRREADER_H
-#define DIRREADER_H
-
-#include "imagereader.h"
-
-const String KParentDir("..");
-const String KChildDir(".");
-
-/**
-Class Directory reader
-
-@internalComponent
-@released
-*/
-class DirReader : public ImageReader
-{
-private:
-	ExeVsE32ImageMap iExeVsE32ImageMap;
-
-public:
-	DirReader(char* aDirName);
-	~DirReader(void);
-	void ReadImage(void);
-	void ProcessImage(void);
-	void PrepareExeVsIdMap(void);
-	const ExeVsIdDataMap& GetExeVsIdMap() const;
-	ExeNamesVsDepListMap& GatherDependencies(void);
-	void PrepareExeDependencyList(E32Image* aE32Image, StringList& aExecutableList);
-	static EImageType EntryType(char* aStr);
-
-private:	
-	void ReadDir(String aPath);
-	bool IsExecutable(String aName);
-};
- 
-#endif //DIRREADER_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 to read the directory
+* @internalComponent
+* @released
+*
+*/
+
+
+#ifndef DIRREADER_H
+#define DIRREADER_H
+
+#include "imagereader.h"
+
+const string KParentDir("..");
+const string KChildDir(".");
+
+/**
+Class Directory reader
+
+@internalComponent
+@released
+*/
+class DirReader : public ImageReader
+{ 
+public:
+	DirReader(const char* aDirName);
+	~DirReader(void);
+	void ReadImage(void);
+	void ProcessImage(void);
+	void PrepareExeVsIdMap(void);
+	const ExeVsIdDataMap& GetExeVsIdMap() const;
+	ExeNamesVsDepListMap& GatherDependencies(void);
+	void PrepareExeDependencyList(E32Image* aE32Image, StringList& aExecutables);
+	static EImageType EntryType(string& aStr);
+
+private:	
+	void ReadDir(const string& aPath);
+	bool IsExecutable(const string& aName); 
+	ExeVsE32ImageMap iExeVsE32ImageMap;
+};
+ 
+#endif //DIRREADER_H