diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyutils/telephonywatchers/bwins/TELWATCHERBASEU.DEF
--- a/telephonyutils/telephonywatchers/bwins/TELWATCHERBASEU.DEF	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyutils/telephonywatchers/bwins/TELWATCHERBASEU.DEF	Thu May 06 15:10:38 2010 +0100
@@ -1,25 +1,25 @@
-EXPORTS
-	??0CPhoneWatcher@@IAE@H@Z @ 1 NONAME ; CPhoneWatcher::CPhoneWatcher(int)
-	??0CWatcherBase@@IAE@H@Z @ 2 NONAME ; CWatcherBase::CWatcherBase(int)
-	??1CPhoneWatcher@@UAE@XZ @ 3 NONAME ; CPhoneWatcher::~CPhoneWatcher(void)
-	??1CWatcherBase@@UAE@XZ @ 4 NONAME ; CWatcherBase::~CWatcherBase(void)
-	?ConstructL@CPhoneWatcher@@MAEXXZ @ 5 NONAME ; void CPhoneWatcher::ConstructL(void)
-	?ConstructL@CWatcherBase@@MAEXXZ @ 6 NONAME ; void CWatcherBase::ConstructL(void)
-	?RequestNextState@CWatcherBase@@IAEXXZ @ 7 NONAME ; void CWatcherBase::RequestNextState(void)
-	?SetDisabled@CWatcherBase@@IAEXABVTDesC16@@H@Z @ 8 NONAME ; void CWatcherBase::SetDisabled(class TDesC16 const &, int)
-	?SuspendFor@CWatcherBase@@IAEXH@Z @ 9 NONAME ; void CWatcherBase::SuspendFor(int)
-	?DoCancel@CWatcherBase@@EAEXXZ @ 10 NONAME ; void CWatcherBase::DoCancel(void)
-	?HandleStateEventL@CPhoneWatcher@@MAEXH@Z @ 11 NONAME ; void CPhoneWatcher::HandleStateEventL(int)
-	?RunL@CWatcherBase@@EAEXXZ @ 12 NONAME ; void CWatcherBase::RunL(void)
-	?RunError@CWatcherBase@@EAEHH@Z @ 13 NONAME ; int CWatcherBase::RunError(int)
-	?WaitForPhoneToPowerUpL@CWatcherBase@@IAEXXZ @ 14 NONAME ; void CWatcherBase::WaitForPhoneToPowerUpL(void)
-	?Reset@CPhoneWatcher@@MAEXXZ @ 15 NONAME ; void CPhoneWatcher::Reset(void)
-	?PhoneIsOff@CPhoneWatcher@@MAEXXZ @ 16 NONAME ; void CPhoneWatcher::PhoneIsOff(void)
-	?PhoneIsOff@MPhoneOnOffObserver@@UAEXXZ @ 17 NONAME ; void MPhoneOnOffObserver::PhoneIsOff(void)
-	?PhoneIsOn@MPhoneOnOffObserver@@UAEXXZ @ 18 NONAME ; void MPhoneOnOffObserver::PhoneIsOn(void)
-	??0CModemChangeObserver@@QAE@AAVMModemChangeObserver@@@Z @ 19 NONAME ; CModemChangeObserver::CModemChangeObserver(class MModemChangeObserver &)
-	??1CModemChangeObserver@@UAE@XZ @ 20 NONAME ; CModemChangeObserver::~CModemChangeObserver(void)
-	?ConstructL@CModemChangeObserver@@QAEXXZ @ 21 NONAME ; void CModemChangeObserver::ConstructL(void)
-	?HandleModemChangedL@CPhoneWatcher@@EAEXXZ @ 22 NONAME ; void CPhoneWatcher::HandleModemChangedL(void)
-
-
+EXPORTS
+	??0CPhoneWatcher@@IAE@H@Z @ 1 NONAME ; CPhoneWatcher::CPhoneWatcher(int)
+	??0CWatcherBase@@IAE@H@Z @ 2 NONAME ; CWatcherBase::CWatcherBase(int)
+	??1CPhoneWatcher@@UAE@XZ @ 3 NONAME ; CPhoneWatcher::~CPhoneWatcher(void)
+	??1CWatcherBase@@UAE@XZ @ 4 NONAME ; CWatcherBase::~CWatcherBase(void)
+	?ConstructL@CPhoneWatcher@@MAEXXZ @ 5 NONAME ; void CPhoneWatcher::ConstructL(void)
+	?ConstructL@CWatcherBase@@MAEXXZ @ 6 NONAME ; void CWatcherBase::ConstructL(void)
+	?RequestNextState@CWatcherBase@@IAEXXZ @ 7 NONAME ; void CWatcherBase::RequestNextState(void)
+	?SetDisabled@CWatcherBase@@IAEXABVTDesC16@@H@Z @ 8 NONAME ; void CWatcherBase::SetDisabled(class TDesC16 const &, int)
+	?SuspendFor@CWatcherBase@@IAEXH@Z @ 9 NONAME ; void CWatcherBase::SuspendFor(int)
+	?DoCancel@CWatcherBase@@EAEXXZ @ 10 NONAME ; void CWatcherBase::DoCancel(void)
+	?HandleStateEventL@CPhoneWatcher@@MAEXH@Z @ 11 NONAME ; void CPhoneWatcher::HandleStateEventL(int)
+	?RunL@CWatcherBase@@EAEXXZ @ 12 NONAME ; void CWatcherBase::RunL(void)
+	?RunError@CWatcherBase@@EAEHH@Z @ 13 NONAME ; int CWatcherBase::RunError(int)
+	?WaitForPhoneToPowerUpL@CWatcherBase@@IAEXXZ @ 14 NONAME ; void CWatcherBase::WaitForPhoneToPowerUpL(void)
+	?Reset@CPhoneWatcher@@MAEXXZ @ 15 NONAME ; void CPhoneWatcher::Reset(void)
+	?PhoneIsOff@CPhoneWatcher@@MAEXXZ @ 16 NONAME ; void CPhoneWatcher::PhoneIsOff(void)
+	?PhoneIsOff@MPhoneOnOffObserver@@UAEXXZ @ 17 NONAME ; void MPhoneOnOffObserver::PhoneIsOff(void)
+	?PhoneIsOn@MPhoneOnOffObserver@@UAEXXZ @ 18 NONAME ; void MPhoneOnOffObserver::PhoneIsOn(void)
+	??0CModemChangeObserver@@QAE@AAVMModemChangeObserver@@@Z @ 19 NONAME ; CModemChangeObserver::CModemChangeObserver(class MModemChangeObserver &)
+	??1CModemChangeObserver@@UAE@XZ @ 20 NONAME ; CModemChangeObserver::~CModemChangeObserver(void)
+	?ConstructL@CModemChangeObserver@@QAEXXZ @ 21 NONAME ; void CModemChangeObserver::ConstructL(void)
+	?HandleModemChangedL@CPhoneWatcher@@EAEXXZ @ 22 NONAME ; void CPhoneWatcher::HandleModemChangedL(void)
+
+