diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyutils/etel3rdpartyapi/ExampleApps/SuppleServices/CMainMenu.cpp
--- a/telephonyutils/etel3rdpartyapi/ExampleApps/SuppleServices/CMainMenu.cpp	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyutils/etel3rdpartyapi/ExampleApps/SuppleServices/CMainMenu.cpp	Thu May 06 15:10:38 2010 +0100
@@ -1,247 +1,247 @@
-// 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:
-//
-
-#include "CMainMenu.h"
-
-/**
-Factory constructor.
-
-@param  aConsole Console to which output is printed
-@return          Instance of CMainMenu class
-*/
-CMainMenu* CMainMenu::NewLC(CConsoleBase& aConsole)
-	{
-	CMainMenu* self = new(ELeave) CMainMenu(aConsole);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-/**
-Constructor, called by factory constructor CMainMenu::NewLC()
-
-@param aConsole Console to which output is printed
-*/
-CMainMenu::CMainMenu(CConsoleBase& aConsole)
-	: CBaseMenuAsync(aConsole)
-	{
-	// Empty method
-	}
-
-/**
-Second phase constructor.
-*/
-void CMainMenu::ConstructL()
-	{
-	CBaseMenuAsync::ConstructL();
-	iPhoneId = CPhoneId::NewL(this);
-	iCallForwarding = CCallForwardingStatus::NewL(this);
-	iCallWaiting = CCallWaitingStatus::NewL(this);
-	iCallBarring = CCallBarringStatus::NewL(this);
-	iFlightModeInfo = CFlightModeInfo::NewL(this);
-	iIdentityService = CIdentityServiceStatus::NewL(this);
-	}
-
-/**
-Destructor.
-Deletes owned objects.
-*/
-CMainMenu::~CMainMenu()
-	{
-	delete iTelephony;
-	delete iPhoneId;
-	delete iFlightModeInfo;
-	delete iCallForwarding;
-	delete iCallWaiting;
-	delete iCallBarring;
-	delete iIdentityService;
-	}
-
-/**
-Provides functionality for member objects to notify the Menu object (their
-owner) that they have completed their request.
-
-@param aDerivedType Type of class derived from CISVAPIBase
-*/
-void CMainMenu::ExecComplete(TTelISVExampleType aDerivedType)
-	{
-   if	(iState==ESetNotifier || aDerivedType == KFlightModeInfo)
-		{
-		switch(aDerivedType)
-			{
-		case KCallForwardingStatus:
-			iLastOperation = iCallForwarding;
-			break;
-		case KCallBarringStatus:
-			iLastOperation = iCallBarring;
-			break;
-		case KCallWaitingStatus:
-			iLastOperation = iCallWaiting;
-			break;
-		case KFlightModeInfo:
-			iLastOperation = iFlightModeInfo;
-			break;
-		case KIdentityServiceStatus:
-			iLastOperation = iIdentityService;
-			break;
-			}
-		TRAPD(errNotify, iLastOperation->RequestNotificationL());
-		if (errNotify != KErrNone)
-			{
-			iConsole->Printf(_L("Notification Request for TTelISVExampleType"));
-			iConsole->Printf(_L("%d left with error code "), aDerivedType);
-			iConsole->Printf(_L("%d\n"), errNotify);
-			return;
-			};
-			
-		// Check the type of iLastOperation to see what it has been cast to.
-		switch(iLastOperation->GetExampleType())
-			{
-		case KCallBarringStatus:
-			iState = ECallWaiting;
-			iLastOperation = iCallWaiting;
-			SetActive();
-			CompleteOwnRequest(KErrNone);
-			break;
-		case KCallWaitingStatus:
-			iState = ECallForwarding;
-			iLastOperation = iCallForwarding;
-			SetActive();
-			CompleteOwnRequest(KErrNone);
-			break;
-		case KCallForwardingStatus:
-			iState = EIdentityService;
-			iLastOperation = iIdentityService;
-			SetActive();
-			CompleteOwnRequest(KErrNone);
-			break;
-		case KIdentityServiceStatus:
-			iConsole->Printf(KMenuMsg);
-			GetInput();
-			break;
-		default:
-
-			break;
-			}
-		}
-	else if(aDerivedType == KPhoneId)
-		{
-		iLastOperation = iFlightModeInfo;
-		SetActive();
-		CompleteOwnRequest(KErrNone);
-		}
-	}
-
-/**
-Provides functionality for member objects to notify the Menu object (their 
-owner) that they have been notified of a change.
-
-@param aDerivedType Type of class derived from CISVAPIBase.
-*/
-void CMainMenu::ExecNotify(TTelISVExampleType aDerivedType)
-	{
-	switch(aDerivedType)
-		{
-	case KFlightModeInfo:
-		if (IsActive())
-			{
-			Cancel();
-			}
-		iState = ECallBarring;
-		iLastOperation = iCallBarring;
-		SetActive();
-		CompleteOwnRequest(KErrNone);
-		break;
-	case KCallForwardingStatus:
-		iState = ECallForwarding;
-		iLastOperation = iCallForwarding;
-		SetActive();
-		CompleteOwnRequest(KErrNone);
-		break;
-		}
-	}
-
-/**
-Handles key presses and CMainMenu states.
-*/
-void CMainMenu::RunL()
-	{
-	switch(iState)
-		{
-	case EStart:
-		iState = EGetFlightModeInfo;
-		iLastOperation = iPhoneId;
-		TRAPD(errPhone, iLastOperation->StartRequestL());
-		if (errPhone)
-			{
-			iConsole->Printf(_L("Request left with error code "));
-			iConsole->Printf(_L("%d\n"), errPhone);
-			return;
-			};
-		break;
-	case EEnd:
-		CActiveScheduler::Stop();
-		break;
-	case EGetFlightModeInfo:
-	case ECallWaiting:
-	case ECallForwarding:
-	case ECallBarring:
-	case EIdentityService:
-		iState = ESetNotifier;
-		TRAPD(err, iLastOperation->StartRequestL());
-		if (err != KErrNone)
-			{
-			iConsole->Printf(_L("Request left with error code "));
-			iConsole->Printf(_L("%d\n"), err);
-			return;
-			}
-		break;
-	case EWaitingForKeyPress:
-		{
-		TInt c = iConsole->KeyCode();
-		switch(c)
-			{
-		case 'E':
-		case 'e':
-		case EKeyEscape:
-		// cancel notifications
-			iFlightModeInfo->Cancel();
-			CActiveScheduler::Stop();
-			break;
-		default:
-			GetInput();
-			}
-		}
-		break;
-	default:
-		break;
-		}
-	}
-
-/**
-Cancels outstanding asynchronous request.
-*/
-void CMainMenu::DoCancel()
-	{
-	if(iState == EStart)
-		{
-		CompleteOwnRequest(KErrCancel);
-		}
-	else
-		{
-		iConsole->ReadCancel();
-		}
-	}
-
+// 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:
+//
+
+#include "CMainMenu.h"
+
+/**
+Factory constructor.
+
+@param  aConsole Console to which output is printed
+@return          Instance of CMainMenu class
+*/
+CMainMenu* CMainMenu::NewLC(CConsoleBase& aConsole)
+	{
+	CMainMenu* self = new(ELeave) CMainMenu(aConsole);
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	return self;
+	}
+
+/**
+Constructor, called by factory constructor CMainMenu::NewLC()
+
+@param aConsole Console to which output is printed
+*/
+CMainMenu::CMainMenu(CConsoleBase& aConsole)
+	: CBaseMenuAsync(aConsole)
+	{
+	// Empty method
+	}
+
+/**
+Second phase constructor.
+*/
+void CMainMenu::ConstructL()
+	{
+	CBaseMenuAsync::ConstructL();
+	iPhoneId = CPhoneId::NewL(this);
+	iCallForwarding = CCallForwardingStatus::NewL(this);
+	iCallWaiting = CCallWaitingStatus::NewL(this);
+	iCallBarring = CCallBarringStatus::NewL(this);
+	iFlightModeInfo = CFlightModeInfo::NewL(this);
+	iIdentityService = CIdentityServiceStatus::NewL(this);
+	}
+
+/**
+Destructor.
+Deletes owned objects.
+*/
+CMainMenu::~CMainMenu()
+	{
+	delete iTelephony;
+	delete iPhoneId;
+	delete iFlightModeInfo;
+	delete iCallForwarding;
+	delete iCallWaiting;
+	delete iCallBarring;
+	delete iIdentityService;
+	}
+
+/**
+Provides functionality for member objects to notify the Menu object (their
+owner) that they have completed their request.
+
+@param aDerivedType Type of class derived from CISVAPIBase
+*/
+void CMainMenu::ExecComplete(TTelISVExampleType aDerivedType)
+	{
+   if	(iState==ESetNotifier || aDerivedType == KFlightModeInfo)
+		{
+		switch(aDerivedType)
+			{
+		case KCallForwardingStatus:
+			iLastOperation = iCallForwarding;
+			break;
+		case KCallBarringStatus:
+			iLastOperation = iCallBarring;
+			break;
+		case KCallWaitingStatus:
+			iLastOperation = iCallWaiting;
+			break;
+		case KFlightModeInfo:
+			iLastOperation = iFlightModeInfo;
+			break;
+		case KIdentityServiceStatus:
+			iLastOperation = iIdentityService;
+			break;
+			}
+		TRAPD(errNotify, iLastOperation->RequestNotificationL());
+		if (errNotify != KErrNone)
+			{
+			iConsole->Printf(_L("Notification Request for TTelISVExampleType"));
+			iConsole->Printf(_L("%d left with error code "), aDerivedType);
+			iConsole->Printf(_L("%d\n"), errNotify);
+			return;
+			};
+			
+		// Check the type of iLastOperation to see what it has been cast to.
+		switch(iLastOperation->GetExampleType())
+			{
+		case KCallBarringStatus:
+			iState = ECallWaiting;
+			iLastOperation = iCallWaiting;
+			SetActive();
+			CompleteOwnRequest(KErrNone);
+			break;
+		case KCallWaitingStatus:
+			iState = ECallForwarding;
+			iLastOperation = iCallForwarding;
+			SetActive();
+			CompleteOwnRequest(KErrNone);
+			break;
+		case KCallForwardingStatus:
+			iState = EIdentityService;
+			iLastOperation = iIdentityService;
+			SetActive();
+			CompleteOwnRequest(KErrNone);
+			break;
+		case KIdentityServiceStatus:
+			iConsole->Printf(KMenuMsg);
+			GetInput();
+			break;
+		default:
+
+			break;
+			}
+		}
+	else if(aDerivedType == KPhoneId)
+		{
+		iLastOperation = iFlightModeInfo;
+		SetActive();
+		CompleteOwnRequest(KErrNone);
+		}
+	}
+
+/**
+Provides functionality for member objects to notify the Menu object (their 
+owner) that they have been notified of a change.
+
+@param aDerivedType Type of class derived from CISVAPIBase.
+*/
+void CMainMenu::ExecNotify(TTelISVExampleType aDerivedType)
+	{
+	switch(aDerivedType)
+		{
+	case KFlightModeInfo:
+		if (IsActive())
+			{
+			Cancel();
+			}
+		iState = ECallBarring;
+		iLastOperation = iCallBarring;
+		SetActive();
+		CompleteOwnRequest(KErrNone);
+		break;
+	case KCallForwardingStatus:
+		iState = ECallForwarding;
+		iLastOperation = iCallForwarding;
+		SetActive();
+		CompleteOwnRequest(KErrNone);
+		break;
+		}
+	}
+
+/**
+Handles key presses and CMainMenu states.
+*/
+void CMainMenu::RunL()
+	{
+	switch(iState)
+		{
+	case EStart:
+		iState = EGetFlightModeInfo;
+		iLastOperation = iPhoneId;
+		TRAPD(errPhone, iLastOperation->StartRequestL());
+		if (errPhone)
+			{
+			iConsole->Printf(_L("Request left with error code "));
+			iConsole->Printf(_L("%d\n"), errPhone);
+			return;
+			};
+		break;
+	case EEnd:
+		CActiveScheduler::Stop();
+		break;
+	case EGetFlightModeInfo:
+	case ECallWaiting:
+	case ECallForwarding:
+	case ECallBarring:
+	case EIdentityService:
+		iState = ESetNotifier;
+		TRAPD(err, iLastOperation->StartRequestL());
+		if (err != KErrNone)
+			{
+			iConsole->Printf(_L("Request left with error code "));
+			iConsole->Printf(_L("%d\n"), err);
+			return;
+			}
+		break;
+	case EWaitingForKeyPress:
+		{
+		TInt c = iConsole->KeyCode();
+		switch(c)
+			{
+		case 'E':
+		case 'e':
+		case EKeyEscape:
+		// cancel notifications
+			iFlightModeInfo->Cancel();
+			CActiveScheduler::Stop();
+			break;
+		default:
+			GetInput();
+			}
+		}
+		break;
+	default:
+		break;
+		}
+	}
+
+/**
+Cancels outstanding asynchronous request.
+*/
+void CMainMenu::DoCancel()
+	{
+	if(iState == EStart)
+		{
+		CompleteOwnRequest(KErrCancel);
+		}
+	else
+		{
+		iConsole->ReadCancel();
+		}
+	}
+