# HG changeset patch
# User hgs
# Date 1287138088 -10800
# Node ID 25b8d29b7c595114be523185742c586c55650612
# Parent  12bc758d6a021607949db535ac5d1033bb952c9d
201041

diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/group/bld.inf
--- a/cellular/group/bld.inf	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/group/bld.inf	Fri Oct 15 13:21:28 2010 +0300
@@ -18,6 +18,7 @@
 
 #include "../telephonysettings/group/bld.inf"
 #include "../sssettings/group/bld.inf"
+//#include "../psmnetworkplugin/group/bld.inf"
 
 // End of File
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/bwins/psuinotesu.def
--- a/cellular/psuinotes/bwins/psuinotesu.def	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/bwins/psuinotesu.def	Fri Oct 15 13:21:28 2010 +0300
@@ -7,99 +7,100 @@
 	?qt_metacall@PsUiSettingsWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 6 NONAME ; int PsUiSettingsWrapper::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?metaObject@PsUiUtils@@UBEPBUQMetaObject@@XZ @ 7 NONAME ; struct QMetaObject const * PsUiUtils::metaObject(void) const
 	?passwordQueryCompleted@PsUiNotes@@IAEXVQString@@_N@Z @ 8 NONAME ; void PsUiNotes::passwordQueryCompleted(class QString, bool)
-	?handleProgressNoteCanceled@PsUiNotes@@AAEXXZ @ 9 NONAME ; void PsUiNotes::handleProgressNoteCanceled(void)
-	?errorCodeTextMapping@PsUiUtils@@SA_NHAAVQString@@@Z @ 10 NONAME ; bool PsUiUtils::errorCodeTextMapping(int, class QString &)
-	?showNotificationDialog@PsUiNotes@@QAEXABVQString@@@Z @ 11 NONAME ; void PsUiNotes::showNotificationDialog(class QString const &)
-	??1PsUiDivertNoteHandler@@UAE@XZ @ 12 NONAME ; PsUiDivertNoteHandler::~PsUiDivertNoteHandler(void)
-	?qt_metacall@PsUiNotes@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 13 NONAME ; int PsUiNotes::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?handleDivertingError@PsUiDivertNoteHandler@@QAEXH@Z @ 14 NONAME ; void PsUiDivertNoteHandler::handleDivertingError(int)
-	??0PsUiNotes@@AAE@XZ @ 15 NONAME ; PsUiNotes::PsUiNotes(void)
-	?showPasswordQueryDialog@PsUiNotes@@QAEXABVQString@@ABVQValidator@@H@Z @ 16 NONAME ; void PsUiNotes::showPasswordQueryDialog(class QString const &, class QValidator const &, int)
-	?trUtf8@PsUiNotes@@SA?AVQString@@PBD0@Z @ 17 NONAME ; class QString PsUiNotes::trUtf8(char const *, char const *)
-	?getStaticMetaObject@PsUiUtils@@SAABUQMetaObject@@XZ @ 18 NONAME ; struct QMetaObject const & PsUiUtils::getStaticMetaObject(void)
-	?readCenrepValue@PsUiSettingsWrapper@@ABE?AVQVariant@@JK@Z @ 19 NONAME ; class QVariant PsUiSettingsWrapper::readCenrepValue(long, unsigned long) const
-	?getStaticMetaObject@PsUiDivertNoteHandler@@SAABUQMetaObject@@XZ @ 20 NONAME ; struct QMetaObject const & PsUiDivertNoteHandler::getStaticMetaObject(void)
-	?isFeatureCallWaitingDistiquishNotProvisionedEnabled@PsUiSettingsWrapper@@QAE_NXZ @ 21 NONAME ; bool PsUiSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled(void)
-	??1PsUiWaitingNoteHandler@@UAE@XZ @ 22 NONAME ; PsUiWaitingNoteHandler::~PsUiWaitingNoteHandler(void)
-	?formatPhoneNumber@PsUiNotes@@ABE?AVQString@@V2@@Z @ 23 NONAME ; class QString PsUiNotes::formatPhoneNumber(class QString) const
-	?passwordTextChanged@PsUiNotes@@AAEXXZ @ 24 NONAME ; void PsUiNotes::passwordTextChanged(void)
-	?tr@PsUiNotes@@SA?AVQString@@PBD0@Z @ 25 NONAME ; class QString PsUiNotes::tr(char const *, char const *)
-	??0PsUiSettingsWrapper@@QAE@PAVQObject@@@Z @ 26 NONAME ; PsUiSettingsWrapper::PsUiSettingsWrapper(class QObject *)
-	?staticMetaObject@PsUiLocalisation@@2UQMetaObject@@B @ 27 NONAME ; struct QMetaObject const PsUiLocalisation::staticMetaObject
-	??1PsUiSettingsWrapper@@UAE@XZ @ 28 NONAME ; PsUiSettingsWrapper::~PsUiSettingsWrapper(void)
-	?getStaticMetaObject@PsUiWaitingNoteHandler@@SAABUQMetaObject@@XZ @ 29 NONAME ; struct QMetaObject const & PsUiWaitingNoteHandler::getStaticMetaObject(void)
-	?getStaticMetaObject@PsUiSettingsWrapper@@SAABUQMetaObject@@XZ @ 30 NONAME ; struct QMetaObject const & PsUiSettingsWrapper::getStaticMetaObject(void)
-	?trUtf8@PsUiUtils@@SA?AVQString@@PBD0@Z @ 31 NONAME ; class QString PsUiUtils::trUtf8(char const *, char const *)
-	?qt_metacast@PsUiWaitingNoteHandler@@UAEPAXPBD@Z @ 32 NONAME ; void * PsUiWaitingNoteHandler::qt_metacast(char const *)
-	?finishedPasswordQueryDialog@PsUiNotes@@QAEXPAVHbAction@@@Z @ 33 NONAME ; void PsUiNotes::finishedPasswordQueryDialog(class HbAction *)
-	?handleDivertingStatus@PsUiDivertNoteHandler@@QAEXAAV?$QList@PAVPSCallDivertingStatus@@@@_N@Z @ 34 NONAME ; void PsUiDivertNoteHandler::handleDivertingStatus(class QList<class PSCallDivertingStatus *> &, bool)
-	??0PsUiWaitingNoteHandler@@QAE@AAVPSetCallWaitingWrapper@@@Z @ 35 NONAME ; PsUiWaitingNoteHandler::PsUiWaitingNoteHandler(class PSetCallWaitingWrapper &)
-	?trUtf8@PsUiSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 36 NONAME ; class QString PsUiSettingsWrapper::trUtf8(char const *, char const *, int)
-	?tr@PsUiSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 37 NONAME ; class QString PsUiSettingsWrapper::tr(char const *, char const *, int)
-	?cancelNote@PsUiNotes@@QAEXH@Z @ 38 NONAME ; void PsUiNotes::cancelNote(int)
-	?tr@PsUiLocalisation@@SA?AVQString@@PBD0H@Z @ 39 NONAME ; class QString PsUiLocalisation::tr(char const *, char const *, int)
-	?removeTranslators@PsUiLocalisation@@QAEXXZ @ 40 NONAME ; void PsUiLocalisation::removeTranslators(void)
-	?tr@PsUiUtils@@SA?AVQString@@PBD0@Z @ 41 NONAME ; class QString PsUiUtils::tr(char const *, char const *)
-	?qt_metacast@PsUiSettingsWrapper@@UAEPAXPBD@Z @ 42 NONAME ; void * PsUiSettingsWrapper::qt_metacast(char const *)
-	?tr@PsUiDivertNoteHandler@@SA?AVQString@@PBD0@Z @ 43 NONAME ; class QString PsUiDivertNoteHandler::tr(char const *, char const *)
-	??0PsUiLocalisation@@QAE@PAVQObject@@@Z @ 44 NONAME ; PsUiLocalisation::PsUiLocalisation(class QObject *)
-	??1PsUiLocalisation@@UAE@XZ @ 45 NONAME ; PsUiLocalisation::~PsUiLocalisation(void)
-	?trUtf8@PsUiWaitingNoteHandler@@SA?AVQString@@PBD0H@Z @ 46 NONAME ; class QString PsUiWaitingNoteHandler::trUtf8(char const *, char const *, int)
-	?noteShowing@PsUiNotes@@QAE_NXZ @ 47 NONAME ; bool PsUiNotes::noteShowing(void)
-	??_EPsUiWaitingNoteHandler@@UAE@I@Z @ 48 NONAME ; PsUiWaitingNoteHandler::~PsUiWaitingNoteHandler(unsigned int)
-	?trUtf8@PsUiNotes@@SA?AVQString@@PBD0H@Z @ 49 NONAME ; class QString PsUiNotes::trUtf8(char const *, char const *, int)
-	?trUtf8@PsUiDivertNoteHandler@@SA?AVQString@@PBD0@Z @ 50 NONAME ; class QString PsUiDivertNoteHandler::trUtf8(char const *, char const *)
-	?handleCFRequesting@PsUiDivertNoteHandler@@QAEX_N0@Z @ 51 NONAME ; void PsUiDivertNoteHandler::handleCFRequesting(bool, bool)
-	?metaObject@PsUiLocalisation@@UBEPBUQMetaObject@@XZ @ 52 NONAME ; struct QMetaObject const * PsUiLocalisation::metaObject(void) const
-	?trUtf8@PsUiDivertNoteHandler@@SA?AVQString@@PBD0H@Z @ 53 NONAME ; class QString PsUiDivertNoteHandler::trUtf8(char const *, char const *, int)
-	??_EPsUiLocalisation@@UAE@I@Z @ 54 NONAME ; PsUiLocalisation::~PsUiLocalisation(unsigned int)
-	?handleCallWaitingGetStatus@PsUiWaitingNoteHandler@@QAEXW4PsCallWaitingStatus@PSetCallWaitingWrapper@@ABV?$QList@E@@@Z @ 55 NONAME ; void PsUiWaitingNoteHandler::handleCallWaitingGetStatus(enum PSetCallWaitingWrapper::PsCallWaitingStatus, class QList<unsigned char> const &)
-	?formatActiveDivertsNoteText@PsUiNotes@@AAEXABV?$QList@PAVPSCallDivertingStatus@@@@AAVQString@@@Z @ 56 NONAME ; void PsUiNotes::formatActiveDivertsNoteText(class QList<class PSCallDivertingStatus *> const &, class QString &)
-	?instance@PsUiNotes@@SAPAV1@XZ @ 57 NONAME ; class PsUiNotes * PsUiNotes::instance(void)
-	?staticMetaObject@PsUiDivertNoteHandler@@2UQMetaObject@@B @ 58 NONAME ; struct QMetaObject const PsUiDivertNoteHandler::staticMetaObject
-	?staticMetaObject@PsUiUtils@@2UQMetaObject@@B @ 59 NONAME ; struct QMetaObject const PsUiUtils::staticMetaObject
-	?qt_metacast@PsUiLocalisation@@UAEPAXPBD@Z @ 60 NONAME ; void * PsUiLocalisation::qt_metacast(char const *)
-	?handleCallWaitingError@PsUiWaitingNoteHandler@@QAEXH@Z @ 61 NONAME ; void PsUiWaitingNoteHandler::handleCallWaitingError(int)
-	?progressNoteCanceled@PsUiNotes@@IAEXXZ @ 62 NONAME ; void PsUiNotes::progressNoteCanceled(void)
-	?launchNextNoteIfReady@PsUiNotes@@AAEXXZ @ 63 NONAME ; void PsUiNotes::launchNextNoteIfReady(void)
-	?qt_metacast@PsUiUtils@@UAEPAXPBD@Z @ 64 NONAME ; void * PsUiUtils::qt_metacast(char const *)
-	?trUtf8@PsUiWaitingNoteHandler@@SA?AVQString@@PBD0@Z @ 65 NONAME ; class QString PsUiWaitingNoteHandler::trUtf8(char const *, char const *)
-	?tr@PsUiDivertNoteHandler@@SA?AVQString@@PBD0H@Z @ 66 NONAME ; class QString PsUiDivertNoteHandler::tr(char const *, char const *, int)
-	?staticMetaObject@PsUiSettingsWrapper@@2UQMetaObject@@B @ 67 NONAME ; struct QMetaObject const PsUiSettingsWrapper::staticMetaObject
-	?staticMetaObject@PsUiNotes@@2UQMetaObject@@B @ 68 NONAME ; struct QMetaObject const PsUiNotes::staticMetaObject
-	?tr@PsUiLocalisation@@SA?AVQString@@PBD0@Z @ 69 NONAME ; class QString PsUiLocalisation::tr(char const *, char const *)
-	??_EPsUiSettingsWrapper@@UAE@I@Z @ 70 NONAME ; PsUiSettingsWrapper::~PsUiSettingsWrapper(unsigned int)
-	?getStaticMetaObject@PsUiLocalisation@@SAABUQMetaObject@@XZ @ 71 NONAME ; struct QMetaObject const & PsUiLocalisation::getStaticMetaObject(void)
-	?showCallDivertDetails@PsUiNotes@@QAEXABV?$QList@PAVPSCallDivertingStatus@@@@@Z @ 72 NONAME ; void PsUiNotes::showCallDivertDetails(class QList<class PSCallDivertingStatus *> const &)
-	?trUtf8@PsUiUtils@@SA?AVQString@@PBD0H@Z @ 73 NONAME ; class QString PsUiUtils::trUtf8(char const *, char const *, int)
-	??1PsUiNotes@@EAE@XZ @ 74 NONAME ; PsUiNotes::~PsUiNotes(void)
-	?qt_metacall@PsUiDivertNoteHandler@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 75 NONAME ; int PsUiDivertNoteHandler::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacast@PsUiDivertNoteHandler@@UAEPAXPBD@Z @ 76 NONAME ; void * PsUiDivertNoteHandler::qt_metacast(char const *)
-	?trUtf8@PsUiLocalisation@@SA?AVQString@@PBD0H@Z @ 77 NONAME ; class QString PsUiLocalisation::trUtf8(char const *, char const *, int)
-	?trUtf8@PsUiSettingsWrapper@@SA?AVQString@@PBD0@Z @ 78 NONAME ; class QString PsUiSettingsWrapper::trUtf8(char const *, char const *)
-	?staticMetaObject@PsUiWaitingNoteHandler@@2UQMetaObject@@B @ 79 NONAME ; struct QMetaObject const PsUiWaitingNoteHandler::staticMetaObject
-	?handleCallWaitingRequesting@PsUiWaitingNoteHandler@@QAEX_N0@Z @ 80 NONAME ; void PsUiWaitingNoteHandler::handleCallWaitingRequesting(bool, bool)
-	?tr@PsUiNotes@@SA?AVQString@@PBD0H@Z @ 81 NONAME ; class QString PsUiNotes::tr(char const *, char const *, int)
-	?metaObject@PsUiWaitingNoteHandler@@UBEPBUQMetaObject@@XZ @ 82 NONAME ; struct QMetaObject const * PsUiWaitingNoteHandler::metaObject(void) const
-	?tr@PsUiWaitingNoteHandler@@SA?AVQString@@PBD0@Z @ 83 NONAME ; class QString PsUiWaitingNoteHandler::tr(char const *, char const *)
-	?showGlobalNotificationDialog@PsUiNotes@@QAEXABVQString@@@Z @ 84 NONAME ; void PsUiNotes::showGlobalNotificationDialog(class QString const &)
-	?qt_metacall@PsUiWaitingNoteHandler@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 85 NONAME ; int PsUiWaitingNoteHandler::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?activeNoteAboutToClose@PsUiNotes@@AAEXXZ @ 86 NONAME ; void PsUiNotes::activeNoteAboutToClose(void)
-	??_EPsUiNotes@@UAE@I@Z @ 87 NONAME ; PsUiNotes::~PsUiNotes(unsigned int)
-	?metaObject@PsUiSettingsWrapper@@UBEPBUQMetaObject@@XZ @ 88 NONAME ; struct QMetaObject const * PsUiSettingsWrapper::metaObject(void) const
-	?metaObject@PsUiNotes@@UBEPBUQMetaObject@@XZ @ 89 NONAME ; struct QMetaObject const * PsUiNotes::metaObject(void) const
-	??0PsUiDivertNoteHandler@@QAE@AAVPSetCallDivertingWrapper@@@Z @ 90 NONAME ; PsUiDivertNoteHandler::PsUiDivertNoteHandler(class PSetCallDivertingWrapper &)
-	?showGlobalNote@PsUiNotes@@QAEXAAHABVQString@@W4MessageBoxType@HbMessageBox@@@Z @ 91 NONAME ; void PsUiNotes::showGlobalNote(int &, class QString const &, enum HbMessageBox::MessageBoxType)
-	?handleDivertingChanged@PsUiDivertNoteHandler@@QAEXABVPSCallDivertingCommand@@_N@Z @ 92 NONAME ; void PsUiDivertNoteHandler::handleDivertingChanged(class PSCallDivertingCommand const &, bool)
-	?showGlobalProgressNote@PsUiNotes@@QAEXAAHABVQString@@@Z @ 93 NONAME ; void PsUiNotes::showGlobalProgressNote(int &, class QString const &)
-	?handleCallWaitingChanged@PsUiWaitingNoteHandler@@QAEXW4PsCallWaitingCommand@PSetCallWaitingWrapper@@H@Z @ 94 NONAME ; void PsUiWaitingNoteHandler::handleCallWaitingChanged(enum PSetCallWaitingWrapper::PsCallWaitingCommand, int)
-	??_EPsUiDivertNoteHandler@@UAE@I@Z @ 95 NONAME ; PsUiDivertNoteHandler::~PsUiDivertNoteHandler(unsigned int)
-	?qt_metacall@PsUiLocalisation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 96 NONAME ; int PsUiLocalisation::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?installTranslator@PsUiLocalisation@@QAE_NW4TranslationFileId@1@@Z @ 97 NONAME ; bool PsUiLocalisation::installTranslator(enum PsUiLocalisation::TranslationFileId)
-	?showGlobalErrorNote@PsUiNotes@@QAEXAAHH@Z @ 98 NONAME ; void PsUiNotes::showGlobalErrorNote(int &, int)
-	?isPhoneOffline@PsUiSettingsWrapper@@QBE_NXZ @ 99 NONAME ; bool PsUiSettingsWrapper::isPhoneOffline(void) const
-	?metaObject@PsUiDivertNoteHandler@@UBEPBUQMetaObject@@XZ @ 100 NONAME ; struct QMetaObject const * PsUiDivertNoteHandler::metaObject(void) const
-	?trUtf8@PsUiLocalisation@@SA?AVQString@@PBD0@Z @ 101 NONAME ; class QString PsUiLocalisation::trUtf8(char const *, char const *)
-	?tr@PsUiUtils@@SA?AVQString@@PBD0H@Z @ 102 NONAME ; class QString PsUiUtils::tr(char const *, char const *, int)
-	?numberGroupingSupported@PsUiSettingsWrapper@@QBE_NXZ @ 103 NONAME ; bool PsUiSettingsWrapper::numberGroupingSupported(void) const
+	?handleCliRequesting@PsUiCliNoteHandler@@QAEX_N0@Z @ 9 NONAME ; void PsUiCliNoteHandler::handleCliRequesting(bool, bool)
+	?trUtf8@PsUiCliNoteHandler@@SA?AVQString@@PBD0H@Z @ 10 NONAME ; class QString PsUiCliNoteHandler::trUtf8(char const *, char const *, int)
+	?handleProgressNoteCanceled@PsUiNotes@@AAEXXZ @ 11 NONAME ; void PsUiNotes::handleProgressNoteCanceled(void)
+	?errorCodeTextMapping@PsUiUtils@@SA_NHAAVQString@@@Z @ 12 NONAME ; bool PsUiUtils::errorCodeTextMapping(int, class QString &)
+	?showNotificationDialog@PsUiNotes@@QAEXABVQString@@@Z @ 13 NONAME ; void PsUiNotes::showNotificationDialog(class QString const &)
+	??1PsUiDivertNoteHandler@@UAE@XZ @ 14 NONAME ; PsUiDivertNoteHandler::~PsUiDivertNoteHandler(void)
+	?qt_metacall@PsUiNotes@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 15 NONAME ; int PsUiNotes::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??_EPsUiCliNoteHandler@@UAE@I@Z @ 16 NONAME ; PsUiCliNoteHandler::~PsUiCliNoteHandler(unsigned int)
+	?handleDivertingError@PsUiDivertNoteHandler@@QAEXH@Z @ 17 NONAME ; void PsUiDivertNoteHandler::handleDivertingError(int)
+	??0PsUiNotes@@AAE@XZ @ 18 NONAME ; PsUiNotes::PsUiNotes(void)
+	?showPasswordQueryDialog@PsUiNotes@@QAEXABVQString@@ABVQValidator@@H@Z @ 19 NONAME ; void PsUiNotes::showPasswordQueryDialog(class QString const &, class QValidator const &, int)
+	?trUtf8@PsUiNotes@@SA?AVQString@@PBD0@Z @ 20 NONAME ; class QString PsUiNotes::trUtf8(char const *, char const *)
+	?getStaticMetaObject@PsUiUtils@@SAABUQMetaObject@@XZ @ 21 NONAME ; struct QMetaObject const & PsUiUtils::getStaticMetaObject(void)
+	?readCenrepValue@PsUiSettingsWrapper@@ABE?AVQVariant@@JK@Z @ 22 NONAME ; class QVariant PsUiSettingsWrapper::readCenrepValue(long, unsigned long) const
+	?getStaticMetaObject@PsUiDivertNoteHandler@@SAABUQMetaObject@@XZ @ 23 NONAME ; struct QMetaObject const & PsUiDivertNoteHandler::getStaticMetaObject(void)
+	?isFeatureCallWaitingDistiquishNotProvisionedEnabled@PsUiSettingsWrapper@@QAE_NXZ @ 24 NONAME ; bool PsUiSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled(void)
+	??1PsUiWaitingNoteHandler@@UAE@XZ @ 25 NONAME ; PsUiWaitingNoteHandler::~PsUiWaitingNoteHandler(void)
+	?formatPhoneNumber@PsUiNotes@@ABE?AVQString@@V2@@Z @ 26 NONAME ; class QString PsUiNotes::formatPhoneNumber(class QString) const
+	?passwordTextChanged@PsUiNotes@@AAEXXZ @ 27 NONAME ; void PsUiNotes::passwordTextChanged(void)
+	?handleCliError@PsUiCliNoteHandler@@QAEXH@Z @ 28 NONAME ; void PsUiCliNoteHandler::handleCliError(int)
+	?tr@PsUiNotes@@SA?AVQString@@PBD0@Z @ 29 NONAME ; class QString PsUiNotes::tr(char const *, char const *)
+	??0PsUiSettingsWrapper@@QAE@PAVQObject@@@Z @ 30 NONAME ; PsUiSettingsWrapper::PsUiSettingsWrapper(class QObject *)
+	??1PsUiSettingsWrapper@@UAE@XZ @ 31 NONAME ; PsUiSettingsWrapper::~PsUiSettingsWrapper(void)
+	?getStaticMetaObject@PsUiWaitingNoteHandler@@SAABUQMetaObject@@XZ @ 32 NONAME ; struct QMetaObject const & PsUiWaitingNoteHandler::getStaticMetaObject(void)
+	?getStaticMetaObject@PsUiSettingsWrapper@@SAABUQMetaObject@@XZ @ 33 NONAME ; struct QMetaObject const & PsUiSettingsWrapper::getStaticMetaObject(void)
+	?trUtf8@PsUiUtils@@SA?AVQString@@PBD0@Z @ 34 NONAME ; class QString PsUiUtils::trUtf8(char const *, char const *)
+	?qt_metacast@PsUiWaitingNoteHandler@@UAEPAXPBD@Z @ 35 NONAME ; void * PsUiWaitingNoteHandler::qt_metacast(char const *)
+	?tr@PsUiCliNoteHandler@@SA?AVQString@@PBD0@Z @ 36 NONAME ; class QString PsUiCliNoteHandler::tr(char const *, char const *)
+	?finishedPasswordQueryDialog@PsUiNotes@@QAEXPAVHbAction@@@Z @ 37 NONAME ; void PsUiNotes::finishedPasswordQueryDialog(class HbAction *)
+	?handleDivertingStatus@PsUiDivertNoteHandler@@QAEXAAV?$QList@PAVPSCallDivertingStatus@@@@_N@Z @ 38 NONAME ; void PsUiDivertNoteHandler::handleDivertingStatus(class QList<class PSCallDivertingStatus *> &, bool)
+	??0PsUiWaitingNoteHandler@@QAE@AAVPSetCallWaitingWrapper@@@Z @ 39 NONAME ; PsUiWaitingNoteHandler::PsUiWaitingNoteHandler(class PSetCallWaitingWrapper &)
+	?trUtf8@PsUiSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString PsUiSettingsWrapper::trUtf8(char const *, char const *, int)
+	?tr@PsUiSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 41 NONAME ; class QString PsUiSettingsWrapper::tr(char const *, char const *, int)
+	?metaObject@PsUiCliNoteHandler@@UBEPBUQMetaObject@@XZ @ 42 NONAME ; struct QMetaObject const * PsUiCliNoteHandler::metaObject(void) const
+	?tr@PsUiCliNoteHandler@@SA?AVQString@@PBD0H@Z @ 43 NONAME ; class QString PsUiCliNoteHandler::tr(char const *, char const *, int)
+	?cancelNote@PsUiNotes@@QAEXH@Z @ 44 NONAME ; void PsUiNotes::cancelNote(int)
+	?numberGroupingSupported@PsUiSettingsWrapper@@QBE_NXZ @ 45 NONAME ; bool PsUiSettingsWrapper::numberGroupingSupported(void) const
+	?tr@PsUiUtils@@SA?AVQString@@PBD0@Z @ 46 NONAME ; class QString PsUiUtils::tr(char const *, char const *)
+	?qt_metacast@PsUiSettingsWrapper@@UAEPAXPBD@Z @ 47 NONAME ; void * PsUiSettingsWrapper::qt_metacast(char const *)
+	?tr@PsUiDivertNoteHandler@@SA?AVQString@@PBD0@Z @ 48 NONAME ; class QString PsUiDivertNoteHandler::tr(char const *, char const *)
+	?trUtf8@PsUiWaitingNoteHandler@@SA?AVQString@@PBD0H@Z @ 49 NONAME ; class QString PsUiWaitingNoteHandler::trUtf8(char const *, char const *, int)
+	?noteShowing@PsUiNotes@@QAE_NXZ @ 50 NONAME ; bool PsUiNotes::noteShowing(void)
+	??_EPsUiWaitingNoteHandler@@UAE@I@Z @ 51 NONAME ; PsUiWaitingNoteHandler::~PsUiWaitingNoteHandler(unsigned int)
+	?trUtf8@PsUiNotes@@SA?AVQString@@PBD0H@Z @ 52 NONAME ; class QString PsUiNotes::trUtf8(char const *, char const *, int)
+	?trUtf8@PsUiCliNoteHandler@@SA?AVQString@@PBD0@Z @ 53 NONAME ; class QString PsUiCliNoteHandler::trUtf8(char const *, char const *)
+	?trUtf8@PsUiDivertNoteHandler@@SA?AVQString@@PBD0@Z @ 54 NONAME ; class QString PsUiDivertNoteHandler::trUtf8(char const *, char const *)
+	?handleCFRequesting@PsUiDivertNoteHandler@@QAEX_N0@Z @ 55 NONAME ; void PsUiDivertNoteHandler::handleCFRequesting(bool, bool)
+	?trUtf8@PsUiDivertNoteHandler@@SA?AVQString@@PBD0H@Z @ 56 NONAME ; class QString PsUiDivertNoteHandler::trUtf8(char const *, char const *, int)
+	?handleCallWaitingGetStatus@PsUiWaitingNoteHandler@@QAEXW4PsCallWaitingStatus@PSetCallWaitingWrapper@@ABV?$QList@E@@@Z @ 57 NONAME ; void PsUiWaitingNoteHandler::handleCallWaitingGetStatus(enum PSetCallWaitingWrapper::PsCallWaitingStatus, class QList<unsigned char> const &)
+	?qt_metacast@PsUiCliNoteHandler@@UAEPAXPBD@Z @ 58 NONAME ; void * PsUiCliNoteHandler::qt_metacast(char const *)
+	?formatActiveDivertsNoteText@PsUiNotes@@AAEXABV?$QList@PAVPSCallDivertingStatus@@@@AAVQString@@@Z @ 59 NONAME ; void PsUiNotes::formatActiveDivertsNoteText(class QList<class PSCallDivertingStatus *> const &, class QString &)
+	?instance@PsUiNotes@@SAPAV1@XZ @ 60 NONAME ; class PsUiNotes * PsUiNotes::instance(void)
+	?staticMetaObject@PsUiDivertNoteHandler@@2UQMetaObject@@B @ 61 NONAME ; struct QMetaObject const PsUiDivertNoteHandler::staticMetaObject
+	?staticMetaObject@PsUiUtils@@2UQMetaObject@@B @ 62 NONAME ; struct QMetaObject const PsUiUtils::staticMetaObject
+	?handleCallWaitingError@PsUiWaitingNoteHandler@@QAEXH@Z @ 63 NONAME ; void PsUiWaitingNoteHandler::handleCallWaitingError(int)
+	?progressNoteCanceled@PsUiNotes@@IAEXXZ @ 64 NONAME ; void PsUiNotes::progressNoteCanceled(void)
+	?qt_metacast@PsUiUtils@@UAEPAXPBD@Z @ 65 NONAME ; void * PsUiUtils::qt_metacast(char const *)
+	?launchNextNoteIfReady@PsUiNotes@@AAEXXZ @ 66 NONAME ; void PsUiNotes::launchNextNoteIfReady(void)
+	?staticMetaObject@PsUiCliNoteHandler@@2UQMetaObject@@B @ 67 NONAME ; struct QMetaObject const PsUiCliNoteHandler::staticMetaObject
+	?trUtf8@PsUiWaitingNoteHandler@@SA?AVQString@@PBD0@Z @ 68 NONAME ; class QString PsUiWaitingNoteHandler::trUtf8(char const *, char const *)
+	?tr@PsUiDivertNoteHandler@@SA?AVQString@@PBD0H@Z @ 69 NONAME ; class QString PsUiDivertNoteHandler::tr(char const *, char const *, int)
+	?staticMetaObject@PsUiSettingsWrapper@@2UQMetaObject@@B @ 70 NONAME ; struct QMetaObject const PsUiSettingsWrapper::staticMetaObject
+	?staticMetaObject@PsUiNotes@@2UQMetaObject@@B @ 71 NONAME ; struct QMetaObject const PsUiNotes::staticMetaObject
+	??_EPsUiSettingsWrapper@@UAE@I@Z @ 72 NONAME ; PsUiSettingsWrapper::~PsUiSettingsWrapper(unsigned int)
+	??1PsUiCliNoteHandler@@UAE@XZ @ 73 NONAME ; PsUiCliNoteHandler::~PsUiCliNoteHandler(void)
+	?showCallDivertDetails@PsUiNotes@@QAEXABV?$QList@PAVPSCallDivertingStatus@@@@@Z @ 74 NONAME ; void PsUiNotes::showCallDivertDetails(class QList<class PSCallDivertingStatus *> const &)
+	?trUtf8@PsUiUtils@@SA?AVQString@@PBD0H@Z @ 75 NONAME ; class QString PsUiUtils::trUtf8(char const *, char const *, int)
+	??1PsUiNotes@@EAE@XZ @ 76 NONAME ; PsUiNotes::~PsUiNotes(void)
+	?qt_metacall@PsUiDivertNoteHandler@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 77 NONAME ; int PsUiDivertNoteHandler::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacast@PsUiDivertNoteHandler@@UAEPAXPBD@Z @ 78 NONAME ; void * PsUiDivertNoteHandler::qt_metacast(char const *)
+	?trUtf8@PsUiSettingsWrapper@@SA?AVQString@@PBD0@Z @ 79 NONAME ; class QString PsUiSettingsWrapper::trUtf8(char const *, char const *)
+	?staticMetaObject@PsUiWaitingNoteHandler@@2UQMetaObject@@B @ 80 NONAME ; struct QMetaObject const PsUiWaitingNoteHandler::staticMetaObject
+	?handleCallWaitingRequesting@PsUiWaitingNoteHandler@@QAEX_N0@Z @ 81 NONAME ; void PsUiWaitingNoteHandler::handleCallWaitingRequesting(bool, bool)
+	?tr@PsUiNotes@@SA?AVQString@@PBD0H@Z @ 82 NONAME ; class QString PsUiNotes::tr(char const *, char const *, int)
+	?metaObject@PsUiWaitingNoteHandler@@UBEPBUQMetaObject@@XZ @ 83 NONAME ; struct QMetaObject const * PsUiWaitingNoteHandler::metaObject(void) const
+	?tr@PsUiWaitingNoteHandler@@SA?AVQString@@PBD0@Z @ 84 NONAME ; class QString PsUiWaitingNoteHandler::tr(char const *, char const *)
+	?showGlobalNotificationDialog@PsUiNotes@@QAEXABVQString@@@Z @ 85 NONAME ; void PsUiNotes::showGlobalNotificationDialog(class QString const &)
+	?qt_metacall@PsUiCliNoteHandler@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 86 NONAME ; int PsUiCliNoteHandler::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@PsUiWaitingNoteHandler@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 87 NONAME ; int PsUiWaitingNoteHandler::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?activeNoteAboutToClose@PsUiNotes@@AAEXXZ @ 88 NONAME ; void PsUiNotes::activeNoteAboutToClose(void)
+	??_EPsUiNotes@@UAE@I@Z @ 89 NONAME ; PsUiNotes::~PsUiNotes(unsigned int)
+	?metaObject@PsUiSettingsWrapper@@UBEPBUQMetaObject@@XZ @ 90 NONAME ; struct QMetaObject const * PsUiSettingsWrapper::metaObject(void) const
+	?metaObject@PsUiNotes@@UBEPBUQMetaObject@@XZ @ 91 NONAME ; struct QMetaObject const * PsUiNotes::metaObject(void) const
+	??0PsUiDivertNoteHandler@@QAE@AAVPSetCallDivertingWrapper@@@Z @ 92 NONAME ; PsUiDivertNoteHandler::PsUiDivertNoteHandler(class PSetCallDivertingWrapper &)
+	?getStaticMetaObject@PsUiCliNoteHandler@@SAABUQMetaObject@@XZ @ 93 NONAME ; struct QMetaObject const & PsUiCliNoteHandler::getStaticMetaObject(void)
+	?handleCnapStatus@PsUiCliNoteHandler@@QAEXH@Z @ 94 NONAME ; void PsUiCliNoteHandler::handleCnapStatus(int)
+	?showGlobalNote@PsUiNotes@@QAEXAAHABVQString@@W4MessageBoxType@HbMessageBox@@@Z @ 95 NONAME ; void PsUiNotes::showGlobalNote(int &, class QString const &, enum HbMessageBox::MessageBoxType)
+	?cliInformation@PsUiCliNoteHandler@@QAEXABW4PsCallLineIdentity@@@Z @ 96 NONAME ; void PsUiCliNoteHandler::cliInformation(enum PsCallLineIdentity const &)
+	?handleDivertingChanged@PsUiDivertNoteHandler@@QAEXABVPSCallDivertingCommand@@_N@Z @ 97 NONAME ; void PsUiDivertNoteHandler::handleDivertingChanged(class PSCallDivertingCommand const &, bool)
+	?showGlobalProgressNote@PsUiNotes@@QAEXAAHABVQString@@@Z @ 98 NONAME ; void PsUiNotes::showGlobalProgressNote(int &, class QString const &)
+	?handleCallWaitingChanged@PsUiWaitingNoteHandler@@QAEXW4PsCallWaitingCommand@PSetCallWaitingWrapper@@H@Z @ 99 NONAME ; void PsUiWaitingNoteHandler::handleCallWaitingChanged(enum PSetCallWaitingWrapper::PsCallWaitingCommand, int)
+	??_EPsUiDivertNoteHandler@@UAE@I@Z @ 100 NONAME ; PsUiDivertNoteHandler::~PsUiDivertNoteHandler(unsigned int)
+	?showGlobalErrorNote@PsUiNotes@@QAEXAAHH@Z @ 101 NONAME ; void PsUiNotes::showGlobalErrorNote(int &, int)
+	?metaObject@PsUiDivertNoteHandler@@UBEPBUQMetaObject@@XZ @ 102 NONAME ; struct QMetaObject const * PsUiDivertNoteHandler::metaObject(void) const
+	??0PsUiCliNoteHandler@@QAE@AAVPSetCliWrapper@@@Z @ 103 NONAME ; PsUiCliNoteHandler::PsUiCliNoteHandler(class PSetCliWrapper &)
+	?tr@PsUiUtils@@SA?AVQString@@PBD0H@Z @ 104 NONAME ; class QString PsUiUtils::tr(char const *, char const *, int)
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/eabi/psuinotesu.def
--- a/cellular/psuinotes/eabi/psuinotesu.def	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/eabi/psuinotesu.def	Fri Oct 15 13:21:28 2010 +0300
@@ -1,103 +1,104 @@
 EXPORTS
-	_ZN16PsUiLocalisation11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
-	_ZN16PsUiLocalisation11qt_metacastEPKc @ 2 NONAME
-	_ZN16PsUiLocalisation16staticMetaObjectE @ 3 NONAME DATA 16
-	_ZN16PsUiLocalisation17installTranslatorENS_17TranslationFileIdE @ 4 NONAME
-	_ZN16PsUiLocalisation17removeTranslatorsEv @ 5 NONAME
-	_ZN16PsUiLocalisation19getStaticMetaObjectEv @ 6 NONAME
-	_ZN16PsUiLocalisationC1EP7QObject @ 7 NONAME
-	_ZN16PsUiLocalisationC2EP7QObject @ 8 NONAME
-	_ZN16PsUiLocalisationD0Ev @ 9 NONAME
-	_ZN16PsUiLocalisationD1Ev @ 10 NONAME
-	_ZN16PsUiLocalisationD2Ev @ 11 NONAME
-	_ZN19PsUiSettingsWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 12 NONAME
-	_ZN19PsUiSettingsWrapper11qt_metacastEPKc @ 13 NONAME
-	_ZN19PsUiSettingsWrapper16staticMetaObjectE @ 14 NONAME DATA 16
-	_ZN19PsUiSettingsWrapper19getStaticMetaObjectEv @ 15 NONAME
-	_ZN19PsUiSettingsWrapper51isFeatureCallWaitingDistiquishNotProvisionedEnabledEv @ 16 NONAME
-	_ZN19PsUiSettingsWrapperC1EP7QObject @ 17 NONAME
-	_ZN19PsUiSettingsWrapperC2EP7QObject @ 18 NONAME
-	_ZN19PsUiSettingsWrapperD0Ev @ 19 NONAME
-	_ZN19PsUiSettingsWrapperD1Ev @ 20 NONAME
-	_ZN19PsUiSettingsWrapperD2Ev @ 21 NONAME
-	_ZN21PsUiDivertNoteHandler11qt_metacallEN11QMetaObject4CallEiPPv @ 22 NONAME
-	_ZN21PsUiDivertNoteHandler11qt_metacastEPKc @ 23 NONAME
-	_ZN21PsUiDivertNoteHandler16staticMetaObjectE @ 24 NONAME DATA 16
-	_ZN21PsUiDivertNoteHandler18handleCFRequestingEbb @ 25 NONAME
-	_ZN21PsUiDivertNoteHandler19getStaticMetaObjectEv @ 26 NONAME
-	_ZN21PsUiDivertNoteHandler20handleDivertingErrorEi @ 27 NONAME
-	_ZN21PsUiDivertNoteHandler21handleDivertingStatusER5QListIP21PSCallDivertingStatusEb @ 28 NONAME
-	_ZN21PsUiDivertNoteHandler22handleDivertingChangedERK22PSCallDivertingCommandb @ 29 NONAME
-	_ZN21PsUiDivertNoteHandlerC1ER24PSetCallDivertingWrapper @ 30 NONAME
-	_ZN21PsUiDivertNoteHandlerC2ER24PSetCallDivertingWrapper @ 31 NONAME
-	_ZN21PsUiDivertNoteHandlerD0Ev @ 32 NONAME
-	_ZN21PsUiDivertNoteHandlerD1Ev @ 33 NONAME
-	_ZN21PsUiDivertNoteHandlerD2Ev @ 34 NONAME
-	_ZN22PsUiWaitingNoteHandler11qt_metacallEN11QMetaObject4CallEiPPv @ 35 NONAME
-	_ZN22PsUiWaitingNoteHandler11qt_metacastEPKc @ 36 NONAME
-	_ZN22PsUiWaitingNoteHandler16staticMetaObjectE @ 37 NONAME DATA 16
-	_ZN22PsUiWaitingNoteHandler19getStaticMetaObjectEv @ 38 NONAME
-	_ZN22PsUiWaitingNoteHandler22handleCallWaitingErrorEi @ 39 NONAME
-	_ZN22PsUiWaitingNoteHandler24handleCallWaitingChangedEN22PSetCallWaitingWrapper20PsCallWaitingCommandEi @ 40 NONAME
-	_ZN22PsUiWaitingNoteHandler26handleCallWaitingGetStatusEN22PSetCallWaitingWrapper19PsCallWaitingStatusERK5QListIhE @ 41 NONAME
-	_ZN22PsUiWaitingNoteHandler27handleCallWaitingRequestingEbb @ 42 NONAME
-	_ZN22PsUiWaitingNoteHandlerC1ER22PSetCallWaitingWrapper @ 43 NONAME
-	_ZN22PsUiWaitingNoteHandlerC2ER22PSetCallWaitingWrapper @ 44 NONAME
-	_ZN22PsUiWaitingNoteHandlerD0Ev @ 45 NONAME
-	_ZN22PsUiWaitingNoteHandlerD1Ev @ 46 NONAME
-	_ZN22PsUiWaitingNoteHandlerD2Ev @ 47 NONAME
-	_ZN9PsUiNotes10cancelNoteEi @ 48 NONAME
-	_ZN9PsUiNotes11noteShowingEv @ 49 NONAME
-	_ZN9PsUiNotes11qt_metacallEN11QMetaObject4CallEiPPv @ 50 NONAME
-	_ZN9PsUiNotes11qt_metacastEPKc @ 51 NONAME
-	_ZN9PsUiNotes14showGlobalNoteERiRK7QStringN12HbMessageBox14MessageBoxTypeE @ 52 NONAME
-	_ZN9PsUiNotes16staticMetaObjectE @ 53 NONAME DATA 16
-	_ZN9PsUiNotes19getStaticMetaObjectEv @ 54 NONAME
-	_ZN9PsUiNotes19passwordTextChangedEv @ 55 NONAME
-	_ZN9PsUiNotes19showGlobalErrorNoteERii @ 56 NONAME
-	_ZN9PsUiNotes20progressNoteCanceledEv @ 57 NONAME
-	_ZN9PsUiNotes21launchNextNoteIfReadyEv @ 58 NONAME
-	_ZN9PsUiNotes21showCallDivertDetailsERK5QListIP21PSCallDivertingStatusE @ 59 NONAME
-	_ZN9PsUiNotes22activeNoteAboutToCloseEv @ 60 NONAME
-	_ZN9PsUiNotes22passwordQueryCompletedE7QStringb @ 61 NONAME
-	_ZN9PsUiNotes22showGlobalProgressNoteERiRK7QString @ 62 NONAME
-	_ZN9PsUiNotes22showNotificationDialogERK7QString @ 63 NONAME
-	_ZN9PsUiNotes23showPasswordQueryDialogERK7QStringRK10QValidatori @ 64 NONAME
-	_ZN9PsUiNotes26handleProgressNoteCanceledEv @ 65 NONAME
-	_ZN9PsUiNotes27finishedPasswordQueryDialogEP8HbAction @ 66 NONAME
-	_ZN9PsUiNotes27formatActiveDivertsNoteTextERK5QListIP21PSCallDivertingStatusER7QString @ 67 NONAME
-	_ZN9PsUiNotes28showGlobalNotificationDialogERK7QString @ 68 NONAME
-	_ZN9PsUiNotes8instanceEv @ 69 NONAME
-	_ZN9PsUiNotesC1Ev @ 70 NONAME
-	_ZN9PsUiNotesC2Ev @ 71 NONAME
-	_ZN9PsUiNotesD0Ev @ 72 NONAME
-	_ZN9PsUiNotesD1Ev @ 73 NONAME
-	_ZN9PsUiNotesD2Ev @ 74 NONAME
-	_ZN9PsUiUtils11qt_metacallEN11QMetaObject4CallEiPPv @ 75 NONAME
-	_ZN9PsUiUtils11qt_metacastEPKc @ 76 NONAME
-	_ZN9PsUiUtils16staticMetaObjectE @ 77 NONAME DATA 16
-	_ZN9PsUiUtils19getStaticMetaObjectEv @ 78 NONAME
-	_ZN9PsUiUtils20errorCodeTextMappingEiR7QString @ 79 NONAME
-	_ZNK16PsUiLocalisation10metaObjectEv @ 80 NONAME
-	_ZNK19PsUiSettingsWrapper10metaObjectEv @ 81 NONAME
-	_ZNK19PsUiSettingsWrapper14isPhoneOfflineEv @ 82 NONAME
-	_ZNK19PsUiSettingsWrapper15readCenrepValueElm @ 83 NONAME
-	_ZNK19PsUiSettingsWrapper23numberGroupingSupportedEv @ 84 NONAME
-	_ZNK21PsUiDivertNoteHandler10metaObjectEv @ 85 NONAME
-	_ZNK22PsUiWaitingNoteHandler10metaObjectEv @ 86 NONAME
-	_ZNK9PsUiNotes10metaObjectEv @ 87 NONAME
-	_ZNK9PsUiNotes17formatPhoneNumberE7QString @ 88 NONAME
-	_ZNK9PsUiUtils10metaObjectEv @ 89 NONAME
-	_ZTI16PsUiLocalisation @ 90 NONAME
-	_ZTI19PsUiSettingsWrapper @ 91 NONAME
-	_ZTI21PsUiDivertNoteHandler @ 92 NONAME
-	_ZTI22PsUiWaitingNoteHandler @ 93 NONAME
-	_ZTI9PsUiNotes @ 94 NONAME
-	_ZTI9PsUiUtils @ 95 NONAME
-	_ZTV16PsUiLocalisation @ 96 NONAME
-	_ZTV19PsUiSettingsWrapper @ 97 NONAME
-	_ZTV21PsUiDivertNoteHandler @ 98 NONAME
-	_ZTV22PsUiWaitingNoteHandler @ 99 NONAME
-	_ZTV9PsUiNotes @ 100 NONAME
-	_ZTV9PsUiUtils @ 101 NONAME
+	_ZN18PsUiCliNoteHandler11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
+	_ZN18PsUiCliNoteHandler11qt_metacastEPKc @ 2 NONAME
+	_ZN18PsUiCliNoteHandler14cliInformationERK18PsCallLineIdentity @ 3 NONAME
+	_ZN18PsUiCliNoteHandler14handleCliErrorEi @ 4 NONAME
+	_ZN18PsUiCliNoteHandler16handleCnapStatusEi @ 5 NONAME
+	_ZN18PsUiCliNoteHandler16staticMetaObjectE @ 6 NONAME DATA 16
+	_ZN18PsUiCliNoteHandler19getStaticMetaObjectEv @ 7 NONAME
+	_ZN18PsUiCliNoteHandler19handleCliRequestingEbb @ 8 NONAME
+	_ZN18PsUiCliNoteHandlerC1ER14PSetCliWrapper @ 9 NONAME
+	_ZN18PsUiCliNoteHandlerC2ER14PSetCliWrapper @ 10 NONAME
+	_ZN18PsUiCliNoteHandlerD0Ev @ 11 NONAME
+	_ZN18PsUiCliNoteHandlerD1Ev @ 12 NONAME
+	_ZN18PsUiCliNoteHandlerD2Ev @ 13 NONAME
+	_ZN19PsUiSettingsWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 14 NONAME
+	_ZN19PsUiSettingsWrapper11qt_metacastEPKc @ 15 NONAME
+	_ZN19PsUiSettingsWrapper16staticMetaObjectE @ 16 NONAME DATA 16
+	_ZN19PsUiSettingsWrapper19getStaticMetaObjectEv @ 17 NONAME
+	_ZN19PsUiSettingsWrapper51isFeatureCallWaitingDistiquishNotProvisionedEnabledEv @ 18 NONAME
+	_ZN19PsUiSettingsWrapperC1EP7QObject @ 19 NONAME
+	_ZN19PsUiSettingsWrapperC2EP7QObject @ 20 NONAME
+	_ZN19PsUiSettingsWrapperD0Ev @ 21 NONAME
+	_ZN19PsUiSettingsWrapperD1Ev @ 22 NONAME
+	_ZN19PsUiSettingsWrapperD2Ev @ 23 NONAME
+	_ZN21PsUiDivertNoteHandler11qt_metacallEN11QMetaObject4CallEiPPv @ 24 NONAME
+	_ZN21PsUiDivertNoteHandler11qt_metacastEPKc @ 25 NONAME
+	_ZN21PsUiDivertNoteHandler16staticMetaObjectE @ 26 NONAME DATA 16
+	_ZN21PsUiDivertNoteHandler18handleCFRequestingEbb @ 27 NONAME
+	_ZN21PsUiDivertNoteHandler19getStaticMetaObjectEv @ 28 NONAME
+	_ZN21PsUiDivertNoteHandler20handleDivertingErrorEi @ 29 NONAME
+	_ZN21PsUiDivertNoteHandler21handleDivertingStatusER5QListIP21PSCallDivertingStatusEb @ 30 NONAME
+	_ZN21PsUiDivertNoteHandler22handleDivertingChangedERK22PSCallDivertingCommandb @ 31 NONAME
+	_ZN21PsUiDivertNoteHandlerC1ER24PSetCallDivertingWrapper @ 32 NONAME
+	_ZN21PsUiDivertNoteHandlerC2ER24PSetCallDivertingWrapper @ 33 NONAME
+	_ZN21PsUiDivertNoteHandlerD0Ev @ 34 NONAME
+	_ZN21PsUiDivertNoteHandlerD1Ev @ 35 NONAME
+	_ZN21PsUiDivertNoteHandlerD2Ev @ 36 NONAME
+	_ZN22PsUiWaitingNoteHandler11qt_metacallEN11QMetaObject4CallEiPPv @ 37 NONAME
+	_ZN22PsUiWaitingNoteHandler11qt_metacastEPKc @ 38 NONAME
+	_ZN22PsUiWaitingNoteHandler16staticMetaObjectE @ 39 NONAME DATA 16
+	_ZN22PsUiWaitingNoteHandler19getStaticMetaObjectEv @ 40 NONAME
+	_ZN22PsUiWaitingNoteHandler22handleCallWaitingErrorEi @ 41 NONAME
+	_ZN22PsUiWaitingNoteHandler24handleCallWaitingChangedEN22PSetCallWaitingWrapper20PsCallWaitingCommandEi @ 42 NONAME
+	_ZN22PsUiWaitingNoteHandler26handleCallWaitingGetStatusEN22PSetCallWaitingWrapper19PsCallWaitingStatusERK5QListIhE @ 43 NONAME
+	_ZN22PsUiWaitingNoteHandler27handleCallWaitingRequestingEbb @ 44 NONAME
+	_ZN22PsUiWaitingNoteHandlerC1ER22PSetCallWaitingWrapper @ 45 NONAME
+	_ZN22PsUiWaitingNoteHandlerC2ER22PSetCallWaitingWrapper @ 46 NONAME
+	_ZN22PsUiWaitingNoteHandlerD0Ev @ 47 NONAME
+	_ZN22PsUiWaitingNoteHandlerD1Ev @ 48 NONAME
+	_ZN22PsUiWaitingNoteHandlerD2Ev @ 49 NONAME
+	_ZN9PsUiNotes10cancelNoteEi @ 50 NONAME
+	_ZN9PsUiNotes11noteShowingEv @ 51 NONAME
+	_ZN9PsUiNotes11qt_metacallEN11QMetaObject4CallEiPPv @ 52 NONAME
+	_ZN9PsUiNotes11qt_metacastEPKc @ 53 NONAME
+	_ZN9PsUiNotes14showGlobalNoteERiRK7QStringN12HbMessageBox14MessageBoxTypeE @ 54 NONAME
+	_ZN9PsUiNotes16staticMetaObjectE @ 55 NONAME DATA 16
+	_ZN9PsUiNotes19getStaticMetaObjectEv @ 56 NONAME
+	_ZN9PsUiNotes19passwordTextChangedEv @ 57 NONAME
+	_ZN9PsUiNotes19showGlobalErrorNoteERii @ 58 NONAME
+	_ZN9PsUiNotes20progressNoteCanceledEv @ 59 NONAME
+	_ZN9PsUiNotes21launchNextNoteIfReadyEv @ 60 NONAME
+	_ZN9PsUiNotes21showCallDivertDetailsERK5QListIP21PSCallDivertingStatusE @ 61 NONAME
+	_ZN9PsUiNotes22activeNoteAboutToCloseEv @ 62 NONAME
+	_ZN9PsUiNotes22passwordQueryCompletedE7QStringb @ 63 NONAME
+	_ZN9PsUiNotes22showGlobalProgressNoteERiRK7QString @ 64 NONAME
+	_ZN9PsUiNotes22showNotificationDialogERK7QString @ 65 NONAME
+	_ZN9PsUiNotes23showPasswordQueryDialogERK7QStringRK10QValidatori @ 66 NONAME
+	_ZN9PsUiNotes26handleProgressNoteCanceledEv @ 67 NONAME
+	_ZN9PsUiNotes27finishedPasswordQueryDialogEP8HbAction @ 68 NONAME
+	_ZN9PsUiNotes27formatActiveDivertsNoteTextERK5QListIP21PSCallDivertingStatusER7QString @ 69 NONAME
+	_ZN9PsUiNotes28showGlobalNotificationDialogERK7QString @ 70 NONAME
+	_ZN9PsUiNotes8instanceEv @ 71 NONAME
+	_ZN9PsUiNotesC1Ev @ 72 NONAME
+	_ZN9PsUiNotesC2Ev @ 73 NONAME
+	_ZN9PsUiNotesD0Ev @ 74 NONAME
+	_ZN9PsUiNotesD1Ev @ 75 NONAME
+	_ZN9PsUiNotesD2Ev @ 76 NONAME
+	_ZN9PsUiUtils11qt_metacallEN11QMetaObject4CallEiPPv @ 77 NONAME
+	_ZN9PsUiUtils11qt_metacastEPKc @ 78 NONAME
+	_ZN9PsUiUtils16staticMetaObjectE @ 79 NONAME DATA 16
+	_ZN9PsUiUtils19getStaticMetaObjectEv @ 80 NONAME
+	_ZN9PsUiUtils20errorCodeTextMappingEiR7QString @ 81 NONAME
+	_ZNK18PsUiCliNoteHandler10metaObjectEv @ 82 NONAME
+	_ZNK19PsUiSettingsWrapper10metaObjectEv @ 83 NONAME
+	_ZNK19PsUiSettingsWrapper15readCenrepValueElm @ 84 NONAME
+	_ZNK19PsUiSettingsWrapper23numberGroupingSupportedEv @ 85 NONAME
+	_ZNK21PsUiDivertNoteHandler10metaObjectEv @ 86 NONAME
+	_ZNK22PsUiWaitingNoteHandler10metaObjectEv @ 87 NONAME
+	_ZNK9PsUiNotes10metaObjectEv @ 88 NONAME
+	_ZNK9PsUiNotes17formatPhoneNumberE7QString @ 89 NONAME
+	_ZNK9PsUiUtils10metaObjectEv @ 90 NONAME
+	_ZTI18PsUiCliNoteHandler @ 91 NONAME
+	_ZTI19PsUiSettingsWrapper @ 92 NONAME
+	_ZTI21PsUiDivertNoteHandler @ 93 NONAME
+	_ZTI22PsUiWaitingNoteHandler @ 94 NONAME
+	_ZTI9PsUiNotes @ 95 NONAME
+	_ZTI9PsUiUtils @ 96 NONAME
+	_ZTV18PsUiCliNoteHandler @ 97 NONAME
+	_ZTV19PsUiSettingsWrapper @ 98 NONAME
+	_ZTV21PsUiDivertNoteHandler @ 99 NONAME
+	_ZTV22PsUiWaitingNoteHandler @ 100 NONAME
+	_ZTV9PsUiNotes @ 101 NONAME
+	_ZTV9PsUiUtils @ 102 NONAME
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/inc/psuiutils.h
--- a/cellular/psuinotes/inc/psuiutils.h	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/inc/psuiutils.h	Fri Oct 15 13:21:28 2010 +0300
@@ -37,8 +37,7 @@
     Q_OBJECT
     
 public:
-    enum BasicServiceGroups
-    {
+    enum BasicServiceGroups {
         Unknown = -1, //this is not part of GSM standard
         // Phone settings updates this automatically to ETelephony or to EAltTele,
         // depending on if ALS is supported, and which line is active.
@@ -96,6 +95,15 @@
     // no ui note support
     };
     
+    // Service status of the Phone ID services (CLIP/CLIR/CNIP).
+    enum PhoneIdServiceStatus {
+        ServiceActivePermanent,
+        ServiceActiveDefaultRestricted,
+        ServiceActiveDefaultAllowed,
+        ServiceNotProvisioned,
+        ServiceUnknown
+    };
+    
 public:
     /*!
       Error code text conversion
@@ -121,12 +129,6 @@
      */
     bool isFeatureCallWaitingDistiquishNotProvisionedEnabled();
     
-    /*!
-     Checks if phone is in offline mode or not.
-     Return true if phone is in offline mode.
-     Return false if phone is not in offline mode.
-     */
-    bool isPhoneOffline() const;
     
     /*!
      Number grouping support
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/psuinotes.pro
--- a/cellular/psuinotes/psuinotes.pro	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/psuinotes.pro	Fri Oct 15 13:21:28 2010 +0300
@@ -19,13 +19,13 @@
 # Input
 HEADERS += ../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuidivertnotehandler.h \
 	../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuiwaitingnotehandler.h \
+	../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuiclinotehandler.h \
     ../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuinotes.h \
-    ../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuilocalisation.h \
     inc/psuiutils.h 
 SOURCES += src/psuidivertnotehandler.cpp \
 	src/psuiwaitingnotehandler.cpp \
+    src/psuiclinotehandler.cpp \
     src/psuinotes.cpp \
-    src/psuilocalisation.cpp \
     src/psuiutils.cpp 
 DEFINES += BUILD_PSUINOTES
 symbian: { 
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/src/psuiclinotehandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cellular/psuinotes/src/psuiclinotehandler.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2010 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 <hbdevicenotificationdialog.h>
+#include <psetcliwrapper.h>
+#include "psuinotes.h"
+#include "psuiclinotehandler.h"
+#include "psuiutils.h"
+#include "psuilogging.h"
+
+/*!
+  PsUiCliNoteHandler::PsUiCliNoteHandler
+ */
+PsUiCliNoteHandler::PsUiCliNoteHandler(PSetCliWrapper& cliWrapper) :
+    m_cliWrapper(cliWrapper)
+{
+    DPRINT << ": IN";
+
+    QObject::connect(
+        &m_cliWrapper, 
+        SIGNAL(cliInformation( const PsCallLineIdentity& )),
+        this, 
+        SLOT(cliInformation( const PsCallLineIdentity& )));
+    QObject::connect(
+        &m_cliWrapper, 
+        SIGNAL(handleCliRequesting( bool, bool )),
+        this, 
+        SLOT(handleCliRequesting( bool, bool )));
+    QObject::connect(
+        &m_cliWrapper, 
+        SIGNAL(handleCliError( int )),
+        this, 
+        SLOT(handleCliError( int )));
+    
+    QObject::connect(
+        &m_cliWrapper, 
+        SIGNAL(handleCnapStatus( int )),
+        this, 
+        SLOT(handleCnapStatus( int )));
+
+    DPRINT << ": OUT";
+}
+
+/*!
+  PsUiCliNoteHandler::~PsUiCliNoteHandler
+ */
+PsUiCliNoteHandler::~PsUiCliNoteHandler()
+{
+    DPRINT << ": IN";
+    DPRINT << ": OUT";
+}
+
+/*!
+  PsUiCliNoteHandler::handleCliInformation
+ */
+void PsUiCliNoteHandler::cliInformation( 
+    const PsCallLineIdentity& type)
+{
+    DPRINT << ": IN";
+    PsUiNotes::instance()->cancelNote(m_activeNoteId);
+
+    switch (type) {
+        case ClirOn:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_dpopinfo_my_caller_id_not_sent_on_calling"));
+            break;
+        case ClirOff:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_dpopinfo_my_caller_id_sent_on_calling"));
+            break;
+        case ClipOn:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_dpopinfo_number_of_caller_is_shown"));
+            break;
+        case ClipOff:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_dpopinfo_number_of_caller_is_not_shown"));
+            break;
+        case ColrOn:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_dpopinfo_my_caller_id_not_sent_on_answer"));
+            break;
+        case ColrOff:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_dpopinfo_my_caller_id_sent_on_answering"));
+            break;
+        case ColpOn:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_dpopinfo_answering_number_is_shown"));
+            break;
+        case ColpOff:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_dpopinfo_answering_number_is_not_shown"));
+            break;
+        case CliUnknown:
+        default:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_info_result_unknown"));
+            break;
+    }
+   
+    DPRINT << ": OUT";
+}
+
+/*!
+  PsUiCliNoteHandler::handleCliRequesting
+ */
+void PsUiCliNoteHandler::handleCliRequesting(bool ongoing,bool interrupted)
+{
+    DPRINT << ": IN";
+    DPRINT << "ongoing:" << ongoing << ", interrupted:" << interrupted;
+    
+    if (interrupted) {
+        PsUiNotes::instance()->cancelNote(m_activeProgressNoteId);
+        PsUiNotes::instance()->cancelNote(m_activeNoteId);
+    } else {
+        if (ongoing) {
+          PsUiNotes::instance()->showGlobalProgressNote(
+              m_activeProgressNoteId, hbTrId("txt_common_info_requesting"));
+      } else {
+          PsUiNotes::instance()->cancelNote(m_activeProgressNoteId);
+      }
+    }            
+    DPRINT << ": OUT";
+}
+
+/*!
+PsUiCliNoteHandler::handleCnapStatus
+ */
+void PsUiCliNoteHandler::handleCnapStatus(int status)
+{
+    DPRINT << ": IN";   
+    switch (status) {
+        case PsUiUtils::ServiceActivePermanent:
+        case PsUiUtils::ServiceActiveDefaultAllowed:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_dpopinfo_name_of_caller_is_shown"));
+            break;
+        case PsUiUtils::ServiceActiveDefaultRestricted:
+        case PsUiUtils::ServiceNotProvisioned:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_dpopinfo_name_of_caller_is_not_shown"));
+            break;
+        case PsUiUtils::ServiceUnknown:
+        default:
+            PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_info_request_not_completed"));
+            break;
+    }
+    DPRINT << ": OUT";
+}
+
+/*!
+  PsUiCliNoteHandler::handleCliError
+ */
+void PsUiCliNoteHandler::handleCliError(int error)
+{
+    DPRINT << ": IN";
+    DPRINT << "errorCode:" << error;
+    PsUiNotes::instance()->cancelNote(m_activeNoteId);
+    PsUiNotes::instance()->showGlobalErrorNote(m_activeNoteId, error);
+
+    DPRINT << ": OUT";
+}
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/src/psuilocalisation.cpp
--- a/cellular/psuinotes/src/psuilocalisation.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2010 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 "psuilocalisation.h"
-#include "psuilogging.h"
-#include <QTranslator>
-#include <QLocale>
-#include <QApplication>
-
-
-// Constant definitions 
-const char *TS_FILE_TELEPHONE_CP = "telephone_cp";
-const char *TS_FILE_COMMON = "common"; 
-
-/*!
-    \class PsUiLocalisation
-    \brief Localisation utility class for 
-           Telephony control panel plugins. 
-
-    Use installTranslator function for installing 
-    needed translation files. 
-    
-    Takes ownership of the created QTranslator objects
-    and destroys them when PsUiLocalisation 
-    object is destructed. 
-*/
-
-
-/*!
-  PsUiLocalisation::PsUiLocalisation() 
- */
-PsUiLocalisation::PsUiLocalisation(QObject *parent)
- :QObject(parent)
-{
-    DPRINT; 
-}
-
-
-/*!
-  PsUiLocalisation::~PsUiLocalisation() 
-*/
-PsUiLocalisation::~PsUiLocalisation()
-{
-    DPRINT << ":IN"; 
-    removeTranslators();
-    DPRINT << ":OUT";
-}
-
-
-/*!
-  PsUiLocalisation::installTranslator() 
-*/
-bool PsUiLocalisation::installTranslator(
-        TranslationFileId translationFileId)
-{
-    DPRINT << ": IN";
-   
-    QString lang = QLocale::system().name();
-    QString path = "z:/resource/qt/translations/";
-    bool translatorLoaded(false);  
-
-    QString fileName; 
-    switch (translationFileId) {
-        case TranslationFileTelephoneCp: 
-            fileName = TS_FILE_TELEPHONE_CP; 
-            break; 
-        case TranslationFileCommon:
-            fileName = TS_FILE_COMMON; 
-            break;
-        default: 
-            DWARNING << ": Unknown enum value!";
-            break; 
-    }
-
-    if (!fileName.isEmpty()) {
-        QTranslator* translator = new QTranslator;
-        translatorLoaded = translator->load(
-                path + fileName + "_" + lang);
-        if (translatorLoaded) {
-            m_translators.append(translator); 
-            qApp->installTranslator(translator);
-            DPRINT << ": translator installed: " << fileName; 
-        } else {
-            delete translator; 
-            translator = NULL;
-            DWARNING << ": Translator not loaded!";
-        }
-    }
-
-    DPRINT << ": OUT";
-    return translatorLoaded;
-}
-
-
-/*!
-  PsUiLocalisation::removeTranslators()
-*/
-void PsUiLocalisation::removeTranslators()
-{
-    DPRINT << ": IN";
-
-    foreach (QTranslator *translator, m_translators) {
-        qApp->removeTranslator(translator);
-    }    
-    qDeleteAll(m_translators);
-    m_translators.clear();
-    
-    DPRINT << ": OUT";
-}
-
-
-// End of File. 
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/src/psuinotes.cpp
--- a/cellular/psuinotes/src/psuinotes.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/src/psuinotes.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -33,13 +33,11 @@
 #include <hbinputstandardfilters.h>
 #include <xqserviceutil.h>
 #include <QApplication>
-#include <QTranslator>
 #include <Qt>
 
 #include "psuinotes.h"
 #include "psuiutils.h"
 #include "psuilogging.h"
-#include "psuilocalisation.h"
 
 /*!
   PsUiNotes::instance.
@@ -69,17 +67,7 @@
     m_notesQueue = new QQueue<QObject*>();
     
     m_psuiSettings = new PsUiSettingsWrapper();
- 
-    // Localization file loading 
-    m_localisation = new PsUiLocalisation(this); 
-       
-    // Install required translations
-    m_localisation->installTranslator(
-           PsUiLocalisation::
-           TranslationFileCommon);
-    m_localisation->installTranslator(
-           PsUiLocalisation::
-           TranslationFileTelephoneCp);
+    
     DPRINT << ": OUT";
     }
 
@@ -89,8 +77,6 @@
 PsUiNotes::~PsUiNotes()
 {
     DPRINT << ": IN";
-
-    delete m_localisation;
  
     qDeleteAll(*m_notesQueue);
     
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/src/psuiutils.cpp
--- a/cellular/psuinotes/src/psuiutils.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/src/psuiutils.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -114,16 +114,7 @@
     return enabled;
 }
 
-bool PsUiSettingsWrapper::isPhoneOffline() const
-{
-    bool offLinesupport(false);
-    if (XQSysInfo::isSupported(KFeatureIdOfflineMode)) {
-        offLinesupport = !readCenrepValue(
-                KCRUidCoreApplicationUIs.iUid, 
-                KCoreAppUIsNetworkConnectionAllowed).toBool();
-    }
-    return offLinesupport;
-}
+
 
 QVariant PsUiSettingsWrapper::readCenrepValue(
     const long int uid, const unsigned long int key) const
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/src/psuiwaitingnotehandler.cpp
--- a/cellular/psuinotes/src/psuiwaitingnotehandler.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/src/psuiwaitingnotehandler.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -124,17 +124,17 @@
     } else {
         switch (setting){
             case PSetCallWaitingWrapper::ActivateCallWaiting:
-                 PsUiNotes::instance()->showGlobalNotificationDialog(
-                 hbTrId("txt_phone_info_call_waiting_activated"));
-             break;
+                PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_info_call_waiting_activated"));
+                break;
             case PSetCallWaitingWrapper::DeactivateCallWaiting:
-                 PsUiNotes::instance()->showGlobalNotificationDialog(
-                 hbTrId("txt_phone_info_call_waiting_deactivated")); 
-             break;
+                PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_info_call_waiting_deactivated")); 
+                break;
             default: 
-                 PsUiNotes::instance()->showGlobalNotificationDialog(
-                 hbTrId("txt_phone_info_result_unknown"));
-             break;
+                PsUiNotes::instance()->showGlobalNotificationDialog(
+                hbTrId("txt_phone_info_result_unknown"));
+                break;
         }
       }
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/mocks/mock_psetcliwrapper.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cellular/psuinotes/tsrc/mocks/mock_psetcliwrapper.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 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 <QtGlobal>
+#include <QDebug>
+#include <smcmockclassincludes.h>
+#include "psetcliwrapper.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+class PSetCliWrapperPrivate
+{
+public:
+    PSetCliWrapperPrivate() {}
+};
+
+
+// -----------------------------------------------------------------------------
+// PSetCliWrapper::PSetCliWrapper
+// -----------------------------------------------------------------------------
+//
+PSetCliWrapper::PSetCliWrapper( 
+        CPsetContainer & /*psetContainer*/,
+        QObject * parent )
+    :
+    QObject(parent)
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCliWrapper::~PSetCliWrapper
+// -----------------------------------------------------------------------------
+//
+PSetCliWrapper::~PSetCliWrapper(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCliWrapper::getColpMode
+// -----------------------------------------------------------------------------
+//
+void PSetCliWrapper::getColpMode(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCliWrapper::getClipMode
+// -----------------------------------------------------------------------------
+//
+void PSetCliWrapper::getClipMode(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCliWrapper::getClirMode
+// -----------------------------------------------------------------------------
+//
+void PSetCliWrapper::getClirMode(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCliWrapper::getColrMode
+// -----------------------------------------------------------------------------
+//
+void PSetCliWrapper::getColrMode(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCliWrapper::getCnap
+// -----------------------------------------------------------------------------
+//
+void PSetCliWrapper::getCnap(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// PSetCliWrapper::cancelAll
+// -----------------------------------------------------------------------------
+//
+void PSetCliWrapper::cancelAll(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/mocks/mock_psuilocalisation.cpp
--- a/cellular/psuinotes/tsrc/mocks/mock_psuilocalisation.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 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 <QDebug>
-#include <smcmockclassincludes.h>
-#include "psuilocalisation.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// PsUiLocalisation::PsUiLocalisation
-// -----------------------------------------------------------------------------
-//
-PsUiLocalisation::PsUiLocalisation( 
-        QObject * parent )
-    //:
-    //QObject( /*parent*/ )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// PsUiLocalisation::~PsUiLocalisation
-// -----------------------------------------------------------------------------
-//
-PsUiLocalisation::~PsUiLocalisation(  )
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// PsUiLocalisation::installTranslator
-// -----------------------------------------------------------------------------
-//
-bool PsUiLocalisation::installTranslator( 
-        TranslationFileId translationFileId )
-    {
-    SMC_MOCK_METHOD1( bool, TranslationFileId, translationFileId )
-    }
-
-
-// -----------------------------------------------------------------------------
-// PsUiLocalisation::removeTranslators
-// -----------------------------------------------------------------------------
-//
-void PsUiLocalisation::removeTranslators(  )
-    {
-    SMC_MOCK_METHOD0( void )
-    }
-
-
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/mocks/mock_psuiutils.cpp
--- a/cellular/psuinotes/tsrc/mocks/mock_psuiutils.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/tsrc/mocks/mock_psuiutils.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -67,16 +67,6 @@
 
 
 // -----------------------------------------------------------------------------
-// PsUiSettingsWrapper::isPhoneOffline
-// -----------------------------------------------------------------------------
-//
-bool PsUiSettingsWrapper::isPhoneOffline(  ) const
-    {
-    SMC_MOCK_METHOD0( bool )
-    }
-
-
-// -----------------------------------------------------------------------------
 // PsUiSettingsWrapper::numberGroupingSupported
 // -----------------------------------------------------------------------------
 //
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/run_auto_tests_qt.bat
--- a/cellular/psuinotes/tsrc/run_auto_tests_qt.bat	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/tsrc/run_auto_tests_qt.bat	Fri Oct 15 13:21:28 2010 +0300
@@ -138,6 +138,7 @@
 call cd %1
 call qmake
 call sbs --config winscw_udeb --keepgoing CLEAN
+call sbs RESOURCE
 if [%INSTRUMENT%] EQU [TRUE] (
 call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
 ) else (
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuiclinotehandler/qtestmains60.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cellular/psuinotes/tsrc/ut_psuiclinotehandler/qtestmains60.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 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 QTESTMAINS60
+#define QTESTMAINS60
+
+#define QTEST_MAIN_S60(TestObject) \
+int main(int argc, char *argv[]) \
+{ \
+char *new_argv[3]; \
+QCoreApplication app(argc, argv); \
+\
+QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
+QByteArray   bytes  = str.toAscii(); \
+\
+char arg1[] = "-o"; \
+\
+new_argv[0] = argv[0]; \
+new_argv[1] = arg1; \
+new_argv[2] = bytes.data(); \
+\
+TestObject tc; \
+return QTest::qExec(&tc, 3, new_argv); \
+}
+
+#endif
\ No newline at end of file
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuiclinotehandler/ut_psuiclinotehandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cellular/psuinotes/tsrc/ut_psuiclinotehandler/ut_psuiclinotehandler.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2010 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 "ut_psuiclinotehandler.h"
+#include "psuiclinotehandler.h"
+#include "psetcliwrapper.h"
+#include "psuinotes.h"
+#include "psuiutils.h"
+#include "qtestmains60.h"
+#include <smcmockclassincludes.h>
+
+class CPsetContainer
+{
+public:
+    CPsetContainer(){};
+    ~CPsetContainer(){};
+};
+
+/*!
+  UT_psuiclinotehandler::UT_psuiclinotehandler
+ */
+UT_psuiclinotehandler::UT_psuiclinotehandler() 
+{
+    
+}
+
+/*!
+  UT_psuiclinotehandler::~UT_psuiclinotehandler
+ */
+UT_psuiclinotehandler::~UT_psuiclinotehandler()
+{
+    
+}
+
+/*!
+  UT_psuiclinotehandler::init
+ */
+void UT_psuiclinotehandler::init()
+{
+    initialize();
+    m_psetContainer = new CPsetContainer();
+    m_mockCliWrapper = new PSetCliWrapper(*m_psetContainer,this);
+    m_cliHandler = new PsUiCliNoteHandler(*m_mockCliWrapper);
+}
+
+/*!
+  UT_psuiclinotehandler::cleanup
+ */
+void UT_psuiclinotehandler::cleanup()
+{
+    delete m_cliHandler;
+    delete m_mockCliWrapper;   
+    delete m_psetContainer;
+    reset();
+}
+
+/*!
+  UT_psuiclinotehandler::t_memleak
+ */
+void UT_psuiclinotehandler::t_memleak()
+{
+    
+}
+
+/*!
+  UT_psuiclinotehandler::t_construction
+ */
+void UT_psuiclinotehandler::t_construction()
+{
+    EXPECT(QObject,connect).times(4);
+    CPsetContainer psetContainer;
+    PSetCliWrapper *mockCliWrapper = new PSetCliWrapper(psetContainer,this);
+    PsUiCliNoteHandler *cliHandler = new PsUiCliNoteHandler(*mockCliWrapper);
+    delete cliHandler;
+    delete mockCliWrapper;
+    QVERIFY(verify());
+}
+
+void UT_psuiclinotehandler::t_handleCliRequesting()
+{   
+    EXPECT(PsUiNotes,showGlobalProgressNote);
+    bool ongoing = true;
+    bool interrupted = false;
+    m_cliHandler->handleCliRequesting(ongoing,interrupted);
+    QVERIFY(verify());
+    
+    EXPECT(PsUiNotes,cancelNote).times(2);
+    ongoing = false;
+    interrupted = true;
+    m_cliHandler->handleCliRequesting(ongoing,interrupted);
+    QVERIFY(verify()); 
+    
+    EXPECT(PsUiNotes,cancelNote);
+    ongoing = false;
+    interrupted = false;
+    m_cliHandler->handleCliRequesting(ongoing,interrupted);
+    QVERIFY(verify()); 
+}
+
+void UT_psuiclinotehandler::t_cliInformation()
+{  
+    EXPECT(PsUiNotes,cancelNote);
+   
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_dpopinfo_my_caller_id_not_sent_on_calling"));
+    m_cliHandler->cliInformation(ClirOn);
+    QVERIFY(verify());
+  
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_dpopinfo_my_caller_id_sent_on_calling"));
+    m_cliHandler->cliInformation(ClirOff);
+    QVERIFY(verify());
+   
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_dpopinfo_number_of_caller_is_shown"));
+    m_cliHandler->cliInformation(ClipOn);
+    QVERIFY(verify());
+    
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_dpopinfo_number_of_caller_is_not_shown"));
+    m_cliHandler->cliInformation(ClipOff);
+    QVERIFY(verify());
+  
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_dpopinfo_my_caller_id_not_sent_on_answer"));
+    m_cliHandler->cliInformation(ColrOn);
+    QVERIFY(verify());
+    
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_dpopinfo_my_caller_id_sent_on_answering"));
+    m_cliHandler->cliInformation(ColrOff);
+    QVERIFY(verify());
+    
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_dpopinfo_answering_number_is_shown"));
+    m_cliHandler->cliInformation(ColpOn);
+    QVERIFY(verify());
+    
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_dpopinfo_answering_number_is_not_shown"));
+    m_cliHandler->cliInformation(ColpOff);
+    QVERIFY(verify());
+    
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_info_result_unknown")).times(2);
+    m_cliHandler->cliInformation(CliUnknown);
+    m_cliHandler->cliInformation((PsCallLineIdentity)100); 
+    QVERIFY(verify()); 
+}
+
+void UT_psuiclinotehandler::t_handleCliError()
+{
+    EXPECT(PsUiNotes,cancelNote);
+    EXPECT(PsUiNotes,showGlobalErrorNote);
+    int error = -1;
+    m_cliHandler->handleCliError(error);
+    
+    QVERIFY(verify());
+}
+
+void UT_psuiclinotehandler::t_handleCnapStatus()
+{  
+    EXPECT(PsUiNotes,instance);
+      
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_dpopinfo_name_of_caller_is_shown")).times(2);
+    m_cliHandler->handleCnapStatus(PsUiUtils::ServiceActivePermanent);
+    m_cliHandler->handleCnapStatus(PsUiUtils::ServiceActiveDefaultAllowed);  
+    QVERIFY(verify());
+    
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_dpopinfo_name_of_caller_is_not_shown")).times(2);
+    m_cliHandler->handleCnapStatus(PsUiUtils::ServiceActiveDefaultRestricted);
+    m_cliHandler->handleCnapStatus(PsUiUtils::ServiceNotProvisioned);
+    QVERIFY(verify());
+
+    EXPECT(PsUiNotes,showGlobalNotificationDialog).with(
+        QString("txt_phone_info_request_not_completed"));
+    m_cliHandler->handleCnapStatus(PsUiUtils::ServiceUnknown);
+    QVERIFY(verify());
+}
+
+QTEST_MAIN_S60(UT_psuiclinotehandler)
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuiclinotehandler/ut_psuiclinotehandler.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cellular/psuinotes/tsrc/ut_psuiclinotehandler/ut_psuiclinotehandler.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,54 @@
+/*
+* Copyright (c) 2010 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 UT_PSUICLINOTEHANDLER_H
+#define UT_PSUICLINOTEHANDLER_H
+
+#include <QtTest/QtTest>
+#include <mockservice.h>
+
+class CPsetContainer;
+class PSetCliWrapper;
+class PsUiCliNoteHandler;
+
+class UT_psuiclinotehandler : public QObject, MockService
+{
+    Q_OBJECT
+
+public:    
+    UT_psuiclinotehandler();
+    ~UT_psuiclinotehandler();
+    
+private slots:
+    void init();
+    void cleanup();
+    void t_memleak();
+    
+    void t_construction();
+    
+    void t_handleCliRequesting(); 
+    void t_cliInformation();
+    void t_handleCliError();  
+    void t_handleCnapStatus();
+ 
+private:
+    CPsetContainer *m_psetContainer;
+    PSetCliWrapper *m_mockCliWrapper;
+    PsUiCliNoteHandler *m_cliHandler;
+};
+
+#endif // UT_PSUCLINOTEHANDLER_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuiclinotehandler/ut_psuiclinotehandler.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cellular/psuinotes/tsrc/ut_psuiclinotehandler/ut_psuiclinotehandler.pro	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2010 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: 
+#
+
+
+CONFIG += hb qtestlib
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += . ../../src/
+INCLUDEPATH += . ../../inc/
+DEFINES += BUILD_PSUINOTES BUILD_PSETWRAPPER
+
+QT -= gui
+QT += testlib
+
+symbian: {
+  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+  LIBS += -lmocklib -lsymbianmock
+}
+
+# test code
+HEADERS += ut_psuiclinotehandler.h
+SOURCES += ut_psuiclinotehandler.cpp
+
+# code to be tested
+HEADERS += ../../../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuiclinotehandler.h	 
+SOURCES += ../../src/psuiclinotehandler.cpp 
+
+# mocks needed for testing
+HEADERS += ../../../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuinotes.h \  
+	../../../../phonesrv_plat/phone_settings_api/inc/psetcliwrapper.h \
+	../../../../phonesrv_plat/phone_settings_api/inc/psetcalldivertingwrapper.h \
+	../../inc/psuiutils.h
+
+SOURCES += ../mocks/mock_psuinotes.cpp \
+		../mocks/mock_psetcliwrapper.cpp \ 
+		../mocks/mock_qobject.cpp \
+		../mocks/mock_psuiutils.cpp
+		
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuilocalisation/qtestmains60.h
--- a/cellular/psuinotes/tsrc/ut_psuilocalisation/qtestmains60.h	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 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 QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray   bytes  = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
\ No newline at end of file
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuilocalisation/ut_psuilocalisation.cpp
--- a/cellular/psuinotes/tsrc/ut_psuilocalisation/ut_psuilocalisation.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-/*
-* Copyright (c) 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 "ut_psuilocalisation.h"
-#include "qtestmains60.h"
-#include <smcmockclassincludes.h>
-#define private public
-#include "psuilocalisation.h"
-
-void QCoreApplication::installTranslator(QTranslator * messageFile)
-{
-    SMC_MOCK_METHOD1( void, QTranslator *, messageFile)
-}
-
-/*!
-  UT_psuilocalisation::UT_psuilocalisation
- */
-UT_psuilocalisation::UT_psuilocalisation() 
-{
-    
-}
-
-/*!
-  UT_psuilocalisation::~UT_psuilocalisation
- */
-UT_psuilocalisation::~UT_psuilocalisation()
-{
-    
-}
-
-/*!
-  UT_psuilocalisation::init
- */
-void UT_psuilocalisation::init()
-{
-    initialize();
-    
-    m_psuiLocalisation.reset(new PsUiLocalisation); 
-}
-
-/*!
-  UT_psuilocalisation::cleanup
- */
-void UT_psuilocalisation::cleanup()
-{
-    reset();
-    delete m_psuiLocalisation.take(); 
-}
-
-/*!
-  UT_psuilocalisation::t_memleak
- */
-void UT_psuilocalisation::t_memleak()
-{
-    
-}
-
-/*!
-  UT_psuilocalisation::t_installTranslator
- */
-void UT_psuilocalisation::t_installTranslator()
-{
-    
-    // Test: successfull load  
-    expect("QTranslator::load").
-        returns(true);    
-    expect("QCoreApplication::installTranslator").times(1);
-    
-    m_psuiLocalisation->installTranslator(
-            PsUiLocalisation::TranslationFileCommon);
-    QVERIFY(m_psuiLocalisation->m_translators.count() == 1);
-    QVERIFY(verify());
-    
-    // Test: failing load  
-    expect("QTranslator::load").
-        returns(false);
-    expect("QCoreApplication::installTranslator").times(0);
-    m_psuiLocalisation->installTranslator(
-        PsUiLocalisation::TranslationFileCommon);
-    QVERIFY(m_psuiLocalisation->m_translators.count() == 1);
-    
-    // Test: Unknown enum value
-    QVERIFY(verify());
-    expect("QCoreApplication::installTranslator").times(0);
-    m_psuiLocalisation->installTranslator(
-            (PsUiLocalisation::TranslationFileId)2);
-    QVERIFY(m_psuiLocalisation->m_translators.count() == 1);
-    QVERIFY(verify());
-    
-    // Test: telephone_cp translator load 
-    expect("QTranslator::load").
-        returns(false);
-    expect("QCoreApplication::installTranslator").times(0);
-    m_psuiLocalisation->installTranslator(
-        PsUiLocalisation::TranslationFileTelephoneCp);
-    QVERIFY(verify());
- 
-}
-
-/*!
-  UT_psuilocalisation::t_removeTranslators
- */
-void UT_psuilocalisation::t_removeTranslators()
-{
-    expect("QTranslator::load").
-        returns(true);
-    
-    m_psuiLocalisation->installTranslator(
-        PsUiLocalisation::TranslationFileCommon); 
-    m_psuiLocalisation->installTranslator(
-        PsUiLocalisation::TranslationFileTelephoneCp);
-    
-    m_psuiLocalisation->removeTranslators(); 
-    QVERIFY(m_psuiLocalisation->m_translators.count() == 0);
-    QVERIFY(verify());
-}
-
-QTEST_MAIN_S60(UT_psuilocalisation)
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuilocalisation/ut_psuilocalisation.h
--- a/cellular/psuinotes/tsrc/ut_psuilocalisation/ut_psuilocalisation.h	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 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 UT_PSUILOCALISATION_H
-#define UT_PSUILOCALISATION_H
-
-#include <QtTest/QtTest>
-#include <mockservice.h>
-
-class PsUiLocalisation; 
-
-class UT_psuilocalisation : public QObject, MockService
-{
-    Q_OBJECT
-
-public:    
-    UT_psuilocalisation();
-    ~UT_psuilocalisation();
-    
-private slots:
-    void init();
-    void cleanup();
-    void t_memleak();
-    void t_installTranslator();
-    void t_removeTranslators(); 
- 
-private: 
-    QScopedPointer<PsUiLocalisation> m_psuiLocalisation; 
-    
-};
-
-#endif
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuilocalisation/ut_psuilocalisation.pro
--- a/cellular/psuinotes/tsrc/ut_psuilocalisation/ut_psuilocalisation.pro	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 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: 
-#
-
-CONFIG += qtestlib
-CONFIG += hb
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += . ../../src/
-INCLUDEPATH += . ../../inc/
-DEFINES += BUILD_PSUINOTES 
-    
-QT -= gui
-QT += testlib
-
-symbian: {
-  CONFIG += no_icon
-  INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-  INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-  LIBS += -lmocklib -lsymbianmock
-}
-
-# test code
-HEADERS += ut_psuilocalisation.h
-SOURCES += ut_psuilocalisation.cpp
-
-# code to be tested
-HEADERS += ../../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuilocalisation.h 
-           
-SOURCES += ../../src/psuilocalisation.cpp
-
-# mocks needed for testing
-SOURCES += ../mocks/mock_qtranslator.cpp 
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuinotes/ut_psuinotes.pro
--- a/cellular/psuinotes/tsrc/ut_psuinotes/ut_psuinotes.pro	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/tsrc/ut_psuinotes/ut_psuinotes.pro	Fri Oct 15 13:21:28 2010 +0300
@@ -35,13 +35,11 @@
 SOURCES += ut_psuinotes.cpp
 
 # code to be tested
-HEADERS += ../../../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuinotes.h	 
+HEADERS += ../../../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuinotes.h
                    
 SOURCES += ../../src/psuinotes.cpp 
 
 # mocks needed for testing
-HEADERS += ../../../../phonesrv_plat/phone_settings_ui_notes_api/inc/psuilocalisation.h \
-		../../inc/psuiutils.h	
+HEADERS += ../../inc/psuiutils.h
 
-SOURCES += ../mocks/mock_psuilocalisation.cpp \
-		../mocks/mock_psuiutils.cpp
+SOURCES += ../mocks/mock_psuiutils.cpp
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuiutils/ut_psuiutils.cpp
--- a/cellular/psuinotes/tsrc/ut_psuiutils/ut_psuiutils.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/tsrc/ut_psuiutils/ut_psuiutils.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -163,14 +163,5 @@
     QVERIFY( verify() );
 }
 
-/*!
-  UT_PsUiUtils::::t_isPhoneOffline
- */
-void UT_PsUiUtils::t_isPhoneOffline()
-{
-    expect("XQSysInfo::isSupported");
-    mWrapper->isPhoneOffline();
-    QVERIFY( verify() );
-}
 
 QTEST_MAIN_S60(UT_PsUiUtils)
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/psuinotes/tsrc/ut_psuiutils/ut_psuiutils.h
--- a/cellular/psuinotes/tsrc/ut_psuiutils/ut_psuiutils.h	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/psuinotes/tsrc/ut_psuiutils/ut_psuiutils.h	Fri Oct 15 13:21:28 2010 +0300
@@ -41,7 +41,6 @@
     void t_errorCodeTextMapping();
     
     void t_isFeatureCallWaitingDistiquishNotProvisionedEnabled();
-    void t_isPhoneOffline();
     
 private:
     PsUiSettingsWrapper *mWrapper;
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/telephonysettings/xqbindings/psetwrapper/bwins/psetwrapperu.def
--- a/cellular/telephonysettings/xqbindings/psetwrapper/bwins/psetwrapperu.def	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/telephonysettings/xqbindings/psetwrapper/bwins/psetwrapperu.def	Fri Oct 15 13:21:28 2010 +0300
@@ -132,4 +132,5 @@
 	??_EPSetCallWaitingWrapper@@UAE@I@Z @ 131 NONAME ; PSetCallWaitingWrapper::~PSetCallWaitingWrapper(unsigned int)
 	??0PSetCallWaitingWrapper@@QAE@AAVCPsetContainer@@PAVQObject@@@Z @ 132 NONAME ; PSetCallWaitingWrapper::PSetCallWaitingWrapper(class CPsetContainer &, class QObject *)
 	?qt_metacall@PSetCallBarringWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 133 NONAME ; int PSetCallBarringWrapper::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?getCPsetCli@PSetCliWrapper@@QBEAAVCPsetCli@@XZ @ 134 NONAME ; class CPsetCli & PSetCliWrapper::getCPsetCli(void) const
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/telephonysettings/xqbindings/psetwrapper/eabi/psetwrapperu.def
--- a/cellular/telephonysettings/xqbindings/psetwrapper/eabi/psetwrapperu.def	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/telephonysettings/xqbindings/psetwrapper/eabi/psetwrapperu.def	Fri Oct 15 13:21:28 2010 +0300
@@ -132,4 +132,5 @@
 	_ZTV22PSetCallBarringWrapper @ 131 NONAME
 	_ZTV22PSetCallWaitingWrapper @ 132 NONAME
 	_ZTV24PSetCallDivertingWrapper @ 133 NONAME
+	_ZNK14PSetCliWrapper11getCPsetCliEv @ 134 NONAME
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 cellular/telephonysettings/xqbindings/psetwrapper/src/psetcliwrapper.cpp
--- a/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcliwrapper.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/cellular/telephonysettings/xqbindings/psetwrapper/src/psetcliwrapper.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -121,5 +121,15 @@
     
     DPRINT << ": OUT ";
 }
+
+/*!
+  PSetCliWrapper::getCPsetCli
+ */
+CPsetCli &  PSetCliWrapper::getCPsetCli() const
+    {
+    DPRINT;
+    
+    return *m_psetCli;
+    }
     
 // End of File. 
diff -r 12bc758d6a02 -r 25b8d29b7c59 package_definition.xml
--- a/package_definition.xml	Mon Oct 04 15:57:13 2010 +0300
+++ b/package_definition.xml	Fri Oct 15 13:21:28 2010 +0300
@@ -195,7 +195,7 @@
    <component id="psuinotes" filter="s60" name="Phone Settings Notes UI" introduced="^4">
     <unit bldFile="cellular/psuinotes" qt:proFile="psuinotes.pro"/>
    </component>
-  </collection>
+  </collection>  
   <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
    <component id="callprovider" filter="s60" name="Call Provider">
     <unit bldFile="convergedcallengine/callprovider/group"/>
diff -r 12bc758d6a02 -r 25b8d29b7c59 phoneclientserver/enpolicy/src/dosenpolicy/cdosemergencynumberpolicy.cpp
--- a/phoneclientserver/enpolicy/src/dosenpolicy/cdosemergencynumberpolicy.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/phoneclientserver/enpolicy/src/dosenpolicy/cdosemergencynumberpolicy.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -74,6 +74,7 @@
     TInt err = KErrNone;
 
     CRepository* variationFlags = CRepository::NewL( KCRUidTelSrvVariation );
+    CleanupStack::PushL(variationFlags);
     err = variationFlags->Get( KTelSrvVariationFlags , variantReadOnlyValues );
 
     if ( err != KErrNotFound )
@@ -90,7 +91,7 @@
         iAdvancedCheck = EFalse;
         }
     
-    delete variationFlags;
+    CleanupStack::PopAndDestroy(variationFlags);
 
     iCenRep = CRepository::NewL( KCRUidDefaultEmergencyNumbers );    
     iListener = CCenRepNotifyHandler::NewL( 
diff -r 12bc758d6a02 -r 25b8d29b7c59 phoneclientserver/phoneclient/tsrc/public/basic/ut_ussd/ut_ussd.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/phoneclient/tsrc/public/basic/ut_ussd/ut_ussd.pkg	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,29 @@
+;
+; Copyright (c) 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: Phoneclientserver USSD part unit test PKG file
+;
+
+
+;Languages
+&EN
+
+;Localised Vendor name
+%{"Nokia EN"}
+
+;Unique Vendor name
+:"Nokia"
+
+;Files to install
+"\epoc32\release\armv5\urel\ut_ussd.exe"-"!:\sys\bin\ut_ussd.exe"
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 phoneclientserver/phoneclient/tsrc/public/basic/ut_ussd/ut_ussd.pro
--- a/phoneclientserver/phoneclient/tsrc/public/basic/ut_ussd/ut_ussd.pro	Mon Oct 04 15:57:13 2010 +0300
+++ b/phoneclientserver/phoneclient/tsrc/public/basic/ut_ussd/ut_ussd.pro	Fri Oct 15 13:21:28 2010 +0300
@@ -46,11 +46,11 @@
 HEADERS += ../../../../../phoneserver/inc/ussd/mphsrvussdmessagesentobserver.h
 HEADERS += ../../../../../phoneserver/inc/ussd/mphsrvussdnetworkobserver.h
 HEADERS += ../../../../../phoneserver/inc/ussd/mphsrvussdreplytimerobserver.h
-HEADERS += ../../../../../phoneserver/inc/Standard/mphsrvphoneinterface.h
-HEADERS += ../../../../../phoneserver/inc/Standard/cphsrvresourcemanager.h
-HEADERS += ../../../../../phoneserver/inc/Standard/phsrvutils.h
-HEADERS += ../../../../../phoneserver/inc/Standard/phsrvdebuginfo.h
-HEADERS += ../../../../../phoneserver/inc/Standard/phsrvconfigure.h
+HEADERS += ../../../../../phoneserver/inc/standard/mphsrvphoneinterface.h
+HEADERS += ../../../../../phoneserver/inc/standard/cphsrvresourcemanager.h
+HEADERS += ../../../../../phoneserver/inc/standard/phsrvutils.h
+HEADERS += ../../../../../phoneserver/inc/standard/phsrvdebuginfo.h
+HEADERS += ../../../../../phoneserver/inc/standard/phsrvconfigure.h
 
 SOURCES += ../../../../../phoneserver/src/ussd/cphsrvussdmanager.cpp
 SOURCES += ../../../../../phoneserver/src/ussd/cphsrvussdnotifynwrelease.cpp
@@ -67,7 +67,7 @@
 HEADERS += ../../../../../phoneclient/inc/ussdwrapper/cphcltussdrequesthandler.h
 HEADERS += ../../../../../phoneclient/inc/ussdwrapper/mphcltussdnotecontrollercallback.h
 HEADERS += ../../../../../phoneclient/inc/ussdwrapper/mphcltussdrequesthandler.h
-HEADERS += ../../../../../phoneclient/inc/SharedClientServer/phcltclientserver.h
+HEADERS += ../../../../../phoneclient/inc/sharedclientserver/phcltclientserver.h
 HEADERS += ../../../../../phoneclient/inc/ussdwrapper/cphcltussdcommonconstant.h
 
 SOURCES += ../../../../../phoneclient/src/ussdwrapper/cphcltussdext.cpp
@@ -116,4 +116,7 @@
 LIBS += -laknnotify
 LIBS += -leiksrv
 LIBS += -lbafl
-
+LIBS += -lcharconv      # CCnvCharacterSetConverter
+LIBS += -lws32          # RWsSession
+LIBS += -lapparc        # TApaAppInfo,
+LIBS += -lapgrfx        # TApaTaskList,RApaLsSession
diff -r 12bc758d6a02 -r 25b8d29b7c59 phoneclientserver/phoneserver/src/standard/cphsrvsession.cpp
--- a/phoneclientserver/phoneserver/src/standard/cphsrvsession.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/phoneclientserver/phoneserver/src/standard/cphsrvsession.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -138,10 +138,8 @@
 
             // Add to container (takes ownership)
             iContainer->AddL( subSession );
-            if (function != EPhoneServerImageHandlerSubSessionOpen )
-                {
-                CleanupStack::Pop( subSession );    
-                }
+            CleanupStack::Pop( subSession );    
+            
             // Get a handle for the object
             const TInt handle = iObjectIx->AddL( subSession );
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 phoneclientserver/phoneserver/src/standard/phsrvsubsessionfactory.cpp
--- a/phoneclientserver/phoneserver/src/standard/phsrvsubsessionfactory.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/phoneclientserver/phoneserver/src/standard/phsrvsubsessionfactory.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -78,39 +78,52 @@
     switch( aFunction )
         {
         case EPhoneServerExtCallSubSessionOpen:
+            {
             subSession = new( ELeave ) CPhSrvSubSessionExtCall( aSession );
             break;
+            }
         case EPhoneServerNotifySubSessionOpen:
+            {
             subSession = new( ELeave ) CPhSrvSubSessionNotifier( aSession );
             break;
+            }
         case EPhoneServerUSSDSubSessionOpen:
+            {
             subSession = new( ELeave ) CPhSrvSubSessionUssd( aSession );
             break;
+            }
         case EPhoneServerEmergencyNumberSubSessionOpen:
-            subSession = new( ELeave ) CPhSrvSubSessionEmergencyNum( aSession );
-            break;
-        case EPhoneServerComHandSubSessionOpen:
+		        {
             subSession = 
-                CPhSrvSubSessionCommandHandler::NewL( aSession );
+			          new( ELeave ) CPhSrvSubSessionEmergencyNum( aSession );
             break;
+			      }
         case EPhoneServerMessengerSubSessionOpen:
-            subSession = 
-                CPhSrvSubSessionMessenger::NewL( aSession );
+            {
+            subSession = CPhSrvSubSessionMessenger::NewL( aSession );
             break;
-
+            }
+        case EPhoneServerComHandSubSessionOpen:
+        	  {
+            subSession = CPhSrvSubSessionCommandHandler::NewL( aSession );
+            break;
+            }
         case EPhoneServerImageHandlerSubSessionOpen:
+            {
             subSession = CPhSrvSubSessionImageHandler::NewL( aSession );
             break;
+            }
         default:
+            {
+        		User::Leave( KErrNotSupported );
             break;
+            }
         }
 
     // Complete construction
-    if ( aFunction != EPhoneServerImageHandlerSubSessionOpen )
-        {
-        CleanupStack::PushL( subSession );        
-        }
+    CleanupStack::PushL( subSession );        
     subSession->ConstructL();
+    
     return subSession;
     }
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 phoneclientserver/phoneserver/src/standard/standard_aiw/cphsrvemergencyrequestmanager.cpp
--- a/phoneclientserver/phoneserver/src/standard/standard_aiw/cphsrvemergencyrequestmanager.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/phoneclientserver/phoneserver/src/standard/standard_aiw/cphsrvemergencyrequestmanager.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -127,11 +127,10 @@
 //
 void CPhSrvEmergencyRequestManager::EmergencyDialCancel()
     {
-    // Clear pending request status 
-    iIsRequestPending = EFalse;
-    
     if ( !iPendingRequestPointer.IsNull() )
         {
+		// Clear pending request status 
+		iIsRequestPending = EFalse;
         iPendingRequestPointer.Complete( KErrCancel );
         }
     }
diff -r 12bc758d6a02 -r 25b8d29b7c59 phonecmdhandler/phonecmdhnlr/src/phonehandlercontrol.cpp
--- a/phonecmdhandler/phonecmdhnlr/src/phonehandlercontrol.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/phonecmdhandler/phonecmdhnlr/src/phonehandlercontrol.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -133,21 +133,10 @@
 CPhoneHandlerControl::~CPhoneHandlerControl()
     {
     COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerControl::~CPhoneHandlerControl() start" );
-    
-    if( iInterfaceSelector )
-        {
-        delete iInterfaceSelector;
-        }
-    
-    if( iResponse )
-        {
-        iResponse->Delete();
-        }
-        
-    if( iCallStateObserver )
-        {
-        delete iCallStateObserver;
-        }
+
+    delete iInterfaceSelector; // deletes iTarget
+    delete iResponse;
+    delete iCallStateObserver;
             
     COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerControl::~CPhoneHandlerControl() end" );
     }
diff -r 12bc758d6a02 -r 25b8d29b7c59 phonesrv_plat/call_remote_party_information_api/group/bld.inf
--- a/phonesrv_plat/call_remote_party_information_api/group/bld.inf	Mon Oct 04 15:57:13 2010 +0300
+++ b/phonesrv_plat/call_remote_party_information_api/group/bld.inf	Fri Oct 15 13:21:28 2010 +0300
@@ -27,6 +27,5 @@
 ../inc/mcallremotepartyinfo.h           MW_LAYER_PLATFORM_EXPORT_PATH(mcallremotepartyinfo.h)
 ../inc/mcallremotepartyinfoobserver.h   MW_LAYER_PLATFORM_EXPORT_PATH(mcallremotepartyinfoobserver.h)
 ../inc/ccallremotepartyinfoiter.h       MW_LAYER_PLATFORM_EXPORT_PATH(ccallremotepartyinfoiter.h)
-../inc/xqcallremotepartyinfo.h          MW_LAYER_PLATFORM_EXPORT_PATH(xqcallremotepartyinfo.h)
 
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 phonesrv_plat/call_remote_party_information_api/inc/xqcallremotepartyinfo.h
--- a/phonesrv_plat/call_remote_party_information_api/inc/xqcallremotepartyinfo.h	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/*!
-* Copyright (c) 2010 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: Provides information about remote party information of ongoing calls.
-*
-*/
-
-#ifndef XQCALLREMOTEPARTYINFO_H
-#define XQCALLREMOTEPARTYINFO_H
-
-#include <QObject>
-#include <QString>
-#include <QGlobal.h>
-#include <ccpdefs.h>
-#include <mcallremotepartyinfo.h>
-
-// forward declarations 
-class XQCallRemotePartyInfoPrivate;
-class CallRemotePartyInfoPrivate;
-
-/*!
-    CallRemotePartyInfo
-    Holds calls remote party information.
-*/
-NONSHARABLE_CLASS( CallRemotePartyInfo )
-    {
-public:
-    /*!
-       Constructors and destructor
-    */
-    CallRemotePartyInfo();
-    CallRemotePartyInfo(const CallRemotePartyInfo&);
-    CallRemotePartyInfo& operator=(const CallRemotePartyInfo&);
-    ~CallRemotePartyInfo();
-
-public:
-    void setCallIndex(int index); 
-    void setAddress(QString address); 
-    void setMatchedName(QString matchedName); 
-    void setNameFromNetwork(QString nameFromNetwork); 
-    void setCompanyName(QString companyName); 
-    void setSATCall(bool SATCall); 
-    void setRemoteIdentity(MCallRemotePartyInfo::TRemoteIdentityStatus remoteIdentity); 
-    
-    int callIndex() const;  
-    QString address() const;
-    QString matchedName() const ; 
-    QString nameFromNetwork() const; 
-    QString companyName() const; 
-    bool SATCall() const; 
-    MCallRemotePartyInfo::TRemoteIdentityStatus remoteIdentity() const;
-    
-protected:  
-    CallRemotePartyInfoPrivate* d_ptr;  
-     
-    };
- 
-
-#ifdef BUILD_XQCALLREMOTEPARTYINFO
-#define XQCALLREMOTEPARTYINFO_EXPORT Q_DECL_EXPORT
-#else
-#define XQCALLREMOTEPARTYINFO_EXPORT Q_DECL_IMPORT
-#endif
-/*!
-    XQCallRemotePartyInfo
-    Class to be used for receiving information about ongoing call remote party informations.
-    
-    Usage example:
-    
-    QList<CallRemotePartyInfo> infos;
-    CallRemotePartyInfo callRemotePartyInfoFirst;
-    CallRemotePartyInfo callRemotePartyInfoLast;
-    XQCallRemotePartyInfo xqCallRemotePartyInfo;
-    xqCallRemotePartyInfo.getCallRemotePartyInfos(infos);
-    callRemotePartyInfoFirst = infos.first();
-    callRemotePartyInfoLast = infos.last();
-     
-*/
-
-
-class XQCALLREMOTEPARTYINFO_EXPORT XQCallRemotePartyInfo: public QObject
-{
-    Q_OBJECT
-
-public: 
-    /*!
-       Constructor and destructor
-    */
-    XQCallRemotePartyInfo ();
-    ~XQCallRemotePartyInfo ();
-        
-    /*!
-        \fn void getCallRemotePartyInfos(QList<CallRemotePartyInfo> &infos)
-        
-        Gets the snapshot of remote party information of ongoing calls.
-    */
-    void getCallRemotePartyInfos(QList<CallRemotePartyInfo> &infos);
- 
-signals:
-    
-    /*!
-        \fn void callRemotePartyInformationChanged()
-        
-        Signals that there are changes in remote party informations of ongoing calls. 
-        Client should fetch the call infomations after receiving the notification.
-    */
-    void callRemotePartyInformationChanged();
-
-private slots:       
-   
-/*!
-        \fn void sendCallRemotePartyInfoChangedSignal()
-        
-        Sends signal call remote party info changed signal to client's.
-    */
-    void sendCallRemotePartyInfoChangedSignal();
-    
-    
-protected:  
-
-     XQCallRemotePartyInfoPrivate* const d_ptr;  
-
-     Q_DECLARE_PRIVATE(XQCallRemotePartyInfo);  
- 
-};
-
-#endif // XQCALLREMOTEPARTYINFO_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 phonesrv_plat/phone_settings_api/inc/psetcliwrapper.h
--- a/phonesrv_plat/phone_settings_api/inc/psetcliwrapper.h	Mon Oct 04 15:57:13 2010 +0300
+++ b/phonesrv_plat/phone_settings_api/inc/psetcliwrapper.h	Fri Oct 15 13:21:28 2010 +0300
@@ -79,6 +79,11 @@
     * Cancels any (and all) request(s).
     */
     void cancelAll();
+
+    /**
+    * Returns reference to CPSetCli
+    */
+    CPsetCli & getCPsetCli() const;
     
 signals: // Notify via signals     
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 phonesrv_plat/phone_settings_ui_notes_api/group/bld.inf
--- a/phonesrv_plat/phone_settings_ui_notes_api/group/bld.inf	Mon Oct 04 15:57:13 2010 +0300
+++ b/phonesrv_plat/phone_settings_ui_notes_api/group/bld.inf	Fri Oct 15 13:21:28 2010 +0300
@@ -25,7 +25,7 @@
 PRJ_EXPORTS
 
 ../inc/psuinotes.h     MW_LAYER_PLATFORM_EXPORT_PATH(psuinotes.h)
-../inc/psuilocalisation.h     MW_LAYER_PLATFORM_EXPORT_PATH(psuilocalisation.h)
 ../inc/psuiwaitingnotehandler.h     MW_LAYER_PLATFORM_EXPORT_PATH(psuiwaitingnotehandler.h)
 ../inc/psuidivertnotehandler.h     MW_LAYER_PLATFORM_EXPORT_PATH(psuidivertnotehandler.h)
+../inc/psuiclinotehandler.h     MW_LAYER_PLATFORM_EXPORT_PATH(psuiclinotehandler.h)
 ../inc/psuiconstants.h     MW_LAYER_PLATFORM_EXPORT_PATH(psuiconstants.h)
diff -r 12bc758d6a02 -r 25b8d29b7c59 phonesrv_plat/phone_settings_ui_notes_api/inc/psuiclinotehandler.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phonesrv_plat/phone_settings_ui_notes_api/inc/psuiclinotehandler.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2010 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 PSUICLINOTEHANDLER_H_
+#define PSUICLINOTEHANDLER_H_
+
+#include <QObject>
+#include <QList>
+#include <psetcliwrapper.h>
+
+class PSetCliWrapper;
+
+#ifdef BUILD_PSUINOTES
+#define PSUINOTES_EXPORT Q_DECL_EXPORT
+#else
+#define PSUINOTES_EXPORT Q_DECL_IMPORT
+#endif
+
+class PSUINOTES_EXPORT PsUiCliNoteHandler : public QObject
+{
+    Q_OBJECT
+    
+public:
+    PsUiCliNoteHandler(PSetCliWrapper& cliWrapper);
+    ~PsUiCliNoteHandler();
+
+public slots: // Slots: 
+
+    void handleCliRequesting( bool ongoing, bool interrupted ); 
+
+    void cliInformation( const PsCallLineIdentity& type );
+
+    void handleCliError( int error );
+    
+    void handleCnapStatus( int status );
+
+private:   // data
+   
+    // For cli signals
+    PSetCliWrapper& m_cliWrapper;
+     
+    // Current active note id 
+    int m_activeNoteId;
+    
+    // Current progress note id
+    int m_activeProgressNoteId;
+   
+};
+
+#endif /* PSUICLINOTEHANDLER_H_ */
diff -r 12bc758d6a02 -r 25b8d29b7c59 phonesrv_plat/phone_settings_ui_notes_api/inc/psuilocalisation.h
--- a/phonesrv_plat/phone_settings_ui_notes_api/inc/psuilocalisation.h	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 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 PSUILOCALISATION_H_
-#define PSUILOCALISATION_H_
-
-#include <QObject>
-#include <QList>
-
-// Forward declarations 
-class QTranslator; 
-
-#ifdef BUILD_PSUINOTES
-#define PSUINOTES_EXPORT Q_DECL_EXPORT
-#else
-#define PSUINOTES_EXPORT Q_DECL_IMPORT
-#endif
-
-class PSUINOTES_EXPORT PsUiLocalisation: public QObject
-    {
-    Q_OBJECT
-    
-public: 
-    
-    enum TranslationFileId {
-        TranslationFileCommon, 
-        TranslationFileTelephoneCp
-    }; 
-        
-public:
-    
-    PsUiLocalisation(QObject *parent = NULL);
-    ~PsUiLocalisation();
-
-    /**
-     * Installs specific translation file
-     * @param translationFileId Id of file to be installed
-     */
-    bool installTranslator(TranslationFileId translationFileId);
-    
-    /**
-     * Removes installed translators
-     */
-    void removeTranslators();
-
-private:     
-    
-    QList<QTranslator *> m_translators;
-    };
-
-
-#endif /* PSUILOCALISATION_H_ */
diff -r 12bc758d6a02 -r 25b8d29b7c59 phonesrv_plat/phone_settings_ui_notes_api/inc/psuinotes.h
--- a/phonesrv_plat/phone_settings_ui_notes_api/inc/psuinotes.h	Mon Oct 04 15:57:13 2010 +0300
+++ b/phonesrv_plat/phone_settings_ui_notes_api/inc/psuinotes.h	Fri Oct 15 13:21:28 2010 +0300
@@ -31,8 +31,7 @@
 
 class HbInputDialog;
 class QValidator;
-class QTranslator; 
-class PsUiLocalisation;
+
 class PsUiSettingsWrapper;
 
 class PSUINOTES_EXPORT PsUiNotes: public QObject
@@ -211,11 +210,6 @@
       Password validator. Not own.
      */
     const QValidator *m_passwordValidator;
-    
-    /**
-      Translators.
-     */
-    PsUiLocalisation *m_localisation; 
 
     PsUiSettingsWrapper *m_psuiSettings;
 };
diff -r 12bc758d6a02 -r 25b8d29b7c59 satengine/satserver/Commands/LaunchBrowserCmd/inc/CLaunchBrowserHandler.h
--- a/satengine/satserver/Commands/LaunchBrowserCmd/inc/CLaunchBrowserHandler.h	Mon Oct 04 15:57:13 2010 +0300
+++ b/satengine/satserver/Commands/LaunchBrowserCmd/inc/CLaunchBrowserHandler.h	Fri Oct 15 13:21:28 2010 +0300
@@ -23,7 +23,8 @@
 #include <etelpckt.h>
 #include <w32std.h>             // WsSession
 #include <apgtask.h>            // TApaTask
-#include <DocumentHandler.h>    // KWmlcHandler
+// Legacy Symbian browser UID
+const static TInt KWmlcHandler = 0x10008D39;   // WML Browser
 
 #include "CSatCommandHandler.h"
 #include "SatSTypes.h"          // TSatQuery
diff -r 12bc758d6a02 -r 25b8d29b7c59 satengine/satserver/Commands/LaunchBrowserCmd/src/CLaunchBrowserHandler.cpp
--- a/satengine/satserver/Commands/LaunchBrowserCmd/src/CLaunchBrowserHandler.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/satengine/satserver/Commands/LaunchBrowserCmd/src/CLaunchBrowserHandler.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -800,19 +800,18 @@
 // Launches The Browser with URL.
 // --------------------------------------------------------------------------
 //
-void CLaunchBrowserHandler::LaunchWithUrlL( const TDesC& /*aParam*/,
-    const TUid& /*aAccessPointUid*/ )
+void CLaunchBrowserHandler::LaunchWithUrlL( const TDesC& aParam,
+    const TUid& aAccessPointUid )
     {
     LOG( SIMPLE,
         "LAUNCHBROWSER: CLaunchBrowserHandler::LaunchWithUrlL calling" )
-//    LOG3( SIMPLE,
-//         "LAUNCHBROWSER: CLaunchBrowserHandler::LaunchWithUrlL\
-//          url=%s, IAP=%d", &aParam, aAccessPointUid.iUid )        
+    LOG3( SIMPLE,
+         "LAUNCHBROWSER: CLaunchBrowserHandler::LaunchWithUrlL\
+          url=%s, IAP=%d", &aParam, aAccessPointUid.iUid )        
 
     // Browser launching called.
-//    TInt err = iUtils->SatUiHandler().ShellController().LaunchBrowserL(
-//        aParam, aAccessPointUid );
-    TInt err =  KErrNone;
+    TInt err = iUtils->SatUiHandler().ShellController().LaunchBrowserL(
+        aParam, aAccessPointUid );
 
     if ( KErrNone == err )
         {
diff -r 12bc758d6a02 -r 25b8d29b7c59 satengine/satserver/Engine/src/CSatApnHandler.cpp
--- a/satengine/satserver/Engine/src/CSatApnHandler.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/satengine/satserver/Engine/src/CSatApnHandler.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -17,9 +17,7 @@
 
 // INCLUDE FILES
 #include <cmmanager.h>
-#include <cmmanagerext.h>
 #include <cmconnectionmethod.h>
-#include <cmconnectionmethodext.h>
 #include <cmconnectionmethoddef.h>
 #include <cmpluginpacketdatadef.h>
 #include <cmdestination.h>
@@ -209,11 +207,11 @@
     if ( aApnId )
         { 
         // Create CMManager Session
-        RCmManagerExt cmManager;
+        RCmManager cmManager;
         cmManager.OpenLC();
         
         // Get the connection method
-        RCmConnectionMethodExt cm;
+        RCmConnectionMethod cm;
         cm = cmManager.ConnectionMethodL( aApnId );
         CleanupClosePushL( cm );
 
@@ -247,12 +245,12 @@
         &aReqApn )
     
     // Create CMManager Session
-    RCmManagerExt cmManager;
+    RCmManager cmManager;
     cmManager.OpenLC();
 
     // Create a connection method without destination. So when we can find 
     // the connection method by going through the connection method list.
-    RCmConnectionMethodExt cm;
+    RCmConnectionMethod cm;
     cm = cmManager.CreateConnectionMethodL( KUidPacketDataBearerType );
     CleanupClosePushL( cm );
     
diff -r 12bc758d6a02 -r 25b8d29b7c59 satengine/satserver/EventMonitors/src/csatbrowserwsmonitor.cpp
--- a/satengine/satserver/EventMonitors/src/csatbrowserwsmonitor.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/satengine/satserver/EventMonitors/src/csatbrowserwsmonitor.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -19,7 +19,8 @@
 // INCLUDE FILES
 #include    <etelsat.h>
 #include    <apgtask.h>
-#include    <DocumentHandler.h>  //KWmlcHandler
+// Legacy symbian browser UID
+const static TInt KWmlcHandler = 0x10008D39;   // WML Browser
 #include    "CSatBrowserThreadMonitor.h"
 #include    "csatbrowserwsmonitor.h"
 #include    "SatLog.h"
diff -r 12bc758d6a02 -r 25b8d29b7c59 satui/satapp/inc/satappconfirmprovider.h
--- a/satui/satapp/inc/satappconfirmprovider.h	Mon Oct 04 15:57:13 2010 +0300
+++ b/satui/satapp/inc/satappconfirmprovider.h	Fri Oct 15 13:21:28 2010 +0300
@@ -55,8 +55,11 @@
     /** Shows the confirm note about Open Channel */
     void showOpenChannelConfirm(SatAppAction &action);
 
-    /** Shows the confirmation not about SetUpCall*/
+    /** Shows the confirmation note about SetUpCall*/
     void showSetUpCallConfirm(SatAppAction &action);
+    
+    /** Shows the confirmation note about LaunchBrowser*/
+    void showLaunchBrowserConfirm(SatAppAction &action);
 
 private:
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 satui/satapp/src/satappconfirmprovider.cpp
--- a/satui/satapp/src/satappconfirmprovider.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/satui/satapp/src/satappconfirmprovider.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -79,14 +79,14 @@
             showSetUpCallConfirm(action);
             break;
             }
-        // TODO: implemente later   
-        case ESatSRefreshQuery:
-        // TODO: implemente later
         case ESatSLaunchBrowserQuery:
             {
-            action.completeWithNoResponse();
+            showLaunchBrowserConfirm(action);
             break;
             }
+        // Shown only when Confirm SIM services setting enabled, 
+        // setting not supported on this code line.
+        case ESatSRefreshQuery:
         default:
             {
             qDebug("SATAPP: SatAppConfirmProvider::ConfirmCommand:\
@@ -162,6 +162,32 @@
 }
 
 // ----------------------------------------------------------------------------
+// SatAppConfirmProvider::showLaunchBrowserConfirm
+// ----------------------------------------------------------------------------
+//
+void SatAppConfirmProvider::showLaunchBrowserConfirm(SatAppAction &action)
+{
+    qDebug("SATAPP: SatAppConfirmProvider::showLaunchBrowserConfirm >");
+    QString text = action.value(KeyText).toString();
+    if (!text.length()){
+        text = hbTrId("txt_simatk_dialog_openbrowser");
+        }
+    mConfirmQuery = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+    // Sets the "Yes"-action/button
+    mConfirmQuery->setText(text);
+    mConfirmQuery->setStandardButtons(HbMessageBox::Ok | HbMessageBox::Cancel);
+    SAT_ASSERT(connect(mConfirmQuery->actions().at(0), SIGNAL(triggered()),
+        &action, SLOT(completeWithSuccess())));
+    SAT_ASSERT(connect(mConfirmQuery->actions().at(1), SIGNAL(triggered()),
+        &action, SLOT(completeWithBackRequested())));
+    SAT_ASSERT(connect(mAction, SIGNAL(actionCompleted(SatAppAction *)),
+        this, SLOT(resetState())));
+    qDebug("SATAPP: SatAppUiProvider::showLaunchBrowserConfirm before open");
+    mConfirmQuery->open();
+    qDebug("SATAPP: SatAppConfirmProvider::showLaunchBrowserConfirm <");
+}
+
+// ----------------------------------------------------------------------------
 // SatAppConfirmProvider::clearScreen
 // ----------------------------------------------------------------------------
 //
diff -r 12bc758d6a02 -r 25b8d29b7c59 satui/satapp/src/satappinputprovider.cpp
--- a/satui/satapp/src/satappinputprovider.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/satui/satapp/src/satappinputprovider.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -211,16 +211,11 @@
     // Set PromptText
     inputDialog->setPromptText(heading);
     // Set ContentText
-    HbEditorInterface inputMode(inputDialog->lineEdit());
     inputDialog->lineEdit()->setFocus();
     if (ESatDigitOnly == characterSet) {
         // digit mode, digits only (0 9, *, #, and +)
-        inputMode.setFilter(HbPhoneNumberFilter::instance());
-        inputMode.setMode(HbInputModeNumeric);
-        inputMode.setInputConstraints(HbEditorConstraintFixedInputMode);
-    } else {
-        // char mode
-        inputMode.setUpAsLatinAlphabetOnlyEditor();
+        inputDialog->lineEdit()->setInputMethodHints(
+            Qt::ImhDialableCharactersOnly);
     }
     composeDialog(inputDialog, GetInkey);
     mCurrentAction->set(KeyMinLength, 1); 
@@ -258,12 +253,9 @@
     // Set PromptText
     inputDialog->setPromptText(heading);
     // Set ContentText
-    HbEditorInterface inputMode(inputDialog->lineEdit());
     inputDialog->lineEdit()->setFocus();
-
-    inputMode.setFilter(HbPhoneNumberFilter::instance());
-    inputMode.setMode(HbInputModeNumeric);
-    inputMode.setInputConstraints(HbEditorConstraintFixedInputMode);
+    inputDialog->lineEdit()->setInputMethodHints(
+                Qt::ImhDialableCharactersOnly);
     
     composeDialog(inputDialog, GetImmediate);
 
@@ -333,16 +325,11 @@
     mCurrentDialog = inputQuery;
     inputQuery->setPromptText(heading);
     inputQuery->setValue(QVariant(content));
-    HbEditorInterface inputMode(inputQuery->lineEdit());
     inputQuery->lineEdit()->setFocus();
     if (ESatDigitOnly == characterSet) {
         // digit mode, digits only (0 9, *, #, and +)
-        inputMode.setFilter(HbPhoneNumberFilter::instance());
-        inputMode.setMode(HbInputModeNumeric);
-        inputMode.setInputConstraints(HbEditorConstraintFixedInputMode);
-    } else {
-        // char mode
-        inputMode.setUpAsLatinAlphabetOnlyEditor();
+        inputQuery->lineEdit()->setInputMethodHints(
+            Qt::ImhDialableCharactersOnly);
     }
 
     inputQuery->lineEdit()->setMaxLength(maxLength);
@@ -592,7 +579,7 @@
     }
     mCurrentAction->completeWithSuccess();
     mCurrentAction = 0;
-    qDebug("SATAPP: SatAppInputProvider::transmitStringFromDialog >");
+    qDebug("SATAPP: SatAppInputProvider::transmitStringFromDialog <");
 }
 
 // ----------------------------------------------------------------------------
diff -r 12bc758d6a02 -r 25b8d29b7c59 satui/satapp/tsrc/ut_satapp/ut_satapp.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/satui/satapp/tsrc/ut_satapp/ut_satapp.pkg	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,29 @@
+;
+; Copyright (c) 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: satapp unit test PKG file
+;
+
+
+;Languages
+&EN
+
+;Localised Vendor name
+%{"Nokia EN"}
+
+;Unique Vendor name
+:"Nokia"
+
+;Files to install
+"\epoc32\release\armv5\urel\ut_satapp.exe"-"!:\sys\bin\ut_satapp.exe"
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 satui/satapp/tsrc/ut_satapp/ut_satapp.pro
--- a/satui/satapp/tsrc/ut_satapp/ut_satapp.pro	Mon Oct 04 15:57:13 2010 +0300
+++ b/satui/satapp/tsrc/ut_satapp/ut_satapp.pro	Fri Oct 15 13:21:28 2010 +0300
@@ -23,10 +23,6 @@
 HEADERS += $$PUBLIC_HEADERS
 MOC_DIR = moc
 
-symbian {
-    TARGET.CAPABILITY = CAP_APPLICATION
-}
-
 INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
                $$MOC_DIR \
                ../../../../inc \
@@ -40,10 +36,10 @@
         -lbafl \
         -lmediaclientaudio \
         -lprofileeng \
+        -lafservice \
         -lFlogger
 
-HEADERS += ../../inc \
-           ../../inc/satappmainhandler.h \
+HEADERS += ../../inc/satappmainhandler.h \
            ../../inc/satappserverdispatcher.h \
            ../../inc/satappmenuprovider.h \
            ../../inc/satappinputprovider.h \
diff -r 12bc758d6a02 -r 25b8d29b7c59 satui/satshellcontroller/src/csatshellcontroller.cpp
--- a/satui/satshellcontroller/src/csatshellcontroller.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/satui/satshellcontroller/src/csatshellcontroller.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -35,7 +35,8 @@
 #include <apgtask.h>            // TApaTaskList
 #include <apgwgnam.h>           // CApaWindowGroupName
 #include <MenuSatInterface.h>   // CMenuSATInterface
-#include <DocumentHandler.h>    // KWmlcHandler
+// Legacy symbian browser UID
+const static TInt KWmlcHandler         = 0x10008D39;   // WML Browser
 #include "csatshellcontroller.h"
 
 // Browser Cen Rep Keys.
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/dialpad.pro
--- a/telutils/dialpad/dialpad.pro	Mon Oct 04 15:57:13 2010 +0300
+++ b/telutils/dialpad/dialpad.pro	Fri Oct 15 13:21:28 2010 +0300
@@ -39,7 +39,8 @@
            inc/dialpademergencycalleventfilter.h \
            inc/dialpadhasheventfilter.h \
            inc/dialpadnumericbutton.h \
-           inc/dialpadnumericbuttongrid.h
+           inc/dialpadnumericbuttongrid.h \
+           inc/dialpadlineedit.h
 
 SOURCES += src/dialpad.cpp \
            src/dialpadbutton.cpp \
@@ -58,7 +59,8 @@
            src/dialpadvtkeyhandler.cpp \
            src/dialpadhasheventfilter.cpp \
            src/dialpadnumericbutton.cpp \
-           src/dialpadnumericbuttongrid.cpp
+           src/dialpadnumericbuttongrid.cpp \
+           src/dialpadlineedit.cpp
 
 RESOURCES += dialpad.qrc
 
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/inc/dialpadbluetootheventfilter.h
--- a/telutils/dialpad/inc/dialpadbluetootheventfilter.h	Mon Oct 04 15:57:13 2010 +0300
+++ b/telutils/dialpad/inc/dialpadbluetootheventfilter.h	Fri Oct 15 13:21:28 2010 +0300
@@ -22,6 +22,7 @@
 
 class QTimer;
 class Dialpad;
+class XQAiwRequest;
 
 /*!
     DialpadBluetoothEventFilter
@@ -46,10 +47,24 @@
     */
     void toggleBluetooth();
 
+    /*!
+       \fn void requestCompleted(const QVariant& value)
+
+       XQAiwRequest informs that it has completed bluetooth request succesfully.
+    */
+    void requestOk(const QVariant& value);
+    
+    /*!
+       \fn void requestError(int errorCode, QString errorMessage)
+
+       XQAiwRequest informs that bluetooth request failed.
+    */
+    void requestError(int errorCode, const QString& errorMessage);
 
 private:
     QTimer *mLongPressTimer;
     Dialpad* mDialpad;
+    XQAiwRequest *mRequest;
 };
 
 #endif // DIALPADBLUETOOTHEVENTFILTER_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/inc/dialpadlineedit.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/inc/dialpadlineedit.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,41 @@
+/*
+* Copyright (c) 2010 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 DIALPADLINEEDIT_H
+#define DIALPADLINEEDIT_H
+
+// System includes
+#include <hblineedit.h>
+
+// Class declaration
+class DialpadLineEdit : public HbLineEdit
+{
+    Q_OBJECT
+
+public:
+    explicit DialpadLineEdit(QGraphicsItem *parent = 0);
+
+    ~DialpadLineEdit();
+
+protected:
+    void focusOutEvent(QFocusEvent * event);
+    void focusInEvent(QFocusEvent * event);
+
+};
+
+#endif // DIALPADLINEEDIT_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/src/dialpad.cpp
--- a/telutils/dialpad/src/dialpad.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/telutils/dialpad/src/dialpad.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -424,6 +424,7 @@
     if (mBackgroundItem) {
         layoutBackgroundItem();
     }
+    mInputField->editor().setFocus();    
 }
 
 void Dialpad::layoutBackgroundItem()
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/src/dialpadbluetootheventfilter.cpp
--- a/telutils/dialpad/src/dialpadbluetootheventfilter.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/telutils/dialpad/src/dialpadbluetootheventfilter.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -30,7 +30,7 @@
 const QString BluetoothCharacter("*");
 
 DialpadBluetoothEventFilter::DialpadBluetoothEventFilter(Dialpad* dialpad, QObject* parent) :
-    QObject(parent), mDialpad(dialpad)
+    QObject(parent), mDialpad(dialpad), mRequest(0)
 {
     PHONE_TRACE;
     mLongPressTimer = new QTimer(this);
@@ -40,6 +40,8 @@
 
 DialpadBluetoothEventFilter::~DialpadBluetoothEventFilter()
 {
+    delete mRequest;
+    mRequest = 0;
 }
 
 bool DialpadBluetoothEventFilter::eventFilter(QObject *watched, QEvent *event)
@@ -68,12 +70,39 @@
     PHONE_TRACE;
     mDialpad->editor().setText(QString(""));
 #ifdef Q_OS_SYMBIAN
-    XQApplicationManager appManager;
-    QScopedPointer<XQAiwRequest> request(appManager.create(BluetoothServiceName, BluetoothInterfaceTogglePower,
-                                                           BluetoothTogglePower, false));
-    if (request == NULL) {
+    if(mRequest == NULL) {
+        XQApplicationManager appManager;
+        mRequest = appManager.create(BluetoothServiceName, BluetoothInterfaceTogglePower,
+                                                           BluetoothTogglePower, false);
+    }
+    
+    if (mRequest == NULL) {
         return;
+    } else {
+        connect(mRequest, SIGNAL(requestOk(const QVariant&)), this, SLOT(requestOk(const QVariant&)));
+        connect(mRequest, SIGNAL(requestError(int, const QString&)), this, SLOT(requestError(int, const QString&)));
     }
-    request->send();
+
+    mRequest->setSynchronous(false);
+    mRequest->send();
 #endif // Q_OS_SYMBIAN
 }
+
+void DialpadBluetoothEventFilter::requestOk(const QVariant& value)
+{
+    PHONE_TRACE;
+    Q_UNUSED(value);
+    delete mRequest;
+    mRequest = 0;
+}
+
+void DialpadBluetoothEventFilter::requestError(int errorCode, const QString& errorMessage)
+{
+    Q_UNUSED(errorCode);
+    Q_UNUSED(errorMessage);
+    PHONE_DEBUG2("DialpadBluetoothEventFilter::requestError - errorCode: ", errorCode);
+    PHONE_DEBUG2("DialpadBluetoothEventFilter::requestError - errorMessage: ", errorMessage);
+    delete mRequest;
+    mRequest = 0;
+}
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/src/dialpadinputfield.cpp
--- a/telutils/dialpad/src/dialpadinputfield.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/telutils/dialpad/src/dialpadinputfield.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -17,7 +17,7 @@
 
 #include <QGraphicsLinearLayout>
 
-#include <hblineedit.h>
+#include <dialpadlineedit.h>
 #include <hbinputeditorinterface.h>
 #include <hbinputstandardfilters.h>
 #include <hbdeviceprofile.h>
@@ -43,7 +43,7 @@
       mMainWindow(mainWindow)
 {
     // create editor
-    mNumberEditor = new HbLineEdit(this);
+    mNumberEditor = new DialpadLineEdit(this);
     mNumberEditor->setObjectName(QLatin1String("numberEdit"));
     HbEditorInterface editorInterface(mNumberEditor);
     editorInterface.setFilter(HbPhoneNumberFilter::instance());
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/src/dialpadlineedit.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/src/dialpadlineedit.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2010 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: 
+*
+*/
+
+// System includes
+#include <hbevent.h>
+#include <hbapplication.h>
+
+// User includes
+#include "dialpadlineedit.h"
+
+
+// External function prototypes
+
+// Local constants
+
+// ======== LOCAL FUNCTIONS ========
+
+// ======== MEMBER FUNCTIONS ========
+/*!
+     Constructor.
+ */
+DialpadLineEdit::DialpadLineEdit (QGraphicsItem *parent) :
+    HbLineEdit(parent)
+{
+}
+
+/*!
+     Destructor.
+ */
+DialpadLineEdit::~DialpadLineEdit ()
+{
+}
+
+/*!
+    \reimp
+ */
+void DialpadLineEdit::focusOutEvent(QFocusEvent * event)
+{
+    HbWidget::focusOutEvent(event);
+    event->accept();
+}
+
+/*!
+    \reimp
+ */
+void DialpadLineEdit::focusInEvent(QFocusEvent * event)
+{
+    HbWidget::focusInEvent(event);
+    event->accept();
+    HbEvent focusEvent(HbEvent::InputMethodFocusIn);
+    HbApplication::sendEvent(this, &focusEvent);
+}
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/tsrc/unit/shared/mock_dialpadbluetootheventfilter.cpp
--- a/telutils/dialpad/tsrc/unit/shared/mock_dialpadbluetootheventfilter.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/shared/mock_dialpadbluetootheventfilter.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -66,3 +66,22 @@
 {
     SMC_MOCK_METHOD0( void )
 }
+
+// -----------------------------------------------------------------------------
+// DialpadBluetoothEventFilter::requestOk
+// -----------------------------------------------------------------------------
+//
+void DialpadBluetoothEventFilter::requestOk(const QVariant& value)
+{
+    Q_UNUSED(value);
+}
+
+// -----------------------------------------------------------------------------
+// DialpadBluetoothEventFilter::requestError
+// -----------------------------------------------------------------------------
+//
+void DialpadBluetoothEventFilter::requestError(int errorCode, const QString& errorMessage)
+{
+    Q_UNUSED(errorCode);
+    Q_UNUSED(errorMessage);
+}
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.cpp
--- a/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -29,6 +29,7 @@
 
 #ifdef Q_OS_SYMBIAN
 #include "xqappmgr.h"
+#include "xqaiwrequest.h"
 #endif
 
 #include "dialpadtest.h"
@@ -42,6 +43,10 @@
 QString mOperation;
 bool mEmbedded;
 bool mSendCalled;
+bool mSynchronous;
+bool mSetSynchronousCalled;
+bool mXQAiwRequestDestructorCalled;
+bool mEmitOK;
 
 #ifdef Q_OS_SYMBIAN
 XQAiwRequest* XQApplicationManager::create(const QString& service, const QString& interface, const QString& operation, bool embedded)
@@ -52,7 +57,9 @@
     mEmbedded = embedded;
     return new XQAiwRequest(); 
 }
-void XQAiwRequest::send() { mSendCalled = true; }
+void XQAiwRequest::send() { mSendCalled = true; if(mEmitOK){ QVariant var; emit requestOk(var); }else{ emit requestError(-1, QString("error message")); } }
+void XQAiwRequest::setSynchronous(bool synchronous) { mSynchronous = synchronous; mSetSynchronousCalled = true; }
+XQAiwRequest::~XQAiwRequest() { mXQAiwRequestDestructorCalled = true; };
 #endif
 
 // helper class
@@ -91,6 +98,7 @@
     void cleanup();
     void cleanupTestCase();
     void testLongPressAsteriskKey();
+    void testFailingLongPressAsteriskKey();
     void testShortAndLongPressAsteriskKey();
 
 private:
@@ -133,6 +141,10 @@
     mOperation = QString("");
     mEmbedded = false;
     mSendCalled = false;
+    mSynchronous = true;
+    mSetSynchronousCalled = false;
+    mXQAiwRequestDestructorCalled = false;
+    mEmitOK = true;
 }
 
 void ut_DialpadBluetoothEventFilter::cleanupTestCase()
@@ -153,6 +165,9 @@
 
 void ut_DialpadBluetoothEventFilter::testLongPressAsteriskKey()
 {
+    // Emit fail from event
+    mEmitOK = false;
+    
     mDialpad->openDialpad();
     QTest::qWait(2*WAIT_TIME);
 
@@ -168,7 +183,38 @@
     QCOMPARE(mInterface, BluetoothInterfaceTogglePower);
     QCOMPARE(mOperation, BluetoothTogglePower);
     QVERIFY(mEmbedded == false);
+    QVERIFY(mSetSynchronousCalled == true);
+    QVERIFY(mSynchronous == false);
     QVERIFY(mSendCalled == true);
+    
+    QTest::qWait(100);
+    QVERIFY(mXQAiwRequestDestructorCalled == true);
+}
+
+void ut_DialpadBluetoothEventFilter::testFailingLongPressAsteriskKey()
+{
+    mDialpad->openDialpad();
+    QTest::qWait(2*WAIT_TIME);
+
+    // Basic long press
+    mUtil->mouseClickDialpad(Qt::Key_Asterisk, DialpadTestUtil::Press);
+    QTest::qWait(2000);
+    mUtil->mouseClickDialpad(Qt::Key_Asterisk, DialpadTestUtil::Release);
+    QTest::qWait(1000);
+    QCOMPARE(mDialpad->editor().text(), QString(""));
+    mDialpad->closeDialpad();
+    
+    QCOMPARE(mService, BluetoothServiceName);
+    QCOMPARE(mInterface, BluetoothInterfaceTogglePower);
+    QCOMPARE(mOperation, BluetoothTogglePower);
+    QVERIFY(mEmbedded == false);
+    QVERIFY(mSetSynchronousCalled == true);
+    QVERIFY(mSynchronous == false);
+    QVERIFY(mSendCalled == true);
+    
+    QTest::qWait(100);
+    QVERIFY(mXQAiwRequestDestructorCalled == true);
+	
 }
 
 void ut_DialpadBluetoothEventFilter::testShortAndLongPressAsteriskKey()
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.pro
--- a/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.pro	Mon Oct 04 15:57:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.pro	Fri Oct 15 13:21:28 2010 +0300
@@ -30,6 +30,7 @@
 
 #
 HEADERS += ../../../inc/dialpadbluetootheventfilter.h \
+           xqaiwrequest.h \
            xqappmgr.h \
            dialpadtestutil.h
 SOURCES += ut_dialpadbluetootheventfilter.cpp \
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/xqaiwrequest.h
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/xqappmgr.h
--- a/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/xqappmgr.h	Mon Oct 04 15:57:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/xqappmgr.h	Fri Oct 15 13:21:28 2010 +0300
@@ -1,7 +1,16 @@
-class XQAiwRequest
+#include <QObject>
+
+class XQAiwRequest : public QObject
 {
+    Q_OBJECT
 public:
+    ~XQAiwRequest();
     void send();	
+    void setSynchronous(bool synchronous);
+    
+signals:
+    void requestOk(const QVariant& result);
+    void requestError(int errorCode, const QString& errorMessage);
 };
 
 class XQApplicationManager
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/tsrc/unit/ut_dialpadlineedit/testdialpadlineedit.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadlineedit/testdialpadlineedit.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,54 @@
+/*
+* Copyright (c) 2010 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: 
+*
+*/
+
+// System includes
+#include <hbevent.h>
+
+// User includes
+#include "testdialpadlineedit.h"
+
+
+// External function prototypes
+
+// Local constants
+
+// ======== LOCAL FUNCTIONS ========
+
+// ======== MEMBER FUNCTIONS ========
+/*!
+     Constructor.
+ */
+TestDialpadLineEdit::TestDialpadLineEdit(QGraphicsItem *parent) : 
+        DialpadLineEdit(parent)
+{
+}
+
+/*!
+     Destructor.
+ */
+TestDialpadLineEdit::~TestDialpadLineEdit()
+{
+}
+
+void TestDialpadLineEdit::testFocusOutEvent(QFocusEvent * event) 
+{
+    DialpadLineEdit::focusOutEvent(event);
+}
+void TestDialpadLineEdit::testFocusInEvent(QFocusEvent * event) 
+{
+    DialpadLineEdit::focusInEvent(event);
+}
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/tsrc/unit/ut_dialpadlineedit/testdialpadlineedit.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadlineedit/testdialpadlineedit.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,62 @@
+/*
+* Copyright (c) 2010 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 TESTDIALPADLINEEDIT_H
+#define TESTDIALPADLINEEDIT_H
+
+// System includes
+
+// User includes
+#include "dialpadlineedit.h"
+
+// Forward declarations
+
+// External data types
+
+// Constants
+
+// Class declaration
+class TestDialpadLineEdit : public DialpadLineEdit
+{
+    Q_OBJECT
+
+public:
+    explicit TestDialpadLineEdit(QGraphicsItem *parent = 0);
+
+    ~TestDialpadLineEdit();
+    
+    void testFocusOutEvent(QFocusEvent * event);
+    void testFocusInEvent(QFocusEvent * event);
+
+signals:
+
+public slots:
+
+protected:
+    
+protected slots:
+
+private:
+
+private slots:
+
+private: // data 
+
+};
+
+#endif // TESTDIALPADLINEEDIT_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/tsrc/unit/ut_dialpadlineedit/ut_dialpadlineedit.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadlineedit/ut_dialpadlineedit.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,76 @@
+/*!
+* Copyright (c) 2010 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 <QtGui>
+#include <QtTest/QtTest>
+#include <qevent.h>
+#include "ut_dialpadlineedit.h"
+#include "testdialpadlineedit.h"
+#include "phonesrvtestmain.h"
+
+
+UT_dialpadlineedit::UT_dialpadlineedit()
+    : 
+    m_classUt(0)
+{
+    
+}
+
+
+UT_dialpadlineedit::~UT_dialpadlineedit()
+{
+    delete m_classUt;
+}
+
+
+void UT_dialpadlineedit::init()
+{
+    initialize();
+    
+    m_classUt = new TestDialpadLineEdit();
+}
+
+
+void UT_dialpadlineedit::cleanup()
+{
+    reset();
+    
+    delete m_classUt;
+    m_classUt = 0;
+}
+
+
+void UT_dialpadlineedit::t_focusOutEvent()
+{
+    EXPECT(HbWidget, focusOutEvent);
+    EXPECT(HbAbstractEdit, focusOutEvent).times(0);
+    QFocusEvent event(QEvent::FocusOut);
+    m_classUt->testFocusOutEvent(&event);
+    QVERIFY(verify());
+}
+
+
+void UT_dialpadlineedit::t_focusInEvent()
+{
+    EXPECT(HbWidget, focusInEvent);
+    EXPECT(HbAbstractEdit, focusInEvent).times(0);
+    QFocusEvent event(QEvent::FocusIn);
+    m_classUt->testFocusInEvent(&event);
+    QVERIFY(verify());
+}
+
+PHONESRV_TEST_MAIN(UT_dialpadlineedit)
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/tsrc/unit/ut_dialpadlineedit/ut_dialpadlineedit.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadlineedit/ut_dialpadlineedit.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,47 @@
+/*
+* Copyright (c) 2010 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 UT_DIALPADLINEEDIT_H
+#define UT_DIALPADLINEEDIT_H
+
+#include <QtTest/QtTest>
+#include <mockservice.h>
+
+class TestDialpadLineEdit;
+
+class UT_dialpadlineedit : public QObject, public MockService
+{
+    Q_OBJECT
+
+public:    
+    
+    UT_dialpadlineedit();
+    ~UT_dialpadlineedit();
+    
+private slots:
+
+    void init();
+    void cleanup();
+
+    void t_focusOutEvent();
+    void t_focusInEvent();
+    
+private:
+    TestDialpadLineEdit *m_classUt;
+};
+
+#endif  // UT_DIALPADLINEEDIT_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 telutils/dialpad/tsrc/unit/ut_dialpadlineedit/ut_dialpadlineedit.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadlineedit/ut_dialpadlineedit.pro	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,49 @@
+#
+# Copyright (c) 2010 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:
+#
+#
+
+TEMPLATE = app
+TARGET =
+MOC_DIR = moc
+CONFIG += qtestlib hb
+HB += hbinput
+DEFINES += BUILD_DIALPAD \
+           BUILD_DIALPADKEYHANDLER
+
+QT -= gui
+
+symbian {
+    INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+    INCLUDEPATH += . ../../../inc
+    INCLUDEPATH +=../../../../../tsrc/common
+
+    
+    HEADERS += ../../../inc/dialpadlineedit.h
+    SOURCES += ../../../src/dialpadlineedit.cpp
+    
+    HEADERS += ut_dialpadlineedit.h
+    SOURCES += ut_dialpadlineedit.cpp
+    HEADERS += testdialpadlineedit.h
+    SOURCES += testdialpadlineedit.cpp
+    
+    #MOCKED DEPENDENCIES
+    SOURCES += ../../../../../tsrc/mocks/orbit/mock_hbwidget.cpp
+    SOURCES += ../../../../../tsrc/mocks/orbit/mock_hbapplication.cpp
+    SOURCES += ../../../../../tsrc/mocks/orbit/mock_hblineedit.cpp
+    SOURCES += ../../../../../tsrc/mocks/orbit/mock_hbabstractedit.cpp
+    
+    LIBS += -lmocklib -lsymbianmock
+}
diff -r 12bc758d6a02 -r 25b8d29b7c59 tsrc/common/phonesrvtestmain.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/common/phonesrvtestmain.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2010 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 PHONESRVTESTMAIN
+#define PHONESRVTESTMAIN
+
+#define PHONESRV_TEST_MAIN(TestObject) \
+int main(int argc, char *argv[]) \
+{ \
+char *new_argv[3]; \
+QCoreApplication app(argc, argv); \
+\
+QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
+QByteArray   bytes  = str.toAscii(); \
+\
+char arg1[] = "-o"; \
+\
+new_argv[0] = argv[0]; \
+new_argv[1] = arg1; \
+new_argv[2] = bytes.data(); \
+\
+TestObject tc; \
+return QTest::qExec(&tc, 3, new_argv); \
+}
+
+#endif
diff -r 12bc758d6a02 -r 25b8d29b7c59 tsrc/mocks/orbit/mock_hbabstractedit.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/mocks/orbit/mock_hbabstractedit.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,933 @@
+/** Copyright (c) 2010 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:
+*
+*/
+#include <smcmockclassincludes.h>
+#include <hbvalidator.h>
+#include <hbmenu.h>
+#include <qgraphicssceneevent.h>
+#include <qtextobject.h>
+#include <qpainter.h>
+#include "hbabstractedit.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::HbAbstractEdit
+// -----------------------------------------------------------------------------
+//
+HbAbstractEdit::HbAbstractEdit( 
+        QGraphicsItem * parent )
+    {
+    Q_UNUSED(parent)
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::~HbAbstractEdit
+// -----------------------------------------------------------------------------
+//
+HbAbstractEdit::~HbAbstractEdit(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::isReadOnly
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractEdit::isReadOnly(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setReadOnly
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setReadOnly( 
+        bool value )
+    {
+    SMC_MOCK_METHOD1( void, bool, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::cursorPosition
+// -----------------------------------------------------------------------------
+//
+int HbAbstractEdit::cursorPosition(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::cursorVisibility
+// -----------------------------------------------------------------------------
+//
+Hb::TextCursorVisibility HbAbstractEdit::cursorVisibility(  ) const
+    {
+    SMC_MOCK_METHOD0( Hb::TextCursorVisibility )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setCursorVisibility
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setCursorVisibility( 
+        Hb::TextCursorVisibility value )
+    {
+    SMC_MOCK_METHOD1( void, Hb::TextCursorVisibility, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::validator
+// -----------------------------------------------------------------------------
+//
+HbValidator * HbAbstractEdit::validator(  ) const
+    {
+    SMC_MOCK_METHOD0( HbValidator * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setValidator
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setValidator( 
+        HbValidator * validator )
+    {
+    SMC_MOCK_METHOD1( void, HbValidator *, validator )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::hasAcceptableInput
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractEdit::hasAcceptableInput(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::primitive
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbAbstractEdit::primitive( 
+        HbStyle::Primitive primitive ) const
+    {
+    SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::event
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractEdit::event( 
+        QEvent * event )
+    {
+    SMC_MOCK_METHOD1( bool, QEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::type
+// -----------------------------------------------------------------------------
+//
+int HbAbstractEdit::type(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setAlignment
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setAlignment( 
+        Qt::Alignment alignment )
+    {
+    //SMC_MOCK_METHOD1( void, Qt::Alignment, alignment )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::alignment
+// -----------------------------------------------------------------------------
+//
+Qt::Alignment HbAbstractEdit::alignment(  ) const
+    {
+    //SMC_MOCK_METHOD0( Qt::Alignment )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::contextMenuFlags
+// -----------------------------------------------------------------------------
+//
+Hb::TextContextMenuFlags HbAbstractEdit::contextMenuFlags(  ) const
+    {
+    SMC_MOCK_METHOD0( Hb::TextContextMenuFlags )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setContextMenuFlags
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setContextMenuFlags( 
+        Hb::TextContextMenuFlags flags )
+    {
+    //SMC_MOCK_METHOD1( void, Hb::TextContextMenuFlags, flags )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setContextMenuFlag
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setContextMenuFlag( 
+        Hb::TextContextMenuFlag flag )
+    {
+    //SMC_MOCK_METHOD1( void, Hb::TextContextMenuFlag, flag )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::clearContextMenuFlag
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::clearContextMenuFlag( 
+        Hb::TextContextMenuFlag flag )
+    {
+    //SMC_MOCK_METHOD1( void, Hb::TextContextMenuFlag, flag )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::placeholderText
+// -----------------------------------------------------------------------------
+//
+QString HbAbstractEdit::placeholderText(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setPlaceholderText
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setPlaceholderText( 
+        const QString & text )
+    {
+    SMC_MOCK_METHOD1( void, const QString &, text )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::anchorAt
+// -----------------------------------------------------------------------------
+//
+QString HbAbstractEdit::anchorAt( 
+        const QPointF & pos ) const
+    {
+    SMC_MOCK_METHOD1( QString, const QPointF &, pos )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::anchorAt
+// -----------------------------------------------------------------------------
+//
+QString HbAbstractEdit::anchorAt( 
+        int pos ) const
+    {
+    SMC_MOCK_METHOD1( QString, int, pos )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setSmileyTheme
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setSmileyTheme( 
+        const HbSmileyTheme & theme )
+    {
+    SMC_MOCK_METHOD1( void, const HbSmileyTheme &, theme )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::smileyTheme
+// -----------------------------------------------------------------------------
+//
+HbSmileyTheme HbAbstractEdit::smileyTheme(  ) const
+    {
+   SMC_MOCK_METHOD0( HbSmileyTheme )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::defaultSmileyTheme
+// -----------------------------------------------------------------------------
+//
+HbSmileyTheme HbAbstractEdit::defaultSmileyTheme(  ) const
+    {
+    SMC_MOCK_METHOD0( HbSmileyTheme )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::resetSmileyTheme
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::resetSmileyTheme(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::isSmileysEnabled
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractEdit::isSmileysEnabled(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setSmileysEnabled
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setSmileysEnabled( 
+        bool enabled )
+    {
+    SMC_MOCK_METHOD1( void, bool, enabled )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setFormatDialog
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setFormatDialog( 
+        HbFormatDialogPointer dialog )
+    {
+    SMC_MOCK_METHOD1( void, HbFormatDialogPointer, dialog )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::characterAt
+// -----------------------------------------------------------------------------
+//
+QChar HbAbstractEdit::characterAt( 
+        int pos ) const
+    {
+    SMC_MOCK_METHOD1( QChar, int, pos )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::contentsChanged
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::contentsChanged(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::cursorPositionChanged
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::cursorPositionChanged( 
+        int oldPos,
+        int newPos )
+    {
+    SMC_MOCK_METHOD2( void, int, oldPos, 
+        int, newPos )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::selectionChanged
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::selectionChanged( 
+        const QTextCursor & oldCursor,
+        const QTextCursor & newCursor )
+    {
+    SMC_MOCK_METHOD2( void, const QTextCursor &, oldCursor, 
+        const QTextCursor &, newCursor )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::aboutToShowContextMenu
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::aboutToShowContextMenu( 
+        HbMenu * contextMenu,
+        const QPointF & pos )
+    {
+    SMC_MOCK_METHOD2( void, HbMenu *, contextMenu, 
+        const QPointF &, pos )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::anchorTapped
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::anchorTapped( 
+        const QString & anchor )
+    {
+    SMC_MOCK_METHOD1( void, const QString &, anchor )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::updatePrimitives
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::updatePrimitives(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setCursorPosition
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setCursorPosition( 
+        int pos,
+        QTextCursor::MoveMode mode )
+    {
+    SMC_MOCK_METHOD2( void, int, pos, 
+        QTextCursor::MoveMode, mode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::cut
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::cut(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::copy
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::copy(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::paste
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::paste(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::selectClickedWord
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::selectClickedWord(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::selectAll
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::selectAll(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::deselect
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::deselect(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::format
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::format(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::HbAbstractEdit
+// -----------------------------------------------------------------------------
+//
+HbAbstractEdit::HbAbstractEdit( 
+        HbAbstractEditPrivate & dd,
+        QGraphicsItem * parent )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::drawContents
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::drawContents( 
+        QPainter * painter,
+        const QStyleOptionGraphicsItem & option )
+    {
+    SMC_MOCK_METHOD2( void, QPainter *, painter, 
+        const QStyleOptionGraphicsItem &, option )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::resizeEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::resizeEvent( 
+        QGraphicsSceneResizeEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::inputMethodEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::inputMethodEvent( 
+        QInputMethodEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QInputMethodEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::inputMethodQuery
+// -----------------------------------------------------------------------------
+//
+QVariant HbAbstractEdit::inputMethodQuery( 
+        Qt::InputMethodQuery query ) const
+    {
+    SMC_MOCK_METHOD1( QVariant, Qt::InputMethodQuery, query )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::keyPressEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::keyPressEvent( 
+        QKeyEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QKeyEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::keyReleaseEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::keyReleaseEvent( 
+        QKeyEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QKeyEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::focusInEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::focusInEvent( 
+        QFocusEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QFocusEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::focusOutEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::focusOutEvent( 
+        QFocusEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QFocusEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::changeEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::changeEvent( 
+        QEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::hideEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::hideEvent( 
+        QHideEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QHideEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setDocument
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setDocument( 
+        QTextDocument * document )
+    {
+    SMC_MOCK_METHOD1( void, QTextDocument *, document )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::document
+// -----------------------------------------------------------------------------
+//
+QTextDocument * HbAbstractEdit::document(  ) const
+    {
+    SMC_MOCK_METHOD0( QTextDocument * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setTextCursor
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setTextCursor( 
+        const QTextCursor & cursor )
+    {
+    SMC_MOCK_METHOD1( void, const QTextCursor &, cursor )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::textCursor
+// -----------------------------------------------------------------------------
+//
+QTextCursor HbAbstractEdit::textCursor(  ) const
+    {
+    SMC_MOCK_METHOD0( QTextCursor )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::toPlainText
+// -----------------------------------------------------------------------------
+//
+QString HbAbstractEdit::toPlainText(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::toHtml
+// -----------------------------------------------------------------------------
+//
+QString HbAbstractEdit::toHtml(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::moveCursor
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::moveCursor( 
+        QTextCursor::MoveOperation op,
+        QTextCursor::MoveMode mode )
+    {
+    SMC_MOCK_METHOD2( void, QTextCursor::MoveOperation, op, 
+        QTextCursor::MoveMode, mode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::blockBoundingRect
+// -----------------------------------------------------------------------------
+//
+QRectF HbAbstractEdit::blockBoundingRect( 
+        const QTextBlock & block ) const
+    {
+    SMC_MOCK_METHOD1( QRectF, const QTextBlock &, block )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::isScrollable
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractEdit::isScrollable(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setScrollable
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setScrollable( 
+        bool value )
+    {
+    SMC_MOCK_METHOD1( void, bool, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::scrollArea
+// -----------------------------------------------------------------------------
+//
+HbScrollArea * HbAbstractEdit::scrollArea(  ) const
+    {
+    SMC_MOCK_METHOD0( HbScrollArea * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::createContextMenu
+// -----------------------------------------------------------------------------
+//
+HbMenu * HbAbstractEdit::createContextMenu(  )
+    {
+    SMC_MOCK_METHOD0( HbMenu * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::showContextMenu
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::showContextMenu( 
+        QPointF position )
+    {
+    SMC_MOCK_METHOD1( void, QPointF, position )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::createMimeDataFromSelection
+// -----------------------------------------------------------------------------
+//
+QMimeData * HbAbstractEdit::createMimeDataFromSelection(  ) const
+    {
+    SMC_MOCK_METHOD0( QMimeData * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::filterInputText
+// -----------------------------------------------------------------------------
+//
+QString HbAbstractEdit::filterInputText( 
+        const QString & text )
+    {
+    SMC_MOCK_METHOD1( QString, const QString &, text )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::canInsertFromMimeData
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractEdit::canInsertFromMimeData( 
+        const QMimeData * source ) const
+    {
+    SMC_MOCK_METHOD1( bool, const QMimeData *, source )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::insertFromMimeData
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::insertFromMimeData( 
+        const QMimeData * source )
+    {
+    SMC_MOCK_METHOD1( void, const QMimeData *, source )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::rectForPosition
+// -----------------------------------------------------------------------------
+//
+QRectF HbAbstractEdit::rectForPosition( 
+        int position,
+        QTextLine::Edge edge ) const
+    {
+    SMC_MOCK_METHOD2( QRectF, int, position, 
+        QTextLine::Edge, edge )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::updateGeometry
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::updateGeometry(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::polish
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::polish( 
+        HbStyleParameters & params )
+    {
+    SMC_MOCK_METHOD1( void, HbStyleParameters &, params )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::itemChange
+// -----------------------------------------------------------------------------
+//
+QVariant HbAbstractEdit::itemChange( 
+        GraphicsItemChange change,
+        const QVariant & value )
+    {
+    SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change, 
+        const QVariant &, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::gestureEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::gestureEvent( 
+        QGestureEvent * e )
+    {
+    SMC_MOCK_METHOD1( void, QGestureEvent *, e )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setPlainText
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setPlainText( 
+        const QString & text )
+    {
+    SMC_MOCK_METHOD1( void, const QString &, text )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::setHtml
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::setHtml( 
+        const QString & text )
+    {
+    SMC_MOCK_METHOD1( void, const QString &, text )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::documentLayoutChanged
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::documentLayoutChanged(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::documentSizeChanged
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::documentSizeChanged( 
+        const QSizeF & size )
+    {
+    SMC_MOCK_METHOD1( void, const QSizeF &, size )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::blockCountChanged
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::blockCountChanged( 
+        int newBlockCount )
+    {
+    SMC_MOCK_METHOD1( void, int, newBlockCount )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractEdit::timerEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractEdit::timerEvent( 
+        QTimerEvent * e )
+    {
+    SMC_MOCK_METHOD1( void, QTimerEvent *, e )
+    }
+
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 tsrc/mocks/orbit/mock_hbapplication.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/mocks/orbit/mock_hbapplication.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,137 @@
+/** Copyright (c) 2010 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:
+*
+*/
+#include <smcmockclassincludes.h>
+#include <hbapplication.h>
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbApplication::HbApplication
+// -----------------------------------------------------------------------------
+//
+HbApplication::HbApplication( 
+          int &argc,
+          char *argv[],
+          Hb::ApplicationFlags flags ) : QApplication(argc, argv)
+    {
+    
+    }
+
+#if defined(Q_OS_SYMBIAN)
+// -----------------------------------------------------------------------------
+// HbApplication::HbApplication
+// -----------------------------------------------------------------------------
+//
+HbApplication::HbApplication( 
+        QApplication::QS60MainApplicationFactory factory,
+        int &argc, char *argv[], Hb::ApplicationFlags flags ) :QApplication(argc, argv)
+    {
+    
+    }
+#endif // Q_OS_SYMBIAN
+
+// -----------------------------------------------------------------------------
+// HbApplication::~HbApplication
+// -----------------------------------------------------------------------------
+//
+HbApplication::~HbApplication(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbApplication::symbianEventFilter
+// -----------------------------------------------------------------------------
+//
+bool HbApplication::symbianEventFilter( 
+        const QSymbianEvent * event )
+    {
+    //SMC_MOCK_METHOD1( bool, const QSymbianEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbApplication::activate
+// -----------------------------------------------------------------------------
+//
+void HbApplication::activate(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbApplication::activityManager
+// -----------------------------------------------------------------------------
+//
+HbActivityManager * HbApplication::activityManager(  )
+    {
+    SMC_MOCK_METHOD0( HbActivityManager * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbApplication::activateReason
+// -----------------------------------------------------------------------------
+//
+Hb::ActivationReason HbApplication::activateReason(  ) const
+    {
+    SMC_MOCK_METHOD0( Hb::ActivationReason )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbApplication::activateParams
+// -----------------------------------------------------------------------------
+//
+QVariantHash HbApplication::activateParams(  ) const
+    {
+    SMC_MOCK_METHOD0( QVariantHash )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbApplication::activateId
+// -----------------------------------------------------------------------------
+//
+QString HbApplication::activateId(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbApplication::activateData
+// -----------------------------------------------------------------------------
+//
+QVariant HbApplication::activateData(  )
+    {
+    SMC_MOCK_METHOD0( QVariant )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbApplication::hideSplash
+// -----------------------------------------------------------------------------
+//
+void HbApplication::hideSplash(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 tsrc/mocks/orbit/mock_hblineedit.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/mocks/orbit/mock_hblineedit.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,458 @@
+/** Copyright (c) 2010 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:
+*
+*/
+#include <QDebug>
+#include <QFontMetrics>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <QTextBlock>
+#include <QTextDocument>
+
+#include <smcmockclassincludes.h>
+#include "hblineedit.h"
+#include "hbabstractedit.h"
+#include "hbwidget.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::HbLineEdit
+// -----------------------------------------------------------------------------
+//
+HbLineEdit::HbLineEdit(QGraphicsItem *parent) 
+{
+    Q_UNUSED(parent)
+}
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::HbLineEdit
+// -----------------------------------------------------------------------------
+//
+HbLineEdit::HbLineEdit( 
+        const QString & text,
+        QGraphicsItem * parent )
+    {
+    Q_UNUSED(text)
+    Q_UNUSED(parent)
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::~HbLineEdit
+// -----------------------------------------------------------------------------
+//
+HbLineEdit::~HbLineEdit(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::type
+// -----------------------------------------------------------------------------
+//
+int HbLineEdit::type(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::maxLength
+// -----------------------------------------------------------------------------
+//
+int HbLineEdit::maxLength(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::setMaxLength
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::setMaxLength( 
+        int length )
+    {
+    SMC_MOCK_METHOD1( void, int, length )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::setMinRows
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::setMinRows( 
+        int rows )
+    {
+    SMC_MOCK_METHOD1( void, int, rows )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::minRows
+// -----------------------------------------------------------------------------
+//
+int HbLineEdit::minRows(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::setMaxRows
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::setMaxRows( 
+        int rows )
+    {
+    SMC_MOCK_METHOD1( void, int, rows )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::maxRows
+// -----------------------------------------------------------------------------
+//
+int HbLineEdit::maxRows(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::isExpandable
+// -----------------------------------------------------------------------------
+//
+bool HbLineEdit::isExpandable(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::text
+// -----------------------------------------------------------------------------
+//
+QString HbLineEdit::text(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::displayText
+// -----------------------------------------------------------------------------
+//
+QString HbLineEdit::displayText(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::hasSelectedText
+// -----------------------------------------------------------------------------
+//
+bool HbLineEdit::hasSelectedText(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::selectedText
+// -----------------------------------------------------------------------------
+//
+QString HbLineEdit::selectedText(  ) const
+    {
+    SMC_MOCK_METHOD0( QString )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::selectionStart
+// -----------------------------------------------------------------------------
+//
+int HbLineEdit::selectionStart(  ) const
+    {
+    SMC_MOCK_METHOD0( int )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::setSelection
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::setSelection( 
+        int start,
+        int length )
+    {
+    SMC_MOCK_METHOD2( void, int, start, 
+        int, length )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::setCursorPosition
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::setCursorPosition( 
+        int pos )
+    {
+    SMC_MOCK_METHOD1( void, int, pos )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::echoMode
+// -----------------------------------------------------------------------------
+//
+HbLineEdit::EchoMode HbLineEdit::echoMode(  ) const
+    {
+    SMC_MOCK_METHOD0( HbLineEdit::EchoMode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::setEchoMode
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::setEchoMode( HbLineEdit::EchoMode echoMode )
+    {
+    SMC_MOCK_METHOD1( void, HbLineEdit::EchoMode, echoMode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::setCapitalization
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::setCapitalization( 
+        QFont::Capitalization caps )
+    {
+    SMC_MOCK_METHOD1( void, QFont::Capitalization, caps )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::capitalization
+// -----------------------------------------------------------------------------
+//
+QFont::Capitalization HbLineEdit::capitalization(  ) const
+    {
+    SMC_MOCK_METHOD0( QFont::Capitalization )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::adjustFontSizeToFitHeight
+// -----------------------------------------------------------------------------
+//
+bool HbLineEdit::adjustFontSizeToFitHeight(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::setAdjustFontSizeToFitHeight
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::setAdjustFontSizeToFitHeight( 
+        bool active )
+    {
+    SMC_MOCK_METHOD1( void, bool, active )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::event
+// -----------------------------------------------------------------------------
+//
+bool HbLineEdit::event( 
+        QEvent * event )
+    {
+    SMC_MOCK_METHOD1( bool, QEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::setAutoCompleteContent
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::setAutoCompleteContent( 
+        QGraphicsLayoutItem * content )
+    {
+    SMC_MOCK_METHOD1( void, QGraphicsLayoutItem *, content )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::setText
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::setText( 
+        const QString & text )
+    {
+    SMC_MOCK_METHOD1( void, const QString &, text )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::editingFinished
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::editingFinished(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::textChanged
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::textChanged( 
+        const QString & text )
+    {
+    SMC_MOCK_METHOD1( void, const QString &, text )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::selectionChanged
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::selectionChanged(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::HbLineEdit
+// -----------------------------------------------------------------------------
+//
+HbLineEdit::HbLineEdit( 
+        HbLineEditPrivate & dd,
+        QGraphicsItem * parent )
+    {
+    Q_UNUSED(dd)
+    Q_UNUSED(parent)
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::inputMethodEvent
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::inputMethodEvent( 
+        QInputMethodEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QInputMethodEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::inputMethodQuery
+// -----------------------------------------------------------------------------
+//
+QVariant HbLineEdit::inputMethodQuery( 
+        Qt::InputMethodQuery input) const
+    {
+    SMC_MOCK_METHOD1( QVariant, Qt::InputMethodQuery, input )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::keyPressEvent
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::keyPressEvent( 
+        QKeyEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QKeyEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::keyReleaseEvent
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::keyReleaseEvent( 
+        QKeyEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QKeyEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::canInsertFromMimeData
+// -----------------------------------------------------------------------------
+//
+bool HbLineEdit::canInsertFromMimeData( 
+        const QMimeData * source ) const
+    {
+    SMC_MOCK_METHOD1( bool, const QMimeData *, source )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::insertFromMimeData
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::insertFromMimeData( 
+        const QMimeData * source )
+    {
+    SMC_MOCK_METHOD1( void, const QMimeData *, source )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::focusOutEvent
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::focusOutEvent( 
+        QFocusEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QFocusEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::focusInEvent
+// -----------------------------------------------------------------------------
+//
+void HbLineEdit::focusInEvent( 
+        QFocusEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QFocusEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbLineEdit::eventFilter
+// -----------------------------------------------------------------------------
+//
+bool HbLineEdit::eventFilter( 
+        QObject *obj,
+        QEvent *ev )
+    {
+    SMC_MOCK_METHOD2( bool, QObject *, obj, 
+        QEvent *, ev )
+    }
+
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 tsrc/mocks/orbit/mock_hbwidget.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/mocks/orbit/mock_hbwidget.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,453 @@
+/** Copyright (c) 2010 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:
+*
+*/
+#include <smcmockclassincludes.h>
+#include <qgraphicssceneevent.h>
+#include "hbwidget.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbWidget::HbWidget
+// -----------------------------------------------------------------------------
+//
+HbWidget::HbWidget( 
+        QGraphicsItem * parent,
+        Qt::WindowFlags wFlags )
+    {
+    Q_UNUSED(parent)
+    Q_UNUSED(wFlags)
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::~HbWidget
+// -----------------------------------------------------------------------------
+//
+HbWidget::~HbWidget(  )
+    {
+    
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::event
+// -----------------------------------------------------------------------------
+//
+bool HbWidget::event( 
+        QEvent * e )
+    {
+    SMC_MOCK_METHOD1( bool, QEvent *, e )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setStyle
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setStyle( 
+        HbStyle * style )
+    {
+    SMC_MOCK_METHOD1( void, HbStyle *, style )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::style
+// -----------------------------------------------------------------------------
+//
+HbStyle * HbWidget::style(  ) const
+    {
+    SMC_MOCK_METHOD0( HbStyle * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::clearActions
+// -----------------------------------------------------------------------------
+//
+void HbWidget::clearActions(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::mainWindow
+// -----------------------------------------------------------------------------
+//
+HbMainWindow * HbWidget::mainWindow(  ) const
+    {
+    SMC_MOCK_METHOD0( HbMainWindow * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::primitive
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbWidget::primitive( 
+        HbStyle::Primitive primitive ) const
+    {
+    SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::primitive
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbWidget::primitive( 
+        const QString & itemName ) const
+    {
+    SMC_MOCK_METHOD1( QGraphicsItem *, const QString &, itemName )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::layoutPrimitive
+// -----------------------------------------------------------------------------
+//
+QGraphicsLayoutItem * HbWidget::layoutPrimitive( 
+        const QString & itemName ) const
+    {
+    SMC_MOCK_METHOD1( QGraphicsLayoutItem *, const QString &, itemName )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusOrientation
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusOrientation( 
+        Qt::Orientations previous,
+        Qt::Orientations next )
+    {
+    //SMC_MOCK_METHOD2( void, Qt::Orientations, previous, 
+    //    Qt::Orientations, next )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::keyForFocusNextChild
+// -----------------------------------------------------------------------------
+//
+QKeySequence HbWidget::keyForFocusNextChild(  ) const
+    {
+    SMC_MOCK_METHOD0( QKeySequence )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::keyForFocusPreviousChild
+// -----------------------------------------------------------------------------
+//
+QKeySequence HbWidget::keyForFocusPreviousChild(  ) const
+    {
+    SMC_MOCK_METHOD0( QKeySequence )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setKeyFocusMode
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setKeyFocusMode( 
+        const QKeySequence & key )
+    {
+    SMC_MOCK_METHOD1( void, const QKeySequence &, key )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::keyFocusMode
+// -----------------------------------------------------------------------------
+//
+QKeySequence HbWidget::keyFocusMode(  ) const
+    {
+    SMC_MOCK_METHOD0( QKeySequence )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::lastFocusedChild
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbWidget::lastFocusedChild(  ) const
+    {
+    SMC_MOCK_METHOD0( QGraphicsItem * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusOrder
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusOrder( 
+        QGraphicsItem * first,
+        QGraphicsItem * second )
+    {
+    SMC_MOCK_METHOD2( void, QGraphicsItem *, first, 
+        QGraphicsItem *, second )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusDelegation
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusDelegation( 
+        HbWidget::FocusDelegation focusDelegation )
+    {
+    SMC_MOCK_METHOD1( void, HbWidget::FocusDelegation, focusDelegation )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::focusDelegation
+// -----------------------------------------------------------------------------
+//
+HbWidget::FocusDelegation HbWidget::focusDelegation(  ) const
+    {
+    SMC_MOCK_METHOD0( HbWidget::FocusDelegation )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusLooping
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusLooping( 
+        bool enable )
+    {
+    SMC_MOCK_METHOD1( void, bool, enable )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::hasFocusLooping
+// -----------------------------------------------------------------------------
+//
+bool HbWidget::hasFocusLooping(  ) const
+    {
+    SMC_MOCK_METHOD0( bool )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusMode
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusMode( 
+        HbWidget::FocusMode focus )
+    {
+    SMC_MOCK_METHOD1( void, HbWidget::FocusMode, focus )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::focusMode
+// -----------------------------------------------------------------------------
+//
+HbWidget::FocusMode HbWidget::focusMode(  ) const
+    {
+    SMC_MOCK_METHOD0( HbWidget::FocusMode )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setFocusHighlight
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setFocusHighlight( 
+        HbStyle::Primitive type,
+        HbWidget::FocusHighlight focusHighlight )
+    {
+    SMC_MOCK_METHOD2( void, HbStyle::Primitive, type, 
+        HbWidget::FocusHighlight, focusHighlight )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::focusHighlight
+// -----------------------------------------------------------------------------
+//
+HbStyle::Primitive HbWidget::focusHighlight( 
+        HbWidget::FocusHighlight focusHighlight )
+    {
+    SMC_MOCK_METHOD1( HbStyle::Primitive, HbWidget::FocusHighlight, focusHighlight )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::setBackgroundItem
+// -----------------------------------------------------------------------------
+//
+void HbWidget::setBackgroundItem( 
+        QGraphicsItem * item,
+        int zValue )
+    {
+    SMC_MOCK_METHOD2( void, QGraphicsItem *, item, 
+        int, zValue )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::backgroundItem
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbWidget::backgroundItem(  ) const
+    {
+    SMC_MOCK_METHOD0( QGraphicsItem * )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::recreatePrimitives
+// -----------------------------------------------------------------------------
+//
+void HbWidget::recreatePrimitives(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::updatePrimitives
+// -----------------------------------------------------------------------------
+//
+void HbWidget::updatePrimitives(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::focusInEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::focusInEvent( 
+        QFocusEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QFocusEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::focusOutEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::focusOutEvent( 
+        QFocusEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QFocusEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::resizeEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::resizeEvent( 
+        QGraphicsSceneResizeEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::changeEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::changeEvent( 
+        QEvent * event )
+    {
+    SMC_MOCK_METHOD1( void, QEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::itemChange
+// -----------------------------------------------------------------------------
+//
+QVariant HbWidget::itemChange( 
+        GraphicsItemChange change,
+        const QVariant & value )
+    {
+    SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change, 
+        const QVariant &, value )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::polishEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidget::polishEvent(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::polish
+// -----------------------------------------------------------------------------
+//
+void HbWidget::polish( 
+        HbStyleParameters & params )
+    {
+    SMC_MOCK_METHOD1( void, HbStyleParameters &, params )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::repolish
+// -----------------------------------------------------------------------------
+//
+void HbWidget::repolish(  )
+    {
+    SMC_MOCK_METHOD0( void )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::sceneEventFilter
+// -----------------------------------------------------------------------------
+//
+bool HbWidget::sceneEventFilter( 
+        QGraphicsItem * watched,
+        QEvent * event )
+    {
+    SMC_MOCK_METHOD2( bool, QGraphicsItem *, watched, 
+        QEvent *, event )
+    }
+
+
+// -----------------------------------------------------------------------------
+// HbWidget::HbWidget
+// -----------------------------------------------------------------------------
+//
+HbWidget::HbWidget( 
+        HbWidgetPrivate & dd,
+        QGraphicsItem * parent,
+        Qt::WindowFlags wFlags )
+    {
+    Q_UNUSED(dd)
+    Q_UNUSED(wFlags)
+    Q_UNUSED(wFlags)
+    }
+
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/inc/ut_actioncustomitem.h
--- a/vmbx/vmbxcpplugin/tsrc/inc/ut_actioncustomitem.h	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2010 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:  Implementation of the Ut_vmbxCpPlugin class
-*
-*/
-
-
-#ifndef UT_ACTIONCUSTOMIEM_H
-#define UT_CUSTOMCONTROLS_H
-
-#include <QObject>
-#include <QtTest/QtTest>
-
-class Ut_ActionCustomItem : public QObject
-{
-    Q_OBJECT
-    
-private slots:
-    void testNewAndDelete();
-    void testCreateItem();
-    void testCanSetModelIndex();    
-};
-
-#endif // UT_CUSTOMCONTROLS_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/inc/ut_customedit.h
--- a/vmbx/vmbxcpplugin/tsrc/inc/ut_customedit.h	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2010 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:  Implementation of the Ut_vmbxCpPlugin class
-*
-*/
-
-
-#ifndef UT_CUSTOMEDIT_H
-#define UT_CUSTOMEDIT_H
-
-#include <QObject>
-#include <QtTest/QtTest>
-
-class Ut_CustomEdit : public QObject
-{
-    Q_OBJECT
-    
-private slots:
-    void testFocusInEvent();
-    
-};
-
-#endif // UT_CUSTOMEDIT_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/inc/ut_vmbxcpplugin.h
--- a/vmbx/vmbxcpplugin/tsrc/inc/ut_vmbxcpplugin.h	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2009 - 2010 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:  Implementation of the Ut_vmbxCpPlugin class
-*
-*/
-
-
-#ifndef UT_VMBXCPPLUGIN_H
-#define UT_VMBXCPPLUGIN_H
-
-// System includes
-#include <QtTest/QtTest>
-#include <QObject>
-
-/*!
-    Ut_vmbxCpPlugin module test class.
-
-    Tests Ut_vmbxCpPlugin interface.
-    See cpp file for more information.
-
-    @lib Ut_vmbxCpPlugin.lib
-*/
-
-// Class declaration
-class Ut_vmbxCpPlugin : public QObject
-{
-    Q_OBJECT
-
-private slots: 
-
-    /*!
-        Test method in VmbxCpPlugin
-    */
-    void testCreateSettingFormItemData();
-    
-    /*!
-        Test method in VmbxCpGroup
-    */    
-    void testCreateVmbxCpGroup();
-};
-
-#endif // _UT_VMBXCPPLUGIN_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/inc/ut_vmbxuiengine.h
--- a/vmbx/vmbxcpplugin/tsrc/inc/ut_vmbxuiengine.h	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2009 - 2010 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:  Implementation of the Ut_VmbxUiEngine class
-*
-*/
-
-
-#ifndef UT_VMBXUIENGINE_H
-#define UT_VMBXUIENGINE_H
-
-#include <QObject>
-
-// Class forwards
-class VmbxUiEngine;
-
-static TInt globalExpRet;
-static QString globalNumber;
-
-/*!
-    Ut_VmbxUiEngine module test class.
-
-    Tests Ut_VmbxUiEngine interface.
-    See cpp file for more information.
-
-    @lib Ut_VmbxUiEngine.lib
-*/
-class Ut_VmbxUiEngine : public QObject
-{
-    Q_OBJECT
-
-private slots: 
-
-    void initTestCase();
-    void cleanupTestCase();
-    
-    void testCsVoice1Number();
-    void testCsVideo1Number();      
-    void testIsVideoSupport();
-    void testHandleNotifyL();
-    
-private:  //data
-
-    /*!
-        Own.
-    */
-    VmbxUiEngine *mUiEngine;
-};
-
-#endif // _UT_VMBXUIENGINE_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/src/main.cpp
--- a/vmbx/vmbxcpplugin/tsrc/src/main.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#include <QtTest/QtTest>
-#include "ut_vmbxcpplugin.h"
-#include "ut_vmbxuiengine.h"
-#include "ut_actioncustomitem.h"
-#include "ut_customedit.h"
-
-// -----------------------------------------------------------------------------
-// main()
-// Main method implemented for directing test output to a file.
-// -----------------------------------------------------------------------------
-int main(int argc, char *argv[])
-    {
-    qDebug("main() >");
-    
-    QApplication app(argc, argv);
-
-    qDebug("ut_vmbxuiengine");
-    Ut_VmbxUiEngine tcUiEngine; 
-    char *pass[3];
-    pass[0] = argv[0];
-    pass[1] = "-o"; 
-    pass[2] = "c:\\logs\\vmbx\\ut_vmbxuiengine.txt";
-    int result = -1;
-    result = QTest::qExec(&tcUiEngine, 3, pass);
-    qDebug("ut_vmbxuiengine result %d", result);
-
-    qDebug("ut_vmbxcpplugin");
-    Ut_vmbxCpPlugin tcCpPlugin;
-    pass[2] = "c:\\logs\\vmbx\\ut_vmbxcpplugin.txt";
-    result = QTest::qExec(&tcCpPlugin, 3, pass);
-    qDebug("ut_vmbxcpplugin result=%d", result);
-    
-    qDebug("ut_actioncustomitem");
-    Ut_ActionCustomItem tcCustom;
-    pass[2] = "c:\\logs\\vmbx\\ut_acttioncustomitem.txt";
-    result = QTest::qExec(&tcCustom, 3, pass);
-    qDebug("ut_actioncustomitem result=%d", result);    
-
-    qDebug("ut_customedit");
-    Ut_CustomEdit tcEdit;
-    pass[2] = "c:\\logs\\vmbx\\ut_customedit.txt";
-    result = QTest::qExec(&tcEdit, 3, pass);
-    qDebug("Ut_CustomEdit result=%d", result);    
-    
-    
-    qDebug("main() <");
-    return result;
-    }
-//End of file
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/src/ut_actioncustomitem.cpp
--- a/vmbx/vmbxcpplugin/tsrc/src/ut_actioncustomitem.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
-* Copyright (c) 2010 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:  Implementation of the Ut_vmbxCpPlugin class
-*
-*/
-
-#include <HbDataFormModelItem>
-#include <QFocusEvent>
-#include <HbMainWindow>
-#include <QEvent>
-#include "ut_actioncustomitem.h"
-#include "actioncustomitem.h"
-#include "customedit.h"
-
-void Ut_ActionCustomItem::testNewAndDelete()
-{
-    QGraphicsWidget *qGraphicsWidget = new QGraphicsWidget();
-    QVERIFY(qGraphicsWidget != 0);
-
-    ActionCustomItem *item = new ActionCustomItem(qGraphicsWidget);
-
-    qDebug("item=0x%x", item);
-    QVERIFY(item);    
-    delete item;
-    item = NULL;   
-    qDebug("delete item=0x%x", item);
-   
-    QVERIFY(!item);
-    
-    delete qGraphicsWidget;
-    qGraphicsWidget = NULL;
-}
-
-void Ut_ActionCustomItem::testCreateItem()
-{
-    QGraphicsWidget *qGraphicsWidget = new QGraphicsWidget();
-    QVERIFY(qGraphicsWidget != 0);
-
-    ActionCustomItem *item = new ActionCustomItem(qGraphicsWidget);
-    qDebug("item=0x%x", item);
-    QVERIFY(item);    
-    
-    HbAbstractViewItem *viewItem = item->createItem();
-
-    qDebug("viewItem=0x%x", viewItem);
-    QVERIFY(viewItem);
-    
-    delete viewItem;
-    viewItem = NULL;
-
-    delete item;
-    item = NULL;   
-    qDebug("delete item=0x%x", item);
-   
-    QVERIFY(!item);
-    
-    delete qGraphicsWidget;
-    qGraphicsWidget = NULL;
-}
-
-void Ut_ActionCustomItem::testCanSetModelIndex()
-{
-    QGraphicsWidget *qGraphicsWidget = new QGraphicsWidget();
-    QVERIFY(qGraphicsWidget != 0);
-
-    ActionCustomItem *item = new ActionCustomItem(qGraphicsWidget);
-    qDebug("item=0x%x", item);
-    QVERIFY(item);    
-    
-    QModelIndex index;
-    item->canSetModelIndex(index);
-    
-    delete item;
-    item = NULL;   
-    qDebug("delete item=0x%x", item);
-   
-    QVERIFY(!item);
-    
-    delete qGraphicsWidget;
-    qGraphicsWidget = NULL;
-}
-
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/src/ut_customedit.cpp
--- a/vmbx/vmbxcpplugin/tsrc/src/ut_customedit.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) 2010 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 <QFocusEvent>
-#include <HbMainWindow>
-#include <QEvent>
-#include <QEventLoop>
-#include "ut_customedit.h"
-#include "customedit.h"
-
-
-
-void Ut_CustomEdit::testFocusInEvent()
-{
-    HbMainWindow *window = new HbMainWindow;
-    QVERIFY(window);
-    
-    QGraphicsWidget *qGraphicsWidget = new QGraphicsWidget();
-    QVERIFY(qGraphicsWidget != 0);
-    CustomEdit *edit = new CustomEdit(qGraphicsWidget);
-    QVERIFY(edit);
-    
-    QFocusEvent *event = new QFocusEvent(QEvent::FocusIn, 
-        Qt::MouseFocusReason);  
-    QVERIFY(event);
-    edit->focusInEvent(event);
-    delete event;
-    event  = NULL;
-    
-    event = new QFocusEvent(QEvent::FocusOut, 
-        Qt::MouseFocusReason);
-    QVERIFY(event);
-    edit->focusInEvent(event);
-    // test for emitEditItemClicked    
-    QEventLoop loop;
-    QTimer timer;
-    timer.start(150);
-    connect( &timer,SIGNAL(timeout()),
-        &loop,SLOT(quit()));
-    loop.exec();
-    delete event;
-    event = NULL;
-    delete edit;
-    edit = NULL;
-    QVERIFY(!edit);
-    
-    delete qGraphicsWidget;
-    qGraphicsWidget = NULL;
-}
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/src/ut_dummyvoicemailbox.cpp
--- a/vmbx/vmbxcpplugin/tsrc/src/ut_dummyvoicemailbox.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,247 +0,0 @@
-/*
-* Copyright (c) 2009 - 2010 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:  Implementation of the CVoiceMailbox class
-*
-*/
-
-// System includes
-#include <QtTest/QtTest>
-#include <cvoicemailbox.h>
-#include <cvoicemailboxentry.h>
-// For global export return value
-#include "ut_vmbxuiengine.h"
-
-// ============================ MEMBER FUNCTIONS =============================
-
- TInt TVoiceMailboxParams::Version()
-    {
-    qDebug("TVoiceMailboxParams::Version <>");
-    return iVersion;
-    }
-    
-
- TVoiceMailboxParams::TVoiceMailboxParams():
-                                        iType( EVmbxNone ),
-                                        iServiceId( KVmbxServiceIdNone ),
-                                        iLineType( EVmbxAlsLineDefault )
-    {
-    qDebug("TVoiceMailboxParams default constructor <>");
-    }
-    
- TVoiceMailboxParams::TVoiceMailboxParams( 
-                        const CVoiceMailboxEntry& aEntry )
-    {
-    qDebug("TVoiceMailboxParams Entry cnstructor >");
-    iType = aEntry.VoiceMailboxType();
-    iServiceId = aEntry.ServiceId();
-    iLineType = aEntry.VmbxAlsLineType();
-    qDebug("TVoiceMailboxParams Entry cnstructor <");
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::CVoiceMailboxImpl
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ---------------------------------------------------------------------------
-//
-CVoiceMailbox::CVoiceMailbox()
-    {
-    qDebug("DummyVoiceMailbox::CVoiceMailbox <>");
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::ConstructL
-// Symbian 2nd phase constructor can leave.
-// ---------------------------------------------------------------------------
-//
-void CVoiceMailbox::ConstructL()
-    {
-    qDebug("DummyVoiceMailbox::ConstructL <>");
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::NewL
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-CVoiceMailbox* CVoiceMailbox::NewL()
-{
-    qDebug("DummyVoiceMailbox::NewL" );
-
-    CVoiceMailbox * self = NULL;
-    self = CVoiceMailbox::NewLC();
-    CleanupStack::Pop( self );
-    qDebug("DummyVoiceMailbox::NewL <");
-    return self;   
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::NewLC
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-CVoiceMailbox* CVoiceMailbox::NewLC()
-    {
-    qDebug("DummyVoiceMailbox::NewLC >");
-    CVoiceMailbox* self = new( ELeave ) CVoiceMailbox;
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    qDebug("DummyVoiceMailbox::NewLC <");
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::~CVoiceMailbox
-// Destructor
-// ---------------------------------------------------------------------------
-//
-CVoiceMailbox::~CVoiceMailbox()
-    {
-    qDebug("DummyVoiceMailbox::~CVoiceMailbox > <");
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::GetStoredEntry
-//
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailbox::GetStoredEntry( 
-    const TVoiceMailboxParams& aParams, CVoiceMailboxEntry*& aEntry) const
-    {
-    qDebug("DummyVoiceMailbox::GetStoredEntry >");
-    Q_UNUSED(aParams);
-    TRAPD (err, aEntry = CVoiceMailboxEntry::NewL());    
-    qDebug("DummyVoiceMailbox::GetStoredEntry err %d<", err);
-    return globalExpRet;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::SaveEntry
-// Destructor
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailbox::SaveEntry(const CVoiceMailboxEntry& aEntry)
-    {
-    qDebug("DummyVoiceMailbox::SaveEntry <>");
-    Q_UNUSED(aEntry);
-    return globalExpRet;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::QueryNewEntry
-//
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailbox::QueryNewEntry(
-        const TVoiceMailboxParams& aParams, CVoiceMailboxEntry*& aEntry)
-    {
-    qDebug("DummyVoiceMailbox::QueryNewEntry <>");
-    Q_UNUSED(aParams);
-    TRAPD (err, aEntry = CVoiceMailboxEntry::NewL());
-    return globalExpRet;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::QueryChangeEntry
-//
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailbox::QueryChangeEntry( 
-        const TVoiceMailboxParams& aParams, CVoiceMailboxEntry*& aEntry)
-    {
-    qDebug("DummyVoiceMailbox::QueryChangeEntry <>");
-    Q_UNUSED(aParams);
-    TRAPD (err, aEntry = CVoiceMailboxEntry::NewL());
-    return globalExpRet;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::QueryVmbxType
-//
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailbox::QueryVmbxType(
-                            TVoiceMailboxParams& aParams )
-    {
-    qDebug("DummyVoiceMailbox::QueryVmbxType <>");
-    aParams.iType = EVmbxVoice;
-    aParams.iServiceId = KVmbxServiceVoice;
-    aParams.iLineType = EVmbxAlsLine1;
-    return globalExpRet;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::NotifyVmbxNumberChangeL
-//
-// ---------------------------------------------------------------------------
-//
-void CVoiceMailbox::NotifyVmbxNumberChangeL(
-    MVoiceMailboxObserver& aObserver, const TBool aNotifyOnActiveLineOnly )
-    {
-    qDebug("DummyVoiceMailbox::NotifyVmbxNumberChangeL <>");
-    Q_UNUSED(aObserver);
-    Q_UNUSED(aNotifyOnActiveLineOnly);
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::NotifyVmbxNumberChangeCancel
-//
-// ---------------------------------------------------------------------------
-//
-void CVoiceMailbox::NotifyVmbxNumberChangeCancel()
-    {
-    qDebug("DummyVoiceMailbox::NotifyVmbxNumberChangeCancel <>");
-    }
-
-// ---------------------------------------------------------------------------
-//  CVoiceMailbox::CheckConfiguration
-//
-// ---------------------------------------------------------------------------
-//
-TBool CVoiceMailbox::CheckConfiguration(
-    const TVoiceMailboxParams& aParams, const TInt aFlags )
-    {
-    qDebug("DummyVoiceMailbox::CheckConfiguration <>");
-    Q_UNUSED(aParams);
-    Q_UNUSED(aFlags);
-    return globalExpRet;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::GetServiceIds
-//
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailbox::GetServiceIds( RIdArray& aProfileIds ) const
-    {
-    qDebug("DummyVoiceMailbox::GetServiceIds <>");
-    Q_UNUSED(aProfileIds);
-    return 0;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CVoiceMailbox::SaveProvisionedEntry
-//
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailbox::SaveProvisionedEntry( 
-                                const CVoiceMailboxEntry& aEntry)
-    {
-    qDebug("DummyVoiceMailbox::SaveProvisionedEntry <>");
-    Q_UNUSED(aEntry);
-    return globalExpRet;
-    }
-
-// End of file
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/src/ut_dummyvoicemailboxentry.cpp
--- a/vmbx/vmbxcpplugin/tsrc/src/ut_dummyvoicemailboxentry.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,331 +0,0 @@
-/*
-* Copyright (c) 2009 - 2010 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:  Implementation of the CVoiceMailboxEntry class
-*
-*/
-
-// System includes
-#include <QtTest/QtTest>
-#include <cvoicemailboxentry.h>
-// For global value
-#include "ut_vmbxuiengine.h"
-
-// CONSTANTS
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::NewL
-// 
-// ---------------------------------------------------------------------------
-//
-
-EXPORT_C CVoiceMailboxEntry* CVoiceMailboxEntry::NewL()
-    {
-    qDebug( "DummyVoiceMailboxEntry::NewL >" );
-    CVoiceMailboxEntry* self = CVoiceMailboxEntry::NewLC();
-    CleanupStack::Pop( self );
-    qDebug( "DummyVoiceMailboxEntry::NewL <" );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::NewLC
-// 
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CVoiceMailboxEntry* CVoiceMailboxEntry::NewLC()
-    {
-    qDebug( "DummyVoiceMailboxEntry::NewLC >" );
-    CVoiceMailboxEntry* self = new( ELeave ) CVoiceMailboxEntry;
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    qDebug( "DummyVoiceMailboxEntry::NewLC <" );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::~CVoiceMailboxEntry
-// Destructor
-// ---------------------------------------------------------------------------
-//
-CVoiceMailboxEntry::~CVoiceMailboxEntry()
-    {
-    qDebug( "DummyVoiceMailboxEntry::~CVoiceMailboxEntry >" );
-    delete ivmbxNumber;
-    delete iVmbxBrandId;
-    delete ivmbxName;
-    qDebug( "DummyVoiceMailboxEntry::~CVoiceMailboxEntry <" );
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::ServiceId
-// Get ServiceId
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TServiceId CVoiceMailboxEntry::ServiceId() const
-    {
-    qDebug( "DummyVoiceMailboxEntry::ServiceId %d", iVmbxServiceId );
-    return iVmbxServiceId;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::SetServiceId
-// Set entry's service id
-// ---------------------------------------------------------------------------
-//
-void CVoiceMailboxEntry::SetServiceId( 
-                        const TServiceId& aVmbxServiceId )
-    {
-    qDebug( "DummyVoiceMailboxEntry::SetServiceId %d", aVmbxServiceId);
-    iVmbxServiceId = aVmbxServiceId;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::VoiceMailboxType
-// Returns type of the entry instance
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TVmbxType CVoiceMailboxEntry::VoiceMailboxType( ) const
-    {
-    qDebug( "DummyVoiceMailboxEntry::VoiceMailboxType %d", iVmbxType );
-    return iVmbxType;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::SetVoiceMailboxType
-// Set Type of the entry instance
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CVoiceMailboxEntry::SetVoiceMailboxType( const TVmbxType& aType )
-    {
-    qDebug( "DummyVoiceMailboxEntry::SetVoiceMailboxType %d", aType );
-    iVmbxType = aType;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::VmbxAlsLineType
-// Get ALS line Type of the entry instance
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TVmbxAlsLineType CVoiceMailboxEntry::VmbxAlsLineType() const
-    {
-    qDebug( "DummyVoiceMailboxEntry::VmbxAlsLineType >" );
-    return iVmbxLineType;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::SetVmbxAlsLineType
-// Set ALS line Type of the entry instance
-// ---------------------------------------------------------------------------
-//
-void CVoiceMailboxEntry::SetVmbxAlsLineType( 
-                                const TVmbxAlsLineType& aLine )
-    {
-    qDebug( "DummyVoiceMailboxEntry::SetVmbxAlsLineType %d >", aLine );
-    if ( EVmbxAlsLineDefault == aLine  )
-        {
-        iVmbxLineType = EVmbxAlsLine1;
-        }
-    else
-        {
-        iVmbxLineType = aLine;
-        }
-    qDebug( "DummyVoiceMailboxEntry::SetVmbxAlsLineType %d <", iVmbxLineType );
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::GetVmbxNumber
-// Get number or address of the entry instance
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailboxEntry::GetVmbxNumber( TPtrC& aVmbxNumber ) const
-    {
-    qDebug("DummyVoiceMailboxEntry::GetVmbxNumber >");
-    aVmbxNumber.Set(globalNumber.utf16());
-    qDebug("DummyVoiceMailboxEntry::GetVmbxNumber %d", globalExpRet);
-    return globalExpRet;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::SetVmbxNumber
-// Set number or address of the entry instance
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailboxEntry::SetVmbxNumber( const TDesC& aVmbxNumber )
-    {
-    qDebug("DummyVoiceMailboxEntry::SetVmbxNumber >");
-    globalNumber = QString::fromUtf16(aVmbxNumber.Ptr(), aVmbxNumber.Length());
-    qDebug("DummyVoiceMailboxEntry::SetVmbxNumber %d", globalExpRet);
-    return globalExpRet;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::GetVmbxAlsLineType
-// Get Brand Id of the entry instance
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailboxEntry::GetBrandId( TPtrC8& aBrandId ) const
-    {
-    qDebug("DummyVoiceMailboxEntry::GetBrandId >");
-    TInt result( KErrNotFound ); 
-    if ( iVmbxBrandId )
-        {
-        aBrandId.Set( iVmbxBrandId->Des() );
-        result = KErrNone;
-        }
-    else
-        {
-        aBrandId.Set( KNullDesC8 );
-        }
-    qDebug("DummyVoiceMailboxEntry::GetBrandId <");
-    return result;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::SetBrandId
-// Set Brand Id of the entry instance
-// ---------------------------------------------------------------------------
-//
-TInt CVoiceMailboxEntry::SetBrandId( const TDesC8& aBrandId )
-{
-    qDebug("DummyVoiceMailboxEntry::SetBrandId >");
-    TInt result( KErrNoMemory );
-    if ( KVmbxMaxNumberLength < aBrandId.Length() ){
-        result = KErrArgument;
-    }else{
-        delete iVmbxBrandId;
-        iVmbxBrandId = aBrandId.Alloc();
-        if ( iVmbxBrandId ){
-            result = KErrNone;
-        }
-    }
-    qDebug("DummyVoiceMailboxEntry::SetBrandId <");
-    return result;
-}
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::GetVmbxName
-// Get Name of the entry instance
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TInt CVoiceMailboxEntry::GetVmbxName( TPtrC& aVmbxName ) const
-{
-    qDebug("DummyVoiceMailboxEntry::GetVmbxName >");
-    TInt result( KErrNotFound );
-    if ( ivmbxName ){
-        aVmbxName.Set( ivmbxName->Des() );
-        result = KErrNone;
-    }else{
-        qDebug( "DummyVoiceMailboxEntry::GetVmbxName:KNullDesC" );
-        aVmbxName.Set( KNullDesC );
-    }      
-    qDebug("DummyVoiceMailboxEntry::GetVmbxName <");
-    return result;
-}
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::SetVmbxName
-// Set Name of the entry instance
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TInt CVoiceMailboxEntry::SetVmbxName( const TDesC& aVmbxName )
-{
-    qDebug("DummyVoiceMailboxEntry::SetVmbxName >");
-    TInt result( KErrNoMemory );
-    if (KVmbxMaxNumberLength < aVmbxName.Length()){
-        result = KErrArgument;
-    }else{
-        delete ivmbxName;
-        ivmbxName = aVmbxName.Alloc(); // Returns NULL if fails.
-        if ( ivmbxName ){
-            result = KErrNone;
-        }       
-    }
-    qDebug("DummyVoiceMailboxEntry::SetVmbxName <");
-    return result;
-}
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::UsingMemoryLocation
-// Returns memory location of the entry instance
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TVmbxMemoryLocation CVoiceMailboxEntry::UsingMemoryLocation( ) const
-    {
-    qDebug("DummyVoiceMailboxEntry::UsingMemoryLocation <>");
-    return iUsingMemory;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::Reset
-// Reset the data members of the entry instance
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CVoiceMailboxEntry::Reset()
-{
-    qDebug("DummyVoiceMailboxEntry::Reset >");
-    iVmbxServiceId = KVmbxServiceIdNone;
-    iVmbxType = EVmbxNone;
-    iVmbxLineType = EVmbxAlsLineDefault;
-    if (ivmbxNumber){
-    	ivmbxNumber->Des().Zero();
-    	qDebug("DummyVoiceMailboxEntry::Reset vmbx number");
-    }
-    if (ivmbxName){
-    	ivmbxName->Des().Zero();
-    	qDebug("DummyVoiceMailboxEntry::Reset vmbx name");
-    }
-    if (iVmbxBrandId){
-    	iVmbxBrandId->Des().Zero();
-    	qDebug("DummyVoiceMailboxEntry::Reset vmbx brandId");
-    }
-    iUsingMemory = EVmbxSimMemory;
-    qDebug("DummyVoiceMailboxEntry::Reset <");
-}
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::SetUsingMemoryLocation
-// Set using memory of the entry instance
-// ---------------------------------------------------------------------------
-//
-void CVoiceMailboxEntry::SetUsingMemoryLocation( 
-                                        const TVmbxMemoryLocation& aType  )
-    {
-    qDebug("DummyVoiceMailboxEntry::SetUsingMemoryLocation %d", aType);
-    iUsingMemory = aType;
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::CVoiceMailboxEntry
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ---------------------------------------------------------------------------
-//
-CVoiceMailboxEntry::CVoiceMailboxEntry()
-    {
-    qDebug("DummyVoiceMailboxEntry::CVoiceMailboxEntry <>");
-    }
-
-// ---------------------------------------------------------------------------
-// CVoiceMailboxEntry::ConstructL
-// Symbian 2nd phase constructor can leave.
-// ---------------------------------------------------------------------------
-//
-void CVoiceMailboxEntry::ConstructL()
-    {
-    qDebug("DummyVoiceMailboxEntry::ConstructL <>");
-    }
-
-// End of file
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/src/ut_vmbxcpplugin.cpp
--- a/vmbx/vmbxcpplugin/tsrc/src/ut_vmbxcpplugin.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2009 - 2010 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:  Implementation of the Ut_vmbxCpPlugin class
-*
-*/
-
-// System includes
-#include <e32base.h>
-#include <cpitemdatahelper.h>
-
-// User includes
-#include "vmbxcpplugin.h"
-#include "vmbxcpgroup.h"
-#include "ut_vmbxcpplugin.h"
-
-/*!
-    Ut_vmbxCpPlugin::createSettingFormItemData
-*/
-void Ut_vmbxCpPlugin::testCreateSettingFormItemData()
-{
-    CpItemDataHelper itemDataHelper;
-    VmbxCpPlugin *plugin = new VmbxCpPlugin();
-    QVERIFY(plugin);
-    QList<CpSettingFormItemData *> list;
-    list = plugin->createSettingFormItemData(itemDataHelper);
-    QVERIFY2(0 != list[0], "createSettingFormItemData failed");
-    delete plugin;
-    plugin = NULL;
-}
-
-/*!
-    VmbxCpGroup construtor and destroctor
-*/
-void Ut_vmbxCpPlugin::testCreateVmbxCpGroup()
-{
-    CpItemDataHelper itemDataHelper;
-    VmbxCpGroup *group = new VmbxCpGroup(itemDataHelper);
-    QVERIFY(group);
-    delete group;
-    group = NULL;
-}
-//End of file
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/src/ut_vmbxuiengine.cpp
--- a/vmbx/vmbxcpplugin/tsrc/src/ut_vmbxuiengine.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
-* Copyright (c) 2009 - 2010 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:  Implementation of the Ut_VmbxUiEngine class
-*
-*/
-
-// System includes
-#include <QtTest/QtTest>
-#include <cvoicemailboxentry.h>
-
-// User includes
-#include "vmbxuiengine.h"
-#include "ut_vmbxuiengine.h"
-
-void setTestEnv(TInt aExpRet)
-{
-    globalExpRet = aExpRet;
-    qDebug("setTestEnv %d", globalExpRet);
-}
-
-
-/*!
-    Ut_VmbxUiEngine::initTestCase
-    QTestLib initialization method, called for each test case.
-*/
-void Ut_VmbxUiEngine::initTestCase()
-{
-    mUiEngine = new VmbxUiEngine();
-    QVERIFY(mUiEngine);
-}
-
-/*!
-    Ut_VmbxUiEngine::cleanupTestCase
-    QTestLib cleanup method, called for each test case.
-*/
-void Ut_VmbxUiEngine::cleanupTestCase()
-{
-    if ( mUiEngine ) {
-        delete mUiEngine;
-        mUiEngine = NULL;
-    }
-}
-
-/*!
-    Ut_VmbxUiEngine::testGetCsVoice1Number
-    testCreateVmbxEntry test case
-    Connects to test object signal and verifies received data.
-*/
-void Ut_VmbxUiEngine::testCsVoice1Number()
-{
-    QVERIFY(mUiEngine);
-    QString in("123456");
-    QString out("");
-    setTestEnv(KErrNone);
-    mUiEngine->setCsVoiceNumber(in);
-    mUiEngine->getCsVoiceNumber(out);
-    QCOMPARE(in, out);
-    
-    setTestEnv(KErrNotFound);
-    mUiEngine->setCsVoiceNumber(in);
-    mUiEngine->getCsVoiceNumber(out);
-    QCOMPARE(in, out);
-}
-
-/*!
-    Ut_VmbxUiEngine::testGetCsVideo1Number
-    testVmbxType test case
-    Connects to test object signal and verifies received data.
-*/
-void Ut_VmbxUiEngine::testCsVideo1Number()
-{
-    QVERIFY(mUiEngine);
-    
-    QString in("123456");
-    QString out("");
-
-    setTestEnv(KErrNone);
-    mUiEngine->setCsVideoNumber(in);
-    mUiEngine->getCsVideoNumber(out);
-    QCOMPARE(in, out);
-    
-    setTestEnv(KErrNotFound);
-    mUiEngine->setCsVideoNumber(in);
-    mUiEngine->getCsVideoNumber(out);
-    QCOMPARE(in, out);
-}
-
-void Ut_VmbxUiEngine::testIsVideoSupport()
-{
-    QVERIFY(mUiEngine);
-    mUiEngine->isVideoSupport();
-}
-
-void Ut_VmbxUiEngine::testHandleNotifyL()
-{
-    QVERIFY(mUiEngine);
-    CVoiceMailboxEntry *entry = CVoiceMailboxEntry::NewL();
-    QVERIFY(entry);
-    mUiEngine->HandleNotifyL(*entry);
-}
-
-
-//End file
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin.pro
--- a/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin.pro	Mon Oct 04 15:57:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 2009 - 2010 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: ut_vmbxcpplugin.exe
-#
-
-TEMPLATE = app
-TARGET = ut_vmbxcpplugin
-DEPENDPATH += .
-INCLUDEPATH += .
-CONFIG += hb
-CONFIG += qtestlib
-MOC_DIR = moc
-
-symbian: { 
-    TARGET.CAPABILITY = CAP_GENERAL_DLL 
-}
-
-symbian {
-    INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
-                   $$MOC_DIR \
-                   /epoc32/include/mw/QtTest \
-                   ../../inc\
-                   ./inc
-                   TARGET.EPOCALLOWDLLDATA = 1
-LIBS += -lcpframework
-}
-
-# Input
-HEADERS += inc\ut_vmbxuiengine.h\
-           inc\ut_vmbxcpplugin.h \
-           inc\ut_actioncustomitem.h\
-           inc\ut_customedit.h \
-           ..\inc\vmbxuiengine.h \
-           ..\inc\vmbxcpplugin.h \
-           ..\inc\vmbxcpgroup.h \
-           ..\inc\actioncustomitem.h \
-           ..\inc\customedit.h
-
-
-SOURCES += src\main.cpp\
-           src\ut_vmbxuiengine.cpp\
-           src\ut_vmbxcpplugin.cpp \
-           src\ut_actioncustomitem.cpp \
-           src\ut_customedit.cpp \
-           src\ut_dummyvoicemailbox.cpp\
-           src\ut_dummyvoicemailboxentry.cpp\
-           ..\src\vmbxuiengine.cpp \
-           ..\src\vmbxcpplugin.cpp \
-           ..\src\vmbxcpgroup.cpp  \
-           ..\src\actioncustomitem.cpp \
-           ..\src\customedit.cpp
-
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/inc/ut_actioncustomitem.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/inc/ut_actioncustomitem.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) 2010 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:  Implementation of the Ut_vmbxCpPlugin class
+*
+*/
+
+
+#ifndef UT_ACTIONCUSTOMIEM_H
+#define UT_CUSTOMCONTROLS_H
+
+#include <QObject>
+#include <QtTest/QtTest>
+
+class Ut_ActionCustomItem : public QObject
+{
+    Q_OBJECT
+    
+private slots:
+    void testNewAndDelete();
+    void testCreateItem();
+    void testCanSetModelIndex();    
+};
+
+#endif // UT_CUSTOMCONTROLS_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/inc/ut_customedit.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/inc/ut_customedit.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,34 @@
+/*
+* Copyright (c) 2010 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:  Implementation of the Ut_vmbxCpPlugin class
+*
+*/
+
+
+#ifndef UT_CUSTOMEDIT_H
+#define UT_CUSTOMEDIT_H
+
+#include <QObject>
+#include <QtTest/QtTest>
+
+class Ut_CustomEdit : public QObject
+{
+    Q_OBJECT
+    
+private slots:
+    void testFocusInEvent();
+    
+};
+
+#endif // UT_CUSTOMEDIT_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/inc/ut_vmbxcpplugin.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/inc/ut_vmbxcpplugin.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,53 @@
+/*
+* Copyright (c) 2009 - 2010 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:  Implementation of the Ut_vmbxCpPlugin class
+*
+*/
+
+
+#ifndef UT_VMBXCPPLUGIN_H
+#define UT_VMBXCPPLUGIN_H
+
+// System includes
+#include <QtTest/QtTest>
+#include <QObject>
+
+/*!
+    Ut_vmbxCpPlugin module test class.
+
+    Tests Ut_vmbxCpPlugin interface.
+    See cpp file for more information.
+
+    @lib Ut_vmbxCpPlugin.lib
+*/
+
+// Class declaration
+class Ut_vmbxCpPlugin : public QObject
+{
+    Q_OBJECT
+
+private slots: 
+
+    /*!
+        Test method in VmbxCpPlugin
+    */
+    void testCreateSettingFormItemData();
+    
+    /*!
+        Test method in VmbxCpGroup
+    */    
+    void testCreateVmbxCpGroup();
+};
+
+#endif // _UT_VMBXCPPLUGIN_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/inc/ut_vmbxuiengine.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/inc/ut_vmbxuiengine.h	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,60 @@
+/*
+* Copyright (c) 2009 - 2010 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:  Implementation of the Ut_VmbxUiEngine class
+*
+*/
+
+
+#ifndef UT_VMBXUIENGINE_H
+#define UT_VMBXUIENGINE_H
+
+#include <QObject>
+
+// Class forwards
+class VmbxUiEngine;
+
+static TInt globalExpRet;
+static QString globalNumber;
+
+/*!
+    Ut_VmbxUiEngine module test class.
+
+    Tests Ut_VmbxUiEngine interface.
+    See cpp file for more information.
+
+    @lib Ut_VmbxUiEngine.lib
+*/
+class Ut_VmbxUiEngine : public QObject
+{
+    Q_OBJECT
+
+private slots: 
+
+    void initTestCase();
+    void cleanupTestCase();
+    
+    void testCsVoice1Number();
+    void testCsVideo1Number();      
+    void testIsVideoSupport();
+    void testHandleNotifyL();
+    
+private:  //data
+
+    /*!
+        Own.
+    */
+    VmbxUiEngine *mUiEngine;
+};
+
+#endif // _UT_VMBXUIENGINE_H
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/main.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,49 @@
+#include <QtTest/QtTest>
+#include "ut_vmbxcpplugin.h"
+#include "ut_vmbxuiengine.h"
+#include "ut_actioncustomitem.h"
+#include "ut_customedit.h"
+
+// -----------------------------------------------------------------------------
+// main()
+// Main method implemented for directing test output to a file.
+// -----------------------------------------------------------------------------
+int main(int argc, char *argv[])
+    {
+    qDebug("main() >");
+    
+    QApplication app(argc, argv);
+
+    qDebug("ut_vmbxuiengine");
+    Ut_VmbxUiEngine tcUiEngine; 
+    char *pass[3];
+    pass[0] = argv[0];
+    pass[1] = "-o"; 
+    pass[2] = "c:\\logs\\vmbx\\ut_vmbxuiengine.txt";
+    int result = -1;
+    result = QTest::qExec(&tcUiEngine, 3, pass);
+    qDebug("ut_vmbxuiengine result %d", result);
+
+    qDebug("ut_vmbxcpplugin");
+    Ut_vmbxCpPlugin tcCpPlugin;
+    pass[2] = "c:\\logs\\vmbx\\ut_vmbxcpplugin.txt";
+    result = QTest::qExec(&tcCpPlugin, 3, pass);
+    qDebug("ut_vmbxcpplugin result=%d", result);
+    
+    qDebug("ut_actioncustomitem");
+    Ut_ActionCustomItem tcCustom;
+    pass[2] = "c:\\logs\\vmbx\\ut_acttioncustomitem.txt";
+    result = QTest::qExec(&tcCustom, 3, pass);
+    qDebug("ut_actioncustomitem result=%d", result);    
+
+    qDebug("ut_customedit");
+    Ut_CustomEdit tcEdit;
+    pass[2] = "c:\\logs\\vmbx\\ut_customedit.txt";
+    result = QTest::qExec(&tcEdit, 3, pass);
+    qDebug("Ut_CustomEdit result=%d", result);    
+    
+    
+    qDebug("main() <");
+    return result;
+    }
+//End of file
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_actioncustomitem.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_actioncustomitem.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,93 @@
+/*
+* Copyright (c) 2010 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:  Implementation of the Ut_vmbxCpPlugin class
+*
+*/
+
+#include <HbDataFormModelItem>
+#include <QFocusEvent>
+#include <HbMainWindow>
+#include <QEvent>
+#include "ut_actioncustomitem.h"
+#include "actioncustomitem.h"
+#include "customedit.h"
+
+void Ut_ActionCustomItem::testNewAndDelete()
+{
+    QGraphicsWidget *qGraphicsWidget = new QGraphicsWidget();
+    QVERIFY(qGraphicsWidget != 0);
+
+    ActionCustomItem *item = new ActionCustomItem(qGraphicsWidget);
+
+    qDebug("item=0x%x", item);
+    QVERIFY(item);    
+    delete item;
+    item = NULL;   
+    qDebug("delete item=0x%x", item);
+   
+    QVERIFY(!item);
+    
+    delete qGraphicsWidget;
+    qGraphicsWidget = NULL;
+}
+
+void Ut_ActionCustomItem::testCreateItem()
+{
+    QGraphicsWidget *qGraphicsWidget = new QGraphicsWidget();
+    QVERIFY(qGraphicsWidget != 0);
+
+    ActionCustomItem *item = new ActionCustomItem(qGraphicsWidget);
+    qDebug("item=0x%x", item);
+    QVERIFY(item);    
+    
+    HbAbstractViewItem *viewItem = item->createItem();
+
+    qDebug("viewItem=0x%x", viewItem);
+    QVERIFY(viewItem);
+    
+    delete viewItem;
+    viewItem = NULL;
+
+    delete item;
+    item = NULL;   
+    qDebug("delete item=0x%x", item);
+   
+    QVERIFY(!item);
+    
+    delete qGraphicsWidget;
+    qGraphicsWidget = NULL;
+}
+
+void Ut_ActionCustomItem::testCanSetModelIndex()
+{
+    QGraphicsWidget *qGraphicsWidget = new QGraphicsWidget();
+    QVERIFY(qGraphicsWidget != 0);
+
+    ActionCustomItem *item = new ActionCustomItem(qGraphicsWidget);
+    qDebug("item=0x%x", item);
+    QVERIFY(item);    
+    
+    QModelIndex index;
+    item->canSetModelIndex(index);
+    
+    delete item;
+    item = NULL;   
+    qDebug("delete item=0x%x", item);
+   
+    QVERIFY(!item);
+    
+    delete qGraphicsWidget;
+    qGraphicsWidget = NULL;
+}
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_customedit.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_customedit.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,63 @@
+/*
+* Copyright (c) 2010 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 <QFocusEvent>
+#include <HbMainWindow>
+#include <QEvent>
+#include <QEventLoop>
+#include "ut_customedit.h"
+#include "customedit.h"
+
+
+
+void Ut_CustomEdit::testFocusInEvent()
+{
+    HbMainWindow *window = new HbMainWindow;
+    QVERIFY(window);
+    
+    QGraphicsWidget *qGraphicsWidget = new QGraphicsWidget();
+    QVERIFY(qGraphicsWidget != 0);
+    CustomEdit *edit = new CustomEdit(qGraphicsWidget);
+    QVERIFY(edit);
+    
+    QFocusEvent *event = new QFocusEvent(QEvent::FocusIn, 
+        Qt::MouseFocusReason);  
+    QVERIFY(event);
+    edit->focusInEvent(event);
+    delete event;
+    event  = NULL;
+    
+    event = new QFocusEvent(QEvent::FocusOut, 
+        Qt::MouseFocusReason);
+    QVERIFY(event);
+    edit->focusInEvent(event);
+    // test for emitEditItemClicked    
+    QEventLoop loop;
+    QTimer timer;
+    timer.start(150);
+    connect( &timer,SIGNAL(timeout()),
+        &loop,SLOT(quit()));
+    loop.exec();
+    delete event;
+    event = NULL;
+    delete edit;
+    edit = NULL;
+    QVERIFY(!edit);
+    
+    delete qGraphicsWidget;
+    qGraphicsWidget = NULL;
+}
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_dummyvoicemailbox.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_dummyvoicemailbox.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,247 @@
+/*
+* Copyright (c) 2009 - 2010 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:  Implementation of the CVoiceMailbox class
+*
+*/
+
+// System includes
+#include <QtTest/QtTest>
+#include <cvoicemailbox.h>
+#include <cvoicemailboxentry.h>
+// For global export return value
+#include "ut_vmbxuiengine.h"
+
+// ============================ MEMBER FUNCTIONS =============================
+
+ TInt TVoiceMailboxParams::Version()
+    {
+    qDebug("TVoiceMailboxParams::Version <>");
+    return iVersion;
+    }
+    
+
+ TVoiceMailboxParams::TVoiceMailboxParams():
+                                        iType( EVmbxNone ),
+                                        iServiceId( KVmbxServiceIdNone ),
+                                        iLineType( EVmbxAlsLineDefault )
+    {
+    qDebug("TVoiceMailboxParams default constructor <>");
+    }
+    
+ TVoiceMailboxParams::TVoiceMailboxParams( 
+                        const CVoiceMailboxEntry& aEntry )
+    {
+    qDebug("TVoiceMailboxParams Entry cnstructor >");
+    iType = aEntry.VoiceMailboxType();
+    iServiceId = aEntry.ServiceId();
+    iLineType = aEntry.VmbxAlsLineType();
+    qDebug("TVoiceMailboxParams Entry cnstructor <");
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::CVoiceMailboxImpl
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// ---------------------------------------------------------------------------
+//
+CVoiceMailbox::CVoiceMailbox()
+    {
+    qDebug("DummyVoiceMailbox::CVoiceMailbox <>");
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::ConstructL
+// Symbian 2nd phase constructor can leave.
+// ---------------------------------------------------------------------------
+//
+void CVoiceMailbox::ConstructL()
+    {
+    qDebug("DummyVoiceMailbox::ConstructL <>");
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::NewL
+// Two-phased constructor.
+// ---------------------------------------------------------------------------
+//
+CVoiceMailbox* CVoiceMailbox::NewL()
+{
+    qDebug("DummyVoiceMailbox::NewL" );
+
+    CVoiceMailbox * self = NULL;
+    self = CVoiceMailbox::NewLC();
+    CleanupStack::Pop( self );
+    qDebug("DummyVoiceMailbox::NewL <");
+    return self;   
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::NewLC
+// Two-phased constructor.
+// ---------------------------------------------------------------------------
+//
+CVoiceMailbox* CVoiceMailbox::NewLC()
+    {
+    qDebug("DummyVoiceMailbox::NewLC >");
+    CVoiceMailbox* self = new( ELeave ) CVoiceMailbox;
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    qDebug("DummyVoiceMailbox::NewLC <");
+    return self;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::~CVoiceMailbox
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CVoiceMailbox::~CVoiceMailbox()
+    {
+    qDebug("DummyVoiceMailbox::~CVoiceMailbox > <");
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::GetStoredEntry
+//
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailbox::GetStoredEntry( 
+    const TVoiceMailboxParams& aParams, CVoiceMailboxEntry*& aEntry) const
+    {
+    qDebug("DummyVoiceMailbox::GetStoredEntry >");
+    Q_UNUSED(aParams);
+    TRAPD (err, aEntry = CVoiceMailboxEntry::NewL());    
+    qDebug("DummyVoiceMailbox::GetStoredEntry err %d<", err);
+    return globalExpRet;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::SaveEntry
+// Destructor
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailbox::SaveEntry(const CVoiceMailboxEntry& aEntry)
+    {
+    qDebug("DummyVoiceMailbox::SaveEntry <>");
+    Q_UNUSED(aEntry);
+    return globalExpRet;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::QueryNewEntry
+//
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailbox::QueryNewEntry(
+        const TVoiceMailboxParams& aParams, CVoiceMailboxEntry*& aEntry)
+    {
+    qDebug("DummyVoiceMailbox::QueryNewEntry <>");
+    Q_UNUSED(aParams);
+    TRAPD (err, aEntry = CVoiceMailboxEntry::NewL());
+    return globalExpRet;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::QueryChangeEntry
+//
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailbox::QueryChangeEntry( 
+        const TVoiceMailboxParams& aParams, CVoiceMailboxEntry*& aEntry)
+    {
+    qDebug("DummyVoiceMailbox::QueryChangeEntry <>");
+    Q_UNUSED(aParams);
+    TRAPD (err, aEntry = CVoiceMailboxEntry::NewL());
+    return globalExpRet;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::QueryVmbxType
+//
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailbox::QueryVmbxType(
+                            TVoiceMailboxParams& aParams )
+    {
+    qDebug("DummyVoiceMailbox::QueryVmbxType <>");
+    aParams.iType = EVmbxVoice;
+    aParams.iServiceId = KVmbxServiceVoice;
+    aParams.iLineType = EVmbxAlsLine1;
+    return globalExpRet;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::NotifyVmbxNumberChangeL
+//
+// ---------------------------------------------------------------------------
+//
+void CVoiceMailbox::NotifyVmbxNumberChangeL(
+    MVoiceMailboxObserver& aObserver, const TBool aNotifyOnActiveLineOnly )
+    {
+    qDebug("DummyVoiceMailbox::NotifyVmbxNumberChangeL <>");
+    Q_UNUSED(aObserver);
+    Q_UNUSED(aNotifyOnActiveLineOnly);
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::NotifyVmbxNumberChangeCancel
+//
+// ---------------------------------------------------------------------------
+//
+void CVoiceMailbox::NotifyVmbxNumberChangeCancel()
+    {
+    qDebug("DummyVoiceMailbox::NotifyVmbxNumberChangeCancel <>");
+    }
+
+// ---------------------------------------------------------------------------
+//  CVoiceMailbox::CheckConfiguration
+//
+// ---------------------------------------------------------------------------
+//
+TBool CVoiceMailbox::CheckConfiguration(
+    const TVoiceMailboxParams& aParams, const TInt aFlags )
+    {
+    qDebug("DummyVoiceMailbox::CheckConfiguration <>");
+    Q_UNUSED(aParams);
+    Q_UNUSED(aFlags);
+    return globalExpRet;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::GetServiceIds
+//
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailbox::GetServiceIds( RIdArray& aProfileIds ) const
+    {
+    qDebug("DummyVoiceMailbox::GetServiceIds <>");
+    Q_UNUSED(aProfileIds);
+    return 0;
+    }
+
+
+// ---------------------------------------------------------------------------
+// CVoiceMailbox::SaveProvisionedEntry
+//
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailbox::SaveProvisionedEntry( 
+                                const CVoiceMailboxEntry& aEntry)
+    {
+    qDebug("DummyVoiceMailbox::SaveProvisionedEntry <>");
+    Q_UNUSED(aEntry);
+    return globalExpRet;
+    }
+
+// End of file
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_dummyvoicemailboxentry.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_dummyvoicemailboxentry.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,331 @@
+/*
+* Copyright (c) 2009 - 2010 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:  Implementation of the CVoiceMailboxEntry class
+*
+*/
+
+// System includes
+#include <QtTest/QtTest>
+#include <cvoicemailboxentry.h>
+// For global value
+#include "ut_vmbxuiengine.h"
+
+// CONSTANTS
+
+// ============================ MEMBER FUNCTIONS =============================
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::NewL
+// 
+// ---------------------------------------------------------------------------
+//
+
+EXPORT_C CVoiceMailboxEntry* CVoiceMailboxEntry::NewL()
+    {
+    qDebug( "DummyVoiceMailboxEntry::NewL >" );
+    CVoiceMailboxEntry* self = CVoiceMailboxEntry::NewLC();
+    CleanupStack::Pop( self );
+    qDebug( "DummyVoiceMailboxEntry::NewL <" );
+    return self;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::NewLC
+// 
+// ---------------------------------------------------------------------------
+//
+EXPORT_C CVoiceMailboxEntry* CVoiceMailboxEntry::NewLC()
+    {
+    qDebug( "DummyVoiceMailboxEntry::NewLC >" );
+    CVoiceMailboxEntry* self = new( ELeave ) CVoiceMailboxEntry;
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    qDebug( "DummyVoiceMailboxEntry::NewLC <" );
+    return self;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::~CVoiceMailboxEntry
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CVoiceMailboxEntry::~CVoiceMailboxEntry()
+    {
+    qDebug( "DummyVoiceMailboxEntry::~CVoiceMailboxEntry >" );
+    delete ivmbxNumber;
+    delete iVmbxBrandId;
+    delete ivmbxName;
+    qDebug( "DummyVoiceMailboxEntry::~CVoiceMailboxEntry <" );
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::ServiceId
+// Get ServiceId
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TServiceId CVoiceMailboxEntry::ServiceId() const
+    {
+    qDebug( "DummyVoiceMailboxEntry::ServiceId %d", iVmbxServiceId );
+    return iVmbxServiceId;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::SetServiceId
+// Set entry's service id
+// ---------------------------------------------------------------------------
+//
+void CVoiceMailboxEntry::SetServiceId( 
+                        const TServiceId& aVmbxServiceId )
+    {
+    qDebug( "DummyVoiceMailboxEntry::SetServiceId %d", aVmbxServiceId);
+    iVmbxServiceId = aVmbxServiceId;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::VoiceMailboxType
+// Returns type of the entry instance
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TVmbxType CVoiceMailboxEntry::VoiceMailboxType( ) const
+    {
+    qDebug( "DummyVoiceMailboxEntry::VoiceMailboxType %d", iVmbxType );
+    return iVmbxType;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::SetVoiceMailboxType
+// Set Type of the entry instance
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CVoiceMailboxEntry::SetVoiceMailboxType( const TVmbxType& aType )
+    {
+    qDebug( "DummyVoiceMailboxEntry::SetVoiceMailboxType %d", aType );
+    iVmbxType = aType;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::VmbxAlsLineType
+// Get ALS line Type of the entry instance
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TVmbxAlsLineType CVoiceMailboxEntry::VmbxAlsLineType() const
+    {
+    qDebug( "DummyVoiceMailboxEntry::VmbxAlsLineType >" );
+    return iVmbxLineType;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::SetVmbxAlsLineType
+// Set ALS line Type of the entry instance
+// ---------------------------------------------------------------------------
+//
+void CVoiceMailboxEntry::SetVmbxAlsLineType( 
+                                const TVmbxAlsLineType& aLine )
+    {
+    qDebug( "DummyVoiceMailboxEntry::SetVmbxAlsLineType %d >", aLine );
+    if ( EVmbxAlsLineDefault == aLine  )
+        {
+        iVmbxLineType = EVmbxAlsLine1;
+        }
+    else
+        {
+        iVmbxLineType = aLine;
+        }
+    qDebug( "DummyVoiceMailboxEntry::SetVmbxAlsLineType %d <", iVmbxLineType );
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::GetVmbxNumber
+// Get number or address of the entry instance
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailboxEntry::GetVmbxNumber( TPtrC& aVmbxNumber ) const
+    {
+    qDebug("DummyVoiceMailboxEntry::GetVmbxNumber >");
+    aVmbxNumber.Set(globalNumber.utf16());
+    qDebug("DummyVoiceMailboxEntry::GetVmbxNumber %d", globalExpRet);
+    return globalExpRet;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::SetVmbxNumber
+// Set number or address of the entry instance
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailboxEntry::SetVmbxNumber( const TDesC& aVmbxNumber )
+    {
+    qDebug("DummyVoiceMailboxEntry::SetVmbxNumber >");
+    globalNumber = QString::fromUtf16(aVmbxNumber.Ptr(), aVmbxNumber.Length());
+    qDebug("DummyVoiceMailboxEntry::SetVmbxNumber %d", globalExpRet);
+    return globalExpRet;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::GetVmbxAlsLineType
+// Get Brand Id of the entry instance
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailboxEntry::GetBrandId( TPtrC8& aBrandId ) const
+    {
+    qDebug("DummyVoiceMailboxEntry::GetBrandId >");
+    TInt result( KErrNotFound ); 
+    if ( iVmbxBrandId )
+        {
+        aBrandId.Set( iVmbxBrandId->Des() );
+        result = KErrNone;
+        }
+    else
+        {
+        aBrandId.Set( KNullDesC8 );
+        }
+    qDebug("DummyVoiceMailboxEntry::GetBrandId <");
+    return result;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::SetBrandId
+// Set Brand Id of the entry instance
+// ---------------------------------------------------------------------------
+//
+TInt CVoiceMailboxEntry::SetBrandId( const TDesC8& aBrandId )
+{
+    qDebug("DummyVoiceMailboxEntry::SetBrandId >");
+    TInt result( KErrNoMemory );
+    if ( KVmbxMaxNumberLength < aBrandId.Length() ){
+        result = KErrArgument;
+    }else{
+        delete iVmbxBrandId;
+        iVmbxBrandId = aBrandId.Alloc();
+        if ( iVmbxBrandId ){
+            result = KErrNone;
+        }
+    }
+    qDebug("DummyVoiceMailboxEntry::SetBrandId <");
+    return result;
+}
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::GetVmbxName
+// Get Name of the entry instance
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TInt CVoiceMailboxEntry::GetVmbxName( TPtrC& aVmbxName ) const
+{
+    qDebug("DummyVoiceMailboxEntry::GetVmbxName >");
+    TInt result( KErrNotFound );
+    if ( ivmbxName ){
+        aVmbxName.Set( ivmbxName->Des() );
+        result = KErrNone;
+    }else{
+        qDebug( "DummyVoiceMailboxEntry::GetVmbxName:KNullDesC" );
+        aVmbxName.Set( KNullDesC );
+    }      
+    qDebug("DummyVoiceMailboxEntry::GetVmbxName <");
+    return result;
+}
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::SetVmbxName
+// Set Name of the entry instance
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TInt CVoiceMailboxEntry::SetVmbxName( const TDesC& aVmbxName )
+{
+    qDebug("DummyVoiceMailboxEntry::SetVmbxName >");
+    TInt result( KErrNoMemory );
+    if (KVmbxMaxNumberLength < aVmbxName.Length()){
+        result = KErrArgument;
+    }else{
+        delete ivmbxName;
+        ivmbxName = aVmbxName.Alloc(); // Returns NULL if fails.
+        if ( ivmbxName ){
+            result = KErrNone;
+        }       
+    }
+    qDebug("DummyVoiceMailboxEntry::SetVmbxName <");
+    return result;
+}
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::UsingMemoryLocation
+// Returns memory location of the entry instance
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TVmbxMemoryLocation CVoiceMailboxEntry::UsingMemoryLocation( ) const
+    {
+    qDebug("DummyVoiceMailboxEntry::UsingMemoryLocation <>");
+    return iUsingMemory;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::Reset
+// Reset the data members of the entry instance
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CVoiceMailboxEntry::Reset()
+{
+    qDebug("DummyVoiceMailboxEntry::Reset >");
+    iVmbxServiceId = KVmbxServiceIdNone;
+    iVmbxType = EVmbxNone;
+    iVmbxLineType = EVmbxAlsLineDefault;
+    if (ivmbxNumber){
+    	ivmbxNumber->Des().Zero();
+    	qDebug("DummyVoiceMailboxEntry::Reset vmbx number");
+    }
+    if (ivmbxName){
+    	ivmbxName->Des().Zero();
+    	qDebug("DummyVoiceMailboxEntry::Reset vmbx name");
+    }
+    if (iVmbxBrandId){
+    	iVmbxBrandId->Des().Zero();
+    	qDebug("DummyVoiceMailboxEntry::Reset vmbx brandId");
+    }
+    iUsingMemory = EVmbxSimMemory;
+    qDebug("DummyVoiceMailboxEntry::Reset <");
+}
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::SetUsingMemoryLocation
+// Set using memory of the entry instance
+// ---------------------------------------------------------------------------
+//
+void CVoiceMailboxEntry::SetUsingMemoryLocation( 
+                                        const TVmbxMemoryLocation& aType  )
+    {
+    qDebug("DummyVoiceMailboxEntry::SetUsingMemoryLocation %d", aType);
+    iUsingMemory = aType;
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::CVoiceMailboxEntry
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// ---------------------------------------------------------------------------
+//
+CVoiceMailboxEntry::CVoiceMailboxEntry()
+    {
+    qDebug("DummyVoiceMailboxEntry::CVoiceMailboxEntry <>");
+    }
+
+// ---------------------------------------------------------------------------
+// CVoiceMailboxEntry::ConstructL
+// Symbian 2nd phase constructor can leave.
+// ---------------------------------------------------------------------------
+//
+void CVoiceMailboxEntry::ConstructL()
+    {
+    qDebug("DummyVoiceMailboxEntry::ConstructL <>");
+    }
+
+// End of file
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_vmbxcpplugin.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_vmbxcpplugin.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,53 @@
+/*
+* Copyright (c) 2009 - 2010 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:  Implementation of the Ut_vmbxCpPlugin class
+*
+*/
+
+// System includes
+#include <e32base.h>
+#include <cpitemdatahelper.h>
+
+// User includes
+#include "vmbxcpplugin.h"
+#include "vmbxcpgroup.h"
+#include "ut_vmbxcpplugin.h"
+
+/*!
+    Ut_vmbxCpPlugin::createSettingFormItemData
+*/
+void Ut_vmbxCpPlugin::testCreateSettingFormItemData()
+{
+    CpItemDataHelper itemDataHelper;
+    VmbxCpPlugin *plugin = new VmbxCpPlugin();
+    QVERIFY(plugin);
+    QList<CpSettingFormItemData *> list;
+    list = plugin->createSettingFormItemData(itemDataHelper);
+    QVERIFY2(0 != list[0], "createSettingFormItemData failed");
+    delete plugin;
+    plugin = NULL;
+}
+
+/*!
+    VmbxCpGroup construtor and destroctor
+*/
+void Ut_vmbxCpPlugin::testCreateVmbxCpGroup()
+{
+    CpItemDataHelper itemDataHelper;
+    VmbxCpGroup *group = new VmbxCpGroup(itemDataHelper);
+    QVERIFY(group);
+    delete group;
+    group = NULL;
+}
+//End of file
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_vmbxuiengine.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/src/ut_vmbxuiengine.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,114 @@
+/*
+* Copyright (c) 2009 - 2010 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:  Implementation of the Ut_VmbxUiEngine class
+*
+*/
+
+// System includes
+#include <QtTest/QtTest>
+#include <cvoicemailboxentry.h>
+
+// User includes
+#include "vmbxuiengine.h"
+#include "ut_vmbxuiengine.h"
+
+void setTestEnv(TInt aExpRet)
+{
+    globalExpRet = aExpRet;
+    qDebug("setTestEnv %d", globalExpRet);
+}
+
+
+/*!
+    Ut_VmbxUiEngine::initTestCase
+    QTestLib initialization method, called for each test case.
+*/
+void Ut_VmbxUiEngine::initTestCase()
+{
+    mUiEngine = new VmbxUiEngine();
+    QVERIFY(mUiEngine);
+}
+
+/*!
+    Ut_VmbxUiEngine::cleanupTestCase
+    QTestLib cleanup method, called for each test case.
+*/
+void Ut_VmbxUiEngine::cleanupTestCase()
+{
+    if ( mUiEngine ) {
+        delete mUiEngine;
+        mUiEngine = NULL;
+    }
+}
+
+/*!
+    Ut_VmbxUiEngine::testGetCsVoice1Number
+    testCreateVmbxEntry test case
+    Connects to test object signal and verifies received data.
+*/
+void Ut_VmbxUiEngine::testCsVoice1Number()
+{
+    QVERIFY(mUiEngine);
+    QString in("123456");
+    QString out("");
+    setTestEnv(KErrNone);
+    mUiEngine->setCsVoiceNumber(in);
+    mUiEngine->getCsVoiceNumber(out);
+    QCOMPARE(in, out);
+    
+    setTestEnv(KErrNotFound);
+    mUiEngine->setCsVoiceNumber(in);
+    mUiEngine->getCsVoiceNumber(out);
+    QCOMPARE(in, out);
+}
+
+/*!
+    Ut_VmbxUiEngine::testGetCsVideo1Number
+    testVmbxType test case
+    Connects to test object signal and verifies received data.
+*/
+void Ut_VmbxUiEngine::testCsVideo1Number()
+{
+    QVERIFY(mUiEngine);
+    
+    QString in("123456");
+    QString out("");
+
+    setTestEnv(KErrNone);
+    mUiEngine->setCsVideoNumber(in);
+    mUiEngine->getCsVideoNumber(out);
+    QCOMPARE(in, out);
+    
+    setTestEnv(KErrNotFound);
+    mUiEngine->setCsVideoNumber(in);
+    mUiEngine->getCsVideoNumber(out);
+    QCOMPARE(in, out);
+}
+
+void Ut_VmbxUiEngine::testIsVideoSupport()
+{
+    QVERIFY(mUiEngine);
+    mUiEngine->isVideoSupport();
+}
+
+void Ut_VmbxUiEngine::testHandleNotifyL()
+{
+    QVERIFY(mUiEngine);
+    CVoiceMailboxEntry *entry = CVoiceMailboxEntry::NewL();
+    QVERIFY(entry);
+    mUiEngine->HandleNotifyL(*entry);
+}
+
+
+//End file
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/ut_vmbxcpplugin.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/ut_vmbxcpplugin.pkg	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,29 @@
+;
+; Copyright (c) 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: voicemailbox control panel plugin unit test PKG file
+;
+
+
+;Languages
+&EN
+
+;Localised Vendor name
+%{"Nokia EN"}
+
+;Unique Vendor name
+:"Nokia"
+
+;Files to install
+"\epoc32\release\armv5\urel\ut_vmbxcpplugin.exe"-"!:\sys\bin\ut_vmbxcpplugin.exe"
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/ut_vmbxcpplugin.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxcpplugin/tsrc/ut_vmbxcpplugin/ut_vmbxcpplugin.pro	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2009 - 2010 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: Voicemailbox control panel plugin unit test project
+#
+
+TEMPLATE = app
+TARGET = ut_vmbxcpplugin
+DEPENDPATH += .
+INCLUDEPATH += .
+CONFIG += hb
+CONFIG += qtestlib
+MOC_DIR = moc
+
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
+               $$MOC_DIR
+
+LIBS += -lcpframework
+
+# Input
+HEADERS += inc/ut_vmbxuiengine.h\
+           inc/ut_vmbxcpplugin.h \
+           inc/ut_actioncustomitem.h\
+           inc/ut_customedit.h \
+           ../../inc/vmbxuiengine.h \
+           ../../inc/vmbxcpplugin.h \
+           ../../inc/vmbxcpgroup.h \
+           ../../inc/actioncustomitem.h \
+           ../../inc/customedit.h
+
+
+SOURCES += src/main.cpp\
+           src/ut_vmbxuiengine.cpp\
+           src/ut_vmbxcpplugin.cpp \
+           src/ut_actioncustomitem.cpp \
+           src/ut_customedit.cpp \
+           src/ut_dummyvoicemailbox.cpp\
+           src/ut_dummyvoicemailboxentry.cpp\
+           ../../src/vmbxuiengine.cpp \
+           ../../src/vmbxcpplugin.cpp \
+           ../../src/vmbxcpgroup.cpp  \
+           ../../src/actioncustomitem.cpp \
+           ../../src/customedit.cpp
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxengine/src/vmbxqtuihandler.cpp
--- a/vmbx/vmbxengine/src/vmbxqtuihandler.cpp	Mon Oct 04 15:57:13 2010 +0300
+++ b/vmbx/vmbxengine/src/vmbxqtuihandler.cpp	Fri Oct 15 13:21:28 2010 +0300
@@ -138,8 +138,8 @@
     // Set HbLineEdit  Content 
     iQueryDialog->lineEdit()->setText(aNumber); // default text
     iQueryDialog->lineEdit()->setMaxLength(KVmbxPhoneCharMaxLength);
-    HbEditorInterface inputMode(iQueryDialog->lineEdit());
-    inputMode.setFilter(HbPhoneNumberFilter::instance());
+    iQueryDialog->lineEdit()->setInputMethodHints(
+        Qt::ImhDialableCharactersOnly);
     bool ret = connect(iQueryDialog->lineEdit(), SIGNAL(textChanged(QString)),
         this, SLOT(updatePrimaryAction(QString)));    
     VMBLOGSTRING2( "VmbxQtUiHandler::showVmbxQueryDialog connect textChanged %d", ret)
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.pkg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.pkg	Fri Oct 15 13:21:28 2010 +0300
@@ -0,0 +1,29 @@
+;
+; Copyright (c) 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: voicemailbox engine unit test PKG file
+;
+
+
+;Languages
+&EN
+
+;Localised Vendor name
+%{"Nokia EN"}
+
+;Unique Vendor name
+:"Nokia"
+
+;Files to install
+"\epoc32\release\armv5\urel\ut_vmbxengine.exe"-"!:\sys\bin\ut_vmbxengine.exe"
+
diff -r 12bc758d6a02 -r 25b8d29b7c59 vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.pro
--- a/vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.pro	Mon Oct 04 15:57:13 2010 +0300
+++ b/vmbx/vmbxengine/tsrc/ut_vmbxengine/ut_vmbxengine.pro	Fri Oct 15 13:21:28 2010 +0300
@@ -11,106 +11,97 @@
 #
 # Contributors:
 #
-# Description:
+# Description: Voicemailbox engine unit test project
 #
 
 TEMPLATE = app
 TARGET = ut_vmbxengine
-TARGET.EPOCALLOWDLLDATA = 1
-
+DEPENDPATH += .
+INCLUDEPATH += .
 CONFIG += hb
 CONFIG += qtestlib
+MOC_DIR = moc
 
-DEPENDPATH += .
 
-INCLUDEPATH += .
-INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-HEADERS += \epoc32\include\platform\mw\cvoicemailbox.h
-HEADERS += \epoc32\include\platform\mw\cvoicemailboxentry.h
-
-INCLUDEPATH += ..\..\inc
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
+               $$MOC_DIR
 
 HEADERS += $$PUBLIC_HEADERS
 
-symbian: { 
-    TARGET.CAPABILITY = CAP_GENERAL_DLL
-}
 
 # Code subject to test 
-SOURCES += ..\..\src\vmbxuihandler.cpp
+SOURCES += ../../src/vmbxuihandler.cpp
 # It is mocked by qtuihandler_mock.cpp, remove the real one
-#SOURCES += ..\..\src\vmbxqtuihandler.cpp
-SOURCES += ..\..\src\voicemailboximpl.cpp
-SOURCES += ..\..\src\vmbxpbkstore.cpp
-SOURCES += ..\..\src\vmbxetelconnection.cpp
-SOURCES += ..\..\src\vmbxsimhandler.cpp
-SOURCES += ..\..\src\vmbxcenrephandler.cpp
-SOURCES += ..\..\src\vmbxutilities.cpp
-SOURCES += ..\..\src\vmbxenginefactory.cpp
-SOURCES += ..\..\src\vmbxenginebase.cpp
-SOURCES += ..\..\src\vmbxcsvoiceengine.cpp
-SOURCES += ..\..\src\vmbxcsvideoengine.cpp
-SOURCES += ..\..\src\vmbxvoipengine.cpp
-SOURCES += ..\..\src\vmbxemergencycall.cpp  
-SOURCES += ..\..\src\vmbxuiutilities.cpp
-SOURCES += ..\..\src\vmbxcenrepobserver.cpp
-SOURCES += ..\..\src\vmbxsimstoreobserver.cpp
-SOURCES += ..\..\src\vmbxsatrefreshobserver.cpp
-SOURCES += ..\..\src\vmbxobserver.cpp
-SOURCES += ..\..\src\vmbshandler.cpp
-SOURCES += ..\..\src\vmspshandler.cpp
-SOURCES += ..\..\src\vmsettingsuiiconfileprovider.cpp
-SOURCES += ..\..\src\cvoicemailbox.cpp
-SOURCES += ..\..\src\cvoicemailboxentry.cpp
+#SOURCES += ../../src/vmbxqtuihandler.cpp
+SOURCES += ../../src/voicemailboximpl.cpp
+SOURCES += ../../src/vmbxpbkstore.cpp
+SOURCES += ../../src/vmbxetelconnection.cpp
+SOURCES += ../../src/vmbxsimhandler.cpp
+SOURCES += ../../src/vmbxcenrephandler.cpp
+SOURCES += ../../src/vmbxutilities.cpp
+SOURCES += ../../src/vmbxenginefactory.cpp
+SOURCES += ../../src/vmbxenginebase.cpp
+SOURCES += ../../src/vmbxcsvoiceengine.cpp
+SOURCES += ../../src/vmbxcsvideoengine.cpp
+SOURCES += ../../src/vmbxvoipengine.cpp
+SOURCES += ../../src/vmbxemergencycall.cpp  
+SOURCES += ../../src/vmbxuiutilities.cpp
+SOURCES += ../../src/vmbxcenrepobserver.cpp
+SOURCES += ../../src/vmbxsimstoreobserver.cpp
+SOURCES += ../../src/vmbxsatrefreshobserver.cpp
+SOURCES += ../../src/vmbxobserver.cpp
+SOURCES += ../../src/vmspshandler.cpp
+SOURCES += ../../src/vmsettingsuiiconfileprovider.cpp
+SOURCES += ../../src/cvoicemailbox.cpp
+SOURCES += ../../src/cvoicemailboxentry.cpp
 
-HEADERS += ..\..\inc\vmbxuihandler.h
-HEADERS += ..\..\inc\vmbxqtuihandler.h
-HEADERS += ..\..\inc\voicemailboximpl.h
-HEADERS += ..\..\inc\vmbxpbkstore.h
-HEADERS += ..\..\inc\vmbxetelconnection.h
-HEADERS += ..\..\inc\vmbxsimhandler.h
-HEADERS += ..\..\inc\vmbxcenrephandler.h
-HEADERS += ..\..\inc\vmbxutilities.h
-HEADERS += ..\..\inc\vmbxenginefactory.h
-HEADERS += ..\..\inc\vmbxenginebase.h
-HEADERS += ..\..\inc\vmbxcsvoiceengine.h
-HEADERS += ..\..\inc\vmbxcsvideoengine.h
-HEADERS += ..\..\inc\vmbxvoipengine.h
-HEADERS += ..\..\inc\vmbxemergencycall.h  
-HEADERS += ..\..\inc\vmbxuiutilities.h
-HEADERS += ..\..\inc\vmbxcenrepobserver.h
-HEADERS += ..\..\inc\vmbxsimstoreobserver.h
-HEADERS += ..\..\inc\vmbxsatrefreshobserver.h
-HEADERS += ..\..\inc\vmbxobserver.h
-HEADERS += ..\..\inc\vmbshandler.h
-HEADERS += ..\..\inc\vmspshandler.h
-HEADERS += ..\..\inc\vmsettingsuiiconfileprovider.h
+HEADERS += ../../inc/vmbxuihandler.h
+HEADERS += ../../inc/vmbxqtuihandler.h
+HEADERS += ../../inc/voicemailboximpl.h
+HEADERS += ../../inc/vmbxpbkstore.h
+HEADERS += ../../inc/vmbxetelconnection.h
+HEADERS += ../../inc/vmbxsimhandler.h
+HEADERS += ../../inc/vmbxcenrephandler.h
+HEADERS += ../../inc/vmbxutilities.h
+HEADERS += ../../inc/vmbxenginefactory.h
+HEADERS += ../../inc/vmbxenginebase.h
+HEADERS += ../../inc/vmbxcsvoiceengine.h
+HEADERS += ../../inc/vmbxcsvideoengine.h
+HEADERS += ../../inc/vmbxvoipengine.h
+HEADERS += ../../inc/vmbxemergencycall.h  
+HEADERS += ../../inc/vmbxuiutilities.h
+HEADERS += ../../inc/vmbxcenrepobserver.h
+HEADERS += ../../inc/vmbxsimstoreobserver.h
+HEADERS += ../../inc/vmbxsatrefreshobserver.h
+HEADERS += ../../inc/vmbxobserver.h
+HEADERS += ../../inc/vmspshandler.h
+HEADERS += ../../inc/vmsettingsuiiconfileprovider.h
 
-HEADERS += ..\..\inc\mvmbxcenrephandler.h 
-HEADERS += ..\..\inc\mvmbxcenrepobserver.h 
-HEADERS += ..\..\inc\mvmbxchangeobserver.h 
-HEADERS += ..\..\inc\mvmbxresourceprovider.h
-HEADERS += ..\..\inc\mvmbxsatrefreshobserver.h
-HEADERS += ..\..\inc\mvmbxservicenotify.h
-HEADERS += ..\..\inc\mvmbxsimstoreobserver.h
-HEADERS += ..\..\inc\mvmbxuihandler.h
-HEADERS += ..\..\inc\mvmbxuiutilities.h
+HEADERS += ../../inc/mvmbxcenrephandler.h 
+HEADERS += ../../inc/mvmbxcenrepobserver.h 
+HEADERS += ../../inc/mvmbxchangeobserver.h 
+HEADERS += ../../inc/mvmbxresourceprovider.h
+HEADERS += ../../inc/mvmbxsatrefreshobserver.h
+HEADERS += ../../inc/mvmbxservicenotify.h
+HEADERS += ../../inc/mvmbxsimstoreobserver.h
+HEADERS += ../../inc/mvmbxuihandler.h
+HEADERS += ../../inc/mvmbxuiutilities.h
 
 # Test code
-HEADERS += inc\ut_vmbxengine.h
-HEADERS += inc\ut_pbkstore.h
-HEADERS += inc\ut_simhandler.h
+HEADERS += inc/ut_vmbxengine.h
+HEADERS += inc/ut_pbkstore.h
+HEADERS += inc/ut_simhandler.h
 
-SOURCES += src\ut_vmbxengine.cpp
-SOURCES += src\ut_pbkstore.cpp
-SOURCES += src\ut_simhandler.cpp
-SOURCES += src\main.cpp
+SOURCES += src/ut_vmbxengine.cpp
+SOURCES += src/ut_pbkstore.cpp
+SOURCES += src/ut_simhandler.cpp
+SOURCES += src/main.cpp
 
 # Mock class
-SOURCES += src\etel_mock.cpp
-SOURCES += src\mpbutil_mock.cpp
-SOURCES += src\qtuihandler_mock.cpp
-SOURCES += src\cenrep_mock.cpp
+SOURCES += src/etel_mock.cpp
+SOURCES += src/mpbutil_mock.cpp
+SOURCES += src/qtuihandler_mock.cpp
+SOURCES += src/cenrep_mock.cpp
 
 LIBS += -lflogger
 LIBS += -lfeatmgr