diff -r 6b1d113cdff3 -r 6638e7f4bd8f smsprotocols/smsstack/gsmu/src/gsmuset.cpp
--- a/smsprotocols/smsstack/gsmu/src/gsmuset.cpp	Mon May 03 13:37:20 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmuset.cpp	Thu May 06 15:10:38 2010 +0100
@@ -1,90 +1,90 @@
-// Copyright (c) 1999-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:
-//
-
-#include "gsmuset.h"
-#include "smsstacklog.h"
-
-
-/**
- *  Constructor - initialises iAlphabet and iFlags
- *  
- *  @capability None
- */
-EXPORT_C TSmsUserDataSettings::TSmsUserDataSettings():
-	iAlphabet(TSmsDataCodingScheme::ESmsAlphabet7Bit),
-	iFlags(0)
-	{
-	// NOP
-	} // TSmsDataCodingScheme::ESmsAlphabet7Bit
-
-
-/**
- *  Tests if User Data is concatenated using a 16 bit reference.
- *  
- *  @param aIs16Bit Set to true if concatenated using a 16 bit reference
- *  @return True if concatenated set as on
- *  @capability None
- */
-EXPORT_C TBool TSmsUserDataSettings::TextConcatenated(TBool* aIs16Bit) const
-	{
-	LOGGSMU1("TSmsUserDataSettings::TextConcatenated()");
-
-	if (aIs16Bit!=NULL)
-		*aIs16Bit=iFlags&ESmsFlagConcatenatedUsing16BitReference;
-	return iFlags&ESmsFlagConcatenated;
-	} // TSmsUserDataSettings::TextConcatenated
-
-
-/**
- *  Sets concatenation on/off.
- *  
- *  @param aConcatenated True to set concatenation on
- *  @param aIs16Bit Set to true to set 16 bit concatenation reference (default
- *  8 bit)
- *  @capability None
- */
-EXPORT_C void TSmsUserDataSettings::SetTextConcatenated(TBool aConcatenated,TBool aIs16Bit)
-	{
-	LOGGSMU1("TSmsUserDataSettings::SetTextConcatenated()");
-
-	iFlags=aIs16Bit? iFlags|ESmsFlagConcatenatedUsing16BitReference: iFlags&(~ESmsFlagConcatenatedUsing16BitReference);
-	iFlags=aConcatenated? iFlags|ESmsFlagConcatenated: iFlags&(~ESmsFlagConcatenated);
-	} // TSmsUserDataSettings::SetTextConcatenated
-
-
-/**
- *  Internalises the object.
- *  
- *  @param aStream Stream to read from
- *  @capability None
- */
-EXPORT_C void TSmsUserDataSettings::InternalizeL(RReadStream& aStream)
-	{
-	iAlphabet=(TSmsDataCodingScheme::TSmsAlphabet) aStream.ReadUint8L();
-	iFlags=aStream.ReadUint32L();
-	} // TSmsUserDataSettings::InternalizeL
-
-
-/**
- *  Externalises the object.
- *  
- *  @param aStream Stream to write to
- *  @capability None
- */
-EXPORT_C void TSmsUserDataSettings::ExternalizeL(RWriteStream& aStream) const
-	{
-	aStream.WriteUint8L((TUint8) iAlphabet);
-	aStream.WriteUint32L(iFlags);
-	} // TSmsUserDataSettings::ExternalizeL
+// Copyright (c) 1999-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:
+//
+
+#include "gsmuset.h"
+#include "smsstacklog.h"
+
+
+/**
+ *  Constructor - initialises iAlphabet and iFlags
+ *  
+ *  @capability None
+ */
+EXPORT_C TSmsUserDataSettings::TSmsUserDataSettings():
+	iAlphabet(TSmsDataCodingScheme::ESmsAlphabet7Bit),
+	iFlags(0)
+	{
+	// NOP
+	} // TSmsDataCodingScheme::ESmsAlphabet7Bit
+
+
+/**
+ *  Tests if User Data is concatenated using a 16 bit reference.
+ *  
+ *  @param aIs16Bit Set to true if concatenated using a 16 bit reference
+ *  @return True if concatenated set as on
+ *  @capability None
+ */
+EXPORT_C TBool TSmsUserDataSettings::TextConcatenated(TBool* aIs16Bit) const
+	{
+	LOGGSMU1("TSmsUserDataSettings::TextConcatenated()");
+
+	if (aIs16Bit!=NULL)
+		*aIs16Bit=iFlags&ESmsFlagConcatenatedUsing16BitReference;
+	return iFlags&ESmsFlagConcatenated;
+	} // TSmsUserDataSettings::TextConcatenated
+
+
+/**
+ *  Sets concatenation on/off.
+ *  
+ *  @param aConcatenated True to set concatenation on
+ *  @param aIs16Bit Set to true to set 16 bit concatenation reference (default
+ *  8 bit)
+ *  @capability None
+ */
+EXPORT_C void TSmsUserDataSettings::SetTextConcatenated(TBool aConcatenated,TBool aIs16Bit)
+	{
+	LOGGSMU1("TSmsUserDataSettings::SetTextConcatenated()");
+
+	iFlags=aIs16Bit? iFlags|ESmsFlagConcatenatedUsing16BitReference: iFlags&(~ESmsFlagConcatenatedUsing16BitReference);
+	iFlags=aConcatenated? iFlags|ESmsFlagConcatenated: iFlags&(~ESmsFlagConcatenated);
+	} // TSmsUserDataSettings::SetTextConcatenated
+
+
+/**
+ *  Internalises the object.
+ *  
+ *  @param aStream Stream to read from
+ *  @capability None
+ */
+EXPORT_C void TSmsUserDataSettings::InternalizeL(RReadStream& aStream)
+	{
+	iAlphabet=(TSmsDataCodingScheme::TSmsAlphabet) aStream.ReadUint8L();
+	iFlags=aStream.ReadUint32L();
+	} // TSmsUserDataSettings::InternalizeL
+
+
+/**
+ *  Externalises the object.
+ *  
+ *  @param aStream Stream to write to
+ *  @capability None
+ */
+EXPORT_C void TSmsUserDataSettings::ExternalizeL(RWriteStream& aStream) const
+	{
+	aStream.WriteUint8L((TUint8) iAlphabet);
+	aStream.WriteUint32L(iFlags);
+	} // TSmsUserDataSettings::ExternalizeL