diff -r 6b1d113cdff3 -r 6638e7f4bd8f cellularsrvapitest/telephonyhaitest/common/inc/DataWrapperBase.h
--- a/cellularsrvapitest/telephonyhaitest/common/inc/DataWrapperBase.h	Mon May 03 13:37:20 2010 +0300
+++ b/cellularsrvapitest/telephonyhaitest/common/inc/DataWrapperBase.h	Thu May 06 15:10:38 2010 +0100
@@ -1,96 +1,96 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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:
-*
-*/
-
-
-#ifndef DATA_WRAPPER_BASE_H
-#define DATA_WRAPPER_BASE_H
-
-//	EPOC includes
-#include <datawrapper.h>
-#define SECS_TO_MS(x)  (x*1000000)
-
-_LIT(KConsname,				"Test Console");
-
-#define	GETFROMCONFIGOPTIONAL(aType, aSectName, aKeyName, aResult, aLogMessage)	\
-		if ( !Get##aType##FromConfig(aSectName, aKeyName, aResult) )	\
-			{															\
-			WARN_PRINTF3(aLogMessage, &aKeyName, aResult);				\
-			}
-
-#define	GETFROMCONFIGMANDATORY(aType, aSectName, aKeyName, aResult, aLogMessage, aDataOk)	\
-		if ( !Get##aType##FromConfig(aSectName, aKeyName, aResult) )	\
-			{															\
-			ERR_PRINTF2(aLogMessage, &aKeyName);						\
-			SetBlockResult(EFail);										\
-			aDataOk=EFalse;												\
-			}
-
-#define	GETSTRINGFROMCONFIGOPTIONAL(aSectName, aKeyName, aResult, aLogMessage)	\
-		if ( !GetStringFromConfig(aSectName, aKeyName, aResult) )		\
-			{															\
-			WARN_PRINTF3(aLogMessage, &aKeyName, &aResult);				\
-			}
-
-#define	GETSTRINGFROMCONFIGMANDATORY(aSectName, aKeyName, aResult, aLogMessage, aDataOk)	\
-		if ( !GetStringFromConfig(aSectName, aKeyName, aResult) )		\
-			{															\
-			ERR_PRINTF2(aLogMessage, &aKeyName);						\
-			SetBlockResult(EFail);										\
-			aDataOk=EFalse;												\
-			}
-
-class CDataWrapperBase : public CDataWrapper
-	{
-public:
-	class TEnumEntryTable
-		{
-	public:
-		const TDesC&	iString;
-		TInt			iValue;
-		};
-
-public:
-	TBool					GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult);
-	TBool					GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
-	TBool					GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
-	TBool					GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
-	TBool					GetUintFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TUint& aResult);
-	TBool					GetArrayRectFromConfig(const TDesC& aSectName, const TDesC& aKeyName, RPointerArray<HBufC>& aResult);
-	TBool 					KeyPress();
-	void 					Timedelay(TInt aTimeoutInSecs);
-	virtual void			InitialiseL();
-	inline RFs&				FileServer() { return iFs; }
-	inline CConsoleBase*	GetConsole() { return(Console::NewL(KConsname,TSize(KConsFullScreen,KConsFullScreen)));}
-	TBool					GetEnumFromConfig(const TDesC& aSectName, const TDesC& aKeyName, const TEnumEntryTable* aTable, TInt& aResult);
-
-protected:
-	CDataWrapperBase();
-	virtual ~CDataWrapperBase();
-
-private:
-	TBool	GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
-	TBool 	KeyCheck();
-
-private:
-	// Included ini files
-	RPointerArray<CIniData>	iInclude;
-	RPointerArray<HBufC>	iBuffer;
-	RFs                     iFs;
-	RTimer					iTimer;
-	};
-
-#endif // DATA_WRAPPER_BASE_H
+/*
+* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "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:
+*
+*/
+
+
+#ifndef DATA_WRAPPER_BASE_H
+#define DATA_WRAPPER_BASE_H
+
+//	EPOC includes
+#include <datawrapper.h>
+#define SECS_TO_MS(x)  (x*1000000)
+
+_LIT(KConsname,				"Test Console");
+
+#define	GETFROMCONFIGOPTIONAL(aType, aSectName, aKeyName, aResult, aLogMessage)	\
+		if ( !Get##aType##FromConfig(aSectName, aKeyName, aResult) )	\
+			{															\
+			WARN_PRINTF3(aLogMessage, &aKeyName, aResult);				\
+			}
+
+#define	GETFROMCONFIGMANDATORY(aType, aSectName, aKeyName, aResult, aLogMessage, aDataOk)	\
+		if ( !Get##aType##FromConfig(aSectName, aKeyName, aResult) )	\
+			{															\
+			ERR_PRINTF2(aLogMessage, &aKeyName);						\
+			SetBlockResult(EFail);										\
+			aDataOk=EFalse;												\
+			}
+
+#define	GETSTRINGFROMCONFIGOPTIONAL(aSectName, aKeyName, aResult, aLogMessage)	\
+		if ( !GetStringFromConfig(aSectName, aKeyName, aResult) )		\
+			{															\
+			WARN_PRINTF3(aLogMessage, &aKeyName, &aResult);				\
+			}
+
+#define	GETSTRINGFROMCONFIGMANDATORY(aSectName, aKeyName, aResult, aLogMessage, aDataOk)	\
+		if ( !GetStringFromConfig(aSectName, aKeyName, aResult) )		\
+			{															\
+			ERR_PRINTF2(aLogMessage, &aKeyName);						\
+			SetBlockResult(EFail);										\
+			aDataOk=EFalse;												\
+			}
+
+class CDataWrapperBase : public CDataWrapper
+	{
+public:
+	class TEnumEntryTable
+		{
+	public:
+		const TDesC&	iString;
+		TInt			iValue;
+		};
+
+public:
+	TBool					GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult);
+	TBool					GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
+	TBool					GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
+	TBool					GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
+	TBool					GetUintFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TUint& aResult);
+	TBool					GetArrayRectFromConfig(const TDesC& aSectName, const TDesC& aKeyName, RPointerArray<HBufC>& aResult);
+	TBool 					KeyPress();
+	void 					Timedelay(TInt aTimeoutInSecs);
+	virtual void			InitialiseL();
+	inline RFs&				FileServer() { return iFs; }
+	inline CConsoleBase*	GetConsole() { return(Console::NewL(KConsname,TSize(KConsFullScreen,KConsFullScreen)));}
+	TBool					GetEnumFromConfig(const TDesC& aSectName, const TDesC& aKeyName, const TEnumEntryTable* aTable, TInt& aResult);
+
+protected:
+	CDataWrapperBase();
+	virtual ~CDataWrapperBase();
+
+private:
+	TBool	GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
+	TBool 	KeyCheck();
+
+private:
+	// Included ini files
+	RPointerArray<CIniData>	iInclude;
+	RPointerArray<HBufC>	iBuffer;
+	RFs                     iFs;
+	RTimer					iTimer;
+	};
+
+#endif // DATA_WRAPPER_BASE_H