--- a/cbs/cbsserver/Bwins/CBSCLIENTU.DEF Fri Sep 17 17:09:13 2010 +0300
+++ b/cbs/cbsserver/Bwins/CBSCLIENTU.DEF Mon Oct 04 15:57:13 2010 +0300
@@ -22,28 +22,27 @@
?GetMessageIndexByHandle@RCbs@@QAEHABKAAH@Z @ 21 NONAME ; int RCbs::GetMessageIndexByHandle(unsigned long const &, int &)
?GetNewTopicsCount@RCbs@@QAEHAAH@Z @ 22 NONAME ; int RCbs::GetNewTopicsCount(int &)
?GetNextAndPrevMessageHandle@RCbs@@QAEHABKAAK1AAH@Z @ 23 NONAME ; int RCbs::GetNextAndPrevMessageHandle(unsigned long const &, unsigned long &, unsigned long &, int &)
- ?GetNextAndPrevMessageHandle@RCbsTopicMessages@@QAEHABKAAK1AAH@Z @ 24 NONAME ; int RCbsTopicMessages::GetNextAndPrevMessageHandle(unsigned long const &, unsigned long &, unsigned long &, int &)
- ?GetNextAndPrevTopicNumber@RCbs@@QAEHABGAAG1AAH@Z @ 25 NONAME ; int RCbs::GetNextAndPrevTopicNumber(unsigned short const &, unsigned short &, unsigned short &, int &)
- ?GetReceptionStatus@RCbs@@QAEXAAH@Z @ 26 NONAME ; void RCbs::GetReceptionStatus(int &)
- ?GetTopic@RCbs@@QAEHHAAUTCbsDbTopic@@@Z @ 27 NONAME ; int RCbs::GetTopic(int, struct TCbsDbTopic &)
- ?GetTopicCount@RCbs@@QAEXAAH@Z @ 28 NONAME ; void RCbs::GetTopicCount(int &)
- ?GetTopicDetectionStatus@RCbs@@QAEXAAH@Z @ 29 NONAME ; void RCbs::GetTopicDetectionStatus(int &)
- ?GetUnreadMessageCount@RCbs@@QAEXAAH@Z @ 30 NONAME ; void RCbs::GetUnreadMessageCount(int &)
- ?HasNextCollectionTopic@RCbs@@QAEHXZ @ 31 NONAME ; int RCbs::HasNextCollectionTopic(void)
- ?LockMessage@RCbs@@QAEHABK@Z @ 32 NONAME ; int RCbs::LockMessage(unsigned long const &)
- ?NewL@CCbsMessageClient@@SAPAV1@XZ @ 33 NONAME ; class CCbsMessageClient * CCbsMessageClient::NewL(void)
- ?NextCollectionTopic@RCbs@@QAEHAAUTCbsDbTopicIdentity@@@Z @ 34 NONAME ; int RCbs::NextCollectionTopic(struct TCbsDbTopicIdentity &)
- ?NotifyOnTopicListEvent@RCbs@@QAEXAAVTRequestStatus@@HAAW4TCbsTopicListEvent@@AAG@Z @ 35 NONAME ; void RCbs::NotifyOnTopicListEvent(class TRequestStatus &, int, enum TCbsTopicListEvent &, unsigned short &)
- ?NotifyOnTopicListEventCancel@RCbs@@QAEXXZ @ 36 NONAME ; void RCbs::NotifyOnTopicListEventCancel(void)
- ?NotifySettingsChanged@RCbs@@QAEXAAVTRequestStatus@@AAW4TCbsSettingsEvent@@@Z @ 37 NONAME ; void RCbs::NotifySettingsChanged(class TRequestStatus &, enum TCbsSettingsEvent &)
- ?NotifySettingsChangedCancel@RCbs@@QAEXXZ @ 38 NONAME ; void RCbs::NotifySettingsChangedCancel(void)
- ?NumberOfUnreadHotmarkedMessages@RCbs@@QAEHXZ @ 39 NONAME ; int RCbs::NumberOfUnreadHotmarkedMessages(void)
- ?ReadMessage@RCbs@@QAEHABK@Z @ 40 NONAME ; int RCbs::ReadMessage(unsigned long const &)
- ?SaveMessage@RCbs@@QAEHABK@Z @ 41 NONAME ; int RCbs::SaveMessage(unsigned long const &)
- ?SetLanguages@RCbs@@QAEHABUTCbsDbLanguages@@@Z @ 42 NONAME ; int RCbs::SetLanguages(struct TCbsDbLanguages const &)
- ?SetReceptionStatus@RCbs@@QAEHH@Z @ 43 NONAME ; int RCbs::SetReceptionStatus(int)
- ?SetTopicDetectionStatus@RCbs@@QAEHH@Z @ 44 NONAME ; int RCbs::SetTopicDetectionStatus(int)
- ?Shutdown@RCbs@@QBEXXZ @ 45 NONAME ; void RCbs::Shutdown(void) const
- ?StartCollectionBrowsing@RCbs@@QAEXXZ @ 46 NONAME ; void RCbs::StartCollectionBrowsing(void)
- ?Version@RCbs@@QBE?AVTVersion@@XZ @ 47 NONAME ; class TVersion RCbs::Version(void) const
+ ?GetNextAndPrevTopicNumber@RCbs@@QAEHABGAAG1AAH@Z @ 24 NONAME ; int RCbs::GetNextAndPrevTopicNumber(unsigned short const &, unsigned short &, unsigned short &, int &)
+ ?GetReceptionStatus@RCbs@@QAEXAAH@Z @ 25 NONAME ; void RCbs::GetReceptionStatus(int &)
+ ?GetTopic@RCbs@@QAEHHAAUTCbsDbTopic@@@Z @ 26 NONAME ; int RCbs::GetTopic(int, struct TCbsDbTopic &)
+ ?GetTopicCount@RCbs@@QAEXAAH@Z @ 27 NONAME ; void RCbs::GetTopicCount(int &)
+ ?GetTopicDetectionStatus@RCbs@@QAEXAAH@Z @ 28 NONAME ; void RCbs::GetTopicDetectionStatus(int &)
+ ?GetUnreadMessageCount@RCbs@@QAEXAAH@Z @ 29 NONAME ; void RCbs::GetUnreadMessageCount(int &)
+ ?HasNextCollectionTopic@RCbs@@QAEHXZ @ 30 NONAME ; int RCbs::HasNextCollectionTopic(void)
+ ?LockMessage@RCbs@@QAEHABK@Z @ 31 NONAME ; int RCbs::LockMessage(unsigned long const &)
+ ?NewL@CCbsMessageClient@@SAPAV1@XZ @ 32 NONAME ; class CCbsMessageClient * CCbsMessageClient::NewL(void)
+ ?NextCollectionTopic@RCbs@@QAEHAAUTCbsDbTopicIdentity@@@Z @ 33 NONAME ; int RCbs::NextCollectionTopic(struct TCbsDbTopicIdentity &)
+ ?NotifyOnTopicListEvent@RCbs@@QAEXAAVTRequestStatus@@HAAW4TCbsTopicListEvent@@AAG@Z @ 34 NONAME ; void RCbs::NotifyOnTopicListEvent(class TRequestStatus &, int, enum TCbsTopicListEvent &, unsigned short &)
+ ?NotifyOnTopicListEventCancel@RCbs@@QAEXXZ @ 35 NONAME ; void RCbs::NotifyOnTopicListEventCancel(void)
+ ?NotifySettingsChanged@RCbs@@QAEXAAVTRequestStatus@@AAW4TCbsSettingsEvent@@@Z @ 36 NONAME ; void RCbs::NotifySettingsChanged(class TRequestStatus &, enum TCbsSettingsEvent &)
+ ?NotifySettingsChangedCancel@RCbs@@QAEXXZ @ 37 NONAME ; void RCbs::NotifySettingsChangedCancel(void)
+ ?NumberOfUnreadHotmarkedMessages@RCbs@@QAEHXZ @ 38 NONAME ; int RCbs::NumberOfUnreadHotmarkedMessages(void)
+ ?ReadMessage@RCbs@@QAEHABK@Z @ 39 NONAME ; int RCbs::ReadMessage(unsigned long const &)
+ ?SaveMessage@RCbs@@QAEHABK@Z @ 40 NONAME ; int RCbs::SaveMessage(unsigned long const &)
+ ?SetLanguages@RCbs@@QAEHABUTCbsDbLanguages@@@Z @ 41 NONAME ; int RCbs::SetLanguages(struct TCbsDbLanguages const &)
+ ?SetReceptionStatus@RCbs@@QAEHH@Z @ 42 NONAME ; int RCbs::SetReceptionStatus(int)
+ ?SetTopicDetectionStatus@RCbs@@QAEHH@Z @ 43 NONAME ; int RCbs::SetTopicDetectionStatus(int)
+ ?Shutdown@RCbs@@QBEXXZ @ 44 NONAME ; void RCbs::Shutdown(void) const
+ ?StartCollectionBrowsing@RCbs@@QAEXXZ @ 45 NONAME ; void RCbs::StartCollectionBrowsing(void)
+ ?Version@RCbs@@QBE?AVTVersion@@XZ @ 46 NONAME ; class TVersion RCbs::Version(void) const
--- a/cbs/cbsserver/ClientInc/RCbsTopicMessages.h Fri Sep 17 17:09:13 2010 +0300
+++ b/cbs/cbsserver/ClientInc/RCbsTopicMessages.h Mon Oct 04 15:57:13 2010 +0300
@@ -193,7 +193,7 @@
* in list
* @return Result code
*/
- IMPORT_C TInt GetNextAndPrevMessageHandle(
+ TInt GetNextAndPrevMessageHandle(
const TCbsMessageHandle& aCurrentMsgHandle,
TCbsMessageHandle& aPrevMsgHandle,
TCbsMessageHandle& aNextMsgHandle,
--- a/cellular/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ b/cellular/group/bld.inf Mon Oct 04 15:57:13 2010 +0300
@@ -18,7 +18,6 @@
#include "../telephonysettings/group/bld.inf"
#include "../sssettings/group/bld.inf"
-#include "../psetnotesui/group/bld.inf"
-#include "../servicerequest/group/bld.inf"
-// End of File
\ No newline at end of file
+// End of File
+
--- a/cellular/psetnotesui/bmarm/psuiu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-EXPORTS
- NewL__19CPsuiResourceLoader @ 1 NONAME R3UNUSED ; CPsuiResourceLoader::NewL(void)
- CreateCFObsL__14CPsuiContainer @ 2 NONAME R3UNUSED ; CPsuiContainer::CreateCFObsL(void)
- CreateCWObsL__14CPsuiContainer @ 3 NONAME R3UNUSED ; CPsuiContainer::CreateCWObsL(void)
- CreateCliObsL__14CPsuiContainer @ 4 NONAME R3UNUSED ; CPsuiContainer::CreateCliObsL(void)
- NewLC__19CPsuiResourceLoader @ 5 NONAME R3UNUSED ; CPsuiResourceLoader::NewLC(void)
- NewL__14CPsuiContainer @ 6 NONAME R3UNUSED ; CPsuiContainer::NewL(void)
- NewL__14CPsuiDivertObsR14CPsuiContainer @ 7 NONAME R3UNUSED ; CPsuiDivertObs::NewL(CPsuiContainer &)
- NewL__15CPsuiBarringObsR14CPsuiContainer @ 8 NONAME R3UNUSED ; CPsuiBarringObs::NewL(CPsuiContainer &)
- NewL__15CPsuiWaitingObsR14CPsuiContainer @ 9 NONAME R3UNUSED ; CPsuiWaitingObs::NewL(CPsuiContainer &)
- NewL__16CPsuiCliObserverR14CPsuiContainer @ 10 NONAME R3UNUSED ; CPsuiCliObserver::NewL(CPsuiContainer &)
- CreateCBObsL__14CPsuiContainer @ 11 NONAME R3UNUSED ; CPsuiContainer::CreateCBObsL(void)
- DeleteAndCreateNoteMaster__14CPsuiContainer @ 12 NONAME R3UNUSED ; CPsuiContainer::DeleteAndCreateNoteMaster(void)
- GetNoteMaster__14CPsuiContainer @ 13 NONAME R3UNUSED ; CPsuiContainer::GetNoteMaster(void)
-
--- a/cellular/psetnotesui/bwins/psuiu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-EXPORTS
- ?CreateCBObsL@CPsuiContainer@@QAEPAVCPsuiBarringObs@@XZ @ 1 NONAME ; class CPsuiBarringObs * CPsuiContainer::CreateCBObsL(void)
- ?CreateCFObsL@CPsuiContainer@@QAEPAVCPsuiDivertObs@@XZ @ 2 NONAME ; class CPsuiDivertObs * CPsuiContainer::CreateCFObsL(void)
- ?CreateCWObsL@CPsuiContainer@@QAEPAVCPsuiWaitingObs@@XZ @ 3 NONAME ; class CPsuiWaitingObs * CPsuiContainer::CreateCWObsL(void)
- ?CreateCliObsL@CPsuiContainer@@QAEPAVCPsuiCliObserver@@XZ @ 4 NONAME ; class CPsuiCliObserver * CPsuiContainer::CreateCliObsL(void)
- ?NewL@CPsuiBarringObs@@SAPAV1@AAVCPsuiContainer@@@Z @ 5 NONAME ; class CPsuiBarringObs * CPsuiBarringObs::NewL(class CPsuiContainer &)
- ?NewL@CPsuiCliObserver@@SAPAV1@AAVCPsuiContainer@@@Z @ 6 NONAME ; class CPsuiCliObserver * CPsuiCliObserver::NewL(class CPsuiContainer &)
- ?NewL@CPsuiContainer@@SAPAV1@XZ @ 7 NONAME ; class CPsuiContainer * CPsuiContainer::NewL(void)
- ?NewL@CPsuiDivertObs@@SAPAV1@AAVCPsuiContainer@@@Z @ 8 NONAME ; class CPsuiDivertObs * CPsuiDivertObs::NewL(class CPsuiContainer &)
- ?NewL@CPsuiResourceLoader@@SAPAV1@XZ @ 9 NONAME ; class CPsuiResourceLoader * CPsuiResourceLoader::NewL(void)
- ?NewL@CPsuiWaitingObs@@SAPAV1@AAVCPsuiContainer@@@Z @ 10 NONAME ; class CPsuiWaitingObs * CPsuiWaitingObs::NewL(class CPsuiContainer &)
- ?NewLC@CPsuiResourceLoader@@SAPAV1@XZ @ 11 NONAME ; class CPsuiResourceLoader * CPsuiResourceLoader::NewLC(void)
-
--- a/cellular/psetnotesui/data/psui.rss Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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: Resources of Phone Setting UI Notes
-*
-*/
-
-
-// RESOURCE IDENTIFIER
-NAME PSUI
-
-// INCLUDES
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.hrh>
-#include <avkon.loc>
-#include <EIKCORE.rsg>
-#include <eikon.rh>
-#include "eikon.rsg"
-#include <psui.loc>
-
-// RESOURCE DEFINITIONS
-RESOURCE RSS_SIGNATURE { }
-
-//---------------------------------------------------------------------------
-// resources for basic service group strings
-//---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_bs_alpha_0 { buf = text_bs_alpha_0; }
-RESOURCE TBUF r_bs_alpha_10 { buf = text_bs_alpha_10; }
-RESOURCE TBUF r_bs_alpha_11 { buf = text_bs_alpha_11; }
-RESOURCE TBUF r_bs_alpha_12 { buf = text_bs_alpha_12; }
-RESOURCE TBUF r_bs_alpha_13 { buf = text_bs_alpha_13; }
-RESOURCE TBUF r_bs_alpha_16 { buf = text_bs_alpha_16; }
-RESOURCE TBUF r_bs_alpha_19 { buf = text_bs_alpha_19; }
-RESOURCE TBUF r_bs_alpha_20 { buf = text_bs_alpha_20; }
-RESOURCE TBUF r_bs_alpha_21 { buf = text_bs_alpha_21; }
-RESOURCE TBUF r_bs_alpha_22 { buf = text_bs_alpha_22; }
-RESOURCE TBUF r_bs_alpha_24 { buf = text_bs_alpha_24; }
-RESOURCE TBUF r_bs_alpha_25 { buf = text_bs_alpha_25; }
-RESOURCE TBUF r_bs_alpha_26 { buf = text_bs_alpha_26; }
-RESOURCE TBUF r_bs_alpha_27 { buf = text_bs_alpha_27; }
-RESOURCE TBUF r_bs_alpha_89 { buf = text_bs_alpha_89; }
-RESOURCE TBUF r_bs_alpha_20_vt { buf = qtn_bs_alpha_20_vt; }
-RESOURCE TBUF r_bs_alpha_30 { buf = qtn_bs_alpha_30; }
-
-RESOURCE TBUF r_text_divert_active { buf = qtn_div_heading_active; }
-RESOURCE TBUF r_text_divert_inactive { buf = qtn_div_heading_inactive; }
-
-//---------------------------------------------------------------------------
-// resources for note texts
-//---------------------------------------------------------------------------
-//
-
-//divert specific
-RESOURCE TBUF r_to_number { buf = qtn_div_quest_number;}
-RESOURCE TBUF r_delay_time { buf = qtn_div_quest_delay_time;}
-RESOURCE TBUF r_text_ss_detail_delay_sec { buf = text_ss_detail_delay_sec;}
-RESOURCE TBUF r_activate_note { buf = text_divert_activated;}
-RESOURCE TBUF r_plural_activate_note { buf = qtn_div_conf_activateall;}
-RESOURCE TBUF r_cancel_note { buf = text_divert_canceled;}
-RESOURCE TBUF r_plural_cancel_note { buf = qtn_div_conf_cancelall;}
-RESOURCE TBUF r_not_active_note { buf = text_divert_inactive;}
-RESOURCE TBUF r_divert_active { buf = qtn_divert_active;}
-RESOURCE TBUF r_voip_divert_not_supported { buf = qtn_voip_divert_not_supported;}
-
-//call waiting specific
-RESOURCE TBUF r_cw_active_note { buf = text_call_waiting_activated;}
-RESOURCE TBUF r_cw_cancel_note { buf = text_call_waiting_cancelled;}
-RESOURCE TBUF r_cw_not_active_note { buf = text_call_waiting_not_active;}
-RESOURCE TBUF r_cw_not_provisioned_note {buf = qtn_cw_note_not_provisioned;}
-
-//call barring specific
-RESOURCE TBUF r_cb_active_note { buf = text_barring_activated;}
-RESOURCE TBUF r_cb_cancel_note { buf = text_barring_canceled;}
-RESOURCE TBUF r_cb_plural_cancel_note { buf = qtn_barr_conf_cancelall;}
-RESOURCE TBUF r_barring_not_active_note { buf = text_barring_not_active;}
-RESOURCE TBUF r_password_changed_note { buf = text_password_changed;}
-RESOURCE TBUF r_password_blocked_note { buf = qtn_paswd_info_code_blocked;}
-RESOURCE TBUF r_contact_service_note { buf = qtn_ss_barring_operation_not_successfull;}
-
-
-//cli specific
-RESOURCE TBUF r_clir_active_note { buf = text_clir_active;}
-RESOURCE TBUF r_clir_inactive_note { buf = text_clir_not_active;}
-RESOURCE TBUF r_clip_active_note { buf = text_clip_active;}
-RESOURCE TBUF r_clip_inactive_note { buf = text_clip_not_active;}
-RESOURCE TBUF r_colr_active_note { buf = text_colr_active;}
-RESOURCE TBUF r_colr_inactive_note { buf = text_colr_not_active;}
-RESOURCE TBUF r_colp_active_note { buf = text_colp_active;}
-RESOURCE TBUF r_colp_inactive_note { buf = text_colp_not_active;}
-
-//general error
-RESOURCE TBUF r_password_error_note { buf = text_password_error;}
-RESOURCE TBUF r_not_done_note { buf = text_not_done;}
-RESOURCE TBUF r_request_cancelled_note { buf = text_unconfirmed;}
-RESOURCE TBUF r_not_allowed { buf = text_not_allowed;}
-RESOURCE TBUF r_services_in_conflict { buf = qtn_srvrq_info_confl;}
-RESOURCE TBUF r_result_unknown { buf = text_result_unknown;}
-RESOURCE TBUF r_no_service { buf = text_no_service;}
-RESOURCE TBUF r_request_rejected { buf = text_request_rejected;}
-
-//-----------------------------------------------------------------------------
-// resource for confirmation query
-//-----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_confirmation_query
- {
- flags = EGeneralQueryFlags;
- buttons = R_AVKON_SOFTKEYS_BACK;
- items =
- {
- DLG_LINE
- {
- type = EAknCtQuery;
- id = EGeneralQuery;
- control = AVKON_CONFIRMATION_QUERY
- {
- layout = EConfirmationQueryLayout;
- label = qtn_div_quest_number;
- animation = R_QGN_NOTE_INFO_ANIM;
- };
- }
- };
- }
-
-//----------------------------------------------------
-// resources for softkeys
-//----------------------------------------------------
-//
-RESOURCE CBA r_psui_softkeys_number_back
- {
- buttons =
- {
- CBA_BUTTON {id = EAknSoftkeySelect; txt = qtn_div_softk_number;},
- CBA_BUTTON {id = EAknSoftkeyCancel; txt = text_softkey_back;},
- CBA_BUTTON {id = EAknSoftkeySelect; txt = qtn_div_softk_number;}
- };
- }
-
-RESOURCE CBA r_psui_softkeys_details_back
- {
- buttons =
- {
- CBA_BUTTON {id = EAknSoftkeySelect; txt = qtn_div_softk_detail;},
- CBA_BUTTON {id = EAknSoftkeyCancel; txt = text_softkey_back;},
- CBA_BUTTON {id = EAknSoftkeySelect; txt = qtn_div_softk_detail;}
- };
- }
-
-//----------------------------------------------------
-// resources for header texts in status lists
-//----------------------------------------------------
-//
-RESOURCE TBUF r_cw_status_heading { buf = qtn_cw_status_heading; }
-RESOURCE TBUF r_barr_status_heading { buf = qtn_barr_heading_active; }
-
-//----------------------------------------------------
-// miscellanous new resources, added to the end so that
-// binary compatibility is maintained
-//----------------------------------------------------
-//
-RESOURCE TBUF r_barring_active_note { buf = text_barring_active;}
-RESOURCE TBUF r_net_info_lost { buf = text_net_info_lost;}
-RESOURCE TBUF r_cw_active_no_bsc_note { buf = text_call_waiting_active;}
-
-//----------------------------------------------------
-// resources for CNAP inquiry
-//----------------------------------------------------
-//
-RESOURCE TBUF r_cnap_active { buf = qtn_cnap_active;}
-RESOURCE TBUF r_cnap_inactive { buf = qtn_cnap_not_active;}
-
-//----------------------------------------------------
-// resources for Offline mode
-//----------------------------------------------------
-//
-RESOURCE TBUF r_offline_mode { buf = qtn_offline_not_possible;}
-RESOURCE TBUF r_offline_mode_sap { buf = qtn_offline_not_possible_sap;}
-
-// End of File
--- a/cellular/psetnotesui/eabi/psuiu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-EXPORTS
- _ZN14CPsuiContainer12CreateCBObsLEv @ 1 NONAME
- _ZN14CPsuiContainer12CreateCFObsLEv @ 2 NONAME
- _ZN14CPsuiContainer12CreateCWObsLEv @ 3 NONAME
- _ZN14CPsuiContainer13CreateCliObsLEv @ 4 NONAME
- _ZN14CPsuiContainer4NewLEv @ 5 NONAME
- _ZN14CPsuiDivertObs4NewLER14CPsuiContainer @ 6 NONAME
- _ZN15CPsuiBarringObs4NewLER14CPsuiContainer @ 7 NONAME
- _ZN15CPsuiWaitingObs4NewLER14CPsuiContainer @ 8 NONAME
- _ZN16CPsuiCliObserver4NewLER14CPsuiContainer @ 9 NONAME
- _ZN19CPsuiResourceLoader4NewLEv @ 10 NONAME
- _ZN19CPsuiResourceLoader5NewLCEv @ 11 NONAME
- _ZTI14CPsuiContainer @ 12 NONAME
- _ZTI14CPsuiDivertObs @ 13 NONAME
- _ZTI15CPsuiBarringObs @ 14 NONAME
- _ZTI15CPsuiNoteMaster @ 15 NONAME
- _ZTI15CPsuiWaitingObs @ 16 NONAME
- _ZTI16CPsuiCliObserver @ 17 NONAME
- _ZTI19CPsuiNoteController @ 18 NONAME
- _ZTI19CPsuiResourceLoader @ 19 NONAME
- _ZTV14CPsuiContainer @ 20 NONAME
- _ZTV14CPsuiDivertObs @ 21 NONAME
- _ZTV15CPsuiBarringObs @ 22 NONAME
- _ZTV15CPsuiNoteMaster @ 23 NONAME
- _ZTV15CPsuiWaitingObs @ 24 NONAME
- _ZTV16CPsuiCliObserver @ 25 NONAME
- _ZTV19CPsuiNoteController @ 26 NONAME
- _ZTV19CPsuiResourceLoader @ 27 NONAME
-
--- a/cellular/psetnotesui/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2002-2007 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: Project information
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_MMPFILES
-../group/psui.mmp
-
-PRJ_EXPORTS
-../inc/psuiresourceloader.h |../../../inc/psuiresourceloader.h
-../rom/psui_stub.sis /epoc32/data/z/system/install/psui_stub.sis
-
-// IBY Files
-../rom/psui.iby CORE_APP_LAYER_IBY_EXPORT_PATH(psui.iby)
-../rom/psuiresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(psuiresources.iby)
-
-// LOC files
-../loc/psui.loc MW_LAYER_LOC_EXPORT_PATH(psui.loc)
-
-
-//End of file
--- a/cellular/psetnotesui/group/psui.mmp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2002-2007 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: Project specification file for the Phonesettings Notes Ui
-*
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-// Capability assignment.
-CAPABILITY CAP_GENERAL_DLL
-
-TARGET psui.dll
-TARGETTYPE dll
-UID 0x1000008d 0x100059C6
-VERSION 10.0
-
-SOURCEPATH ../src
-SOURCE psuibarringobs.cpp
-SOURCE psuiwaitingobs.cpp
-SOURCE psuidivertobs.cpp
-SOURCE psuinotemaster.cpp
-SOURCE psuiresourceloader.cpp
-SOURCE psuicontainer.cpp
-SOURCE psuicliobserver.cpp
-SOURCE psuivariationproxy.cpp
-#ifdef RD_PHONE_NG
-SOURCE psuiquerydialog.cpp
-#endif // RD_PHONE_NG
-SOURCE psuireqobserver.cpp
-SOURCE psuinotecontroller.cpp
-
-START RESOURCE ../data/psui.rss
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-// Language definition
-LANGUAGE_IDS
-
-END // RESOURCE
-
-SYSTEMINCLUDE ../../../inc
-
-USERINCLUDE . ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY bafl.lib
-LIBRARY euser.lib
-LIBRARY cone.lib
-LIBRARY aknnotify.lib
-LIBRARY eikcoctl.lib
-LIBRARY avkon.lib
-LIBRARY commonengine.lib
-LIBRARY etelmm.lib
-LIBRARY featmgr.lib
-LIBRARY numbergrouping.lib
-LIBRARY servicerequest.lib
-LIBRARY centralrepository.lib
-#ifdef RD_PHONE_NG
-LIBRARY eikdlg.lib
-LIBRARY eikcore.lib
-#endif // RD_PHONE_NG
-
-// End of File
--- a/cellular/psetnotesui/inc/psuiinternalconstants.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2007 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: Constant values for the Phone Setting UI Notes
-*
-*/
-
-#ifndef CPSUIINTERNALCONSTANTS_H
-#define CPSUIINTERNALCONSTANTS_H
-
-// INCLUDES
-
-//CONSTANTS
-const TInt KPSUINoBscGroup = 255; //unknown basic service group
-const TInt KPSUIDetailsText = 64; //max. length of text in detailed note
-const TText KLRMarker = 0x200E; //LRM marker
-
-// Phone Setting Notes UI's Note Controller Singleton UID
-static const TUid KUidNoteControllerSingleton = { 0x0C };
-
-_LIT( KPSUIListDivider, "\n" ); //list row divisor
-
-// Type of Call Forwarding request.
-// EPsuiNoCF - not a call forwarding request
-// EPsuiCFNry - call forwarding with number and timeout information
-// EPsuiCFOther - call forwarding with number information
-enum TCFType
- {
- EPsuiNoCF = 1,
- EPsuiCFNry,
- EPsuiCFOther
- };
-
-// Note types.
-enum TPsuiNoteTypes
- {
- EPsuiConfirmationNote,
- EPsuiWaitingNote,
- EPsuiErrorNote,
- EPsuiInformationNote
- };
-
-#endif //CPSUIINTERNALCONSTANTS_H
--- a/cellular/psetnotesui/inc/psuinotecontroller.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
-* Copyright (c) 2007 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:
-* Singleton class for controlling notes.
-*
-*/
-
-
-#ifndef PSUINOTECONTROLLER_H
-#define PSUINOTECONTROLLER_H
-
-// INCLUDES
-#include <coemain.h>
-#include "psuinotemaster.h"
-
-// CLASS DECLARATION
-
-class CPsuiNoteController : public CCoeStatic
- {
- public:
-
- /**
- * Returns an instance of this class. When called for the first
- * time, a new instance is created and returned. After that,
- * calling InstanceL returns the same instance that was created
- * earlier.
- *
- * @return A pointer to a CPsuiNoteController object
- */
- static CPsuiNoteController* InstanceL();
-
- /**
- * Destructor.
- */
- virtual ~CPsuiNoteController();
-
- /**
- * Shows the requested note.
- *
- * @param aType Type of note to be shown
- * Error, confirmation, warning and waiting notes are supported.
- * @param aResourceID Content text's resource ID for the note
- */
- void ShowNoteL( TPsuiNoteTypes aType, TInt aResourceID );
-
- /**
- * Shows the basic service list assosiated with supplementary service
- * activation or status check.
- *
- * @param aResourceHeading Heading for the list
- * @param aBsc List of basic service groups
- */
- void ShowBscListL(
- TInt aResourceHeading,
- TUint8 aBsc[KPSUIMaxBscNumber] );
-
- /*
- * Same as above, except intended for CF basic service lists.
- *
- * @param aResourceHeading Heading for the list
- * @param aList List of basic service groups and their statuses
- * and settings
- * @param aCFType Type of call forwarding
- * @param aIndex Index of list item user has selected
- * @return user action ID, i.e. what kind of list to show next
- */
- /*****************************************************
- * Series 60 Customer / ETel
- * Series 60 ETel API
- *****************************************************/
- TCFType ShowBscCFListL(
- TInt aResourceHeading,
- CMobilePhoneCFList& aList,
- TCFType aCFType,
- TInt& aIndex );
-
- /**
- * Shows detailed info about the selected basic service group.
- *
- * @param aCFType Type of Call Forwarding, defines softkeys
- * @param aSetting List of basic service groups and their statuses
- * and settings
- */
- /*****************************************************
- * Series 60 Customer / ETel
- * Series 60 ETel API
- *****************************************************/
- void ShowCfInfoL(
- TCFType& aCFType,
- const RMobilePhone::TMobilePhoneCFInfoEntryV1& aSetting );
-
- /*
- * Returns correct resource ID based on error code.
- *
- * @param aErrorCode Error code for which the resource ID is needed
- * @return Resource ID for the string text in the error note
- */
- TInt SetErrorNoteResourceID ( const TInt aErrorCode );
-
- /**
- * Removes all notes that are being displayed by us.
- */
- void RemoveNotesL();
-
- /**
- * Kills waiting note when the request is completed.
- */
- void KillStaticNoteL();
-
- /**
- * Sets the connection to engine.
- * This is needed to provide user the possibility to cancel
- * pending requests. All the pointers are set with same
- * command, if in the future the amount of parameters comes
- * too large, redesigning might be worth doing.
- *
- * @param aWaitingEngine Reference to Phone Settings' object
- * @param aBarringEngine Reference to Phone Settings' object
- * @param aDivertEngine Reference to Phone Settings' object
- * @param aCliEngine Reference to Phone Settings' object
- */
- void SetEngineContacts( MPsetCallWaiting* aWaitingEngine,
- MPsetCallBarring* aBarringEngine,
- MPsetCallDiverting* aDivertEngine,
- MPsetCli* aCliEngine);
-
-
- private:
-
- /**
- * Default constructor is private because we are using the
- * singleton design pattern.
- */
- CPsuiNoteController();
-
- /**
- * By default EPOC constructor is private.
- */
- void ConstructL();
-
-
- private:
-
- // Note Master does the actual showing of notes and lists
- CPsuiNoteMaster* iNote;
- };
-
-#endif // PSUINOTECONTROLLER_H
-
-// End of File
--- a/cellular/psetnotesui/inc/psuinotemaster.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-/*
-* Copyright (c) 2002-2007 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:
-* CPsuiNoteMaster class is responsible for showing notes. It has also capa-
-* bilities to show bsc list that is common for different features.
-* Pending supplementary service request can be cancelled by the user.
-*
-*/
-
-
-#ifndef CPSUINOTEMASTER_H
-#define CPSUINOTEMASTER_H
-
-// INCLUDES
-#include <aknnotewrappers.h>
-#include <bldvariant.hrh>
-#include "psuiconstants.h"
-#include "psuiinternalconstants.h"
-#include "psetcalldiverting.h"
-
-// FORWARD DECLARATIONS
-class MPsetCallWaiting;
-class MPsetCallBarring;
-class MPsetCli;
-class CAknWaitDialog;
-class CAknGlobalNote;
-class CAknPopupList;
-class CAknSinglePopupMenuStyleListBox;
-class CServiceRequest;
-class CPsuiReqObserver;
-class CPsuiQueryDialog;
-
-// CLASS DECLARATION
-
-/**
-* CPsuiNoteMaster class is responsible for showing notes. It has also capa-
-* bilities to show bsc list that is common for different features.
-* Pending supplementary service request can be cancelled by the user.
-* @lib psui.lib
-* @since 1.0
-*/
-class CPsuiNoteMaster : public CBase
- {
- public: // Constructors and destructor
-
- /**
- * Symbian OS two-phased constructor.
- *
- * @return Returns CPsuiNoteMaster-pointer.
- */
- static CPsuiNoteMaster* NewL();
-
- /**
- * Destructor
- */
- ~CPsuiNoteMaster();
-
- private:
- /**
- * Symbian 2nd phase constructor.
- */
- void ConstructL();
-
-
- public: //new
-
- /**
- * Sets the connection to engine.
- * This is needed to provide user the possibility to cancel
- * pending requests. All the pointers are set with same
- * command, if in the future the amount of parameters comes
- * too large, redesigning might be worth doing.
- *
- * @param aWaitingEngine Reference to Phone Settings' object
- * @param aBarringEngine Reference to Phone Settings' object
- * @param aDivertEngine Reference to Phone Settings' object
- * @param aCliEngine Reference to Phone Settings' object
- */
- void SetEngineContacts( MPsetCallWaiting* aWaitingEngine,
- MPsetCallBarring* aBarringEngine,
- MPsetCallDiverting* aDivertEngine,
- MPsetCli* aCliEngine);
-
- /**
- * Shows the requested note.
- *
- * @param aType Type of note to be shown
- * Error, confirmation, warning and waiting notes are supported.
- * @param aResourceID Content text's resource ID for the note
- */
- void ShowNoteL( TPsuiNoteTypes aType, TInt aResourceID );
-
- /**
- * Kills waiting note when the request is completed.
- */
- void KillStaticNoteL();
-
- /**
- * Shows the basic service list assosiated with supplementary service
- * activation or status check.
- *
- * @param aResourceHeading Heading for the list
- * @param aBsc List of basic service groups
- */
- void ShowBscListL(
- TInt aResourceHeading,
- TUint8 aBsc[KPSUIMaxBscNumber] );
-
- /*
- * Same as above, except intended for CF basic service lists.
- *
- * @param aResourceHeading Heading for the list
- * @param aList List of basic service groups and their statuses
- * and settings
- * @param aCFType Type of call forwarding
- * @param aIndex Index of list item user has selected
- * @return user action ID, i.e. what kind of list to show next
- */
- /*****************************************************
- * Series 60 Customer / ETel
- * Series 60 ETel API
- *****************************************************/
- TCFType ShowBscCFListL(
- TInt aResourceHeading,
- CMobilePhoneCFList& aList,
- TCFType aCFType,
- TInt& aIndex );
-
- /**
- * Shows detailed info about the selected basic service group.
- *
- * @param aCFType Type of Call Forwarding, defines softkeys
- * @param aSetting List of basic service groups and their statuses
- * and settings
- */
- /*****************************************************
- * Series 60 Customer / ETel
- * Series 60 ETel API
- *****************************************************/
- void ShowCfInfoL(
- TCFType& aCFType,
- const RMobilePhone::TMobilePhoneCFInfoEntryV1& aSetting );
-
- /**
- * Shows request cancelled note.
- */
- void ShowCancelRequestNoteL();
-
- /*
- * Returns correct resource ID based on error code.
- *
- * @param aErrorCode Error code for which the resource ID is needed
- * @return Resource ID for the string text in the error note
- */
- TInt SetErrorNoteResourceID ( const TInt aErrorCode );
-
- /**
- * Called when service request
- * is cancelled by the user.
- */
- void RequestNoteCancelledL();
-
- protected:
-
-
- private: //new
-
- void AppendCFNumber( TDes& aString, const TDesC& aNumber);
-
- void CreateListBoxL(
- TCFType aCFType, CAknSinglePopupMenuStyleListBox* aList );
-
- void KillRequestL();
-
- void SetTitleL( const TInt& aResourceHeading );
-
- HBufC* SetBsGroupLC( TUint8 aBscCode );
-
- TBasicServiceGroups ChangeToGSM( const TInt& aBsc );
-
- private: // Member variables
-
- // General Service request
- CServiceRequest* iServiceRequest;
- // Call Barrings engine
- MPsetCallBarring* iBarringEngine;
- // Reference to Call Waiting engine
- MPsetCallWaiting* iWaitingEngine;
- // Reference to Call Diverts engine
- MPsetCallDiverting* iDivertEngine;
- // Reference to Calling Identity engine
- MPsetCli* iCliEngine;
- // There is an active request
- TBool iRequesting;
- // Basic Service Groups list
- CAknPopupList* iPopupList;
- // Request note cancel observer
- CPsuiReqObserver* iReqObserver;
- // Diverts additional information query
- CPsuiQueryDialog* iQuery;
-
- };
-#endif //CPSUINOTEMASTER_H
--- a/cellular/psetnotesui/inc/psuiquerydialog.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2006 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: Query dialog for handling key events.
-*
-*/
-
-/*
-*/
-
-#ifndef CPSUIQUERYDIALOG_H
-#define CPSUIQUERYDIALOG_H
-
-// INCLUDES
-#include <AknQueryDialog.h>
-
-NONSHARABLE_CLASS ( CPsuiQueryDialog ) : public CAknQueryDialog
- {
- public: // Constructors and destructor
-
- /**
- * Symbian OS two-phased constructor.
- *
- * @return Returns CPsuiQueryDialog -pointer.
- */
- static CPsuiQueryDialog* NewL( CAknQueryDialog::TTone aTone );
-
- /**
- * Constructor
- */
- CPsuiQueryDialog( CAknQueryDialog::TTone aTone );
-
- /**
- * Destructor.
- */
- virtual ~CPsuiQueryDialog();
-
-
- protected:
-
- /**
- * From CCoeControl Handle key events. When a key event occurs,
- * CONE calls this function for each control on the control stack,
- * until one of them returns EKeyWasConsumed to indicate that it processed the key event.
- * @param aKeyEvent The key event.
- * @param aType The type of the event: EEventKey, EEventKeyUp or EEventKeyDown.
- * @return Indicates whether or not the key event was used by this control.
- */
- TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-
- /**
- * From CEikdialog This function is called by the EIKON framework
- * if the user activates a button in the button panel.
- * It is not called if the Cancel button is activated,
- * unless the EEikDialogFlagNotifyEsc flag is set.
- * @param aButtonId The ID of the button that was activated
- * @return Should return ETrue if the dialog should exit, and EFalse if it should not.
- */
- TBool OkToExitL( TInt aCommand );
- };
-
-#endif // CPSUIQUERYDIALOG_H
-
-// End of File
--- a/cellular/psetnotesui/inc/psuireqobserver.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2006 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: Declaration of CPsuiReqObserver class.
-*
-*/
-
-
-#ifndef CPSUIREQOBSERVER_H
-#define CPSUIREQOBSERVER_H
-
-// INCLUDES
-#include <mservicerequestobserver.h>
-#include "psuinotemaster.h"
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-/**
-* CPsuiReqObserver class is responsible for observe request note cancel.
-* @since 3.2
-*/
-NONSHARABLE_CLASS ( CPsuiReqObserver ) : public CBase , public MServiceRequestObserver
- {
- public: // Constructors and destructor
-
- /**
- * Symbian OS two-phased constructor.
- *
- */
- static CPsuiReqObserver* NewL( CPsuiNoteMaster& aNoteMaster );
-
- /**
- * Destructor
- */
- ~CPsuiReqObserver();
-
- private:
- CPsuiReqObserver( CPsuiNoteMaster& aNoteMaster );
-
- public: //new
-
- protected:
- /**
- * From MServiceRequestObserver. Called when service request
- * is cancelled by the user.
- */
- void MServiceRequestNoteCancelledL( TBool aCancelledWithEscape );
-
- private: //new
-
- private: // Member variables
-
- CPsuiNoteMaster& iNoteMaster;
-
- };
-#endif //CPSUIREQOBSERVER_H
--- a/cellular/psetnotesui/inc/psuiresourceloader.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2002,2003 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: Loads resources from file.
-*
-*/
-
-
-#ifndef CPSUIRESOURCELOADER_H
-#define CPSUIRESOURCELOADER_H
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-// FORWARD DECLARATIONS
-class RConeResourceLoader;
-
-// CLASS DECLARATION
-/**
-* A helper class for loading dll-specific resource files on demand.
-* Searches and loads the specified resource file to the CONE environment
-* (CCoeEnv) -object (accessible as iCoeEnv in CONE-related classes).
-* After calling NewL the user can access the resources directly via
-* the CONE environment. The resources in the file are accessible until
-* the CPsuiResourceLoader object is destroyed. The resource file must be
-* a well-formed UIKON resource file with NAME and RSS_SIGNATURE specified.
-*
-* @lib psui.lib
-* @since 1.0
-*/
-class CPsuiResourceLoader : public CBase
- {
- public: // Constructors & destructor
-
- /**
- * Symbian OS 1st phase constructor. Creates and returns a new
- * resource loader object.
- * Loads resource from any drive. If this function is succesful
- * (doesn't leave) the resources in the file are usable through
- * CCoeEnv.
- *
- * @return new object of this class holding a reference to the
- * resource file.
- *
- * @exception KErrNotFound if the resource file is not found.
- * @exception KErrNoMemory if out of memory.
- * @exception error from CCoeEnv::AddResourceFileL.
- */
- IMPORT_C static CPsuiResourceLoader* NewL();
-
- /**
- * Same as NewL, but leaves the created object onto the cleanup stack.
- * @see NewL
- */
- IMPORT_C static CPsuiResourceLoader* NewLC();
-
- /* Destructor */
- ~CPsuiResourceLoader();
-
- protected: // private constructor
-
- void ConstructL();
-
- private: // member variables
-
- // CONE resource loader
- RConeResourceLoader* iResourceLoader;
- };
-
-#endif // CPSUIRESOURCELOADER_H
-
-// End of File
-
--- a/cellular/psetnotesui/inc/psuivariationproxy.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
-* Copyright (c) 2006 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:
-* CPsuiVariationProxy class is proxy class for
-* central repository variation
-* (Call waiting/distinguish between not provisioned and not activated).
-*
-*
-*/
-
-
-#ifndef PSUIVARIATIONPROXY_H
-#define PSUIVARIATIONPROXY_H
-
-// INCLUDES
-#include <e32base.h>
-
-// FORWARD DECLARATIONS
-class CRepository;
-
-// CONSTANTS
-const TUint KCallWaitingDistiquishNotProvisioned = 0x00000001;
-
-// CLASS DECLARATION
-/**
-* CPsuiVariationProxy class is proxy class for central repository variation
-* @lib psui.lib
-* @since 1.0
-*/
-NONSHARABLE_CLASS ( CPSuiVariationProxy ): public CBase
-{
-public: //constructor & destructor
-
- /* Symbian OS 2-phase Constructor. */
- static CPSuiVariationProxy* NewL();
-
- /* Destructor */
- ~CPSuiVariationProxy();
-
-public:
- /**
- * Check from member variable 'iFeatures' is the requested feature active.
- *
- * @param aFeature is uid for used central repository variable.
- * @return returns TBool type ETrue/EFalse is current feature enabled or not
- */
-
- TBool FeatureEnabled( TUint aFeature ) const;
-
-private:
-
- /**
- * Constructor
- *
- * Open CenRep, read data into 'iFeatures' and close CenRep
- *
- */
- void ConstructL();
-
-private:
- /* Default constructor */
- CPSuiVariationProxy();
-private:
- // Saves cen rep data. Readed in ConstructL()
- TInt iFeatures;
-
-};
-
-#endif
--- a/cellular/psetnotesui/loc/psui.loc Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,305 +0,0 @@
-/*
-* Copyright (c) 2002-2006 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: Localization strings for Phone Settings UI Notes
-*
-*/
-
-
-// LOCALISATION STRINGS
-
-//SUCCESFUL ACTIVATION
-//d: confirmation note when divert succesfully actived
-//l: popup_note_window
-#define text_divert_activated "Divert activated"
-
-//d: confirmation note when several diverts succesfully actived
-//l: popup_note_window
-#define qtn_div_conf_activateall "Diverts activated"
-
-//d: left sofktey
-//l: control_pane_t1/opt7
-#define qtn_div_softk_number "Number"
-
-//d: softkey text
-//l: control_pane_t1/opt7
-#define qtn_div_softk_detail "Details"
-
-//d: item when divert succesfully activated
-//d: (was previously qtn_div_check_number)
-//l: popup_note_image_window
-#define qtn_div_quest_number "To number: "
-
-//d: item when divert succesfully activated
-//d: (was previously qtn_div_check_delay)
-//l: popup_note_image_window
-#define qtn_div_quest_delay_time "Delay time: "
-
-//d: item when divert succesfully activated
-//l: popup_note_image_window
-#define text_ss_detail_delay_sec "%N seconds"
-
-//d: confirmation note when inquiry for divert active status
-//l: popup_note_window
-#define qtn_divert_active "Divert active"
-
-//DEACTIVATION OF CALL FORWARDING
-//d: confirmation note when divert is not active
-//l: popup_note_window
-#define text_divert_deactivated "Divert deactivated"
-
-//d: confirmation note when divert cancelled
-//l: popup_note_window
-#define text_divert_canceled "Divert cancelled"
-
-//d: confirmation note when several diverts cancelled
-//l: popup_note_window
-#define qtn_div_conf_cancelall "Diverts cancelled"
-
-//d: heading to the list of services divert is inactive for
-//l: heading_pane_t1
-#define qtn_div_heading_inactive "Inactive for:"
-
-//INTERROGATION OF CALL FORWARDING
-//d: confirmation note when divert is not active
-//l: popup_note_window
-#define text_divert_inactive "Divert not active"
-
-// STATUS QUERY
-//d: information note 1st row when receiving status from the network
-//l: popup_note_image_window
-#define qtn_div_info_easy "Divert to: "
-
-//d: information note 2nd row when diverted to voice mailbox
-//l: popup_note_image_window
-#define qtn_div_info_voice_mailbox "Voice mailbox"
-
-//d: information note 2nd row when diverted to none
-//l: popup_note_image_window
-#define qtn_div_info_to_none "None"
-
-//d: heading to the list where cf is active
-//l: heading_pane_t1
-#define qtn_div_heading_active "Active for:"
-
-//ERROR CASES
-//d: information note text when network has lost some cf information
-//l: popup_note_window
-#define text_net_info_lost "Check network services"
-
-//d: information note text when voice unconditional cf active
-//d: and in call setup state
-//l: popup_note_window
-#define text_incoming_calls_diverted "Note: all incoming calls diverted"
-
-//d: information note text when voice conditional cf active
-//d: and in call setup state
-//l: popup_note_window
-#define text_some_inc_calls_diverted "Note: you have active diverts"
-
-//d: error note text when entering invalid phone number
-//l: popup_note_window
-#define text_invalid_number "Invalid phone number"
-
-//d: information note that divert does not affect Internet calls
-//d: when divert is actived
-//l: popup_note_window
-//w:
-//r: 3.0
-//
-#define qtn_voip_divert_not_supported "Diverting calls does not affect Internet calls"
-
-//TELECOMMUNICATION SERVICES
-//d: basic service group name, all tele and bearer services
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_0 "All services"
-
-//d: basic service group name, all teleservices
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_10 "Voice, fax and messages"
-
-//d: basic service group name, telephony services
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_11 "Voice calls"
-
-//d: basic service group name, all data teleservices
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_12 "Fax and messages"
-
-//d: basic service group name, facsimile services
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_13 "Fax"
-
-//d: basic service group name, short message services
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_16 "Messages"
-
-//d: basic service group name, all teleservices except sms
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_19 "Voice calls and fax"
-
-//d: basic service group name, bearer services
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_20 "Data services"
-
-//d: basic service group name, all async services
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_21 "Asynchronous services"
-
-//d: basic service group name, all sync services
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_22 "Synchronous services"
-
-//d: basic service group name, all data circuit sync
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_24 "Synchronous data services"
-
-//d: basic service group name, all data circuit async
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_25 "Asynchronous data services"
-
-//d: basic service group name, all dedicated packet accesses
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_26 "Packet data"
-
-//d: basic service group name, all dedicated PAD accesses
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_27 "PAD access"
-
-//d: basic service group name, alternate line services
-//l: list_single_pane_t1_cp2
-#define text_bs_alpha_89 "Alternate line services"
-
-//d: basic service group name, video telephony services
-//l: list_single_pane_t1_cp2
-#define qtn_bs_alpha_30 "Video calls"
-
-//d: basic service group name, data and video services
-//l: list_single_pane_t1_cp2
-#define qtn_bs_alpha_20_vt "Data and video services"
-
-
-//CALL WAITING
-//d: information note when call waiting is succesfully activated
-//l: popup_note_window
-#define text_call_waiting_activated "Call waiting activated"
-
-//d: information note when call waiting is succesfully cancelled
-//l: popup_note_window
-#define text_call_waiting_cancelled "Call waiting cancelled"
-
-//d: heading to the popup window displaying the result of call waiting inquiry
-//l: heading_pane_t1
-#define qtn_cw_status_heading "Active for:"
-
-//d: information note when call waiting status asked, but no service active
-//l: popup_note_window
-#define text_call_waiting_not_active "Call waiting not active"
-
-//d: information note when call waiting status asked,
-//d: but no basic service groups available
-//l: popup_note_window
-#define text_call_waiting_active "Call waiting active"
-
-
-//d: information note when call waiting status asked, but not provisioned
-//l: popup_note_window
-//r: 3.1
-#define qtn_cw_note_not_provisioned "Call waiting not provisioned"
-
-
-
-//CALL BARRING
-//d: heading to the popup window displaying the result of call barring inquiry
-//l: heading_pane_t1
-#define qtn_barr_heading_active "Active for:"
-
-//d: confirmation note when barring is activated
-//l: popup_note_window
-#define text_barring_activated "Barring activated"
-
-//d: confirmation note when barring is cancelled
-//l: popup_note_window
-#define text_barring_canceled "Barring cancelled"
-
-//d: confirmation note when several barrings are cancelled
-//l: popup_note_window
-#define qtn_barr_conf_cancelall "Barrings cancelled"
-
-//d: result when interrogation of call barring reveals that barring not active
-//l: popup_note_window
-#define text_barring_not_active "Barring not active"
-
-//d: result when interrogation of call barring reveals that barring is active
-//l: popup_note_window
-#define text_barring_active "Barring active"
-
-//d: the barring password is incorrect
-//l: popup_note_window
-#define text_password_error "Password error"
-
-//d: barring password has been changed
-//l: popup_note_window
-#define text_password_changed "Password changed"
-
-//d: barring password has been blocked
-//l: popup_note_window
-#define qtn_paswd_info_code_blocked "Password blocked"
-
-//d: barring contact service needed
-//l: popup_note_window
-#define qtn_ss_barring_operation_not_successfull "Barring operation not successful. Contact your service provider"
-
-
-//CLI-notes
-//d: confirmation note when clir queried, positive answer
-//l: popup_note_window
-#define text_clir_active "Own No. not sent on calling"
-
-//d: confirmation note when clir queried, negative answer
-//l: popup_note_window
-#define text_clir_not_active "Own No. sent on calling"
-
-//d: confirmation note when clip queried, positive answer
-//l: popup_note_window
-#define text_clip_active "Number of caller is shown"
-
-//d: confirmation note when clip queried, negative answer
-//l: popup_note_window
-#define text_clip_not_active "Number of caller is not shown"
-
-//d: confirmation note when colp queried, positive answer
-//l: popup_note_window
-#define text_colp_active "Answering number is shown"
-
-//d: confirmation note when colp queried, negative answer
-//l: popup_note_window
-#define text_colp_not_active "Answering number is not shown"
-
-//d: confirmation note when colr queried, positive answer
-//l: popup_note_window
-#define text_colr_active "Own No. not sent on answering"
-
-//d: confirmation note when colr queried, negative answer
-//l: popup_note_window
-#define text_colr_not_active "Own No. sent on answering"
-
-//d: confirmation note when cnap queried, positive answer
-//l: popup_note_window
-#define qtn_cnap_active "Name of caller is shown"
-
-//d: confirmation note when cnap queried, negative answer
-//l: popup_note_window
-#define qtn_cnap_not_active "Name of caller is not shown"
-
-// End of File
--- a/cellular/psetnotesui/rom/psui.iby Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: IBY file for psui stub compoment.
-*
-*/
-
-
-#ifndef __PSUI_IBY__
-#define __PSUI_IBY__
-
-REM PhoneSettings Notes UI
-
-file=ABI_DIR\BUILD_DIR\psui.dll SHARED_LIB_DIR\psui.dll
-
-data=ZSYSTEM\install\psui_stub.sis System\Install\psui_stub.sis
-
-#endif
--- a/cellular/psetnotesui/rom/psui_stub.pkg Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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: For packing psui stub component.
-;
-; psui_stub.pkg
-
-; Languages
-&EN
-
-; Header
-#{"psui"},(0x100059C6),1,0,0,TYPE=SA
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Target
-
-""-"z:\sys\bin\psui.dll"
-""-"z:\resource\psui.rsc"
\ No newline at end of file
Binary file cellular/psetnotesui/rom/psui_stub.sis has changed
--- a/cellular/psetnotesui/rom/psuiresources.iby Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2005 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: IBY file for psui resources.
-*
-*/
-
-
-#ifndef __PSUI_RESOURCES_IBY__
-#define __PSUI_RESOURCES_IBY__
-
-//Resource file(s) for Psui
-
-data=DATAZ_\RESOURCE_FILES_DIR\psui.rsc RESOURCE_FILES_DIR\psui.rsc
-
-#endif
\ No newline at end of file
--- a/cellular/psetnotesui/src/psuibarringobs.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-/*
-* Copyright (c) 2002-2007 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: Shows notes related to Call Barrings operations.
-*
-*/
-
-
-// INCLUDE FILES
-#include <psui.rsg>
-#include <psuicontainer.h>
-#include <exterror.h>
-#include <etelsat.h>
-
-#include "psuiinternalconstants.h"
-#include "psuinotecontroller.h"
-
-// MEMBER FUNCTIONS
-// ---------------------------------------------------------------------------
-// Symbian OS two-phased Constructor.
-// ---------------------------------------------------------------------------
-EXPORT_C CPsuiBarringObs* CPsuiBarringObs::NewL( CPsuiContainer& aContainer )
- {
- CPsuiBarringObs* self = new( ELeave ) CPsuiBarringObs;
- self->SetContainer( aContainer );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Sets container.
-// ---------------------------------------------------------------------------
-void CPsuiBarringObs::SetContainer( CPsuiContainer& aContainer )
- {
- iContainer = &aContainer;
- }
-
-// ---------------------------------------------------------------------------
-// Handles changing of barring mode.
-// ---------------------------------------------------------------------------
-void CPsuiBarringObs::HandleBarringModeChangedL( TBarringProgram /* aType */,
- TBarringStatus aStatus,
- TBool aPlural )
- {
- if ( aStatus == EBarringStatusActive )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_CB_ACTIVE_NOTE );
- }
- else if ( aStatus == EBarringStatusInactive && !aPlural )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_CB_CANCEL_NOTE );
- }
-
- else if ( aStatus == EBarringStatusInactive && aPlural )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_CB_PLURAL_CANCEL_NOTE );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Handles the get status notifications.
-// ---------------------------------------------------------------------------
-void CPsuiBarringObs::HandleBarringModeStatusL( TUint8 aBsc[KPSUIMaxBscNumber],
- TBarringStatus aStatus )
- {
- if ( aStatus != EBarringStatusActive )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_BARRING_NOT_ACTIVE_NOTE );
- }
- else
- {
- //if no bsc-list, show "Barring active" note
- if ( aBsc[0] == KPSUINoBscGroup )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_BARRING_ACTIVE_NOTE );
- }
- //otherwise show bsc-list
- else
- {
- CPsuiNoteController::InstanceL()->ShowBscListL(
- R_BARR_STATUS_HEADING,
- aBsc );
- }
- }
- }
-
-// ---------------------------------------------------------------------------
-// Handles showing of error notes.
-// ---------------------------------------------------------------------------
-void CPsuiBarringObs::HandleBarringErrorL( TInt aReason )
- {
- if ( aReason != KErrSatControl )
- {
- TInt errorResource(
- CPsuiNoteController::InstanceL()->SetErrorNoteResourceID( aReason ) );
- CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiErrorNote, errorResource );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Handles requesting notes (show/hide).
-// ---------------------------------------------------------------------------
-void CPsuiBarringObs::HandleCBRequestingL( TBool aOngoing, TBool aInterrupted )
- {
- if ( aInterrupted )
- {
- // if interrupted, means that incoming call and all notes must
- // be immediately destroyed.
- CPsuiNoteController::InstanceL()->RemoveNotesL();
- return;
- }
- if ( aOngoing )
- {
- // show requesting note
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiWaitingNote,
- -1 );
- }
- else
- {
- // hide requesting note
- CPsuiNoteController::InstanceL()->KillStaticNoteL();
- }
- }
-
-// ---------------------------------------------------------------------------
-// Handles call barring password notes.
-// ---------------------------------------------------------------------------
-void CPsuiBarringObs::CbPasswordChangedL( TBool aSuccess )
- {
- if ( aSuccess )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_PASSWORD_CHANGED_NOTE );
- }
- else
- {
- HandleBarringErrorL( KErrGsmSSNegativePasswordCheck );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Sets engine contact for observer.
-// ---------------------------------------------------------------------------
-void CPsuiBarringObs::SetEngineContact( MPsetCallBarring* aBarringEngine )
- {
- CPsuiNoteController::InstanceL()->SetEngineContacts(
- NULL,
- aBarringEngine,
- NULL,
- NULL );
- }
-
-// End of File
--- a/cellular/psetnotesui/src/psuicliobserver.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,189 +0,0 @@
-/*
-* Copyright (c) 2002-2007 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: Shows notes related to Call Identity operations.
-*
-*/
-
-
-// INCLUDE FILES
-#include <psui.rsg>
-#include <featmgr.h>
-#include <etelsat.h>
-
-#include "psuicliobserver.h"
-#include "psuicontainer.h"
-#include "psuinotecontroller.h"
-
-// MEMBER FUNCTIONS
-
-// ---------------------------------------------------------------------------
-// Symbian OS two-phased constructor.
-// ---------------------------------------------------------------------------
-EXPORT_C CPsuiCliObserver* CPsuiCliObserver::NewL( CPsuiContainer& aContainer )
- {
- CPsuiCliObserver* self = new( ELeave ) CPsuiCliObserver;
- CleanupStack::PushL( self );
- // Sets up TLS, must be done before FeatureManager is used.
- FeatureManager::InitializeLibL();
- CleanupStack::Pop( self );
- self->SetContainer( aContainer );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Handles calling identity notes.
-// ---------------------------------------------------------------------------
-void CPsuiCliObserver::CliInformationL( TPsuiCli aType )
- {
- TInt resourceID = R_NOT_DONE_NOTE;
- switch( aType )
- {
- case EPsuiClirOn:
- resourceID = R_CLIR_ACTIVE_NOTE;
- break;
- case EPsuiClirOff:
- resourceID = R_CLIR_INACTIVE_NOTE;
- break;
- case EPsuiClipOn:
- resourceID = R_CLIP_ACTIVE_NOTE;
- break;
- case EPsuiClipOff:
- resourceID = R_CLIP_INACTIVE_NOTE;
- break;
- case EPsuiColrOn:
- resourceID = R_COLR_ACTIVE_NOTE;
- break;
- case EPsuiColrOff:
- resourceID = R_COLR_INACTIVE_NOTE;
- break;
- case EPsuiColpOn:
- resourceID = R_COLP_ACTIVE_NOTE;
- break;
- case EPsuiColpOff:
- resourceID = R_COLP_INACTIVE_NOTE;
- break;
- case EPsuiCliUnknown:
- default:
- resourceID = R_NOT_DONE_NOTE;
- break;
- }
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- resourceID );
- }
-
-// ---------------------------------------------------------------------------
-// Handles requesting notes (show/hide).
-// ---------------------------------------------------------------------------
-void CPsuiCliObserver::HandleCliRequestingL( TBool aOngoing, TBool aInterrupted )
- {
- if ( aInterrupted )
- {
- CPsuiNoteController::InstanceL()->RemoveNotesL();
- }
- else
- {
- if ( aOngoing )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiWaitingNote, -1 );
- }
- else
- {
- CPsuiNoteController::InstanceL()->KillStaticNoteL();
- }
- }
- }
-
-// ---------------------------------------------------------------------------
-// Sets engine contact for observer.
-// ---------------------------------------------------------------------------
-void CPsuiCliObserver::SetEngineContact( MPsetCli* aEngine )
- {
- CPsuiNoteController::InstanceL()->SetEngineContacts(
- NULL,
- NULL,
- NULL,
- aEngine );
- }
-
-// ---------------------------------------------------------------------------
-// Handles Cnap status requests.
-// ---------------------------------------------------------------------------
-void CPsuiCliObserver::HandleCnapStatusL( TInt
- aStatus
- )
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdPhoneCnap ) )
- {
- switch ( aStatus )
- {
- case RMobilePhone::EIdServiceActivePermanent:
- case RMobilePhone::EIdServiceActiveDefaultAllowed:
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_CNAP_ACTIVE );
- break;
- case RMobilePhone::EIdServiceActiveDefaultRestricted:
- case RMobilePhone::EIdServiceNotProvisioned:
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_CNAP_INACTIVE );
- break;
- default:
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_NOT_DONE_NOTE );
- break;
- }
- }
- else
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_NOT_DONE_NOTE );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Handles errors.
-// ---------------------------------------------------------------------------
-void CPsuiCliObserver::HandleCliErrorL( TInt aError )
- {
- if ( aError != KErrSatControl )
- {
- TInt errorResource =
- CPsuiNoteController::InstanceL()->SetErrorNoteResourceID( aError );
- CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiErrorNote, errorResource );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Sets container.
-// ---------------------------------------------------------------------------
-void CPsuiCliObserver::SetContainer( CPsuiContainer& aContainer )
- {
- iContainer = &aContainer;
- }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-CPsuiCliObserver::~CPsuiCliObserver()
- {
- //Remove FeatureManager
- FeatureManager::UnInitializeLib();
- }
-
-// End of File
--- a/cellular/psetnotesui/src/psuicontainer.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2002-2007 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: Container object for the PSetNotes objects.
-*
-*/
-
-
-//INCLUDES
-#include <psuicontainer.h>
-
-#include "psuiresourceloader.h"
-
-// ---------------------------------------------------------------------------
-// Symbian OS two-phased constructor.
-// ---------------------------------------------------------------------------
-EXPORT_C CPsuiContainer* CPsuiContainer::NewL()
- {
- CPsuiContainer* self = new ( ELeave ) CPsuiContainer;
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Symbian OS 2nd phase constructor.
-// ---------------------------------------------------------------------------
-void CPsuiContainer::ConstructL()
- {
- iAppEngineResourceLoader = CPsuiResourceLoader::NewL();
- }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-CPsuiContainer::~CPsuiContainer()
- {
- delete iAppEngineResourceLoader;
- }
-
-// ---------------------------------------------------------------------------
-// Creates cli observer. Ownership of the class is transferred.
-// ---------------------------------------------------------------------------
-EXPORT_C CPsuiCliObserver* CPsuiContainer::CreateCliObsL()
- {
- return CPsuiCliObserver::NewL( *this );
- }
-
-// ---------------------------------------------------------------------------
-// Creates call waiting observer. Ownership of the class is transferred.
-// ---------------------------------------------------------------------------
-EXPORT_C CPsuiWaitingObs* CPsuiContainer::CreateCWObsL()
- {
- return CPsuiWaitingObs::NewL( *this );
- }
-
-// ---------------------------------------------------------------------------
-// Creates call forward observer. Ownership of the class is transferred.
-// ---------------------------------------------------------------------------
-EXPORT_C CPsuiDivertObs* CPsuiContainer::CreateCFObsL()
- {
- return CPsuiDivertObs::NewL( *this );
- }
-
-// ---------------------------------------------------------------------------
-// Creates call barring observer. Ownership of the class is transferred.
-// ---------------------------------------------------------------------------
-EXPORT_C CPsuiBarringObs* CPsuiContainer::CreateCBObsL()
- {
- return CPsuiBarringObs::NewL( *this );
- }
-
-// End of file
--- a/cellular/psetnotesui/src/psuidivertobs.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-/*
-* Copyright (c) 2002 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: Shows notes and lists for Divert supplementary service
-*
-*/
-
-
-// INCLUDE FILES
-#include <psui.rsg>
-#include <mmlist.h>
-#include <featmgr.h>
-#include <psuicontainer.h>
-#include <etelsat.h>
-
-#include "psuinotecontroller.h"
-
-
-// ---------------------------------------------------------------------------
-// Symbian OS two-phased constructor.
-// ---------------------------------------------------------------------------
-EXPORT_C CPsuiDivertObs* CPsuiDivertObs::NewL( CPsuiContainer& aContainer )
- {
- CPsuiDivertObs* self = new ( ELeave ) CPsuiDivertObs;
- self->SetContainer( aContainer );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Sets container.
-// ---------------------------------------------------------------------------
-void CPsuiDivertObs::SetContainer( CPsuiContainer& aContainer )
- {
- iContainer = &aContainer;
- }
-
-// ---------------------------------------------------------------------------
-// Handles changing of diverting.
-// ---------------------------------------------------------------------------
-void CPsuiDivertObs::HandleDivertingChangedL(
- const TCallDivertSetting& aSetting,
- TBool aPlural )
- {
- switch( aSetting.iStatus )
- {
- case EDivertingStatusActive:
- if ( aPlural )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote, R_PLURAL_ACTIVATE_NOTE );
- }
- else
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote, R_ACTIVATE_NOTE );
- }
-
- // Diverting calls does not affect Internet calls
- if ( FeatureManager::FeatureSupported( KFeatureIdCommonVoip ) &&
- aSetting.iServiceGroup == EServiceGroupVoice )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiInformationNote, R_VOIP_DIVERT_NOT_SUPPORTED );
- }
- break;
- case EDivertingStatusNotRegistered:
- case EDivertingStatusInactive:
- if ( aPlural )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote, R_PLURAL_CANCEL_NOTE );
- }
- else
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote, R_CANCEL_NOTE );
- }
- break;
- case EDivertingStatusNotProvisioned:
- case EDivertingStatusUnknown:
- default:
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote, R_NOT_DONE_NOTE );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Handles the get status notifications.
-// ---------------------------------------------------------------------------
-/*****************************************************
-* Series 60 Customer / ETel
-* Series 60 ETel API
-*****************************************************/
-void CPsuiDivertObs::HandleDivertingStatusL( CMobilePhoneCFList& aSetting,
- TBool /*aPlural*/ )
- {
- TInt index = 0;
- TCFType action = EPsuiCFOther;
-
- //check the first item
- RMobilePhone::TMobilePhoneCFInfoEntryV1 cfInfo;
- cfInfo = aSetting.GetEntryL( index );
- switch( cfInfo.iStatus )
- {
- case RMobilePhone::ECallForwardingStatusNotActive:
- CPsuiNoteController::InstanceL()->ShowBscCFListL(
- R_TEXT_DIVERT_INACTIVE,
- aSetting,
- EPsuiNoCF,
- index );
- break;
- case RMobilePhone::ECallForwardingStatusActive:
- while ( action != EPsuiNoCF )
- {
- if ( cfInfo.iTimeout > 0 ) //cfnry involved
- {
- action = EPsuiCFNry;
- }
- else // other type of cf
- {
- action = EPsuiCFOther;
- }
- action = CPsuiNoteController::InstanceL()->ShowBscCFListL(
- R_TEXT_DIVERT_ACTIVE,
- aSetting,
- action,
- index );
-
- if ( action != EPsuiNoCF ) //EPsuiCFNry or EPsuiCFOther
- {
- cfInfo = aSetting.GetEntryL( index );
- // display details-view with time and number
- CPsuiNoteController::InstanceL()->ShowCfInfoL( action, cfInfo );
- }
- }
- break;
- case RMobilePhone::ECallForwardingStatusNotRegistered:
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_NOT_ACTIVE_NOTE );
- break;
- case RMobilePhone::ECallForwardingStatusNotProvisioned:
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_NOT_ALLOWED );
- break;
- default:
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote,
- R_NOT_DONE_NOTE );
- break;
- }
- }
-
-// ---------------------------------------------------------------------------
-// Handles showing of error notes.
-// ---------------------------------------------------------------------------
-void CPsuiDivertObs::HandleDivertingErrorL( TInt aReason )
- {
- if ( aReason != KErrSatControl )
- {
- TInt errorResource =
- CPsuiNoteController::InstanceL()->SetErrorNoteResourceID( aReason );
- CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiErrorNote, errorResource );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Handles requesting notes (show/hide).
-// ---------------------------------------------------------------------------
-void CPsuiDivertObs::HandleCFRequestingL( TBool aTrue, TBool aInterrupted )
- {
- if ( aInterrupted )
- {
- CPsuiNoteController::InstanceL()->RemoveNotesL();
- return;
- }
- if ( aTrue )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiWaitingNote, -1 );
- }
- else
- {
- CPsuiNoteController::InstanceL()->KillStaticNoteL();
- }
- }
-
-// ---------------------------------------------------------------------------
-// Sets engine contact for observer.
-// ---------------------------------------------------------------------------
-void CPsuiDivertObs::SetEngineContact( MPsetCallDiverting* aDivertEngine )
- {
- CPsuiNoteController::InstanceL()->SetEngineContacts(
- NULL,
- NULL,
- aDivertEngine,
- NULL );
- }
-
-// End of File
--- a/cellular/psetnotesui/src/psuinotecontroller.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-/*
-* Copyright (c) 2007 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 CPsuiNoteController class.
-*
-*/
-
-
-// INCLUDE FILES
-#include "psuinotecontroller.h"
-#include "psuiinternalconstants.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// CPsuiNoteController::CPsuiNoteController
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CPsuiNoteController::CPsuiNoteController() : CCoeStatic( KUidNoteControllerSingleton )
- {
- }
-
-// Destructor
-CPsuiNoteController::~CPsuiNoteController()
- {
- delete iNote;
- iNote = NULL;
- }
-
-// ---------------------------------------------------------
-// CPsuiNoteController::InstanceL
-// (other items were commented in a header).
-// ---------------------------------------------------------
-//
-CPsuiNoteController* CPsuiNoteController::InstanceL()
- {
- CPsuiNoteController* instance = static_cast<CPsuiNoteController*>(
- CCoeEnv::Static( KUidNoteControllerSingleton ) );
- if ( !instance )
- {
- instance = new ( ELeave ) CPsuiNoteController;
- CleanupStack::PushL( instance );
- instance->ConstructL();
- CleanupStack::Pop( instance );
- }
- return instance;
- }
-
-// -----------------------------------------------------------------------------
-// CPsuiNoteController::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CPsuiNoteController::ConstructL()
- {
- iNote = CPsuiNoteMaster::NewL();
- }
-
-// ---------------------------------------------------------
-// CPsuiNoteController::ShowNoteL
-// ---------------------------------------------------------
-//
-void CPsuiNoteController::ShowNoteL( TPsuiNoteTypes aType, TInt aResourceID )
- {
- iNote->ShowNoteL( aType, aResourceID );
- }
-
-// ---------------------------------------------------------
-// CPsuiNoteController::ShowBscListL
-// ---------------------------------------------------------
-//
-void CPsuiNoteController::ShowBscListL( TInt aResourceHeading, TUint8 aBsc[KPSUIMaxBscNumber] )
- {
- iNote->ShowBscListL( aResourceHeading, aBsc );
- }
-
-// ---------------------------------------------------------
-// CPsuiNoteController::SetErrorNoteResourceID
-// ---------------------------------------------------------
-//
-TInt CPsuiNoteController::SetErrorNoteResourceID ( const TInt aErrorCode )
- {
- return iNote->SetErrorNoteResourceID( aErrorCode );
- }
-
-// ---------------------------------------------------------
-// CPsuiNoteController::RemoveNotesL
-// ---------------------------------------------------------
-//
-void CPsuiNoteController::RemoveNotesL()
- {
- delete iNote;
- iNote = NULL;
- iNote = CPsuiNoteMaster::NewL();
- }
-
-// ---------------------------------------------------------
-// CPsuiNoteController::KillStaticNoteL
-// ---------------------------------------------------------
-//
-void CPsuiNoteController::KillStaticNoteL()
- {
- iNote->KillStaticNoteL();
- }
-
-// ---------------------------------------------------------
-// CPsuiNoteController::SetEngineContacts
-// ---------------------------------------------------------
-//
-void CPsuiNoteController::SetEngineContacts( MPsetCallWaiting* aWaitingEngine,
- MPsetCallBarring* aBarringEngine, MPsetCallDiverting* aDivertEngine,
- MPsetCli* aCliEngine )
- {
- iNote->SetEngineContacts( aWaitingEngine, aBarringEngine,
- aDivertEngine, aCliEngine );
- }
-
-// ---------------------------------------------------------
-// CPsuiNoteController::ShowBscCFListL
-// ---------------------------------------------------------
-//
-TCFType CPsuiNoteController::ShowBscCFListL( TInt aResourceHeading,
- CMobilePhoneCFList& aList, TCFType aCFType, TInt& aIndex )
- {
- return iNote->ShowBscCFListL( aResourceHeading, aList,
- aCFType, aIndex );
- }
-
-// ---------------------------------------------------------
-// CPsuiNoteController::ShowCfInfoL
-// ---------------------------------------------------------
-//
-void CPsuiNoteController::ShowCfInfoL( TCFType& aCFType,
- const RMobilePhone::TMobilePhoneCFInfoEntryV1& aSetting )
- {
- iNote->ShowCfInfoL( aCFType, aSetting );
- }
-
-// End of File
--- a/cellular/psetnotesui/src/psuinotemaster.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,772 +0,0 @@
-/*
-* Copyright (c) 2002-2007 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: Note master class shows the actual notes.
-*
-*/
-
-
-// INCLUDE FILES
-#include <psui.rsg>
-#include <aknlists.h>
-#include <psuicontainer.h>
-#include <StringLoader.h>
-#include <exterror.h>
-#include <gsmerror.h>
-#include <mmlist.h>
-#include <featmgr.h>
-#include <NumberGrouping.h>
-#include <cservicerequest.h>
-#include <e32property.h>
-#include <BTSapDomainPSKeys.h>
-
-#include "psuiinternalconstants.h"
-#include "psuinotemaster.h"
-#include "psuireqobserver.h"
-#include "psuiquerydialog.h"
-
-#include <centralrepository.h>
-#include <NumberGroupingCRKeys.h>
-// MACROS
-
-#ifdef _DEBUG
-
-#define RDEBUG(X) RDebug::Print(X);
-#define RDEBUG_INT(X,Y) RDebug::Print(X,Y);
-#else
-#define RDEBUG(X)
-#define RDEBUG_INT(X,Y)
-#endif
-
-// MEMBER FUNCTIONS
-
-// ---------------------------------------------------------------------------
-// Symbian OS two-phased constructor.
-// ---------------------------------------------------------------------------
-CPsuiNoteMaster* CPsuiNoteMaster::NewL()
- {
- CPsuiNoteMaster* self = new( ELeave ) CPsuiNoteMaster;
- CleanupStack::PushL( self );
- // Sets up TLS, must be done before FeatureManager is used.
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// -----------------------------------------------------------------------------
-// CPsuiNoteMaster::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CPsuiNoteMaster::ConstructL()
- {
- iReqObserver = CPsuiReqObserver::NewL( *this );
- FeatureManager::InitializeLibL();
-
- iServiceRequest = CServiceRequest::NewL( *iReqObserver );
-
- }
-
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-CPsuiNoteMaster::~CPsuiNoteMaster()
- {
- //Remove FeatureManager
- FeatureManager::UnInitializeLib();
-
- delete iServiceRequest;
-
- delete iReqObserver;
-
- if ( iQuery )
- {
- delete iQuery;
- iQuery = NULL;
- }
-
- if ( iPopupList )
- {
- iPopupList->CancelPopup();
- iPopupList = NULL;
- }
-
- iBarringEngine = NULL;
- iDivertEngine = NULL;
- iWaitingEngine = NULL;
- iCliEngine = NULL;
-
- }
-
-// ---------------------------------------------------------------------------
-// CPsuiNoteMaster::SetEngineContacts()
-// ---------------------------------------------------------------------------
-void CPsuiNoteMaster::SetEngineContacts( MPsetCallWaiting* aWaitingEngine,
- MPsetCallBarring* aBarringEngine,
- MPsetCallDiverting* aDivertEngine,
- MPsetCli* aCliEngine )
- {
- iWaitingEngine = aWaitingEngine;
- iBarringEngine = aBarringEngine;
- iDivertEngine = aDivertEngine;
- iCliEngine = aCliEngine;
- }
-
-// ---------------------------------------------------------------------------
-// CPsuiNoteMaster::ShowNoteL()
-// ---------------------------------------------------------------------------
-void CPsuiNoteMaster::ShowNoteL( TPsuiNoteTypes aType, TInt aResourceID )
- {
- if ( aResourceID < 0 )
- {
- if ( aType == EPsuiWaitingNote )
- {
- iRequesting = ETrue;
- iServiceRequest->StartL( KNullDesC );
- }
- return;
- }
-
- HBufC* string = StringLoader::LoadLC( aResourceID );
-
- switch ( aType )
- {
- case EPsuiConfirmationNote:
- {
- iServiceRequest->ShowCompletionNoteL(
- ETrue, // aShowNote
- KErrNone, // aError
- CServiceRequest::ESerqGlobalConfirmationNote, // aNoteType
- string->Des() ); // aText
- break;
- }
- case EPsuiErrorNote:
- {
- CServiceRequest::TSerqNoteType errorType = CServiceRequest::ESerqGlobalErrorNote;
- if ( aResourceID == R_NO_SERVICE ||
- aResourceID == R_NOT_ALLOWED )
- {
- errorType = CServiceRequest::ESerqGlobalInformationNote;
- }
- iServiceRequest->ShowCompletionNoteL(
- ETrue,
- KErrNone,
- errorType,
- string->Des() );
- break;
- }
- case EPsuiInformationNote:
- {
- iServiceRequest->ShowCompletionNoteL(
- ETrue,
- KErrNone,
- CServiceRequest::ESerqGlobalInformationNote,
- string->Des() );
- }
- default:
- break;
- }
- CleanupStack::PopAndDestroy( string );
- string = NULL;
- }
-
-// ---------------------------------------------------------------------------
-// CPsuiNoteMaster::KillStaticNoteL()
-// ---------------------------------------------------------------------------
-void CPsuiNoteMaster::KillStaticNoteL()
- {
- if ( iRequesting )
- {
- delete iServiceRequest;
- iServiceRequest = NULL;
- iServiceRequest = CServiceRequest::NewL( *iReqObserver );
- iRequesting =EFalse;
- }
-
- }
-
-// ---------------------------------------------------------------------------
-// CPsuiNoteMaster::KillRequestL()
-// ---------------------------------------------------------------------------
-void CPsuiNoteMaster::KillRequestL()
- {
- if ( iWaitingEngine )
- {
- iWaitingEngine->CancelProcess();
- }
- else if ( iBarringEngine )
- {
- iBarringEngine->CancelCurrentRequest();
- }
- else if ( iDivertEngine )
- {
- iDivertEngine->CancelCurrentRequest();
- }
- else if ( iCliEngine )
- {
- ShowCancelRequestNoteL();
- iCliEngine->CancelAll();
- }
- }
-// ---------------------------------------------------------------------------
-// CPsuiNoteMaster::ShowBscListL()
-// ---------------------------------------------------------------------------
-void CPsuiNoteMaster::ShowBscListL( TInt aResourceHeading,
- TUint8 aBsc[KPSUIMaxBscNumber] )
- {
- if ( !iWaitingEngine &&
- !iBarringEngine &&
- !iDivertEngine &&
- !iCliEngine )
- {
- return;
- }
-
- if ( aResourceHeading < 0 )
- {
- User::Leave( KErrArgument );
- }
-
- CAknSinglePopupMenuStyleListBox* list =
- new ( ELeave ) CAknSinglePopupMenuStyleListBox;
- CleanupStack::PushL( list );
-
- CreateListBoxL( EPsuiNoCF, list );
-
- CDesCArray* items = new ( ELeave ) CDesCArrayFlat( KPSUIMaxBscNumber );
- CleanupStack::PushL( items );
-
- CTextListBoxModel* model = list->Model();
- if ( !model )
- {
- User::Leave( KErrGeneral );
- }
- model->SetItemTextArray( items );
- model->SetOwnershipType( ELbmOwnsItemArray );
- CleanupStack::Pop( items ); // listbox model now owns this
-
- SetTitleL( aResourceHeading );
-
- TUint8 numberOfBsc = 0;
- HBufC* string = NULL;
- while ( ( aBsc[numberOfBsc] != KPSUINoBscGroup ) &&
- ( numberOfBsc < KPSUIMaxBscNumber ) )
- {
- TUint8 bscCode = aBsc[numberOfBsc];
- string = SetBsGroupLC( bscCode );
-
- if ( string )
- {
- items->AppendL( *string );
- CleanupStack::PopAndDestroy( string );
- }
- numberOfBsc++;
- }
-
- iPopupList->ExecuteLD();
- iPopupList = NULL;
- CleanupStack::PopAndDestroy( list );
- }
-
-// ---------------------------------------------------------------------------
-// Shows additional divert information.
-// ---------------------------------------------------------------------------
-/*****************************************************
-* Series 60 Customer / ETel
-* Series 60 ETel API
-*****************************************************/
-void CPsuiNoteMaster::ShowCfInfoL( TCFType& aCFType,
- const RMobilePhone::TMobilePhoneCFInfoEntryV1& aSetting )
- {
- if ( aCFType == EPsuiNoCF )
- {
- User::Leave( KErrArgument );
- }
-
- // Get base text and set phone number into it.
- // Note that two characters are reserved for LRM markers.
- TBuf<KPSUIDetailsText+2> string;
- StringLoader::Load( string, R_TO_NUMBER );
- string.Append( KPSUIListDivider );
-
- TInt pngErr( KErrNone );
- TInt pngSupported( 0 );
- CRepository* repository = CRepository::NewL( KCRUidNumberGrouping );
- pngErr = repository->Get( KNumberGrouping, pngSupported );
- delete repository;
-
- if ( KErrNone == pngErr && pngSupported != 0 )
- {
- CPNGNumberGrouping* numberGrouping =
- CPNGNumberGrouping::NewL( KPSUIMaxPSUIItemLength );
- CleanupStack::PushL( numberGrouping );
-
- //Check that number fits (with or w/o number formatting).
- if ( (aSetting.iNumber.iTelNumber.Length() + 2) <= numberGrouping->MaxDisplayLength() )
- {
- numberGrouping->Set( aSetting.iNumber.iTelNumber );
- AppendCFNumber( string, numberGrouping->FormattedNumber() );
- }
- else
- {
- AppendCFNumber( string, aSetting.iNumber.iTelNumber );
- }
- CleanupStack::PopAndDestroy( numberGrouping );
- }
- else
- {
- AppendCFNumber( string, aSetting.iNumber.iTelNumber );
- }
-
- //AVKON utils check whether or not conversion is needed
- AknTextUtils::DisplayTextLanguageSpecificNumberConversion( string );
- string.Append( KPSUIListDivider );
-
- // Add delay time.
- if ( aCFType == EPsuiCFNry )
- {
- //Header + divider.
- HBufC* delayTime = StringLoader::LoadLC( R_DELAY_TIME );
- string.Append( *delayTime );
- CleanupStack::PopAndDestroy( delayTime );
- string.Append( KPSUIListDivider );
-
- TBuf<KPSUIMaxPSUIItemLength> writeBuffer;
- HBufC* readBuffer = StringLoader::LoadLC( R_TEXT_SS_DETAIL_DELAY_SEC );
- // format time, -1 means that there is no index in the key string.
- StringLoader::Format( writeBuffer, *readBuffer, -1, aSetting.iTimeout );
- CleanupStack::PopAndDestroy( readBuffer );
-
- string.Append( writeBuffer );
- }
-
- iQuery = CPsuiQueryDialog::NewL( CAknQueryDialog::ENoTone );
- TInt command( iQuery->ExecuteLD( R_CONFIRMATION_QUERY, string ) );
- if( command == EKeyNo )
- {
- // End -key was pressed so don't relaunch previous query
- aCFType = EPsuiNoCF;
- }
- iQuery = NULL;
- }
-
-// ---------------------------------------------------------------------------
-// Shows request cancelled note.
-// ---------------------------------------------------------------------------
-void CPsuiNoteMaster::ShowCancelRequestNoteL()
- {
- if ( iRequesting )
- {
- ShowNoteL( EPsuiInformationNote, R_REQUEST_CANCELLED_NOTE );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Returns resource ID for the most common error codes.
-// ---------------------------------------------------------------------------
-//
-TInt CPsuiNoteMaster::SetErrorNoteResourceID ( const TInt aErrorCode )
- {
- RDEBUG_INT( _L("PSUI.SetErrorNoteResourceID - code %d: "), aErrorCode )
- TInt resourceID = KErrNone;
- switch ( aErrorCode )
- {
- case KErrGsmSSSubscriptionViolation:
- resourceID = R_CONTACT_SERVICE_NOTE;
- break;
- case KErrGsmSSUnknownSubscriber:
- case KErrGsmSSAbsentSubscriber:
- case KErrGsmSSIllegalOperation:
- case KErrGsmSSIllegalSubscriber:
- case KErrGsmSSIllegalEquipment:
- case KErrGsmSSCallBarred:
- case KErrGsmSSDataMissing:
- resourceID = R_NOT_ALLOWED;
- break;
- case KErrGsmSSIncompatibility:
- resourceID = R_SERVICES_IN_CONFLICT;
- break;
- case KErrGsmSSSystemFailure:
- resourceID = R_RESULT_UNKNOWN;
- break;
- case KErrGsmSSUnexpectedDataValue:
- case KErrGsmSSResourcesUnavailable:
- resourceID = R_REQUEST_REJECTED;
- break;
- case KErrGsmSSNegativePasswordCheck:
- case KErrGsmSSPasswordRegistrationFailure:
- resourceID = R_PASSWORD_ERROR_NOTE;
- break;
- case KErrGsmSSPasswordAttemptsViolation:
- resourceID = R_PASSWORD_BLOCKED_NOTE;
- break;
- case KErrGsmSMSNoNetworkService:
- case KErrGsmNoService:
- resourceID = R_NO_SERVICE;
- break;
- case KErrSsActivationDataLost:
- resourceID = R_NET_INFO_LOST;
- break;
- case KErrGsmOfflineOpNotAllowed:
- if ( FeatureManager::FeatureSupported( KFeatureIdOfflineMode ) )
- {
- TInt value = EBTSapNotConnected;
- RProperty::Get(
- KPSUidBluetoothSapConnectionState,
- KBTSapConnectionState,
- value );
- if ( value == EBTSapConnected )
- {
- resourceID = R_OFFLINE_MODE_SAP;
- }
- else
- {
- resourceID = R_OFFLINE_MODE;
- }
- }
- break;
- default:
- resourceID = R_NOT_DONE_NOTE;
- break;
- }
- return resourceID;
- }
-
-// ---------------------------------------------------------------------------
-// CPsuiNoteMaster::ShowBscCFListL()
-// ---------------------------------------------------------------------------
-/*****************************************************
-* Series 60 Customer / ETel
-* Series 60 ETel API
-*****************************************************/
-TCFType CPsuiNoteMaster::ShowBscCFListL( TInt aResourceHeading,
- CMobilePhoneCFList& aList,
- TCFType aCFType,
- TInt& aIndex )
- {
- //note master was deleted - do not create another bsc-list
- if ( !iWaitingEngine &&
- !iBarringEngine &&
- !iDivertEngine &&
- !iCliEngine )
- {
- return EPsuiNoCF;
- }
-
- if ( aResourceHeading < 0 )
- {
- User::Leave( KErrArgument );
- }
-
- CAknSinglePopupMenuStyleListBox* list =
- new ( ELeave ) CAknSinglePopupMenuStyleListBox;
- CleanupStack::PushL( list );
-
- CreateListBoxL( aCFType, list );
-
- CDesCArray* items = new ( ELeave ) CDesCArrayFlat( KPSUIMaxBscNumber );
- CleanupStack::PushL( items );
-
- CTextListBoxModel* model = list->Model();
- if ( !model )
- {
- User::Leave( KErrGeneral );
- }
- model->SetItemTextArray( items );
- model->SetOwnershipType( ELbmOwnsItemArray );
- CleanupStack::Pop( items );
-
- SetTitleL( aResourceHeading );
-
- TInt entries = aList.Enumerate();
- TInt numberOfBscs = 0;
- RMobilePhone::TMobilePhoneCFInfoEntryV1 cfInfo;
- HBufC* string = NULL;
- while ( entries > numberOfBscs )
- {
- cfInfo = aList.GetEntryL( numberOfBscs );
- string = SetBsGroupLC(
- static_cast <TUint8> ( ChangeToGSM( cfInfo.iServiceGroup ) ) );
- // if no string was retrieved, ignore it.
- if ( string )
- {
- items->AppendL( *string );
- CleanupStack::PopAndDestroy( string );
- }
- numberOfBscs++;
- }
- list->SetCurrentItemIndex( aIndex );
-
- TInt popupRet = iPopupList->ExecuteLD();
- aIndex = list->CurrentItemIndex();
- iPopupList = NULL;
- CleanupStack::PopAndDestroy( list );
-
- if ( popupRet ) // if number or details softkey pressed
- {
- return aCFType;
- }
- return EPsuiNoCF;
- }
-
-// ---------------------------------------------------------------------------
-// CPsuiNoteMaster::CreateListBoxL
-// ---------------------------------------------------------------------------
-void CPsuiNoteMaster::CreateListBoxL( TCFType aCFType,
- CAknSinglePopupMenuStyleListBox* aList )
- {
- TInt resourceId = 0;
- if ( aCFType == EPsuiNoCF )
- {
- resourceId = R_AVKON_SOFTKEYS_BACK;
- }
- else if ( aCFType == EPsuiCFOther )
- {
- resourceId = R_PSUI_SOFTKEYS_NUMBER_BACK;
- }
- else
- {
- resourceId = R_PSUI_SOFTKEYS_DETAILS_BACK;
- }
-
- // Create popup list
- iPopupList = CAknPopupList::NewL( aList, resourceId );
- aList->ConstructL( iPopupList, CEikListBox::ELeftDownInViewRect );
- aList->CreateScrollBarFrameL( ETrue );
- aList->ScrollBarFrame()->SetScrollBarVisibilityL(
- CEikScrollBarFrame::EOff,
- CEikScrollBarFrame::EAuto );
- }
-
-// ---------------------------------------------------------------------------
-// CPsuiNoteMaster::SetTitleL
-// ---------------------------------------------------------------------------
-void CPsuiNoteMaster::SetTitleL( const TInt& aResourceHeading )
- {
- TRAPD ( ignore,
- HBufC* string = StringLoader::LoadLC( aResourceHeading );
- iPopupList->SetTitleL( *string );
- CleanupStack::PopAndDestroy( string );
- );
- if ( ignore )
- {
- HBufC16* emptyHeader = NULL;
- iPopupList->SetTitleL( emptyHeader->Des() );
- delete emptyHeader;
- }
- }
-// ---------------------------------------------------------------------------
-// CPsuiNoteMaster::AppendCFNumber
-// ---------------------------------------------------------------------------
-void CPsuiNoteMaster::AppendCFNumber( TDes& aString, const TDesC& aNumber )
- {
- aString.Append( KLRMarker );
- aString.Append( aNumber );
- aString.Append( KLRMarker );
- }
-// ---------------------------------------------------------------------------
-// CPsuiNoteMaster::SetBsGroupLC
-// ---------------------------------------------------------------------------
-HBufC* CPsuiNoteMaster::SetBsGroupLC( TUint8 aBscCode )
- {
- HBufC* string = NULL;
- switch( aBscCode )
- {
- case 0:
- string = StringLoader::LoadLC( R_BS_ALPHA_0 );
- break;
- case 10:
- string = StringLoader::LoadLC( R_BS_ALPHA_10 );
- break;
- case 11:
- string = StringLoader::LoadLC( R_BS_ALPHA_11 );
- break;
- case 12:
- string = StringLoader::LoadLC( R_BS_ALPHA_12 );
- break;
- case 13:
- string = StringLoader::LoadLC( R_BS_ALPHA_13 );
- break;
- case 16:
- string = StringLoader::LoadLC( R_BS_ALPHA_16 );
- break;
- case 19:
- string = StringLoader::LoadLC( R_BS_ALPHA_19 );
- break;
- case 20:
- if ( FeatureManager::FeatureSupported( KFeatureIdCsVideoTelephony ) )
- {
- string = StringLoader::LoadLC( R_BS_ALPHA_20_VT );
- }
- else
- {
- string = StringLoader::LoadLC( R_BS_ALPHA_20 );
- }
- break;
- case 21:
- string = StringLoader::LoadLC( R_BS_ALPHA_21 );
- break;
- case 22:
- string = StringLoader::LoadLC( R_BS_ALPHA_22 );
- break;
- case 24:
- string = StringLoader::LoadLC( R_BS_ALPHA_24 );
- break;
- case 25:
- string = StringLoader::LoadLC( R_BS_ALPHA_25 );
- break;
- case 26:
- string = StringLoader::LoadLC( R_BS_ALPHA_26 );
- break;
- case 27:
- string = StringLoader::LoadLC( R_BS_ALPHA_27 );
- break;
- case 30:
- string = StringLoader::LoadLC( R_BS_ALPHA_30 );
- break;
- case 89:
- string = StringLoader::LoadLC( R_BS_ALPHA_89 );
- break;
- default:
- // all the services that are not displayed to ui
- break;
- }
- return string;
- }
-
-// ---------------------------------------------------------
-// CPsuiNoteMaster::ChangeToGSM
-//
-// ---------------------------------------------------------
-TBasicServiceGroups CPsuiNoteMaster::ChangeToGSM( const TInt& aBsc )
- {
- switch ( aBsc )
- {
- case RMobilePhone::EAllServices:
- return EAllTeleAndBearer;
- case RMobilePhone::EAllTele:
- return EAllTele;
- case RMobilePhone::EVoiceService:
- case RMobilePhone::ETelephony:
- return ETelephony;
- case RMobilePhone::EAllDataTele:
- return EAllDataTele;
- case RMobilePhone::EFaxService:
- return EFax;
- case RMobilePhone::EShortMessageService:
- return ESms;
- case RMobilePhone::EAllDataExSms:
- return EAllDataExSms;
- case RMobilePhone::EAllTeleExcSms:
- return EAllTeleExcSms;
- case RMobilePhone::EAllPlmnTele:
- return EAllPlmnTele;
- case RMobilePhone::EPlmnTele1:
- return EPlmnTele1;
- case RMobilePhone::EPlmnTele2:
- return EPlmnTele2;
- case RMobilePhone::EPlmnTele3:
- return EPlmnTele3;
- case RMobilePhone::EPlmnTele4:
- return EPlmnTele4;
- case RMobilePhone::EPlmnTele5:
- return EPlmnTele5;
- case RMobilePhone::EPlmnTele6:
- return EPlmnTele6;
- case RMobilePhone::EPlmnTele7:
- return EPlmnTele7;
- case RMobilePhone::EPlmnTele8:
- return EPlmnTele8;
- case RMobilePhone::EPlmnTele9:
- return EPlmnTele9;
- case RMobilePhone::EPlmnTeleA:
- return EPlmnTeleA;
- case RMobilePhone::EPlmnTeleB:
- return EPlmnTeleB;
- case RMobilePhone::EPlmnTeleC:
- return EPlmnTeleC;
- case RMobilePhone::EPlmnTeleD:
- return EPlmnTeleD;
- case RMobilePhone::EPlmnTeleE:
- return EPlmnTeleE;
- case RMobilePhone::EPlmnTeleF:
- return EPlmnTeleF;
- case RMobilePhone::EAllBearer:
- return EAllBearer;
- case RMobilePhone::EAllAsync:
- return EAllAsync;
- case RMobilePhone::EAllSync:
- return EAllSync;
- case RMobilePhone::ECircuitDataService:
- case RMobilePhone::ESyncData:
- return ESyncData;
- case RMobilePhone::EPacketDataService:
- case RMobilePhone::EAsyncData:
- return EAsyncData;
- case RMobilePhone::EPacketData:
- return EPacketData;
- case RMobilePhone::EPadAccess:
- return EPadAccess;
- case RMobilePhone::EAllPlmnBearer:
- return EAllPlmnBearer;
- case RMobilePhone::EPlmnBearerServ1:
- return EPlmnBearerServ1;
- case RMobilePhone::EPlmnBearerServ2:
- return EPlmnBearerServ2;
- case RMobilePhone::EPlmnBearerServ3:
- return EPlmnBearerServ3;
- case RMobilePhone::EPlmnBearerServ4:
- return EPlmnBearerServ4;
- case RMobilePhone::EPlmnBearerServ5:
- return EPlmnBearerServ5;
- case RMobilePhone::EPlmnBearerServ6:
- return EPlmnBearerServ6;
- case RMobilePhone::EPlmnBearerServ7:
- return EPlmnBearerServ7;
- case RMobilePhone::EPlmnBearerServ8:
- return EPlmnBearerServ8;
- case RMobilePhone::EPlmnBearerServ9:
- return EPlmnBearerServ9;
- case RMobilePhone::EPlmnBearerServA:
- return EPlmnBearerServA;
- case RMobilePhone::EPlmnBearerServB:
- return EPlmnBearerServB;
- case RMobilePhone::EPlmnBearerServC:
- return EPlmnBearerServC;
- case RMobilePhone::EPlmnBearerServD:
- return EPlmnBearerServD;
- case RMobilePhone::EPlmnBearerServE:
- return EPlmnBearerServE;
- case RMobilePhone::EPlmnBearerServF:
- return EPlmnBearerServF;
- case RMobilePhone::EAuxVoiceService:
- case RMobilePhone::EAltTele:
- return EAltTele;
- case RMobilePhone::EServiceUnspecified:
- default:
- return EUnknown;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CPsuiNoteMaster::RequestNoteCancelledL
-// Called when the Requesting note is cancelled by the user.
-// -----------------------------------------------------------------------------
-//
-void CPsuiNoteMaster::RequestNoteCancelledL()
- {
- KillRequestL();
- iRequesting = EFalse;
- }
-// End of file
--- a/cellular/psetnotesui/src/psuiquerydialog.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2006 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: Query dialog for handling key events.
-*
-*/
-
-
-// INCLUDE FILES
-#include "psuiquerydialog.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// C++ default constructor can NOT contain any code, that
-// might leave.
-//
-CPsuiQueryDialog::CPsuiQueryDialog( CAknQueryDialog::TTone aTone ) :
- CAknQueryDialog( aTone )
- {
- }
-
-// ---------------------------------------------------------------------------
-// Symbian OS two-phased constructor.
-// ---------------------------------------------------------------------------
-CPsuiQueryDialog* CPsuiQueryDialog::NewL( CAknQueryDialog::TTone aTone )
- {
- CPsuiQueryDialog* self = new( ELeave )CPsuiQueryDialog( aTone );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Destructor
-// ---------------------------------------------------------------------------
-//
-CPsuiQueryDialog::~CPsuiQueryDialog()
- {
- }
-
-// ---------------------------------------------------------------------------
-// CPsuiQueryDialog::OfferKeyEventL
-// ---------------------------------------------------------------------------
-//
-TKeyResponse CPsuiQueryDialog::OfferKeyEventL( const TKeyEvent& aKeyEvent,
- TEventCode aType )
- {
- if ( ( aKeyEvent.iScanCode == EStdKeyNo || aKeyEvent.iCode == EKeyNo ) &&
- aType == EEventKeyUp )
- {
- // End -key was pressed, so exit this query dialog
- TryExitL( EKeyNo );
- }
-
- return EKeyWasNotConsumed;
- }
-
-// ---------------------------------------------------------------------------
-// CPsuiQueryDialog::OkToExitL
-// ---------------------------------------------------------------------------
-//
-TBool CPsuiQueryDialog::OkToExitL( TInt /*aCommand*/ )
- {
- // Dismiss query
- return ETrue;
- }
-
-// End of File
--- a/cellular/psetnotesui/src/psuireqobserver.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2006 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: Request observer.
-*
-*/
-
-
-// INCLUDE FILES
-#include <psuicontainer.h>
-
-#include "psuireqobserver.h"
-
-// MACROS
-
-// MEMBER FUNCTIONS
-
-// ---------------------------------------------------------------------------
-// Symbian OS two-phased constructor.
-// ---------------------------------------------------------------------------
-CPsuiReqObserver* CPsuiReqObserver::NewL( CPsuiNoteMaster& aNoteMaster )
- {
- return new( ELeave ) CPsuiReqObserver( aNoteMaster );
- }
-
-CPsuiReqObserver::CPsuiReqObserver( CPsuiNoteMaster& aNoteMaster ):
- iNoteMaster(aNoteMaster)
- {
- }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-CPsuiReqObserver::~CPsuiReqObserver()
- {
- }
-
-// -----------------------------------------------------------------------------
-// CPsuiNoteMaster::MServiceRequestNoteCancelledL
-// Called when the Requesting note is cancelled by the user.
-// -----------------------------------------------------------------------------
-//
-void CPsuiReqObserver::MServiceRequestNoteCancelledL( TBool /*aCancelledWithEscape*/ )
- {
- iNoteMaster.RequestNoteCancelledL();
- }
-// End of file
--- a/cellular/psetnotesui/src/psuiresourceloader.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2002-2004,2007 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: Loads resources from file.
-*
-*/
-
-
-// INCLUDE FILES
-#include <coemain.h>
-#include <ConeResLoader.h>
-
-#include "psuiresourceloader.h"
-
-// CONSTANTS
-_LIT( KPsuiResourceFileNameAndPath, "Z:\\resource\\Psui.rsc" );
-
-// MEMBER FUNCTIONS
-//-----------------------------------------------------------------------------
-// Symbian OS two-phased constructor.
-//-----------------------------------------------------------------------------
-EXPORT_C CPsuiResourceLoader* CPsuiResourceLoader::NewL()
- {
- CPsuiResourceLoader* self = CPsuiResourceLoader::NewLC();
- CleanupStack::Pop( self );
- return self;
- }
-
-//-----------------------------------------------------------------------------
-// Symbian OS two-phased constructor.
-//-----------------------------------------------------------------------------
-EXPORT_C CPsuiResourceLoader* CPsuiResourceLoader::NewLC()
- {
- CPsuiResourceLoader* self = new( ELeave ) CPsuiResourceLoader;
- CleanupStack::PushL( self );
- self->ConstructL();
- return self;
- }
-
-//-----------------------------------------------------------------------------
-// Destructor.
-//-----------------------------------------------------------------------------
-CPsuiResourceLoader::~CPsuiResourceLoader()
- {
- if ( iResourceLoader )
- {
- iResourceLoader->Close();
- }
- delete iResourceLoader;
- iResourceLoader = NULL;
- }
-
-// ----------------------------------------------------------------------------
-//
-// Creates the resource loader and connects it with environment.
-//
-// ----------------------------------------------------------------------------
-//
-void CPsuiResourceLoader::ConstructL()
- {
- iResourceLoader = new ( ELeave ) RConeResourceLoader( *CCoeEnv::Static() );
- TFileName fileName ( KPsuiResourceFileNameAndPath );
- iResourceLoader->OpenL( fileName );
- }
-// End of File
-
--- a/cellular/psetnotesui/src/psuivariationproxy.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2006 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 CPSuiVariationProxy class.
-*
-*
-*/
-
-
-#include "psuivariationproxy.h"
-#include <centralrepository.h>
-#include <settingsinternalcrkeys.h>
-
-CPSuiVariationProxy::CPSuiVariationProxy()
- {
- }
-
-CPSuiVariationProxy::~CPSuiVariationProxy()
- {
- }
-
-CPSuiVariationProxy* CPSuiVariationProxy::NewL()
- {
- CPSuiVariationProxy* self = new ( ELeave ) CPSuiVariationProxy();
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-void CPSuiVariationProxy::ConstructL()
- {
- TInt setting = 0;
- CRepository* centralRepository = CRepository::NewLC( KCRUidPhoneSettings );
- centralRepository->Get( KPSetCallWaiting, setting );
- if( setting )
- {
- iFeatures |= KCallWaitingDistiquishNotProvisioned;
- }
- CleanupStack::PopAndDestroy( centralRepository );
- }
-
-TBool CPSuiVariationProxy::FeatureEnabled( TUint aFeature ) const
- {
- return aFeature&iFeatures;
- }
--- a/cellular/psetnotesui/src/psuiwaitingobs.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-/*
-* Copyright (c) 2002-2007 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: Handles requests for showing Call Waiting notes.
-*
-*/
-
-
-// INCLUDE FILES
-#include <psui.rsg>
-#include <psuicontainer.h>
-#include <etelsat.h>
-
-#include "psuiinternalconstants.h"
-#include "psuinotecontroller.h"
-#include "psuivariationproxy.h"
-
-// MEMBER FUNCTIONS
-// ---------------------------------------------------------------------------
-// Symbian OS two-phased Constructor.
-// ---------------------------------------------------------------------------
-EXPORT_C CPsuiWaitingObs* CPsuiWaitingObs::NewL( CPsuiContainer& aContainer )
- {
- CPsuiWaitingObs* self = new( ELeave ) CPsuiWaitingObs;
- CleanupStack::PushL( self );
- self->ConstructL( aContainer );
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Symbian OS 2nd phase Constructor.
-// ---------------------------------------------------------------------------
-void CPsuiWaitingObs::ConstructL( CPsuiContainer& aContainer )
- {
- iContainer = &aContainer;
-
- CPSuiVariationProxy* variationProxy = CPSuiVariationProxy::NewL();
- CleanupStack::PushL( variationProxy );
- iCallWaitingDistinguishEnabled = variationProxy->FeatureEnabled( KCallWaitingDistiquishNotProvisioned);
- CleanupStack::PopAndDestroy( variationProxy );
-
- }
-
-// ---------------------------------------------------------------------------
-// Handles changing of call waiting.
-// ---------------------------------------------------------------------------
-void CPsuiWaitingObs::HandleCallWaitingChangedL
-( const MPsetCallWaiting::TSetCallWaiting aSetting, const TInt /* aResult */ )
- {
- if ( aSetting == MPsetCallWaiting::EActivateCallWaiting )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote, R_CW_ACTIVE_NOTE );
- }
- else if ( aSetting == MPsetCallWaiting::EDeactivateCallWaiting )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote, R_CW_CANCEL_NOTE );
- }
- }
-
-// ---------------------------------------------------------------------------
-// Sets engine contact for observer.
-// ---------------------------------------------------------------------------
-void CPsuiWaitingObs::SetEngineContact( MPsetCallWaiting& aEngineContact )
- {
- CPsuiNoteController::InstanceL()->SetEngineContacts(
- &aEngineContact, NULL, NULL, NULL );
- }
-
-// ---------------------------------------------------------------------------
-// Handles requesting notes (show/hide).
-// ---------------------------------------------------------------------------
-void CPsuiWaitingObs::HandleCWRequestingL( TBool aOngoing, TBool aInterrupted )
- {
- if ( aInterrupted )
- {
- CPsuiNoteController::InstanceL()->RemoveNotesL();
- return;
- }
-
- if ( aOngoing )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiWaitingNote, -1 );
- }
- else
- {
- CPsuiNoteController::InstanceL()->KillStaticNoteL();
- }
- }
-
-// ---------------------------------------------------------------------------
-// Handles the get status notifications.
-// ---------------------------------------------------------------------------
-//
-void CPsuiWaitingObs::HandleCallWaitingGetStatusL(
- const MPsetCallWaiting::TGetCallWaitingStatus aStatus,
- TUint8 aBsc[KPSUIMaxBscNumber] )
- {
-
- if ( iCallWaitingDistinguishEnabled && aStatus == MPsetCallWaiting::EStatusNotProvisioned )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote, R_CW_NOT_PROVISIONED_NOTE );
- }
- else if ( aStatus != MPsetCallWaiting::EStatusActive )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL(
- EPsuiConfirmationNote, R_CW_NOT_ACTIVE_NOTE );
- }
- else
- {
- if( iCallWaitingDistinguishEnabled )
- {
-
- //show only "CW active" even if the bsc list is present.
- //This change is to fix the error ENYI-6DYFKZ
- CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote,
- R_CW_ACTIVE_NO_BSC_NOTE );
- }
- else
- {
-
- //if no bsc-list present, show only "CW active"
- if ( aBsc[0] == KPSUINoBscGroup )
- {
- CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiConfirmationNote,
- R_CW_ACTIVE_NO_BSC_NOTE );
- }
- else
- {
-
- CPsuiNoteController::InstanceL()->ShowBscListL(
- R_CW_STATUS_HEADING,
- aBsc );
- }
- }
- }
- }
-
-// ---------------------------------------------------------------------------
-// This function handles errors in call waiting requests.
-// ---------------------------------------------------------------------------
-//
-void CPsuiWaitingObs::HandleCWErrorL( TInt aReason )
- {
- if ( aReason != KErrSatControl )
- {
- TInt errorResource(
- CPsuiNoteController::InstanceL()->SetErrorNoteResourceID( aReason ) );
-
- CPsuiNoteController::InstanceL()->ShowNoteL( EPsuiErrorNote, errorResource );
- }
- }
-
-// End of File
--- a/cellular/psetnotesui/tsrc/public/basic/BWINS/T_PSetNotesUiU.DEF Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-EXPORTS
- ?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * __cdecl CreateTestSuiteL(void)
--- a/cellular/psetnotesui/tsrc/public/basic/EABI/T_PSetNotesUiU.DEF Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- _Z16CreateTestSuiteLv @ 1 NONAME
-
--- a/cellular/psetnotesui/tsrc/public/basic/Src/T_PSetNotesUi.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/*
-* Copyright (c) 2006 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 T_PSetNotesUi class.
-*
-*/
-
-
-// CLASS HEADER
-#include "T_PSetNotesUi.h"
-
-// EXTERNAL INCLUDES
-#include <EUnitMacros.h>
-#include <EUnitDecorators.h>
-#include <psuicontainer.h>
-
-// INTERNAL INCLUDES
-
-
-// CONSTRUCTION
-T_PSetNotesUi* T_PSetNotesUi::NewL()
- {
- T_PSetNotesUi* self = T_PSetNotesUi::NewLC();
- CleanupStack::Pop();
-
- return self;
- }
-
-T_PSetNotesUi* T_PSetNotesUi::NewLC()
- {
- T_PSetNotesUi* self = new( ELeave ) T_PSetNotesUi();
- CleanupStack::PushL( self );
-
- self->ConstructL();
-
- return self;
- }
-
-// Destructor (virtual by CBase)
-T_PSetNotesUi::~T_PSetNotesUi()
- {
- }
-
-// Default constructor
-T_PSetNotesUi::T_PSetNotesUi()
- {
- }
-
-// Second phase construct
-void T_PSetNotesUi::ConstructL()
- {
- // The ConstructL from the base class CEUnitTestSuiteClass must be called.
- // It generates the test case table.
- CEUnitTestSuiteClass::ConstructL();
- }
-
-// METHODS
-
-
-void T_PSetNotesUi::SetupL( )
- {
- iContainer = CPsuiContainer::NewL();
- }
-
-
-void T_PSetNotesUi::Teardown( )
- {
- delete iContainer;
- }
-
-void T_PSetNotesUi::T_TestL()
- {
- }
-
-void T_PSetNotesUi::T_Test2L()
- {
- CPsuiWaitingObs* waitingObs = iContainer->CreateCWObsL();
- delete waitingObs;
- }
-
-void T_PSetNotesUi::T_Test3L()
- {
- CPsuiDivertObs* divertObs = iContainer->CreateCFObsL();
- delete divertObs;
- }
-
-void T_PSetNotesUi::T_Test4L()
- {
- CPsuiBarringObs* cbObs = iContainer->CreateCBObsL();
- delete cbObs;
- }
-
-void T_PSetNotesUi::T_Test5L()
- {
- CPsuiCliObserver* cliObs = iContainer->CreateCliObsL();
- delete cliObs;
- }
-
-// TEST TABLE
-EUNIT_BEGIN_TEST_TABLE(
- T_PSetNotesUi,
- "Add test suite description here.",
- "MODULE" )
-
-EUNIT_TEST(
- "CPsuiContainer::NewL",
- "",
- "CPsuiContainer::NewL",
- "FUNCTIONALITY",
- SetupL, T_TestL, Teardown)
-
-EUNIT_TEST(
- "CreateCWObsL",
- "",
- "CreateCWObsL",
- "FUNCTIONALITY",
- SetupL, T_Test2L, Teardown)
-
-EUNIT_TEST(
- "CreateCFObsL",
- "",
- "CreateCFObsL",
- "FUNCTIONALITY",
- SetupL, T_Test3L, Teardown)
-
-EUNIT_TEST(
- "CreateCBObsL",
- "",
- "CreateCBObsL",
- "FUNCTIONALITY",
- SetupL, T_Test4L, Teardown)
-
-EUNIT_TEST(
- "CreateCliObsL",
- "",
- "CreateCliObsL",
- "FUNCTIONALITY",
- SetupL, T_Test5L, Teardown)
-
-EUNIT_END_TEST_TABLE
-
-// END OF FILE
--- a/cellular/psetnotesui/tsrc/public/basic/Src/T_PSetNotesUi.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2006 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: Declaration of T_PSetNotesUi class.
-*
-*/
-
-
-#ifndef __T_PSETNOTESUI_H__
-#define __T_PSETNOTESUI_H__
-
-// EXTERNAL INCLUDES
-#include <CEUnitTestSuiteClass.h>
-#include <EUnitDecorators.h>
-
-
-// INTERNAL INCLUDES
-
-
-// FORWARD DECLARATIONS
-class CPsuiContainer;
-
-// CLASS DEFINITION
-/**
- * TODO Auto-generated EUnit test suite
- *
- */
-NONSHARABLE_CLASS( T_PSetNotesUi )
- : public CEUnitTestSuiteClass
- {
- public: // Constructors and destructors
-
- /**
- * Two phase construction
- */
- static T_PSetNotesUi* NewL();
- static T_PSetNotesUi* NewLC();
- /**
- * Destructor
- */
- ~T_PSetNotesUi();
-
- private: // Constructors and destructors
-
- T_PSetNotesUi();
- void ConstructL();
-
- private: // New methods
-
- void SetupL();
-
- void Teardown();
-
- void T_TestL();
- void T_Test2L();
- void T_Test3L();
- void T_Test4L();
- void T_Test5L();
- void T_Test6L();
- void T_Test7L();
-
-
- private: // Data
-
- CPsuiContainer* iContainer;
-
- EUNIT_DECLARE_TEST_TABLE;
-
- };
-
-#endif // __T_PSETNOTESUI_H__
-
-// End of file
--- a/cellular/psetnotesui/tsrc/public/basic/Src/T_PSetNotesUi_DllMain.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2006 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: Entry point for psetnotesui test.
-*
-*/
-
-
-// CLASS HEADER
-#include "T_PSetNotesUi.h"
-
-// EXTERNAL INCLUDES
-#include <CEUnitTestSuite.h>
-
-EXPORT_C MEUnitTest* CreateTestSuiteL()
- {
- return T_PSetNotesUi::NewL();
- }
-
-#ifndef EKA2
-GLDEF_C TInt E32Dll( TDllReason )
- {
- return KErrNone;
- }
-#endif
-
-// END OF FILE
--- a/cellular/psetnotesui/tsrc/public/basic/group/T_PSetNotesUi.mmp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2007 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: Project specification file
-*
-*/
-
-#include <platform_paths.hrh>
-
-TARGET T_PSetNotesUi.dll
-TARGETTYPE dll
-TARGETPATH /DigiaEUnit/Tests
-UID 0x1000af5a 0x01700000
-
-CAPABILITY ALL -TCB -DRM
-VENDORID VID_DEFAULT
-
-SOURCEPATH ../Src
-SOURCE T_PSetNotesUi.cpp
-
-// Sources required by the test suite
-SOURCEPATH ../Src
-SOURCE T_PSetNotesUi_DllMain.cpp
-
-USERINCLUDE ../Src
-
-SYSTEMINCLUDE /epoc32/include/Digia/EUnit
-MW_LAYER_SYSTEMINCLUDE
-
-
-LIBRARY EUnit.lib
-LIBRARY EUnitUtil.lib
-LIBRARY euser.lib
-LIBRARY psui.lib
-
-// End of file
--- a/cellular/psetnotesui/tsrc/public/basic/group/T_PSetNotesUi.pkg Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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: For packing psetnotesui test component.
-;
-; Supported languages
-&en
-
-; Package header (one name for each supported language)
-#{"T_PSetNotesUi"},(0x01700000),1,0,0
-
-;Localised Vendor name
-%{"Nokia Test EN"}
-
-;Unique Vendor name
-:"Vendor"
-
-;Key and certificate
-*"rd-key.pem","rd.cer"
-
-; Language independent files that are always installed
-"\epoc32\release\armv5\urel\T_PSetNotesUi.dll"-"C:\DigiaEUnit\Tests\T_PSetNotesUi.dll"
-"\epoc32\release\armv5\urel\T_PSetNotesUi.dll"-"C:\sys\bin\T_PSetNotesUi.dll"
Binary file cellular/psetnotesui/tsrc/public/basic/group/T_PSetNotesUi.sis has changed
--- a/cellular/psetnotesui/tsrc/public/basic/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2007 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: Build information file
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
- ARMV5 GCCE WINSCW
-
-PRJ_EXPORTS
-//../rom/T_PSetNotesUI.iby CORE_APP_LAYER_IBY_EXPORT_PATH(T_PSetNotesUI.iby)
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-T_PSetNotesUi.mmp
-
-
-// End of file
--- a/cellular/psetnotesui/tsrc/public/basic/rom/T_PSetNotesUI.iby Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2007 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: IBY file
- *
-*/
-
-#ifndef __T_PSETNOTESUI_IBY__
-#define __T_PSETNOTESUI_IBY__
-
-file= ABI_DIR\BUILD_DIR\T_PSetNotesUI.dll SHARED_LIB_DIR\T_PSetNotesUI.dll
-
-#endif
--- a/cellular/psuinotes/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:13 2010 +0300
+++ b/cellular/psuinotes/tsrc/run_auto_tests_qt.bat Mon Oct 04 15:57:13 2010 +0300
@@ -139,7 +139,7 @@
call qmake
call sbs --config winscw_udeb --keepgoing CLEAN
if [%INSTRUMENT%] EQU [TRUE] (
-call ctcwrap -2comp -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
) else (
call %SBS_CALL%
)
--- a/cellular/servicerequest/bmarm/servicerequestu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-EXPORTS
- NewL__15CServiceRequestR23MServiceRequestObserver @ 1 NONAME R3UNUSED ; CServiceRequest::NewL(MServiceRequestObserver &)
- ShowCompletionNoteL__15CServiceRequestiiQ215CServiceRequest13TSerqNoteTypeRC7TDesC16 @ 2 NONAME ; CServiceRequest::ShowCompletionNoteL(int, int, CServiceRequest::TSerqNoteType, TDesC16 const &)
- StartL__15CServiceRequestRC7TDesC16 @ 3 NONAME R3UNUSED ; CServiceRequest::StartL(TDesC16 const &)
- "_._15CServiceRequest" @ 4 NONAME R3UNUSED ; CServiceRequest::~CServiceRequest(void)
-
--- a/cellular/servicerequest/bwins/servicerequestu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-EXPORTS
- ??1CServiceRequest@@UAE@XZ @ 1 NONAME ; public: virtual __thiscall CServiceRequest::~CServiceRequest(void)
- ?NewL@CServiceRequest@@SAPAV1@AAVMServiceRequestObserver@@@Z @ 2 NONAME ; public: static class CServiceRequest * __cdecl CServiceRequest::NewL(class MServiceRequestObserver &)
- ?ShowCompletionNoteL@CServiceRequest@@QAEXHHW4TSerqNoteType@1@ABVTDesC16@@@Z @ 3 NONAME ; public: void __thiscall CServiceRequest::ShowCompletionNoteL(int,int,enum CServiceRequest::TSerqNoteType,class TDesC16 const &)
- ?StartL@CServiceRequest@@QAEXABVTDesC16@@@Z @ 4 NONAME ; public: void __thiscall CServiceRequest::StartL(class TDesC16 const &)
-
--- a/cellular/servicerequest/data/servicerequest.rss Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
-* Copyright (c) 2002 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: Resource file for general Service Request
-*
-*/
-
-
-
-// RESOURCE IDENTIFIER
-NAME SERQ
-
-// INCLUDES
-
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.hrh>
-#include <avkon.mbg>
-
-#include <avkon.loc>
-#include "servicerequest.hrh"
-
-RESOURCE RSS_SIGNATURE { }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_serq_requesting_wait_note
-// Wait dialog for the servivce request.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_serq_requesting_wait_note
- {
- flags = EAknWaitNoteFlags | EEikDialogFlagWait;
- buttons=R_AVKON_SOFTKEYS_QUIT;
- items=
- {
- DLG_LINE
- {
- type=EAknCtNote;
- id = ESerqRequestingNote;
- control= AVKON_NOTE
- {
- layout = EWaitLayout;
- singular_label = text_sending;
- animation = R_QGN_GRAF_WAIT_BAR_ANIM;
- };
- }
- };
- }
-
-// Used texts in notes:
-
-RESOURCE TBUF r_text_unconfirmed
- {
- buf = text_unconfirmed;
- }
-
-RESOURCE TBUF r_text_not_done
- {
- buf = text_not_done;
- }
-
-RESOURCE TBUF r_text_not_allowed
- {
- buf = text_not_allowed;
- }
-
-RESOURCE TBUF r_text_result_unknown
- {
- buf = text_result_unknown;
- }
-
-RESOURCE TBUF r_text_done
- {
- buf = text_done;
- }
-
-RESOURCE TBUF r_text_no_service
- {
- buf = text_no_service;
- }
-
-RESOURCE TBUF r_qtn_srvrq_info_confl
- {
- buf = qtn_srvrq_info_confl;
- }
-
-RESOURCE TBUF r_text_request_rejected
- {
- buf = text_request_rejected;
- }
-
-RESOURCE TBUF r_password_error_note
- {
- buf = qtn_mem_card_unlock_error;
- }
-
-// End of File
--- a/cellular/servicerequest/eabi/servicerequestu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
- _ZN15CServiceRequest19ShowCompletionNoteLEiiNS_13TSerqNoteTypeERK7TDesC16 @ 1 NONAME
- _ZN15CServiceRequest4NewLER23MServiceRequestObserver @ 2 NONAME
- _ZN15CServiceRequest6StartLERK7TDesC16 @ 3 NONAME
- _ZN15CServiceRequestD0Ev @ 4 NONAME
- _ZN15CServiceRequestD1Ev @ 5 NONAME
- _ZN15CServiceRequestD2Ev @ 6 NONAME
- _ZTI15CServiceRequest @ 7 NONAME
- _ZTV15CServiceRequest @ 8 NONAME
-
--- a/cellular/servicerequest/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2002 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: General Service Request module
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/cservicerequest.h |../../../inc/cservicerequest.h
-../inc/mservicerequestobserver.h |../../../inc/mservicerequestobserver.h
-../rom/servicerequest_stub.sis /epoc32/data/z/system/install/servicerequest_stub.sis
-../rom/servicerequest.iby CORE_APP_LAYER_IBY_EXPORT_PATH(servicerequest.iby)
-../rom/servicerequestresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(servicerequestresources.iby)
-
-PRJ_MMPFILES
-../group/servicerequest.mmp
-
-
-// End of File
--- a/cellular/servicerequest/group/servicerequest.mmp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2002-2004 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: General Service Request module
-*
-*/
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-// Capability assignment.
-CAPABILITY CAP_GENERAL_DLL
-
-TARGET servicerequest.dll
-TARGETTYPE DLL
-UID 0x1000008d 0x10005A3D
-VERSION 10.0
-
-SOURCEPATH ../src
-SOURCE cservicerequest.cpp
-
-// Resource files
-START RESOURCE ../data/servicerequest.rss
-TARGETPATH RESOURCE_FILES_DIR
-HEADER
-LANGUAGE_IDS
-END
-
-USERINCLUDE ../inc
-
-SYSTEMINCLUDE ../../../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib cone.lib avkon.lib commonengine.lib
-LIBRARY aknnotify.lib
-
-// End of file
--- a/cellular/servicerequest/inc/cservicerequest.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-/*
-* Copyright (c) 2002 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: Interface for service request
-*
-*/
-
-
-
-#ifndef CSERVICEREQUEST_H
-#define CSERVICEREQUEST_H
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-#include <AknProgressDialog.h>
-
-// FORWARD DECLARATIONS
-class MServiceRequestObserver;
-class CAknWaitDialog;
-class RConeResourceLoader;
-
-// CLASS DECLARATION
-
-/**
-* Interface for service request
-*
-* -Create instance by calling the static NewL method. User must implement the
-* observer interface MServiceRequestObserver. Cancelling the wait note is
-* informed through this API.
-*
-* iServiceRequest = CServiceRequest::NewL( *this );
-*
-*
-* -The instance can be deleted at any time and all notes are dismissed.
-*
-* delete iServiceRequest;
-*
-*
-* -The wait note can be launched by calling StartL function:
-*
-* iServiceRequest->StartL();
-*
-* By default the text "Requesting" is used, but the user may give the text
-* as a parameter:
-*
-* iServiceRequest->StartL( _L("Please wait...") );
-*
-* Call to the StartL function will delete own notes visible at the call time.
-*
-*
-* -Wait note can deleteted by calling the ShowCompletionNoteL function. This removes
-* all own notes. If the user wants to show a completion note for the request,
-* the parameter aShowNote must be set to ETrue. Creation of a new note may leave.
-* By deafult the Supplementary Service UI specification texts and note types are
-* used. The user may override some parameters, like note type and text. By default,
-* the error code is converted into note, e.g.:
-* KErrNone, Global confirmation note "Done"
-* KErrCancel, Local information note "Request not confirmed"
-* KErrAccessDenied, Global information note "Not allowed"
-* and so on.
-*
-*
-*
-* @lib ServiceRequest.lib
-* @since 1.2
-*/
-class CServiceRequest : public CActive, public MProgressDialogCallback
- {
- public: // Constructors and destructor
-
- // Used note types
- enum TSerqNoteType
- {
- ESerqDefault,
- ESerqLocalInformationNote,
- ESerqLocalConfirmationNote,
- ESerqGlobalInformationNote,
- ESerqGlobalErrorNote,
- ESerqGlobalConfirmationNote
- };
-
-
- /**
- * Two-phased constructor.
- * @param aObserver Oberver to inform cancelling.
- * @return New CServiceRequest object.
- */
- IMPORT_C static CServiceRequest* NewL( MServiceRequestObserver& aObserver );
-
- /**
- * Destructor.
- */
- IMPORT_C virtual ~CServiceRequest();
-
- public: // New functions
-
- /**
- * Starts a wait note.
- * @since 1.2
- * @param aText "Requesting" text is used, if this descriptor's
- * lenght is zero.
- */
- IMPORT_C void StartL( const TDesC& aText = KNullDesC() );
-
- /**
- * Removes wait note and shows new note if wanted.
- * If aShowNote = EFalse, this function won't leave!
- * Removal of the wait note is guaranteed in leave cases also.
- * @since 1.2
- * @param aShowNote ETrue: a note is shown
- * EFalse: no additional note is shown
- * @param aError Used in default notes. The default note type and used
- * text is decided based on this value. These vales are
- * overridden if note type or used text is geven as a
- * parameter.
- * @param aNoteType Type of the note. If EDefault is used, then the
- * aError parameter is checked.
- * @param aText Given text. If lenght is zero, aError parameter is checked.
- */
- IMPORT_C void ShowCompletionNoteL(
- TBool aShowNote = ETrue,
- TInt aError = KErrNone,
- TSerqNoteType aNoteType = ESerqDefault,
- const TDesC& aText = KNullDesC() );
-
- protected: // From baseclasses
-
- // From MProgressDialogCallback
- void DialogDismissedL( TInt aButtonId );
-
- // From CActive
- void RunL();
-
- // From CActive
- void DoCancel();
-
- /**
- * From CActive
- * @param aError
- * @return TInt
- */
- TInt RunError(TInt aError);
-
- private:
-
- /**
- * C++ default constructor.
- */
- CServiceRequest( MServiceRequestObserver& aObserver );
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- /**
- * Zeroes data members
- */
- void Reset();
-
- /**
- * Gets default note implementation for give error value.
- */
- static void GetDefaultNote(
- const TInt aError ,
- TSerqNoteType& aNoteType ,
- TInt& aResourceId );
-
- /**
- * Launches given note. Text is fetched from iNoteText.
- */
- void LaunchNoteL( const TSerqNoteType aNoteType);
-
- private: // Data
- // Service request observer
- MServiceRequestObserver& iObserver;
-
- // Requesting wait note:
- CAknWaitDialog* iRequestingNote;
-
- // Resource loader
- RConeResourceLoader* iResourceLoader;
-
- // Text for note
- HBufC* iNoteText;
-
- // Enables instance deletion in call back.
- TBool* iDestroyed;
-
- // Reserved pointer for future extension
- TAny* iReserved;
- };
-
-#endif // CSERVICEREQUEST_H
-
-// End of File
--- a/cellular/servicerequest/inc/mservicerequestobserver.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2002 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: Observer interface for service request
-*
-*/
-
-
-
-#ifndef MSERVICEREQUESTOBSERVER_H
-#define MSERVICEREQUESTOBSERVER_H
-
-// CLASS DECLARATION
-
-/**
-* Observer interface for service request
-*
-* @lib ServiceRequest.lib
-* @since 1.2
-*/
-class MServiceRequestObserver
- {
- public: // New functions
-
- /**
- * Called when user cancel the service request.
- * @since 1.2
- * @param aCancelledWithEscape ETrue: cancalled with esc key.
- * EFalse: cancelled with softkey (normal).
- */
- virtual void MServiceRequestNoteCancelledL(
- TBool aCancelledWithEscape ) = 0;
- };
-
-#endif // MSERVICEREQUESTOBSERVER_H
-
-// End of File
--- a/cellular/servicerequest/inc/servicerequest.hrh Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2002 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: Definitions used in Service Request module
-*
-*/
-
-
-#ifndef SERVICEREQUEST_HRH
-#define SERVICEREQUEST_HRH
-
-
-// DATA TYPES
-enum TSerqNotes
- {
- ESerqRequestingNote = 1
- };
-
-#endif
-
-// End of File
--- a/cellular/servicerequest/rom/servicerequest.iby Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2005 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 __SERVICEREQUEST_IBY__
-#define __SERVICEREQUEST_IBY__
-
-file=ABI_DIR\BUILD_DIR\servicerequest.dll SHARED_LIB_DIR\servicerequest.dll
-
-data=ZSYSTEM\install\servicerequest_stub.sis System\Install\servicerequest_stub.sis
-
-#endif
--- a/cellular/servicerequest/rom/servicerequest_stub.pkg Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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:
-;
-; servicerequest_stub.pkg
-
-; Languages
-&EN
-
-; Header
-#{"servicerequest"},(0x10005A3D),1,0,0,TYPE=SA
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Target
-
-""-"z:\sys\bin\servicerequest.dll"
-""-"z:\resource\ServiceRequest.rsc"
Binary file cellular/servicerequest/rom/servicerequest_stub.sis has changed
--- a/cellular/servicerequest/rom/servicerequestresources.iby Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2005 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 __SERVICEREQUESTRESOURCES_IBY__
-#define __SERVICEREQUESTRESOURCES_IBY__
-
-data=DATAZ_\RESOURCE_FILES_DIR\SERVICEREQUEST.rsc RESOURCE_FILES_DIR\SERVICEREQUEST.rsc
-
-#endif
--- a/cellular/servicerequest/src/cservicerequest.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,401 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: Interface for service request
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "cservicerequest.h"
-#include "mservicerequestobserver.h"
-#include <servicerequest.rsg>
-
-#include <AknWaitDialog.h>
-#include <AknGlobalNote.h>
-#include <aknnotewrappers.h>
-#include <avkon.hrh>
-
-#include <StringLoader.h>
-#include <gsmerror.h>
-#include <exterror.h>
-#include <ConeResLoader.h>
-#include <textresolver.h>
-
-
-// CONSTANTS
-_LIT( KSerqResourcesWithFullPath,"z:\\resource\\ServiceRequest.rsc" );
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::CServiceRequest
-// C++ default constructor can NOT contain any code that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CServiceRequest::CServiceRequest( MServiceRequestObserver& aObserver )
-: CActive(EPriorityStandard) , iObserver( aObserver )
- {
- CActiveScheduler::Add( this );
- }
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CServiceRequest::ConstructL()
- {
- iResourceLoader = new(ELeave) RConeResourceLoader( *CCoeEnv::Static() );
- TFileName fileName( KSerqResourcesWithFullPath );
- iResourceLoader->OpenL(fileName);
- }
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CServiceRequest* CServiceRequest::NewL( MServiceRequestObserver& aObserver )
- {
- CServiceRequest* self = new( ELeave ) CServiceRequest( aObserver );
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
-
- return self;
- }
-
-// Destructor
-EXPORT_C CServiceRequest::~CServiceRequest()
- {
- Reset();
-
- if ( iResourceLoader )
- {
- iResourceLoader->Close();
- }
- delete iResourceLoader;
- iResourceLoader = NULL;
-
- // If instance is deleted in call back - inform the function.
- if ( iDestroyed )
- {
- *iDestroyed = ETrue;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::Reset
-// Deletes used member data
-// -----------------------------------------------------------------------------
-//
-void CServiceRequest::Reset()
- {
- Cancel();
-
- delete iRequestingNote;
- iRequestingNote = NULL;
-
- delete iNoteText;
- iNoteText = NULL;
- }
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::StartL
-// Launches the request note.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CServiceRequest::StartL( const TDesC& aText )
- {
-
- // delete possible old data:
- Reset();
-
- // Choose alternative "requesting" text if given
- if ( aText.Length() )
- {
- iNoteText = aText.AllocL();
- }
-
- // Create note and launch it.
- CAknWaitDialog* requestingNote = new(ELeave) CAknWaitDialog(
- (REINTERPRET_CAST(CEikDialog**,&iRequestingNote)) , ETrue );
- iRequestingNote = requestingNote;
- requestingNote->PrepareLC( R_SERQ_REQUESTING_WAIT_NOTE );
- if ( iNoteText )
- {
- requestingNote->SetTextL( iNoteText->Des() );
- }
- requestingNote->SetCallback( this );
- requestingNote->RunLD();
- }
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::DialogDismissedL
-// Called when the note is cancelled. Observer call made asyncronously.
-// -----------------------------------------------------------------------------
-//
-void CServiceRequest::DialogDismissedL( TInt aButtonId )
- {
- Cancel();
-
- if ( aButtonId == EAknSoftkeyQuit || aButtonId == EEikBidCancel )
- {
- // Activate new request
- TRequestStatus* status = &iStatus;
- User::RequestComplete( status, aButtonId );
- SetActive();
- }
- }
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::ShowCompletionNoteL
-// Removes the wait note and shows another note if needed.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CServiceRequest::ShowCompletionNoteL(
- TBool aShowNote,
- TInt aError,
- TSerqNoteType aNoteType,
- const TDesC& aText )
- {
- // delete old instances
- Reset();
-
- // if new notes are not required
- if ( !aShowNote )
- {
- return;
- }
-
- // Check default note appearance
- TInt defaultTextId;
- TSerqNoteType defaultNoteType;
- GetDefaultNote( aError , defaultNoteType , defaultTextId );
-
- // Choose text
- if ( aText.Length() )
- {
- iNoteText = aText.AllocL();
- }
- else
- {
- // read from resources
- iNoteText = StringLoader::LoadL( defaultTextId, CCoeEnv::Static() );
- }
-
- // Choose note type
- TSerqNoteType noteType;
- if ( aNoteType != ESerqDefault )
- {
- noteType = aNoteType;
- }
- else
- {
- noteType = defaultNoteType;
- }
-
- // Start note
- LaunchNoteL( noteType );
- }
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::GetDefaultNote
-// Decides note type based on the given error value.
-// -----------------------------------------------------------------------------
-//
-void CServiceRequest::GetDefaultNote(
- const TInt aError,
- TSerqNoteType& aNoteType,
- TInt& aResourceId )
- {
- switch ( aError )
- {
- case KErrNone:
- aResourceId = R_TEXT_DONE;
- aNoteType = ESerqGlobalConfirmationNote;
- break;
- case KErrCancel:
- aResourceId = R_TEXT_UNCONFIRMED;
- aNoteType = ESerqLocalInformationNote;
- break;
- case KErrInUse:
- case KErrAccessDenied:
- case KErrGsmSSUnknownSubscriber:
- case KErrGsmSSAbsentSubscriber:
- case KErrGsmSSIllegalOperation:
- case KErrGsmSSIllegalSubscriber:
- case KErrGsmSSSubscriptionViolation:
- case KErrGsmSSIllegalEquipment:
- aResourceId = R_TEXT_NOT_ALLOWED;
- aNoteType = ESerqGlobalInformationNote;
- break;
- case KErrGsmSSCallBarred:
- case KErrGsmSSIncompatibility:
- aResourceId = R_QTN_SRVRQ_INFO_CONFL;
- aNoteType = ESerqGlobalInformationNote;
- break;
- case KErrGsmSSSystemFailure:
- aResourceId = R_TEXT_RESULT_UNKNOWN;
- aNoteType = ESerqGlobalInformationNote;
- break;
- case KErrGsmSSErrorStatus:
- case KErrGsmSSUnexpectedDataValue:
- case KErrGsmSSResourcesUnavailable:
- aResourceId = R_TEXT_REQUEST_REJECTED;
- aNoteType = ESerqGlobalInformationNote;
- break;
- case KErrGsmSSPasswordAttemptsViolation:
- case KErrGsmSSNegativePasswordCheck:
- case KErrGsmSSPasswordRegistrationFailure:
- aResourceId = R_PASSWORD_ERROR_NOTE;
- aNoteType = ESerqGlobalErrorNote;
- break;
- case KErrGsmNoService:
- aResourceId = R_TEXT_NO_SERVICE;
- aNoteType = ESerqGlobalInformationNote;
- break;
- default:
- aResourceId = R_TEXT_NOT_DONE;
- aNoteType = ESerqGlobalInformationNote;
- break;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::LaunchNoteL
-// Launches given note type. Text is got from iNoteText member variable.
-// -----------------------------------------------------------------------------
-//
-void CServiceRequest::LaunchNoteL( const TSerqNoteType aNoteType)
- {
-
- switch ( aNoteType )
- {
- case ESerqLocalInformationNote:
- case ESerqLocalConfirmationNote:
- {
- CAknResourceNoteDialog* dlg = NULL;
- if ( aNoteType == ESerqLocalInformationNote )
- {
- dlg = new ( ELeave ) CAknInformationNote( ETrue );
- }
- else
- {
- dlg = new ( ELeave ) CAknConfirmationNote( ETrue );
- }
- dlg->ExecuteLD( iNoteText->Des() );
-
- delete iNoteText;
- iNoteText = NULL;
- break;
- }
- case ESerqGlobalInformationNote:
- case ESerqGlobalErrorNote:
- case ESerqGlobalConfirmationNote:
- {
- CAknGlobalNote* dlg = CAknGlobalNote::NewLC();
- if ( aNoteType == ESerqGlobalInformationNote )
- {
- dlg->ShowNoteL( EAknGlobalInformationNote , iNoteText->Des() );
- }
- else if ( aNoteType == ESerqGlobalErrorNote )
- {
- dlg->ShowNoteL( EAknGlobalErrorNote , iNoteText->Des() );
- }
- else
- {
- dlg->ShowNoteL( EAknGlobalConfirmationNote , iNoteText->Des() );
- }
- CleanupStack::PopAndDestroy( dlg );
- delete iNoteText;
- iNoteText = NULL;
- break;
- }
- default:
- User::Invariant();
- break;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::RunL
-// Calls observer interface to tell that the notes has been dismissed.
-// -----------------------------------------------------------------------------
-//
-void CServiceRequest::RunL()
- {
- __ASSERT_ALWAYS( !iDestroyed, User::Invariant() );
-
- TBool destr = EFalse; // Destructor changes to ETrue if deleted.
- iDestroyed = &destr;
-
- // Object still exists and the note is cancelled:
- TRAPD( error ,
- iObserver.MServiceRequestNoteCancelledL( iStatus.Int() == EEikBidCancel ) );
-
- // All OK
- if ( error == KErrNone )
- {
- if ( !destr )
- {
- iDestroyed = NULL;
- }
- return;
- }
-
- // We got an error value.
- if ( !destr )
- {
- iDestroyed = NULL;
- User::Leave( error );
- }
- else
- {
- CTextResolver* textResolver = CTextResolver::NewLC();
- HBufC* buffer = textResolver->ResolveErrorString( error ).AllocLC();
- CAknGlobalNote* note = CAknGlobalNote::NewLC();
- note->ShowNoteL( EAknGlobalErrorNote, *buffer );
- CleanupStack::PopAndDestroy( note );
- CleanupStack::PopAndDestroy( buffer );
- CleanupStack::PopAndDestroy( textResolver );
- }
- }
-
-// ---------------------------------------------------------
-// CServiceRequest::RunError
-// Called when RunL leaves
-// (other items were commented in a header).
-// ---------------------------------------------------------
-//
-TInt CServiceRequest::RunError( TInt /*aError*/ )
- {
- return KErrNone;
- }
-
-
-// -----------------------------------------------------------------------------
-// CServiceRequest::DoCancel
-// Does nothing. Must be implemented due inheritance.
-// -----------------------------------------------------------------------------
-//
-void CServiceRequest::DoCancel()
- {
- }
-
-// End of File
--- a/cellular/sssettings/xqbindings/sssettingswrapper/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:13 2010 +0300
+++ b/cellular/sssettings/xqbindings/sssettingswrapper/tsrc/run_auto_tests_qt.bat Mon Oct 04 15:57:13 2010 +0300
@@ -139,7 +139,7 @@
call qmake
call sbs --config winscw_udeb --keepgoing CLEAN
if [%INSTRUMENT%] EQU [TRUE] (
-call ctcwrap -2comp -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
) else (
call %SBS_CALL%
)
@@ -169,7 +169,7 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::
:CALCULATECOVERAGE
echo Calculating coverage
-ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym -p - | ctcmerge -i - -o profile.txt
call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
goto end
--- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:13 2010 +0300
+++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/run_auto_tests_qt.bat Mon Oct 04 15:57:13 2010 +0300
@@ -139,7 +139,7 @@
call qmake
call sbs --config winscw_udeb --keepgoing CLEAN
if [%INSTRUMENT%] EQU [TRUE] (
-call ctcwrap -2comp -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
) else (
call %SBS_CALL%
)
--- a/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/cellular/telephonysettings/xqbindings/psetwrapper/tsrc/ut_psetcalldivertingwrapper/ut_psetcalldivertingwrapper.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -408,7 +408,7 @@
int ret;
expect("CVoiceMailbox::GetStoredEntry").returns(-2).times(1);
ret = mWrapper->queryVoiceMailBoxNumber(defNumber, ServiceGroupVoice);
- QCOMPARE(ret, 0);
+ QCOMPARE(ret, -2);
// Fail case #2, Not supported.
expect("CVoiceMailbox::GetStoredEntry").returns(-5).times(1);
@@ -419,7 +419,7 @@
expect("CVoiceMailbox::GetStoredEntry").times(1);
expect("CVoiceMailbox::QueryNewEntry").returns(-5).times(1);
ret = mWrapper->queryVoiceMailBoxNumber(defNumber, ServiceGroupVoice);
- QCOMPARE(ret, 0);
+ QCOMPARE(ret, -5);
// Fail case #4, save nok
expect("CVoiceMailbox::GetStoredEntry").returns(-1).times(1);
@@ -586,8 +586,10 @@
spy.clear();
// With list, two entries
- delete cfList;
QT_TRAP_THROWING(cfList = CMobilePhoneCFList::NewL());
+ //delete old cfList and put new in the QScopedPointer;
+ cfListDeleter.reset( cfList );
+
entry.iStatus = RMobilePhone::ECallForwardingStatusNotActive;
entry.iCondition = RMobilePhone::ECallForwardingBusy;
cfList->AddEntryL(entry); // Takes copy
--- a/convergedcallengine/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ b/convergedcallengine/group/bld.inf Mon Oct 04 15:57:13 2010 +0300
@@ -26,7 +26,6 @@
#include "../cce/group/bld.inf"
#include "../spsettings/group/bld.inf"
#include "../cenrepdatabase/group/bld.inf"
-#include "../serviceselector/group/bld.inf"
PRJ_TESTMMPFILES
--- a/convergedcallengine/serviceselector/bwins/serviceselectoru.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-EXPORTS
- ?NewL@CConvergedServiceSelector@@SAPAV1@XZ @ 1 NONAME ; class CConvergedServiceSelector * CConvergedServiceSelector::NewL(void)
- ?GetCallingServiceByCallType@CConvergedServiceSelector@@QAEHAAVTSsResult@1@W4TSsCallType@1@IHABVTDesC16@@@Z @ 2 NONAME ; int CConvergedServiceSelector::GetCallingServiceByCallType(class CConvergedServiceSelector::TSsResult &, enum CConvergedServiceSelector::TSsCallType, unsigned int, int, class TDesC16 const &)
- ?CancelSelection@CConvergedServiceSelector@@QAEXXZ @ 3 NONAME ; void CConvergedServiceSelector::CancelSelection(void)
- ??1CConvergedServiceSelector@@UAE@XZ @ 4 NONAME ; CConvergedServiceSelector::~CConvergedServiceSelector(void)
-
--- a/convergedcallengine/serviceselector/eabi/serviceselectoru.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
- _ZN25CConvergedServiceSelector15CancelSelectionEv @ 1 NONAME
- _ZN25CConvergedServiceSelector27GetCallingServiceByCallTypeERNS_9TSsResultENS_11TSsCallTypeEjiRK7TDesC16 @ 2 NONAME
- _ZN25CConvergedServiceSelector4NewLEv @ 3 NONAME
- _ZN25CConvergedServiceSelectorD0Ev @ 4 NONAME
- _ZN25CConvergedServiceSelectorD1Ev @ 5 NONAME
- _ZN25CConvergedServiceSelectorD2Ev @ 6 NONAME
- _ZTI25CConvergedServiceSelector @ 7 NONAME ; #<TI>#
- _ZTV25CConvergedServiceSelector @ 8 NONAME ; #<VT>#
-
--- a/convergedcallengine/serviceselector/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2005 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: ServiceSelector bld file
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-// Header files
-../inc/cconvergedserviceselector.h MW_LAYER_PLATFORM_EXPORT_PATH(cconvergedserviceselector.h)
-
-// LOC files
-../loc/serviceselector.loc MW_LAYER_LOC_EXPORT_PATH(serviceselector.loc)
-
-// IBY files
-../rom/serviceselector.iby CORE_MW_LAYER_IBY_EXPORT_PATH(serviceselector.iby)
-../rom/serviceselectorresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(serviceselectorresources.iby)
-
-// Stub sis file
-../rom/serviceselector_stub.sis /epoc32/data/z/system/install/serviceselector_stub.sis
-
-PRJ_MMPFILES
-serviceselector.mmp
-
-
-// End of File
--- a/convergedcallengine/serviceselector/group/serviceselector.mmp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* Copyright (c) 2008 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: Project specification file for Service Selector dll
-*
-*/
-
-
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-TARGET serviceselector.dll
-TARGETTYPE dll
-UID 0x1000008d 0x20019532
-VENDORID VID_DEFAULT
-VERSION 10.0
-CAPABILITY CAP_GENERAL_DLL
-
-SOURCEPATH ../src
-
-SOURCE cconvergedserviceselector.cpp
-SOURCE cssconnectionhandler.cpp
-SOURCE cssuiutilities.cpp
-SOURCE cssserviceutilities.cpp
-SOURCE cssservicehandlergsm.cpp
-SOURCE cssservicehandlervoice.cpp
-SOURCE cssservicehandlervoip.cpp
-SOURCE csslistquerydialog.cpp
-SOURCE csssettingshandler.cpp
-SOURCE cssnotedialog.cpp
-SOURCE cssbshandler.cpp
-SOURCE cssiconfileprovider.cpp
-
-USERINCLUDE ../inc
-USERINCLUDE ../srcdata
-USERINCLUDE ../loc
-
-MW_LAYER_SYSTEMINCLUDE // MW layer includes
-
-LANG SC
-SOURCEPATH ../srcdata
-
-START RESOURCE serviceselector.rss
-TARGETPATH RESOURCE_FILES_DIR
-HEADER
-LANGUAGE_IDS
-END
-
-LIBRARY euser.lib
-LIBRARY featmgr.lib // Feature manager.
-LIBRARY flogger.lib // For logging.
-// <-- QT PHONE START -->
-//LIBRARY cch.lib // Converged connection handler client API
-// <-- QT PHONE END -->
-LIBRARY serviceprovidersettings.lib // For service settings
-LIBRARY avkon.lib // For UI queries
-LIBRARY eikdlg.lib // For UI queries
-LIBRARY eikctl.lib // For UI queries
-LIBRARY cone.lib
-LIBRARY eikcoctl.lib // menu bar
-LIBRARY eikcore.lib
-LIBRARY bafl.lib // For CDesArrays
-LIBRARY commonengine.lib // For stringloader
-LIBRARY aknicon.lib
-LIBRARY egul.lib
-LIBRARY bsclient.lib
-LIBRARY aknskins.lib
-LIBRARY efsrv.lib
-
-// End of file
-
--- a/convergedcallengine/serviceselector/inc/cconvergedserviceselector.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CConvergedServiceSelector class.
-*
-*/
-
-
-
-#ifndef CCONVERGEDSERVICESELECTOR_H
-#define CCONVERGEDSERVICESELECTOR_H
-
-// INCLUDES
-#include <e32base.h>
-
-// CONSTANTS
-//None
-
-// MACROS
-//None
-
-// DATA TYPES
-//None.
-
-// FUNCTION PROTOTYPES
-//None
-
-// FORWARD DECLARATIONS
-class CServiceHandler;
-
-// CLASS DECLARATION
-
-/**
-* Interface class for telephone to fetch calling service.
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-class CConvergedServiceSelector
- : public CBase
- {
-
- public: // Enum and class.
-
- /** Different type of calls. */
- enum TSsCallType
- {
- ESsVoiceCall = 0, // Voice call.
- ESsVideoCall = 1, // Video call.
- ESsVoipCall = 2 // Voip call.
- };
-
- /** Class for the results of the service selection.*/
- class TSsResult
- {
- public:
- // Call type
- TSsCallType iCallType;
- // Service id
- TUint iServiceId;
- // Current registration status
- // of the service
- TBool iServiceEnabled;
-
-
- };
-
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- IMPORT_C static CConvergedServiceSelector* NewL();
-
- /**
- * Destructor.
- */
- IMPORT_C virtual ~CConvergedServiceSelector();
-
- public: // New functions
-
- /**
- * Makes service selection for the call.
- * -If voice call is made by sendkey the call type may be changed as voip if
- * there is preferred voip service available.
- * -For voip calls checks the current connection status for the services and
- * shows the confirmation queries (if needed) for the service registration.
- * @param aResult Selection results are returned by this param.
- * @param aCallType Current type of the call.
- * @param aServiceId Current service of the call.
- * @param aSendKey Optional parameter if call is started by SendKey.
- * @param aString Phone number/address for call.
- * @return Error code indicating the success of the selection.
- * KErrCancel if the user cancels a list/confirmation queries.
- */
- IMPORT_C TInt GetCallingServiceByCallType(
- TSsResult& aResult,
- TSsCallType aCallType,
- TUint aServiceId,
- TBool aSendKey = ETrue,
- const TDesC& aString = KNullDesC );
-
- /**
- * Cancels selection.
- * -Dismiss dialogs if any is currently shown and cancels the selection.
- * -Selection can be canceled by deleting the
- * CConvergedServiceSelector instance also.
- */
- IMPORT_C void CancelSelection();
-
- private: // New functions
-
-
- void DoGetCallingServiceByCallTypeL(
- TSsResult& aResult,
- TSsCallType aCallType,
- TUint aServiceId,
- TBool aSendKey,
- const TDesC& aString );
-
- private:
-
- /**
- * C++ default constructor.
- */
- CConvergedServiceSelector();
-
-
- private: // Data
-
- CServiceHandler* iHandler;
-
- };
-
-#endif // CCONVERGEDSERVICESELECTOR_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/cservicehandler.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : MServiceHandler class.
-*
-*/
-
-
-
-#ifndef CSERVICEHANDLER_H
-#define CSERVICEHANDLER_H
-
-// INCLUDES
-#include "cconvergedserviceselector.h"
-
-
-// CONSTANTS
-//None
-
-// MACROS
-//None
-
-// DATA TYPES
-//None.
-
-// FUNCTION PROTOTYPES
-//None
-
-// FORWARD DECLARATIONS
-//None
-
-// CLASS DECLARATION
-
-/**
-* Interface class for service handlers
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-class CServiceHandler
- : public CBase
- {
-
- public: // New functions
-
- /**
- * Interface method for service handlers.
- * -Leaves on failure, Leaves with error KErrCancel if the user
- * cancels some of the queries.
- * @param aResult Selection results are returned by this param.
- * @param aCallType Current type of the call.
- * @param aServiceId Service id of the call ( 0 meens not set ).
- * @param aSendKey Is sendkey used for call.
- * @param aString Phone number/address for call.
- */
- virtual void ExecuteServiceSelectionL(
- CConvergedServiceSelector::TSsResult& aResult,
- CConvergedServiceSelector::TSsCallType aCallType,
- TUint aServiceId,
- TBool aSendKey,
- const TDesC& aString = KNullDesC ) = 0;
-
- /**
- * Destructor.
- */
- virtual ~CServiceHandler(){};
-
- };
-
-#endif // CSERVICEHANDLER_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/cssbshandler.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +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: This file contains the header file of the
-* : CSsBsHandler class.
-*
-*/
-
-#ifndef C_SSBSHANDLER_H
-#define C_SSBSHANDLER_H
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-#include <fbs.h>
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// DATA TYPES
-// None
-
-// FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-
-
-// CLASS DECLARATION
-
-/**
- * CSsBsHandler declaration.
- *
- * @since S60 5.0
- */
-NONSHARABLE_CLASS( CSsBsHandler ) : public CBase
- {
-
-public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- static CSsBsHandler* NewL();
-
- /**
- * Two-phased constructor.
- */
- static CSsBsHandler* NewLC();
-
- /**
- * Destructor.
- */
- virtual ~CSsBsHandler();
-
-public: // New functions
-
- /**
- * Get branded icon
- * @param aBrandingId Brandind Id.
- * @param aBrandedBitmap Branded bitmap.
- * @param aBrandedBitmapMask Bitmap mask.
- */
- void GetBrandedIconL( const TDesC8& aBrandingId,
- CFbsBitmap*& aBrandedBitmap,
- CFbsBitmap*& aBrandedBitmapMask ) const;
-
-private:
-
- /**
- * C++ default constructor.
- */
- CSsBsHandler();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- };
-
-#endif // C_SSBSHANDLER_H
-
-// End of file
--- a/convergedcallengine/serviceselector/inc/cssconnectionhandler.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CSsConnectionHandler class.
-*
-*/
-
-
-#ifndef CSSCONNECTIONHANDLER_H
-#define CSSCONNECTIONHANDLER_H
-
-// INCLUDES
-#include <e32base.h>
-
-// FORWARD DECLARATIONS
-// None
-
-// CLASS DECLARATION
-
-/**
-* Interface to get registration info for services.
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-NONSHARABLE_CLASS( CSsConnectionHandler )
- : public CBase
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- static CSsConnectionHandler* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CSsConnectionHandler();
-
- public: // New functions
-
- /**
- * Checks is the service registered.
- * @param aServiceId Id of the service.
- * @return ETrue if service registered.
- */
- TBool IsVoipServiceRegistered( TUint aServiceId ) const;
-
- private: // New functions
-
- /**
- * C++ default constructor.
- */
- CSsConnectionHandler();
-
- /**
- * Constructor, second phase.
- */
- void ConstructL();
-
- private: // Data
-
-
- };
-
-#endif // CSSCONNECTIONHANDLER_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/cssiconfileprovider.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CSsIconFileProvider class.
-*
-*/
-
-#ifndef C_SSICONFILEPROVIDER_H
-#define C_SSICONFILEPROVIDER_H
-
-#include <e32base.h>
-#include <AknIconUtils.h>
-
-/**
- * Declarition of CSsIconFileProvider.
- *
- * @since S60 v5.0
- */
-NONSHARABLE_CLASS( CSsIconFileProvider ) : public CBase,
- public MAknIconFileProvider
- {
- public:
-
- /**
- * Two-phased constructor.
- * @param aFile for handle to file
- */
- static CSsIconFileProvider* NewL( RFile& aFile );
-
- /**
- * Destructor.
- */
- virtual ~CSsIconFileProvider();
-
- public: // from base class MAknIconFileProvider
-
- /**
- * from MAknIconFileProvider.
- */
- void RetrieveIconFileHandleL( RFile& aFile, const TIconFileType aType );
-
- /**
- * from MAknIconFileProvider.
- */
- void Finished();
-
- private:
-
- /**
- * C++ default constructor.
- */
- CSsIconFileProvider();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL( RFile& aFile );
-
- private: // data
-
- // File handle. Own.
- RFile iFile;
-
- };
-
-#endif // C_SSICONFILEPROVIDER_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/csslistquerydialog.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CSsListQueryDialog class.
-*
-*/
-
-
-
-#ifndef CSSLISTQUERYDIALOG_H
-#define CSSLISTQUERYDIALOG_H
-
-// INCLUDES
-#include <aknlistquerydialog.h>
-
-// CONSTANTS
-//None
-
-// MACROS
-//None
-
-// DATA TYPES
-//None.
-
-// FUNCTION PROTOTYPES
-//None
-
-// FORWARD DECLARATIONS
-//None
-
-// CLASS DECLARATION
-
-/**
-* List query class for service selector
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-NONSHARABLE_CLASS( CSsListQueryDialog )
- : public CAknListQueryDialog
- {
- public: // Constructors and destructor
-
- /**
- * C++ constructor.
- * @param aSelf pointer to itself.
- * @param aIndex Index for user selection.
- */
- CSsListQueryDialog( CEikDialog** aSelf, TInt& aIndex );
-
- /**
- * Destructor.
- */
- virtual ~CSsListQueryDialog();
-
- public: // New functions
-
- /**
- * Executes the list query.
- * @param aResourceId Resource for the list query.
- * @param aItemTextArray Item array. Ownership not
- * trasferred.
- * @param aIcons Icon array. Ownership transferred.
- * @return Id of the key. 0 if list canceled.
- */
- TInt ExecuteListLD( TInt aResourceId,
- MDesCArray* aItemTextArray,
- CArrayPtr<CGulIcon>* aIcons );
-
-
- private: // Data
-
- // Pointer to itself.
- CEikDialog** iSelf;
-
- };
-
-#endif // CSSLISTQUERYDIALOG_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/csslogger.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
-* Copyright (c) 2008 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 macros for logging
-*
-*/
-
-
-
-#ifndef __CSSLOGGER_H__
-#define __CSSLOGGER_H__
-
-// INCLUDES
-#include <e32def.h>
-
-
-/*
- * CodeScanner warnings "codingstandarts: use of #if in .h files
- * (not as main include guards)".
- * Warnings ignored from the logger file.
- */
-#ifndef _DEBUG
-
-/***************************
-* Logging method variants:
-* 0 = No logging
-* 1 = Flogger
-* 2 = RDebug
-***************************/
-
-#define CSS_LOGGING_METHOD 0 // UREL BUILD
-
-#else
-
-#ifdef __WINS__
-#define CSS_LOGGING_METHOD 2 // UDEB BUILD, WINS
-#else
-#define CSS_LOGGING_METHOD 2 // UDEB BUILD, HW
-#endif // __WINS__
-
-#endif // _DEBUG
-
-/*
------------------------------------------------------------------------------
-
- LOG SETTINGS
-
------------------------------------------------------------------------------
-*/
-
-#if CSS_LOGGING_METHOD == 1 // Flogger
-
-#include <flogger.h>
-_LIT(KTfLogFolder,"CSS");
-_LIT(KTfLogFile,"CSSLOG.TXT");
-
-#elif CSS_LOGGING_METHOD == 2 // RDebug
-
-#include <e32svr.h>
-
-#endif
-
-
-/*
------------------------------------------------------------------------------
-
- LOGGING MACROs
-
- USE THESE MACROS IN YOUR CODE !
-
------------------------------------------------------------------------------
-*/
-
-#if CSS_LOGGING_METHOD == 1 // Flogger
-
-#define CSSLOGTEXT(AAA) { \
- RFileLogger::Write(KTfLogFolder(),KTfLogFile(), \
- EFileLoggingModeAppend, AAA); \
- }
-#define CSSLOGSTRING(AAA) { \
- _LIT(tempLogDes,AAA); \
- RFileLogger::Write(KTfLogFolder(),KTfLogFile(), \
- EFileLoggingModeAppend,tempLogDes()); \
- }
-#define CSSLOGSTRING2(AAA,BBB) { \
- _LIT(tempLogDes,AAA); \
- RFileLogger::WriteFormat(KTfLogFolder(),KTfLogFile(), \
- EFileLoggingModeAppend, \
- TRefByValue<const TDesC>(tempLogDes()),BBB); \
- }
-#define CSSLOGSTRING3(AAA,BBB,CCC) { \
- _LIT(tempLogDes,AAA); \
- RFileLogger::WriteFormat(KTfLogFolder(),KTfLogFile(), \
- EFileLoggingModeAppend, \
- TRefByValue<const TDesC>(tempLogDes()),BBB,CCC); \
- }
-#define CSSLOGSTRING4(AAA,BBB,CCC,DDD) { \
- _LIT(tempLogDes,AAA); \
- RFileLogger::WriteFormat(KTfLogFolder(), \
- KTfLogFile(),EFileLoggingModeAppend, \
- TRefByValue<const TDesC>(tempLogDes()), \
- BBB,CCC,DDD); \
- }
-
-
-#elif CSS_LOGGING_METHOD == 2 // RDebug
-
-#define CSSLOGTEXT(AAA) RDebug::Print(AAA);
-
-#define CSSLOGSTRING(AAA) RDebug::Print(_L(AAA));
-
-#define CSSLOGSTRING2(AAA,BBB) RDebug::Print(_L(AAA),BBB);
-
-#define CSSLOGSTRING3(AAA,BBB,CCC) RDebug::Print(_L(AAA),BBB,CCC);
-
-#define CSSLOGSTRING4(AAA,BBB,CCC,DDD) RDebug::Print(_L(AAA),BBB,CCC,DDD);
-
-
-
-#else // CSS_LOGGING_METHOD == 0 or invalid
-
-#define CSSLOGTEXT(AAA)
-#define CSSLOGSTRING(AAA)
-#define CSSLOGSTRING2(AAA,BBB)
-#define CSSLOGSTRING3(AAA,BBB,CCC)
-#define CSSLOGSTRING4(AAA,BBB,CCC,DDD)
-
-#endif // CSS_LOGGING_METHOD
-
-
-#endif // CSSLOGGER_H
--- a/convergedcallengine/serviceselector/inc/cssnotedialog.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CSsNoteDialog class.
-*
-*/
-
-
-
-#ifndef CSSNOTEDIALOG_H
-#define CSSNOTEDIALOG_H
-
-// INCLUDES
-#include <aknnotedialog.h>
-
-
-// CONSTANTS
-//None
-
-// MACROS
-//None
-
-// DATA TYPES
-//None.
-
-// FUNCTION PROTOTYPES
-//None
-
-// FORWARD DECLARATIONS
-//None
-
-// CLASS DECLARATION
-
-/**
-* Note dialog class for service selector
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-NONSHARABLE_CLASS( CSsNoteDialog )
- : public CAknNoteDialog
- {
- public: // Constructors and destructor
-
- /**
- * C++ constructor.
- * @param aSelf pointer to itself.
- */
- CSsNoteDialog( CEikDialog** aSelf );
-
- /**
- * Destructor.
- */
- virtual ~CSsNoteDialog();
-
- /**
- * From CCoeControl
- * Handles key events.
- * @param aKeyEvent Key event details.
- * @param aType Type of event.
- * @return Indicates is or not the key event was used
- */
- TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
- TEventCode aType );
-
- public: // New functions
-
- /**
- * Runs a note dialog.
- * @param aResourceId Resource for the note text.
- */
- void RunDialogLD( TInt aResourceId );
-
- private: // Data
-
- // Pointer to itself.
- CEikDialog** iSelf;
-
- };
-
-#endif // CSSNOTEDIALOG_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/cssservicehandlergsm.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CSsServiceHandlerGsm class.
-*
-*/
-
-
-
-#ifndef CSSSERVICEHANDLERGSM_H
-#define CSSSERVICEHANDLERGSM_H
-
-// INCLUDES
-#include "cservicehandler.h"
-#include <e32base.h>
-
-// CONSTANTS
-//None
-
-// MACROS
-//None
-
-// DATA TYPES
-//None.
-
-// FUNCTION PROTOTYPES
-//None
-
-// FORWARD DECLARATIONS
-//None
-
-// CLASS DECLARATION
-
-/**
-* Gsm service handler class for service selector
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-NONSHARABLE_CLASS( CSsServiceHandlerGsm )
- : public CServiceHandler
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- static CSsServiceHandlerGsm* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CSsServiceHandlerGsm();
-
- public: // New functions
-
-
- protected: // New functions
-
- /**
- * From CServiceHandler
- */
- void ExecuteServiceSelectionL(
- CConvergedServiceSelector::TSsResult& aResult,
- CConvergedServiceSelector::TSsCallType aCallType,
- TUint aServiceId,
- TBool aSendKey,
- const TDesC& aString = KNullDesC );
-
- private:
-
- /**
- * C++ default constructor.
- */
- CSsServiceHandlerGsm();
-
-
- private: // Data
-
- };
-
-#endif // CSSSERVICEHANDLERGSM_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/cssservicehandlervoice.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CSsServiceHandlerVoice class.
-*
-*/
-
-
-
-#ifndef CSSSERVICEHANDLERVOICE_H
-#define CSSSERVICEHANDLERVOICE_H
-
-// INCLUDES
-#include "cservicehandler.h"
-#include <e32base.h>
-
-// CONSTANTS
-//None
-
-// MACROS
-//None
-
-// DATA TYPES
-//None.
-
-// FUNCTION PROTOTYPES
-//None
-
-// FORWARD DECLARATIONS
-class CSPSettingsVoIPUtils;
-
-// CLASS DECLARATION
-
-/**
-* Voice service handler class for service selector
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-NONSHARABLE_CLASS( CSsServiceHandlerVoice )
- : public CServiceHandler
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- static CSsServiceHandlerVoice* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CSsServiceHandlerVoice();
-
- public: // New functions
-
-
- protected: // New functions
-
- /**
- * From CServiceHandler
- */
- void ExecuteServiceSelectionL(
- CConvergedServiceSelector::TSsResult& aResult,
- CConvergedServiceSelector::TSsCallType aCallType,
- TUint aServiceId,
- TBool aSendKey,
- const TDesC& aString = KNullDesC );
-
- private: // New functions
-
- /**
- * Checks is the service registered
- * @param aServiceId Id of the service.
- */
- TBool IsServiceRegistered( TUint aServiceId ) const;
-
- private:
-
- /**
- * C++ default constructor.
- */
- CSsServiceHandlerVoice();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
-
- private: // Data
-
- // Pointer to voip utils
- CSPSettingsVoIPUtils* iVoipUtils;
-
- };
-
-#endif // CSSSERVICEHANDLERVOICE_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/cssservicehandlervoip.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CSsServiceHandlerVoip class.
-*
-*/
-
-
-
-#ifndef CSSSERVICEHANDLERVOIP_H
-#define CSSSERVICEHANDLERVOIP_H
-
-// INCLUDES
-#include "cservicehandler.h"
-#include <e32base.h>
-#include <badesca.h>
-#include <AknIconArray.h>
-#include <gulicon.h>
-
-// CONSTANTS
-//None
-
-// MACROS
-//None
-
-// DATA TYPES
-//None.
-
-// FUNCTION PROTOTYPES
-//None
-
-// FORWARD DECLARATIONS
-class CSsConnectionHandler;
-class CSsUiUtilities;
-class CSsSettingsHandler;
-class CSPSettingsVoIPUtils;
-class CSsBsHandler;
-
-// CLASS DECLARATION
-
-/**
-* VoIP service handler class for service selector
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-NONSHARABLE_CLASS( CSsServiceHandlerVoip )
- : public CServiceHandler
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- static CSsServiceHandlerVoip* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CSsServiceHandlerVoip();
-
- public: // New functions
-
-
- protected: // New functions
-
- /**
- * From MServiceHandler
- */
- void ExecuteServiceSelectionL(
- CConvergedServiceSelector::TSsResult& aResult,
- CConvergedServiceSelector::TSsCallType aCallType,
- TUint aServiceId,
- TBool aSendKey,
- const TDesC& aString = KNullDesC );
-
- private: // New functions
-
- /**
- * Gets calling service by known service id.
- * @param aResult Selection results are returned by this param.
- * @param aServiceId Current service id of the call.
- * @param aSendKey Is sendkey used for call.
- * @param aString Known number/address.
- */
- void GetServiceByServiceId(
- CConvergedServiceSelector::TSsResult& aResult,
- TUint aServiceId,
- TBool aSendKey,
- const TDesC& aString ) const;
-
- /**
- * Gets calling service without service id.
- * Leaves on failure.
- * -Leaves with KErrCancel if some user query canceled by
- * the user
- * @param aResult Selection results are returned by this param.
- */
- void GetCallingServiceL(
- CConvergedServiceSelector::TSsResult& aResult );
-
- /**
- * Fills results by parameters and shows list query for the user
- * if more that one possible service available.
- * Leaves on failure.
- * -Leaves with KErrCancel if some user query canceled by
- * the user.
- * @param aResult Selection results are returned by this param.
- * @param aServices Known service id's.
- * @param aRegistered Services registered or not.
- */
- void SelectServiceL(
- CConvergedServiceSelector::TSsResult& aResult,
- RArray<TUint>& aServices,
- TBool aRegistered );
-
- /**
- * Returns reference to uiutilities class
- * @return UiUtils class.
- */
- CSsUiUtilities& UiUtilitiesL();
-
- /**
- * Returns reference to settings handler class
- * @return SettingsHandler class.
- */
- CSsSettingsHandler& SettingsHandlerL();
-
- /**
- * Returns reference to branding handler class
- * @return CSsBsHandler class.
- */
- CSsBsHandler& BrandingHandlerL();
-
- /**
- * Checks should voip call be changed as cs voice call.
- * @param aServices Known service id.
- * @param aString Known number/address.
- * @return ETrue if CS voice call should be made.
- */
- TBool ChangeTypeAsCsVoice(
- TUint aServiceId,
- const TDesC& aString ) const;
-
- /**
- * Adds icon to the list.
- * @param aIcons On completion, contains new icon
- * @param aServiceId Used Service Id
- * @param aIconId On completion, contains icon's icon list id
- */
- void AddBrandIconL( CArrayPtr<CGulIcon>* aIcons,
- TUint aServiceId,
- TInt& aIconId );
-
- /**
- * Gets item text array and icons for the query list box
- * by service id list.
- * @param aServices Used Services.
- * @param aLbxItems On completion, contains list box item texts.
- * @param aIcons On completion, contains list icons.
- */
- void GetListBoxItemsAndIconsL(
- RArray<TUint>& aServices,
- CDesCArrayFlat* aLbxItems,
- CArrayPtr<CGulIcon>* aIcons );
-
- /**
- * Gets branded bitmap for service.
- * @param aServiceId Used Service Id.
- * @param aBrandedBitmap Branded bitmap.
- * @param aBrandedBitmapMask Bitmap mask.
- */
- void GetBrandIconL( TUint aServiceId,
- CFbsBitmap*& aBrandedBitmap,
- CFbsBitmap*& aBrandedBitmapMask );
-
- private:
-
- /**
- * C++ default constructor.
- */
- CSsServiceHandlerVoip();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
-
- private: // Data
-
- // Pointer to Connection Handler
- CSsConnectionHandler* iConnectionHandler;
-
- // Pointer to UI Utils
- CSsUiUtilities* iUiUtils;
-
- // Pointer to Settings handler
- CSsSettingsHandler* iSettings;
-
- // Pointer to voip utils
- CSPSettingsVoIPUtils* iVoipUtils;
-
- // Pointer to branding handler
- CSsBsHandler* iBsHandler;
- };
-
-#endif // CSSSERVICEHANDLERVOIP_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/cssserviceutilities.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CSsServiceUtilities class.
-*
-*/
-
-
-
-#ifndef CSSSERVICEUTILITIES_H
-#define CSSSERVICEUTILITIES_H
-
-// INCLUDES
-#include "cconvergedserviceselector.h"
-#include <e32base.h>
-
-// CONSTANTS
-//None
-
-// MACROS
-//None
-
-// DATA TYPES
-//None.
-
-// FUNCTION PROTOTYPES
-//None
-
-// FORWARD DECLARATIONS
-//None
-
-// CLASS DECLARATION
-
-/**
-* Static interface class for service selector utilities
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-NONSHARABLE_CLASS( SsServiceUtilities )
- {
-
- public: // New functions
-
- /**
- * Returns service selector by calltype. Leaves on failure.
- * @param aCallType Call type
- * @param aSendKey ETrue if SendKey used
- * @return CServiceHandler Call type handler.
- */
- static CServiceHandler* ServiceHandlerByCallTypeL(
- CConvergedServiceSelector::TSsCallType aCallType,
- TBool aSendKey );
-
- /**
- * Sets the results to TSsResult by params (calltype, service id and
- * registration status).
- * @param aResult Results filled by parameters.
- * @param aCallType Call type
- * @param aServiceId Current service if of the call.
- * @param aEnabled ETrue if service enabled
- */
- static void SetServiceResult(
- CConvergedServiceSelector::TSsResult& aResult,
- CConvergedServiceSelector::TSsCallType aCallType,
- TUint aServiceId,
- TBool aEnabled );
-
- /**
- * Checks is the string valid for cs voice call.
- * @param aString String to be checked.
- * @return ETrue if valid cs number.
- */
- static TBool IsValidCsNumber( const TDesC& aString );
-
- };
-
-#endif // CSSSERVICEUTILITIES_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/csssettingshandler.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CSsServiceHandlerVoip class.
-*
-*/
-
-
-
-#ifndef CSSSETTINGSHANDLER_H
-#define CSSSETTINGSHANDLER_H
-
-// INCLUDES
-#include "cssconnectionhandler.h"
-#include <spsettings.h>
-#include <e32base.h>
-
-// CONSTANTS
-//None
-
-// MACROS
-//None
-
-// DATA TYPES
-//None.
-
-// FUNCTION PROTOTYPES
-//None
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-/**
-* VoIP settings handler class for service selector
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-NONSHARABLE_CLASS( CSsSettingsHandler )
- : public CBase
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- static CSsSettingsHandler* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CSsSettingsHandler();
-
- public: // New functions
-
- /**
- * Gets registered services.
- * @param aConnection Connection handler.
- * @param aServiceIds Array of found services.
- * @return KErrNone if registered service(s) exists.
- */
- TInt GetRegisteredServices(
- CSsConnectionHandler& aConnection,
- RArray<TUint>& aServiceIds ) const;
-
- /**
- * Gets all available services.
- * @param aServiceIds Array of found services.
- * @param aServiceNames Service name array of found services.
- * @return KErrNone if registered service(s) exists.
- */
- TInt GetAllServices(
- RArray<TUint>& aServiceIds ) const;
-
- /**
- * Gets service names from sp settings by service id array.
- * @param aServiceIds Service id array.
- * @param aServiceNames Names of the services are returned
- * by the parameter.
- */
- void GetServiceNamesL( RArray<TUint>& aServiceIds,
- CDesCArray& aServiceNames ) const;
-
- /**
- * Gets brand id for service.
- * @since S60 5.0
- * @param aServiceId Used Service
- * @param aBrandId On completion, contains Brand Id
- */
- void BrandIdL( TInt aServiceId, TDes8& aBrandId );
-
- private: // New functions
-
- /**
- * Gets registered services. Leaves on failure.
- * Leaves with KErrNotFound if not any registered
- * services available.
- * @param aConnection Connection handler.
- * @param aServiceIds Array of found services.
- */
- void DoGetRegisteredServicesL(
- CSsConnectionHandler& aConnection,
- RArray<TUint>& aServiceIds ) const;
-
- /**
- * Gets all available services. Leaves on failure.
- * Leaves with KErrNotFound if not any VoIP capable
- * services available.
- * @param aServiceIds Array of found services.
- */
- void DoGetAllServicesL(
- RArray<TUint>& aServiceIds ) const;
-
- /**
- * Gets voip capable services from sp settings.
- * @param aServiceIds Array of the voip capable services.
- */
- void GetVoipServicesL( RArray<TUint>& aServiceIds ) const;
-
- /**
- * Checks is the service as voip service.
- * @param aServiceId Id of the service.
- * @return ETrue if service is voip capable service.
- */
- TBool IsVoipServiceL( TUint aServiceId ) const;
-
-
- private:
-
- /**
- * C++ default constructor.
- */
- CSsSettingsHandler();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
-
- private: // Data
-
- // Pointer to SP settings
- CSPSettings* iSettings;
-
- };
-
-#endif // CSSSETTINGSHANDLER_H
-
-// End of File
--- a/convergedcallengine/serviceselector/inc/cssuiutilities.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/*
-* Copyright (c) 2008 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: This file contains the header file of the
-* : CSsUiUtilities class.
-*
-*/
-
-
-
-#ifndef CSSUIUTILITIES_H
-#define CSSUIUTILITIES_H
-
-// INCLUDES
-#include <e32base.h>
-#include <bamdesca.h>
-#include <gulicon.h>
-
-// FORWARD DECLARATIONS
-class CEikDialog;
-class CCoeEnv;
-
-// CLASS DECLARATION
-
-/**
-* This class provides UI utilities for service selector
-*
-* @lib ServiceSelector.lib
-* @since Series60_5.0
-*/
-NONSHARABLE_CLASS( CSsUiUtilities )
- : public CBase
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- static CSsUiUtilities* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CSsUiUtilities();
-
- public:
-
- /**
- * Shows a information note.
- * @param aResource Resource id for the note text.
- */
- void ShowInformationNoteL( TInt aResource );
-
- /**
- * Shows a list query.
- * @param aIndex Index of the selection.
- * @param aResource Resource id for the query.
- * @param aItemTextArray List item array. Ownership
- * not trasferred.
- * @param aIcons Icon array. Ownership transferred.
- * @return ETrue if list item selected.
- */
- TBool ShowListQueryL(
- TInt& aIndex,
- TInt aResource,
- MDesCArray* aItemTextArray,
- CArrayPtr<CGulIcon>* aIcons );
-
- /**
- * Loads default icon for service selection list.
- * @param aIcons Default icon is added to the array.
- * Icon array takes ownership for
- * the added icon.
- */
- void LoadDefaultIconL(
- CArrayPtr<CGulIcon>& aIcons );
-
- private:
-
- /**
- * Loads resources for the dialogs.
- */
- void LoadResourceL();
-
- private:
-
- /**
- * C++ default constructor.
- */
- CSsUiUtilities();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- private: // Data
-
- // Pointer to current dialog.
- CEikDialog* iDlg;
-
- // Control environment, not owned
- CCoeEnv* iCoeEnv;
-
- // Resource file offset
- TInt iResourceFileOffset;
-
- };
-
-#endif // CSSUIUTILITIES_H
-
-// End of File
--- a/convergedcallengine/serviceselector/loc/serviceselector.loc Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2008 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:
-* This is a localisation file for Service Selector
-* A .loc file is the one and only place where the logical strings
-* to be localised are defined.
-*
-*/
-
-
-// LOCALISATION STRINGS
-
-// d: It is shown in a information note when
-// d: user tries to make Internet Call but
-// d: no configured services available.
-// l: popup_note_window
-// w:
-// r: 5.0
-//
-#define qtn_voip_no_service_configured "Can not call. Internet call service not configured"
-
-// d: Defines list query header when there are 2+ services to select.
-// l: heading_pane_t1
-// w:
-// r: 5.0
-//
-#define qtn_servtab_select_service_query "Select service to be used:"
-
-// End of File
--- a/convergedcallengine/serviceselector/rom/serviceselector.iby Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
-* Copyright (c) 2008 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: IBY file of ServiceSelector
-*
-*/
-
-
-#ifndef __SERVICESELECTOR_IBY__
-#define __SERVICESELECTOR_IBY__
-
-file=ABI_DIR\BUILD_DIR\serviceselector.dll SHARED_LIB_DIR\serviceselector.dll
-data=ZSYSTEM\install\serviceselector_stub.sis System\Install\serviceselector_stub.sis
-
-#endif
--- a/convergedcallengine/serviceselector/rom/serviceselector.pkg Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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: For packing service handling.
-;
-; servicehandling_stub.pkg
-
-; Languages
-&EN
-
-; Header
-#{"servicehandling"},(0x20019532),1,0,0,TYPE=SA, RU
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Target
-
-"\epoc32\RELEASE\armv5\UREL\serviceselector.dll"-"!:\sys\bin\serviceselector.dll"
-"\epoc32\data\z\resource\serviceselector.rsc"-"!:\resource\serviceselector.rsc"
\ No newline at end of file
--- a/convergedcallengine/serviceselector/rom/serviceselector_stub.pkg Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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: For packing service selector stub.
-;
-; servicehandling_stub.pkg
-
-; Languages
-&EN
-
-; Header
-#{"servicehandling"},(0x20019532),1,0,0,TYPE=SA
-
-;Localised Vendor name
-%{"Nokia"}
-
-;Unique Vendor name
-:"Nokia"
-
-; Target
-
-""-"z:\sys\bin\serviceselector.dll"
-""-"z:\resource\serviceselector.rsc"
\ No newline at end of file
Binary file convergedcallengine/serviceselector/rom/serviceselector_stub.sis has changed
--- a/convergedcallengine/serviceselector/rom/serviceselectorresources.iby Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2008 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: serviceselector's resource iby definitions.
- *
-*/
-
-
-#ifndef __SERVICESELECTOR_RESOURCES_IBY__
-#define __SERVICESELECTOR_RESOURCES_IBY__
-
-data=DATAZ_\RESOURCE_FILES_DIR\serviceselector.rsc RESOURCE_FILES_DIR\serviceselector.rsc
-
-#endif
\ No newline at end of file
--- a/convergedcallengine/serviceselector/src/cconvergedserviceselector.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CConvergedServiceSelector class.
-*
-*/
-
-
-// INCLUDE FILES
-#include "cconvergedserviceselector.h"
-#include "cservicehandler.h"
-#include "cssserviceutilities.h"
-#include "csslogger.h"
-
-// ================= MEMBER FUNCTIONS =======================================
-
-// -----------------------------------------------------------------------------
-// CConvergedServiceSelector::CConvergedServiceSelector
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CConvergedServiceSelector::CConvergedServiceSelector
- (
- // None.
- )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CConvergedServiceSelector::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CConvergedServiceSelector* CConvergedServiceSelector::NewL
- (
- // None.
- )
- {
- CConvergedServiceSelector* self = new ( ELeave ) CConvergedServiceSelector();
- return self;
- }
-
-// Destructor
-EXPORT_C CConvergedServiceSelector::~CConvergedServiceSelector
- (
- // None.
- )
- {
- CancelSelection();
- }
-
-// -----------------------------------------------------------------------------
-// CConvergedServiceSelector::GetCallingServiceByCallType
-// Gets the calling service by current call type and service id.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TInt CConvergedServiceSelector::GetCallingServiceByCallType
- (
- TSsResult& aResult,
- TSsCallType aCallType,
- TUint aServiceId,
- TBool aSendKey,
- const TDesC& aString
- )
- {
- CSSLOGSTRING4("CSSelector: calltype:%d ,serviceId:%d ,sendkey:%d",
- (TInt)aCallType,
- (TInt)aServiceId,
- (TInt)aSendKey);
-
- if ( iHandler )
- {
- // Selection currently ongoing, return error.
- return KErrNotReady;
- }
-
-
- TRAPD( ret, DoGetCallingServiceByCallTypeL( aResult,
- aCallType,
- aServiceId,
- aSendKey,
- aString ) );
-
-
- // Free resources
- CancelSelection();
-
- CSSLOGSTRING2("CSSelector error:%d", ret);
- CSSLOGSTRING4("CSSelector result: calltype:%d ,serviceId:%d ,enabled:%d",
- (TInt)aResult.iCallType,
- (TInt)aResult.iServiceId,
- (TInt)aResult.iServiceEnabled);
-
- return ret;
- }
-
-// -----------------------------------------------------------------------------
-// CConvergedServiceSelector::GetCallingServiceByCallType
-// Cancels selection.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CConvergedServiceSelector::CancelSelection
- (
- // None
- )
- {
- CSSLOGSTRING("CSSelector::CancelSelection");
- // Free memory
- delete iHandler;
- iHandler = NULL;
- }
-
-// -----------------------------------------------------------------------------
-// CConvergedServiceSelector::DoGetCallingServiceByCallTypeL
-// Gets the calling service by current call type and service id.
-// -----------------------------------------------------------------------------
-//
-void CConvergedServiceSelector::DoGetCallingServiceByCallTypeL
- (
- TSsResult& aResult,
- TSsCallType aCallType,
- TUint aServiceId,
- TBool aSendKey,
- const TDesC& aString
- )
-
- {
- // Get handler by calltype
- iHandler = SsServiceUtilities::ServiceHandlerByCallTypeL(
- aCallType,
- aSendKey );
-
-
- // Execute handler.
- iHandler->ExecuteServiceSelectionL( aResult,
- aCallType,
- aServiceId,
- aSendKey,
- aString );
-
- }
-
-// ================= OTHER EXPORTED FUNCTIONS ===============================
-
-// End of File
--- a/convergedcallengine/serviceselector/src/cssbshandler.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CSsBsHandler class.
-*
-*/
-
-// INCLUDE FILES
-#include <mbsaccess.h>
-#include <cbsfactory.h>
-#include <mbselement.h>
-#include <cbsbitmap.h>
-#include <coemain.h>
-#include <AknsItemID.h>
-#include <AknsSkinInstance.h>
-#include <AknsUtils.h>
-
-#include "cssiconfileprovider.h"
-#include "cssbshandler.h"
-#include "csslogger.h"
-
-// EXTERNAL DATA STRUCTURES
-// None
-
-// EXTERNAL FUNCTION PROTOTYPES
-// None
-
-// CONSTANTS
-// Branding server & data constants.
-const TInt KSsBrandingIconSize = 21; // icon size
-
-_LIT8( KSsBSApplicationId, "xsp" ); // application id
-_LIT8( KSsUiBSIconId, "default_brand_image" ); // icon id
-
-// MACROS
-// None
-
-// LOCAL CONSTANTS AND MACROS
-// None
-
-// MODULE DATA STRUCTURES
-// None
-
-// LOCAL FUNCTION PROTOTYPES
-// None
-
-// FORWARD DECLARATIONS
-// None
-
-// ============================= LOCAL FUNCTIONS =============================
-
-// ============================ MEMBER FUNCTIONS =============================
-
-// ---------------------------------------------------------------------------
-// CSsBsHandler::CSsBsHandler
-// C++ default constructor can NOT contain any code, that might leave.
-// ---------------------------------------------------------------------------
-//
-CSsBsHandler::CSsBsHandler()
- {
- // No implementation required
- }
-
-// ---------------------------------------------------------------------------
-// CSsBsHandler::ConstructL
-// Symbian 2nd phase constructor can leave.
-// ---------------------------------------------------------------------------
-//
-void CSsBsHandler::ConstructL()
- {
- }
-
-// ---------------------------------------------------------------------------
-// CSsBsHandler::NewL
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-CSsBsHandler* CSsBsHandler::NewL( )
- {
- CSsBsHandler* self = CSsBsHandler::NewLC();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// CSsBsHandler::NewLC
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-CSsBsHandler* CSsBsHandler::NewLC()
- {
- CSsBsHandler* self = new (ELeave) CSsBsHandler();
- CleanupStack::PushL( self );
- self->ConstructL();
- return self;
- }
-
-// Destructor
-CSsBsHandler::~CSsBsHandler()
- {
- }
-
-// ---------------------------------------------------------------------------
-// CSsBsHandler::GetBrandedIconL
-// (other items were commented in a header).
-// ---------------------------------------------------------------------------
-//
-void CSsBsHandler::GetBrandedIconL(
- const TDesC8& aBrandingId,
- CFbsBitmap*& aBrandedBitmap,
- CFbsBitmap*& aBrandedBitmapMask ) const
- {
- CSSLOGSTRING( "CSSelector::CreateBrandedBitmapL: =>" );
-
- // Create branding server factory and access to branding data.
- CBSFactory* factory = CBSFactory::NewL(
- aBrandingId, KSsBSApplicationId );
- CleanupStack::PushL( factory );
-
- MBSAccess* access = factory->CreateAccessL(
- aBrandingId, ELangInternationalEnglish );
- CleanupClosePushL( *access );
-
- // Get structure which contains bitmap information.
- MBSElement* element = access->GetStructureL( KSsUiBSIconId );
- CleanupClosePushL( *element );
- const CBSBitmap& bitmap = element->BitmapDataL();
-
- // Open file which contains branded bitmaps.
- RFile file;
- CleanupClosePushL( file );
- access->GetFileL( bitmap.BitmapFileId(), file );
-
- // Try to load a skinned bitmap.
- if ( CCoeEnv::Static() )
- {
- TAknsItemID itemId;
- itemId.Set( bitmap.SkinIdMajor(), bitmap.SkinIdMinor() );
- MAknsSkinInstance* skin = AknsUtils::SkinInstance();
- TRAP_IGNORE( ( aBrandedBitmap =
- AknsUtils::CreateBitmapL( skin, itemId ) ) );
- }
-
- // If skinned bitmaps was not found, try to load bitmaps manually.
- if ( !aBrandedBitmap )
- {
- CSsIconFileProvider* fileProvider =
- CSsIconFileProvider::NewL( file );
-
- AknIconUtils::CreateIconL(
- aBrandedBitmap,
- aBrandedBitmapMask,
- *fileProvider,
- bitmap.BitmapId(),
- bitmap.BitmapMaskId() );
- }
-
- // Set sizes.
- const TInt iconSize( KSsBrandingIconSize );
- AknIconUtils::SetSize( aBrandedBitmap, TSize( iconSize, iconSize ) );
- AknIconUtils::SetSize( aBrandedBitmapMask, TSize( iconSize, iconSize ) );
-
- // Destroy some items.
- CleanupStack::PopAndDestroy( &file );
- CleanupStack::PopAndDestroy( element );
- CleanupStack::PopAndDestroy( access );
- CleanupStack::PopAndDestroy( factory );
-
- CSSLOGSTRING( "CSSelector::CreateBrandedBitmapL: <=" );
- }
-
-// ========================== OTHER EXPORTED FUNCTIONS =======================
-
-// End of File
--- a/convergedcallengine/serviceselector/src/cssconnectionhandler.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CSsConnectionHandler class
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "cssconnectionhandler.h"
-#include "csslogger.h"
-
-// ================= MEMBER FUNCTIONS =======================================
-// -----------------------------------------------------------------------------
-// CSsConnectionHandler::CSsConnectionHandler
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSsConnectionHandler::CSsConnectionHandler
- (
- // None.
- )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CSsConnectionHandler::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSsConnectionHandler* CSsConnectionHandler::NewL()
- {
- CSsConnectionHandler* self = new ( ELeave ) CSsConnectionHandler();
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// -----------------------------------------------------------------------------
-// CSsConnectionHandler::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSsConnectionHandler::ConstructL()
- {
- }
-
-// Destructor
-CSsConnectionHandler::~CSsConnectionHandler()
- {
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceUtilities::IsVoipServiceRegistered
-// Checks is the service registered
-// -----------------------------------------------------------------------------
-//
-TBool CSsConnectionHandler::IsVoipServiceRegistered
- (
- TUint /*aServiceId */
- ) const
- {
-
- TBool registered( EFalse );
- return registered;
- }
-
-// ================= OTHER EXPORTED FUNCTIONS ===============================
-
-// End of File
--- a/convergedcallengine/serviceselector/src/cssiconfileprovider.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CSsIconFileProvider class.
-*
-*/
-
-#include "cssiconfileprovider.h"
-
-// ================= MEMBER FUNCTIONS ==========================================
-
-// -----------------------------------------------------------------------------
-// CSsIconFileProvider::CSsIconFileProvider
-//
-// -----------------------------------------------------------------------------
-//
-CSsIconFileProvider::CSsIconFileProvider()
- {
- }
-
-// -----------------------------------------------------------------------------
-// CSsIconFileProvider::~CSsIconFileProvider
-//
-// -----------------------------------------------------------------------------
-//
-CSsIconFileProvider::~CSsIconFileProvider()
- {
- }
-
-// -----------------------------------------------------------------------------
-// CSsIconFileProvider::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSsIconFileProvider::ConstructL( RFile& aFile )
- {
- User::LeaveIfError( iFile.Duplicate( aFile ) );
- }
-
-// ----------------------------------------------------------------------------
-// CSsIconFileProvider::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSsIconFileProvider* CSsIconFileProvider::NewL(
- RFile& aFile )
- {
- CSsIconFileProvider* self =
- new ( ELeave ) CSsIconFileProvider();
- CleanupStack::PushL( self );
- self->ConstructL( aFile );
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// From MAknIconFileProvider
-//
-// ---------------------------------------------------------------------------
-//
-void CSsIconFileProvider::RetrieveIconFileHandleL(
- RFile& aFile, const TIconFileType /*aType*/ )
- {
- // duplicate the file's handle
- User::LeaveIfError( aFile.Duplicate( iFile ) );
- }
-
-// ---------------------------------------------------------------------------
-// From MAknIconFileProvider
-//
-// ---------------------------------------------------------------------------
-//
-void CSsIconFileProvider::Finished()
- {
- delete this;
- }
-
-// End of File
--- a/convergedcallengine/serviceselector/src/csslistquerydialog.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CSsListQueryDialog class
-*
-*/
-
-
-// INCLUDE FILES
-#include "csslistquerydialog.h"
-#include "cssconnectionhandler.h"
-#include "cssuiutilities.h"
-#include "cssserviceutilities.h"
-
-// ================= MEMBER FUNCTIONS =======================================
-
-// -----------------------------------------------------------------------------
-// CSsListQueryDialog::CSsListQueryDialog
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSsListQueryDialog::CSsListQueryDialog
- (
- CEikDialog** aSelf,
- TInt& aIndex
- )
- : CAknListQueryDialog(&aIndex),
- iSelf( aSelf )
- {
- }
-
-// Destructor
-CSsListQueryDialog::~CSsListQueryDialog
- (
- // None.
- )
- {
- // Set self pointer as null.
- // Query could be destroyed by client application or by
- // the user selection.
- if ( iSelf )
- {
- *iSelf = NULL;
- iSelf = NULL;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CSsListQueryDialog::ExecuteListLD
-// Runs the dialog
-// -----------------------------------------------------------------------------
-//
-TInt CSsListQueryDialog::ExecuteListLD
- (
- TInt aResourceId,
- MDesCArray* aItemTextArray,
- CArrayPtr<CGulIcon>* aIcons
- )
- {
- CAknListQueryDialog::PrepareLC( aResourceId );
- SetTone( EConfirmationTone );
- if ( aIcons )
- {
- SetIconArrayL( aIcons );
- }
- SetItemTextArray( aItemTextArray );
- SetOwnershipType( ELbmDoesNotOwnItemArray );
- return CAknListQueryDialog::RunLD();
- }
-
-
-// ================= OTHER EXPORTED FUNCTIONS ===============================
-
-// End of File
--- a/convergedcallengine/serviceselector/src/cssnotedialog.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of CSsNoteDialog class
-*
-*/
-
-
-// INCLUDE FILES
-#include "cssnotedialog.h"
-#include "cssconnectionhandler.h"
-#include "cssuiutilities.h"
-#include "cssserviceutilities.h"
-#include "csslogger.h"
-#include <StringLoader.h>
-#include <avkon.rsg>
-
-// ================= MEMBER FUNCTIONS =======================================
-
-// -----------------------------------------------------------------------------
-// CSsNoteDialog::CSsNoteDialog
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSsNoteDialog::CSsNoteDialog(
- CEikDialog** aSelf )
- : CAknNoteDialog(EConfirmationTone, ELongTimeout),
- iSelf( aSelf )
- {
- }
-
-// Destructor
-CSsNoteDialog::~CSsNoteDialog()
- {
- CSSLOGSTRING("CSsNoteDialog::~CSsNoteDialog");
- // Set self pointer as null.
- // Query could be destroyed by client application or by
- // the user selection.
- if ( iSelf )
- {
- *iSelf = NULL;
- iSelf = NULL;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CSsNoteDialog::RunDialogLD
-// Runs the dialog
-// -----------------------------------------------------------------------------
-//
-void CSsNoteDialog::RunDialogLD(
- TInt aResourceId )
- {
- CSSLOGSTRING("CSsNoteDialog::RunDialogLD <");
- HBufC* text = StringLoader::LoadLC( aResourceId );
- SetTextL( *text );
- CAknNoteDialog::PrepareLC( R_AKN_INFORMATION_NOTE_DIALOG_WAIT );
- CAknNoteDialog::RunLD();
- CleanupStack::PopAndDestroy( text );
- CSSLOGSTRING("CSsNoteDialog::RunDialogLD >");
- }
-
-// -----------------------------------------------------------------------------
-// CSsNoteDialog::OfferKeyEventL
-// Send key handling overriden
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CSsNoteDialog::OfferKeyEventL(
- const TKeyEvent& aKeyEvent,
- TEventCode aType )
- {
- CSSLOGSTRING2("CSsNoteDialog::OfferKeyEventL, aKeyEvent.iScanCode: %d"
- ,aKeyEvent.iScanCode );
- TKeyResponse ret = EKeyWasNotConsumed;
-
- if ( aKeyEvent.iScanCode == EStdKeyYes && aType == EEventKey )
- {
- CSSLOGSTRING("CSsNoteDialog::OfferKeyEventL, EKeyWasConsumed");
- ret = EKeyWasConsumed;
- }
- return ret;
- }
-
-// ================= OTHER EXPORTED FUNCTIONS ===============================
-
-// End of File
--- a/convergedcallengine/serviceselector/src/cssservicehandlergsm.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CSsServiceHandlerGsm class
-*
-*/
-
-
-// INCLUDE FILES
-#include "cssservicehandlergsm.h"
-#include "cssserviceutilities.h"
-#include "csslogger.h"
-
-// CONSTANTS
-// CS service id
-const TInt KGSMServiceId = 1;
-
-
-// ================= MEMBER FUNCTIONS =======================================
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerGsm::CSsServiceHandlerGsm
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSsServiceHandlerGsm::CSsServiceHandlerGsm
- (
- // None.
- )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerGsm::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSsServiceHandlerGsm* CSsServiceHandlerGsm::NewL
- (
- // None.
- )
- {
- CSsServiceHandlerGsm* self = new(ELeave) CSsServiceHandlerGsm();
- return self;
- }
-
-// Destructor
-CSsServiceHandlerGsm::~CSsServiceHandlerGsm
- (
- // None.
- )
- {
-
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerGsm::ExecuteServiceSelectionL
-// Gets the calling service by current call type and service id.
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerGsm::ExecuteServiceSelectionL
- (
- CConvergedServiceSelector::TSsResult& aResult,
- CConvergedServiceSelector::TSsCallType aCallType,
- TUint /*aServiceId*/,
- TBool /*aSendKey*/,
- const TDesC& /*aString*/
- )
- {
- CSSLOGSTRING("CSSelector::ExecuteGsm");
-
- // Set correct service id and call type ( CS voice or video call ).
- SsServiceUtilities::SetServiceResult( aResult,
- aCallType,
- KGSMServiceId,
- ETrue );
-
- }
-
-// ================= OTHER EXPORTED FUNCTIONS ===============================
-
-// End of File
--- a/convergedcallengine/serviceselector/src/cssservicehandlervoice.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CSsServiceHandlerVoice class
-*
-*/
-
-
-// INCLUDE FILES
-#include "cssservicehandlervoice.h"
-#include "cssconnectionhandler.h"
-#include "cssserviceutilities.h"
-#include "csslogger.h"
-#include <spsettingsvoiputils.h>
-
-// CONSTANTS
-// CS service id.
-const TInt KGSMServiceId = 1;
-
-// ================= MEMBER FUNCTIONS =======================================
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoice::CSsServiceHandlerVoice
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSsServiceHandlerVoice::CSsServiceHandlerVoice
- (
- // None.
- )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoice::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerVoice::ConstructL()
- {
- iVoipUtils = CSPSettingsVoIPUtils::NewL();
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoice::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSsServiceHandlerVoice* CSsServiceHandlerVoice::NewL
- (
- // None.
- )
- {
- CSsServiceHandlerVoice* self = new ( ELeave ) CSsServiceHandlerVoice();
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// Destructor
-CSsServiceHandlerVoice::~CSsServiceHandlerVoice
- (
- // None.
- )
- {
- delete iVoipUtils;
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoice::ExecuteServiceSelectionL
-// Gets the calling service by current call type and service id.
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerVoice::ExecuteServiceSelectionL
- (
- CConvergedServiceSelector::TSsResult& aResult,
- CConvergedServiceSelector::TSsCallType aCallType,
- TUint /*aServiceId*/,
- TBool /*aSendKey*/,
- const TDesC& /*aString*/
- )
- {
- CSSLOGSTRING("CSSelector::ExecuteVoice");
-
- TUint prefService(0);
-
- if ( iVoipUtils->IsPreferredTelephonyVoIP() &&
- KErrNone == iVoipUtils->GetPreferredService( prefService ) &&
- IsServiceRegistered( prefService ) )
- {
- CSSLOGSTRING("CSSelector::VoipAsPreferred");
-
- // Preferred telephony value as voip and preferred (voip) service
- // registered -> Change call type as voip and set correct service id.
- SsServiceUtilities::SetServiceResult( aResult,
- CConvergedServiceSelector::ESsVoipCall,
- prefService,
- ETrue );
- }
- else
- {
- // Set (CS)voice call parameters
- // CallType, Service id and GSM service is always "enabled"
- SsServiceUtilities::SetServiceResult( aResult,
- aCallType,
- KGSMServiceId,
- ETrue );
- }
-
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoice::IsServiceRegistered
-// Checks is the service registered
-// -----------------------------------------------------------------------------
-//
-TBool CSsServiceHandlerVoice::IsServiceRegistered
- (
- TUint aServiceId
- ) const
- {
- TBool ret( EFalse );
- CSsConnectionHandler* connection = NULL;
-
- // Nothing to do if CCH client construction not succeed.
- // So ignore the leave and cs call will be made.
- TRAP_IGNORE( connection = CSsConnectionHandler::NewL() );
-
- if ( connection )
- {
- ret = connection->IsVoipServiceRegistered( aServiceId );
- delete connection;
- }
-
- return ret;
- }
-
-// ================= OTHER EXPORTED FUNCTIONS ===============================
-
-// End of File
--- a/convergedcallengine/serviceselector/src/cssservicehandlervoip.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,496 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CSsServiceHandlerVoip class
-*
-*/
-
-
-// INCLUDE FILES
-#include "cssservicehandlervoip.h"
-#include "cssconnectionhandler.h"
-#include "cssuiutilities.h"
-#include "cssserviceutilities.h"
-#include "csssettingshandler.h"
-#include "cssbshandler.h"
-#include "csslogger.h"
-#include <serviceselector.rsg>
-#include <spdefinitions.h>
-#include <spsettingsvoiputils.h>
-#include <data_caging_path_literals.hrh>
-#include <eikenv.h>
-
-
-// CONSTANTS
-// Selection list array granularity
-const TInt KSsArrayGranularity = 2;
-// CS service id
-const TInt KGSMServiceId = 1;
-// List item array size
-const TInt KSsLbxItemsArraySize = 3;
-// Format of the selection list query.
-_LIT( KQueryItemFormat, "%d\t%S" );
-// Branding id
-const TInt KSsBrandingIdLength = 512;
-// Integer length
-const TInt KSsIntegerLength = 10;
-
-
-// ================= MEMBER FUNCTIONS =======================================
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::CSsServiceHandlerVoip
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSsServiceHandlerVoip::CSsServiceHandlerVoip
- (
- // None.
- )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerVoip::ConstructL()
- {
- iConnectionHandler = CSsConnectionHandler::NewL();
- iVoipUtils = CSPSettingsVoIPUtils::NewL();
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSsServiceHandlerVoip* CSsServiceHandlerVoip::NewL
- (
- // None.
- )
- {
- CSsServiceHandlerVoip* self = new ( ELeave ) CSsServiceHandlerVoip();
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// Destructor
-CSsServiceHandlerVoip::~CSsServiceHandlerVoip
- (
- // None.
- )
- {
- delete iVoipUtils;
- delete iConnectionHandler;
- delete iUiUtils;
- delete iSettings;
- delete iBsHandler;
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::ExecuteServiceSelectionL
-// Gets the calling service by current call type and service id.
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerVoip::ExecuteServiceSelectionL
- (
- CConvergedServiceSelector::TSsResult& aResult,
- CConvergedServiceSelector::TSsCallType /*aCallType*/,
- TUint aServiceId,
- TBool aSendKey,
- const TDesC& aString
- )
- {
- CSSLOGSTRING("CSSelector::ExecuteVoip");
-
- if ( 0 != aServiceId && KGSMServiceId != aServiceId )
- {
- // Service id is known, just set correct calltype
- // and registration status.
- GetServiceByServiceId( aResult, aServiceId, aSendKey, aString );
- }
- else
- {
- // Service id is not known or CS service
- // so we have to choce from available voip services.
- GetCallingServiceL( aResult );
- }
-
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::GetServiceByServiceId
-// Gets calling service by known service id.
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerVoip::GetServiceByServiceId
- (
- CConvergedServiceSelector::TSsResult& aResult,
- TUint aServiceId,
- TBool aSendKey,
- const TDesC& aString
- ) const
- {
- if ( aSendKey && ChangeTypeAsCsVoice( aServiceId, aString ) )
- {
- // Set (CS)voice call parameters
- // CallType, Service id and GSM service is always "enabled"
- SsServiceUtilities::SetServiceResult(
- aResult,
- CConvergedServiceSelector::ESsVoiceCall,
- KGSMServiceId,
- ETrue );
- }
- else
- {
- // Get current registration status for the service.
- // This may be unnecessary at the moment because we don't show
- // "Register now?" note anymore and currently clients don't use the
- // registration status for anything.
- TBool registered( iConnectionHandler->IsVoipServiceRegistered(
- aServiceId ) );
-
- // Set results
- SsServiceUtilities::SetServiceResult(
- aResult,
- CConvergedServiceSelector::ESsVoipCall,
- aServiceId,
- registered );
- }
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::GetCallingServiceL
-// Gets calling service without service id.
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerVoip::GetCallingServiceL
- (
- CConvergedServiceSelector::TSsResult& aResult
- )
- {
- TInt error( KErrNone );
- TBool registered( EFalse );
- RArray<TUint> services;
- CleanupClosePushL( services );
-
- // First try to find registered services to be used if not any available
- // then try to find unregistered services.
- error = SettingsHandlerL().GetRegisteredServices(
- *iConnectionHandler, services );
-
- if ( KErrNone != error )
- {
- error = SettingsHandlerL().GetAllServices( services );
- }
- else
- {
- registered = ETrue;
- }
-
- CSSLOGSTRING2("CSSelector::Service error:%d", error);
- if ( KErrNone != error )
- {
- CSSLOGSTRING("CSSelector::Services not available");
- if ( KErrNoMemory == error )
- {
- User::Leave( error );
- }
- // No voip services available/configured.
- // Launch information note and leave.
- UiUtilitiesL().ShowInformationNoteL( R_NO_SERVICE_AVAILABLE );
- User::Leave( KErrNotFound );
- }
-
-
- // Select service. Show list query
- // if more than one services available.
- SelectServiceL( aResult,
- services,
- registered );
-
- CleanupStack::PopAndDestroy( &services );
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::SelectServiceL
-// Makes service selection.
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerVoip::SelectServiceL
- (
- CConvergedServiceSelector::TSsResult& aResult,
- RArray<TUint>& aServices,
- TBool aRegistered
- )
- {
- CSSLOGSTRING2("CSSelector::Service count:%d",aServices.Count());
- if ( 0 == aServices.Count() )
- {
- // Empty array, leave
- User::Leave( KErrNotFound );
- }
-
- TUint serviceId( 0 );
- if ( 1 < aServices.Count() )
- {
- // Because more than one service available we have to
- // make selection list for the user.
- TInt index( KErrNotFound );
-
- CDesCArrayFlat* lbxItems =
- new (ELeave) CDesCArrayFlat( KSsLbxItemsArraySize );
- CleanupStack::PushL( lbxItems );
- CArrayPtr<CGulIcon>* icons =
- new (ELeave) CAknIconArray( KSsLbxItemsArraySize );
- CleanupStack::PushL( icons );
-
- GetListBoxItemsAndIconsL( aServices,
- lbxItems,
- icons );
-
- // List query takes ownership for icon array
- CleanupStack::Pop( icons );
-
- // Select service by list query
- TBool ret = UiUtilitiesL().ShowListQueryL(
- index, R_PHONE_VOIP_CALL_TYPE_QUERY, lbxItems, icons );
-
- CSSLOGSTRING2("CSSelector::Service list ret:%d", ret);
- CSSLOGSTRING2("CSSelector::Service list index:%d", index);
-
-
- // Make sure that the index is on the correct range and user has
- // not canceled the list query.
- if ( !ret || ( index < 0 || index >= aServices.Count() ) )
- {
- // User cancels the query -> leave
- User::Leave( KErrCancel );
- }
-
- CleanupStack::PopAndDestroy( lbxItems );
-
- // Use the selected service.
- serviceId = aServices[index];
- }
- else
- {
- // One service available, use it.
- serviceId = aServices[0];
- }
-
-
- // Set results
- SsServiceUtilities::SetServiceResult(
- aResult,
- CConvergedServiceSelector::ESsVoipCall,
- serviceId,
- aRegistered );
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::UiUtilitiesL
-// Returns uiutilities reference.
-// -----------------------------------------------------------------------------
-//
-CSsUiUtilities& CSsServiceHandlerVoip::UiUtilitiesL()
- {
- if ( !iUiUtils )
- {
- // Create uiutils for ui dialogs.
- // UiUtils is created only for the real need.
- iUiUtils = CSsUiUtilities::NewL();
- }
-
- return *iUiUtils;
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::SettingsHandlerL
-// Returns settings handler reference.
-// -----------------------------------------------------------------------------
-//
-CSsSettingsHandler& CSsServiceHandlerVoip::SettingsHandlerL()
- {
- if ( !iSettings )
- {
- // Create settings handler
- iSettings = CSsSettingsHandler::NewL();
- }
-
- return *iSettings;
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::BrandingHandlerL
-// Returns settings handler reference.
-// -----------------------------------------------------------------------------
-//
-CSsBsHandler& CSsServiceHandlerVoip::BrandingHandlerL()
- {
- if ( !iBsHandler )
- {
- // Create settings handler
- iBsHandler = CSsBsHandler::NewL();
- }
-
- return *iBsHandler;
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::ChangeTypeAsCsVoice
-// Checks should voip call type be changed as cs voice.
-// -----------------------------------------------------------------------------
-//
-TBool CSsServiceHandlerVoip::ChangeTypeAsCsVoice
- (
- TUint aServiceId,
- const TDesC& aString
- ) const
- {
- TBool csCall( EFalse );
- TUint prefService( 0 );
-
- if ( SsServiceUtilities::IsValidCsNumber( aString ) &&
- iVoipUtils->IsPreferredTelephonyVoIP() &&
- KErrNone == iVoipUtils->GetPreferredService( prefService ) )
- {
- csCall = prefService == aServiceId &&
- !iConnectionHandler->IsVoipServiceRegistered( aServiceId );
-
- }
-
- return csCall;
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::AddBrandIconL
-//
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerVoip::AddBrandIconL
- (
- CArrayPtr<CGulIcon>* aIcons,
- TUint aServiceId,
- TInt& aIconId
- )
- {
- CFbsBitmap* brandedBitmap = NULL;
- CFbsBitmap* brandedBitmapMask = NULL;
-
- // Get branded bitmap
- TRAPD( err, GetBrandIconL( aServiceId,
- brandedBitmap,
- brandedBitmapMask ) );
-
- if ( KErrNone == err )
- {
- // The count of list icons(before adding branding icon to the list)
- // must be the branded icon list id
- aIconId = aIcons->Count();
- // Create new icon and add it to the icon list
- CGulIcon* icon = CGulIcon::NewL( brandedBitmap, brandedBitmapMask );
- CleanupStack::PushL( icon );
- aIcons->AppendL( icon );
- CleanupStack::Pop( icon );
- }
- else
- {
- // Use default icon for this service
- aIconId = 0;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::GetListBoxItemsAndIconsL
-//
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerVoip::GetListBoxItemsAndIconsL
- (
- RArray<TUint>& aServices,
- CDesCArrayFlat* aLbxItems,
- CArrayPtr<CGulIcon>* aIcons
- )
- {
- CDesCArray* names = new(ELeave) CDesCArrayFlat( KSsArrayGranularity );
- CleanupStack::PushL( names );
-
- // Load default listbox icon
- UiUtilitiesL().LoadDefaultIconL( *aIcons );
-
- // Get service names by service id array
- SettingsHandlerL().GetServiceNamesL( aServices, *names );
-
- for ( TInt i=0; i< aServices.Count() &&
- names->MdcaCount() == aServices.Count(); i++ )
- {
- RBuf16 buf;
- CleanupClosePushL( buf );
- TInt iconId( KErrNotFound );
-
- // Add brand icon. Default is used if brand icon not found
- AddBrandIconL( aIcons, aServices[ i ], iconId );
-
- HBufC* name = HBufC::NewLC( names->MdcaPoint(i).Length() );
- name->Des().Copy( names->MdcaPoint(i) );
-
- buf.CreateL( names->MdcaPoint(i).Length() +
- KQueryItemFormat().Length() +
- KSsIntegerLength );
-
- // Create final list box item data.
- buf.Format( KQueryItemFormat, iconId, name );
-
- //Append text to the item array.
- aLbxItems->AppendL( buf );
-
- CleanupStack::PopAndDestroy( name );
- CleanupStack::PopAndDestroy( &buf );
- }
-
- CleanupStack::PopAndDestroy( names );
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceHandlerVoip::GetBrandIconL
-//
-// -----------------------------------------------------------------------------
-//
-void CSsServiceHandlerVoip::GetBrandIconL
- (
- TUint aServiceId,
- CFbsBitmap*& aBrandedBitmap,
- CFbsBitmap*& aBrandedBitmapMask
- )
- {
- TBuf8<KSsBrandingIdLength> brandId( KNullDesC8 );
-
- SettingsHandlerL().BrandIdL( aServiceId, brandId );
-
- // Get branded bitmap
- BrandingHandlerL().GetBrandedIconL( brandId,
- aBrandedBitmap,
- aBrandedBitmapMask );
- }
-
-
-// ================= OTHER EXPORTED FUNCTIONS ===============================
-
-// End of File
--- a/convergedcallengine/serviceselector/src/cssserviceutilities.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CSsServiceUtilities class
-*
-*/
-
-
-// INCLUDE FILES
-#include "cssserviceutilities.h"
-#include "cssservicehandlergsm.h"
-#include "cssservicehandlervoice.h"
-#include "cssservicehandlervoip.h"
-
-// CONSTANTS
-_LIT( KSsValidCsNumberChars, "0123456789*#+pwPW" );
-
-
-// ================= MEMBER FUNCTIONS =======================================
-
-
-// -----------------------------------------------------------------------------
-// CSsServiceUtilities::ServiceHandlerByCallTypeL
-// Returns handler by call type
-// -----------------------------------------------------------------------------
-//
-CServiceHandler* SsServiceUtilities::ServiceHandlerByCallTypeL
- (
- CConvergedServiceSelector::TSsCallType aCallType,
- TBool aSendKey
- )
- {
- CServiceHandler* handler = NULL;
-
- // Get handler by calltype
- switch( aCallType )
- {
- case CConvergedServiceSelector::ESsVoiceCall:
- {
- /*
- * CodeScanner warning "neglected to put variable on
- * cleanup stack". Method cannot leave when handler is
- * properly initialized so warning ignored.
- */
- if ( aSendKey )
- {
- // If CS call is made by SendKey use
- // Voice service handler. We may have to
- // change the call type as voip (voice) call
- handler = CSsServiceHandlerVoice::NewL();
- }
- else
- {
- // Otherwise use gsm handler
- handler = CSsServiceHandlerGsm::NewL();
- }
- break;
- }
- case CConvergedServiceSelector::ESsVideoCall:
- {
- // Use gsm handler for video call
- handler = CSsServiceHandlerGsm::NewL();
- break;
- }
- case CConvergedServiceSelector::ESsVoipCall:
- {
- // VoIP handler for VoIP call
- handler = CSsServiceHandlerVoip::NewL();
- break;
- }
- default:
- {
- User::Leave( KErrNotSupported );
- break;
- }
- }
-
- return handler;
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceUtilities::SetServiceResult
-// Sets the results to TSsResult
-// -----------------------------------------------------------------------------
-//
-void SsServiceUtilities::SetServiceResult
- (
- CConvergedServiceSelector::TSsResult& aResult,
- CConvergedServiceSelector::TSsCallType aCallType,
- TUint aServiceId,
- TBool aEnabled
- )
- {
- aResult.iCallType = aCallType;
- aResult.iServiceId = aServiceId;
- aResult.iServiceEnabled = aEnabled;
- }
-
-// -----------------------------------------------------------------------------
-// CSsServiceUtilities::ServiceHandlerByCallTypeL
-// Sets the results to TSsResult
-// -----------------------------------------------------------------------------
-//
-TBool SsServiceUtilities::IsValidCsNumber
- (
- const TDesC& aString
- )
- {
- if ( KErrNone == aString.Compare( KNullDesC ) )
- {
- // Empty string
- return EFalse;
- }
-
- TLex input( aString );
- TPtrC valid( KSsValidCsNumberChars );
-
- while ( valid.Locate( input.Peek() ) != KErrNotFound )
- {
- input.Inc();
- }
-
- return !input.Remainder().Length();
- }
-
-// ================= OTHER EXPORTED FUNCTIONS ===============================
-
-// End of File
--- a/convergedcallengine/serviceselector/src/csssettingshandler.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,313 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CSsSettingsHandler class
-*
-*/
-
-
-// INCLUDE FILES
-#include "csssettingshandler.h"
-#include "csslogger.h"
-#include <spdefinitions.h>
-#include <spproperty.h>
-#include <spentry.h>
-
-// CONSTANTS
-// Default voip service id that is not really a voip capable.
-const TInt KSPDefaultVoIPServiceId = 2;
-
-// ================= MEMBER FUNCTIONS =======================================
-
-// -----------------------------------------------------------------------------
-// CSsSettingsHandler::CSsSettingsHandler
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSsSettingsHandler::CSsSettingsHandler
- (
- // None.
- )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CSsSettingsHandler::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSsSettingsHandler::ConstructL()
- {
- iSettings = CSPSettings::NewL();
- }
-
-// -----------------------------------------------------------------------------
-// CSsSettingsHandler::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSsSettingsHandler* CSsSettingsHandler::NewL
- (
- // None.
- )
- {
- CSsSettingsHandler* self = new ( ELeave ) CSsSettingsHandler();
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// Destructor
-CSsSettingsHandler::~CSsSettingsHandler
- (
- // None.
- )
- {
- delete iSettings;
- }
-
-// -----------------------------------------------------------------------------
-// CSsSettingsHandler::GetRegisteredServices
-// Gets registered services.
-// -----------------------------------------------------------------------------
-//
-TInt CSsSettingsHandler::GetRegisteredServices
- (
- CSsConnectionHandler& aConnection,
- RArray<TUint>& aServiceIds
- ) const
- {
- TRAPD( ret, DoGetRegisteredServicesL( aConnection,
- aServiceIds ) );
-
- return ret;
- }
-
-// -----------------------------------------------------------------------------
-// CSsSettingsHandler::GetRegisteredServices
-// Gets all available services.
-// -----------------------------------------------------------------------------
-//
-TInt CSsSettingsHandler::GetAllServices
- (
- RArray<TUint>& aServiceIds
- ) const
- {
- TRAPD( ret, DoGetAllServicesL( aServiceIds ));
-
- return ret;
- }
-
-// -----------------------------------------------------------------------------
-// CSsSettingsHandler::DoGetRegisteredServicesL
-// Gets registered services.
-// -----------------------------------------------------------------------------
-//
-void CSsSettingsHandler::DoGetRegisteredServicesL
- (
- CSsConnectionHandler& aConnection,
- RArray<TUint>& aServiceIds
- ) const
- {
- CSSLOGSTRING("CSSelector::RegisteredServices");
-
- //Clear array
- aServiceIds.Reset();
-
- RArray<TUint> temp;
- CleanupClosePushL( temp );
-
- // Get all voip service ids.
- GetVoipServicesL( temp );
-
- for ( TInt ind=0; ind< temp.Count(); ind++ )
- {
- // Make sure that the service is registered
- if ( aConnection.IsVoipServiceRegistered( temp[ind] ) )
- {
- // Registered service found
- User::LeaveIfError( aServiceIds.Append( temp[ind] ) );
- }
-
- }
-
- CSSLOGSTRING2("CSSelector::RegisteredServices count:%d",
- aServiceIds.Count());
-
- if ( 0 == aServiceIds.Count() )
- {
- // Not any services found, leave.
- User::Leave( KErrNotFound );
- }
-
- CleanupStack::PopAndDestroy( &temp );
- }
-
-// -----------------------------------------------------------------------------
-// CSsSettingsHandler::DoGetAllServicesL
-// Gets all available services.
-// -----------------------------------------------------------------------------
-//
-void CSsSettingsHandler::DoGetAllServicesL
- (
- RArray<TUint>& aServiceIds
- ) const
- {
- CSSLOGSTRING("CSSelector::AllServices");
- //Clear array
- aServiceIds.Reset();
-
- // Get voip services
- GetVoipServicesL( aServiceIds );
-
- CSSLOGSTRING2("CSSelector::AllServices count:%d", aServiceIds.Count());
-
- if ( 0 == aServiceIds.Count() )
- {
- // Not any services found, leave.
- User::Leave( KErrNotFound );
- }
- }
-
-// -----------------------------------------------------------------------------
-// CSsSettingsHandler::GetVoipServicesL
-// Gets voip services.
-// -----------------------------------------------------------------------------
-//
-void CSsSettingsHandler::GetVoipServicesL
- (
- RArray<TUint>& aServiceIds
- ) const
- {
- //Clear array
- aServiceIds.Reset();
-
- RArray<TUint> temp;
- CleanupClosePushL( temp );
-
- // Get all service ids.
- User::LeaveIfError( iSettings->FindServiceIdsL( temp ) );
-
- for ( TInt ind=0; ind< temp.Count(); ind++ )
- {
- // Make sure that the service is a voip capable.
- // For some reason the service id 2 is not voip capable
- // service (although contains the voip subservice properties)
- // so ignore it.
- if ( KSPDefaultVoIPServiceId != temp[ind] )
- {
- TBool voip( EFalse );
- TRAPD( err, voip = IsVoipServiceL( temp[ind] ) );
- if ( !err && voip )
- {
- // Add voip service
- User::LeaveIfError( aServiceIds.Append( temp[ind] ) );
- }
- }
-
- }
-
- CleanupStack::PopAndDestroy( &temp );
- }
-
-// -----------------------------------------------------------------------------
-// CSsSettingsHandler::IsVoipServiceL
-// Checks is the service as voip service.
-// -----------------------------------------------------------------------------
-//
-TBool CSsSettingsHandler::IsVoipServiceL
- (
- TUint aServiceId
- ) const
- {
- CSPProperty* property = CSPProperty::NewLC();
-
- TInt ret = iSettings->FindPropertyL( aServiceId,
- EPropertyVoIPSubServicePluginId ,
- *property );
-
- CleanupStack::PopAndDestroy( property );
-
- // If Voip subservice properties found (ret = KErrNone) then return ETrue.
- if ( KErrNone != ret )
- {
- return EFalse;
- }
- return ETrue;
- }
-
-// -----------------------------------------------------------------------------
-// CSsSettingsHandler::GetServiceNamesL
-// Checks is the service as voip service.
-// -----------------------------------------------------------------------------
-//
-void CSsSettingsHandler::GetServiceNamesL
- (
- RArray<TUint>& aServiceIds,
- CDesCArray& aServiceNames
- ) const
- {
- if ( 0 == aServiceIds.Count() )
- {
- // Empty array, leave.
- User::Leave( KErrNotFound );
- }
-
- // Get names of the services.
- User::LeaveIfError( iSettings->FindServiceNamesL( aServiceIds,
- aServiceNames ) );
- }
-
-// ---------------------------------------------------------------------------
-// CSsSettingsHandler::BrandIdL
-// (other items were commented in a header).
-// ---------------------------------------------------------------------------
-//
-void CSsSettingsHandler::BrandIdL( TInt aServiceId, TDes8& aBrandId )
- {
- CSSLOGSTRING( "CSsSettingsHandler::BrandIdL: =>" );
-
- CSPEntry* entry = CSPEntry::NewLC();
- const CSPProperty* property;
- RBuf brandId;
- brandId.CleanupClosePushL();
- brandId.CreateL( KSPMaxDesLength );
-
- User::LeaveIfError(
- iSettings->FindEntryL( aServiceId, *entry ) );
-
- User::LeaveIfError(
- entry->GetProperty( property, EPropertyBrandId ) );
-
- if ( property )
- {
- property->GetValue( brandId );
- }
-
- if ( brandId.Length() )
- {
- aBrandId.Copy( brandId );
- }
-
- CleanupStack::PopAndDestroy( &brandId );
- CleanupStack::PopAndDestroy( entry );
-
- CSSLOGSTRING( "CSsSettingsHandler::BrandIdL: <=" );
- }
-
-// ================= OTHER EXPORTED FUNCTIONS ===============================
-
-// End of File
--- a/convergedcallengine/serviceselector/src/cssuiutilities.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +0,0 @@
-/*
-* Copyright (c) 2008 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: This module contains the implementation of
-* : CSsUiUtilities class
-*
-*/
-
-
-// INCLUDE FILES
-#include "cssuiutilities.h"
-#include "cssnotedialog.h"
-#include "csslistquerydialog.h"
-#include "csslogger.h"
-#include <eikdialg.h>
-#include <coemain.h>
-#include <bautils.h>
-#include <data_caging_path_literals.hrh> // For resource dir definations
-#include <StringLoader.h>
-#include <AknsUtils.h>
-#include <avkon.mbg>
-
-// CONSTANTS
-// Resource file drive
-_LIT(KSsResourceFileDrive, "Z:");
-// Resource file name
-_LIT(KSsResourceFileName, "serviceselector.rsc");
-// Bitmap path definations
-#define KPluginBitmapPath KDC_APP_BITMAP_DIR
-_LIT( KBitmapFile, "avkon2.mif" );
-
-// ================= MEMBER FUNCTIONS =======================================
-
-
-// -----------------------------------------------------------------------------
-// CSsUiUtilities::CSsUiUtilities
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSsUiUtilities::CSsUiUtilities
- (
- // None
- )
- : iResourceFileOffset( 0 )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CSsUiUtilities::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSsUiUtilities::ConstructL()
- {
- /*
- Code scanner warning "performance: Using CEikonEnv::Static"
- We have to load resources or we cannot show any
- notes nor queries. Warning ignored.
- */
-
- // A Service selector instance can be created also when CCoeEnv is not
- // available (e.g. from server applications). In this case, the methods
- // needing CCoeEnv/CEikonEnv will leave with KErrNotSupported.
- iCoeEnv = CEikonEnv::Static();
-
- if ( iCoeEnv )
- {
- LoadResourceL();
- }
- }
-
-// -----------------------------------------------------------------------------
-// CSsConnectionHandler::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSsUiUtilities* CSsUiUtilities::NewL()
- {
- CSsUiUtilities* self = new ( ELeave ) CSsUiUtilities();
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// Destructor
-CSsUiUtilities::~CSsUiUtilities()
- {
- delete iDlg;
- iDlg = NULL;
-
- if ( iResourceFileOffset )
- {
- iCoeEnv->DeleteResourceFile( iResourceFileOffset );
- iResourceFileOffset = 0;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CSsUiUtilities::ShowInformationNoteL
-// Shows a information note.
-// -----------------------------------------------------------------------------
-//
-void CSsUiUtilities::ShowInformationNoteL
- (
- TInt aResource
- )
- {
- if ( !iCoeEnv )
- {
- // No CCoeEnv/CEikonEnv, leave
- User::Leave( KErrNotSupported );
- }
-
- CSsNoteDialog* dlg = new(ELeave) CSsNoteDialog( &iDlg );
- iDlg = dlg;
-
- dlg->RunDialogLD( aResource );
- }
-
-// -----------------------------------------------------------------------------
-// CSsUiUtilities::ShowListQueryL
-// Shows a list query.
-// -----------------------------------------------------------------------------
-//
-TBool CSsUiUtilities::ShowListQueryL
- (
- TInt& aIndex,
- TInt aResource,
- MDesCArray* aItemTextArray,
- CArrayPtr<CGulIcon>* aIcons
- )
- {
- if ( !iCoeEnv )
- {
- // No CCoeEnv/CEikonEnv, leave
- User::Leave( KErrNotSupported );
- }
-
- CSsListQueryDialog* dlg = new(ELeave) CSsListQueryDialog( &iDlg, aIndex );
- iDlg = dlg;
-
- TInt ret = dlg->ExecuteListLD( aResource, aItemTextArray, aIcons );
-
- // Return true if query not canceled ( ret = 0, if canceled )
- // and the index is on the correct range.
- return ( 0 != ret && KErrNotFound < aIndex &&
- aIndex < aItemTextArray->MdcaCount() );
- }
-
-// -----------------------------------------------------------------------------
-// CSsUiUtilities::LoadDefaultIconL
-// Loads default list box icon.
-// -----------------------------------------------------------------------------
-//
-void CSsUiUtilities::LoadDefaultIconL
- (
- CArrayPtr<CGulIcon>& aIcons
- )
- {
- if ( !iCoeEnv )
- {
- // No CCoeEnv/CEikonEnv, leave
- User::Leave( KErrNotSupported );
- }
-
- CFbsBitmap* brandedBitmap = NULL;
- CFbsBitmap* brandedBitmapMask = NULL;
-
- TFindFile finder( CEikonEnv::Static()->FsSession() );
- User::LeaveIfError( finder.FindByDir( KBitmapFile,
- KPluginBitmapPath ) );
- TFileName bitmapFileName = finder.File();
-
- //default VoIP icon
- AknsUtils::CreateIconL( AknsUtils::SkinInstance(),
- KAknsIIDQgnPropNrtypVoip,
- brandedBitmap,
- brandedBitmapMask,
- bitmapFileName,
- EMbmAvkonQgn_prop_nrtyp_voip,
- EMbmAvkonQgn_prop_nrtyp_voip_mask );
-
- aIcons.AppendL( CGulIcon::NewL( brandedBitmap, brandedBitmapMask ) );
- }
-
-// -----------------------------------------------------------------------------
-// CSsUiUtilities::LoadResourceL
-// Loads the resources needed for queries and confirmation notes
-// -----------------------------------------------------------------------------
-//
-void CSsUiUtilities::LoadResourceL()
- {
- CSSLOGSTRING("CSSelector::LoadResources");
- TFileName fileName;
- fileName += KSsResourceFileDrive;
- fileName += KDC_RESOURCE_FILES_DIR;
- fileName += KSsResourceFileName;
- BaflUtils::NearestLanguageFile( iCoeEnv->FsSession(), fileName );
- iResourceFileOffset = iCoeEnv->AddResourceFileL( fileName );
- }
-
-// ================= OTHER EXPORTED FUNCTIONS ===============================
-
-// End of File
--- a/convergedcallengine/serviceselector/srcdata/serviceselector.rss Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) 2008 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:
-* This file contains all the resources for service selector.
-*
-*/
-
-
-// RESOURCE IDENTIFIER
-NAME CSSE
-
-
-// INCLUDES
-#include <bldvariant.hrh>
-#include <data_caging_paths_strings.hrh>
-#include <eikon.rh>
-#include <avkon.hrh>
-#include <avkon.rh>
-#include <avkon.rsg>
-#include "serviceselector.loc"
-
-
-// RESOURCE DEFINITIONS
-
-// -----------------------------------------------------------------------------
-//
-// RSS_SIGNATURE
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE RSS_SIGNATURE { }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_no_service_available
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_no_service_available
- {
- buf = qtn_voip_no_service_configured;
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_phone_voip_call_type_query
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE AVKON_LIST_QUERY r_phone_voip_call_type_query
- {
- flags = EGeneralQueryFlags;
- softkeys = R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT;
- items =
- {
- DLG_LINE
- {
- type = EAknCtListQueryControl;
- id = EListQueryControl;
- control = AVKON_LIST_QUERY_CONTROL
- {
- listtype = EAknCtSingleGraphicPopupMenuListBox;
- listbox = LISTBOX
- {
- //constructed dynamically
- };
- heading = qtn_servtab_select_service_query;
- };
- }
-
- };
- }
-
-
-
-//##########################################################
-// End of File
--- a/convergedcallengine/spsettings/backuphelper/src/spsbackuphelpermonitor.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/convergedcallengine/spsettings/backuphelper/src/spsbackuphelpermonitor.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -176,15 +176,9 @@
void CSpsBackupHelperMonitor::RunL()
{
XSPSLOGSTRING( "CSpsBackupHelperMonitor::RunL IN" );
- // The P&S flag has changed state, which could mean that the device is
- // either entering a backup, restore or normal state
- TInt backupStateValue = 0; // To store the P&S value
-
// re-subscribe to the flag to monitor future changes
Subscribe();
-
CheckStatusL();
-
XSPSLOGSTRING( "CSpsBackupHelperMonitor::RunL OUT" );
}
--- a/layers.sysdef.xml Fri Sep 17 17:09:13 2010 +0300
+++ b/layers.sysdef.xml Mon Oct 04 15:57:13 2010 +0300
@@ -13,13 +13,11 @@
<layer name="api_test_layer">
<module name="tedo_api_tests">
- <unit unitID="tedo.PsetNotesUi.test" name="PsetNotesUi.test" bldFile="&layer_real_source_path;/cellular/PsetNotesUi/tsrc/public/basic/group" mrp="" />
<unit unitID="tedo.SSSettings.test" name="SSSettings.test" bldFile="&layer_real_source_path;/cellular/SSSettings/tsrc/public/basic/group" mrp="" />
<unit unitID="tedo.telephonysettings.test" name="telephonysettings.test" bldFile="&layer_real_source_path;/cellular/telephonysettings/tsrc/public/basic/group" mrp="" />
<unit unitID="tedo.cce.test" name="cce.test" bldFile="&layer_real_source_path;/convergedcallengine/cce/tsrc/public/basic/group" mrp="" />
<unit unitID="tedo.spsettings.test" name="spsettings.test" bldFile="&layer_real_source_path;/convergedcallengine/spsettings/tsrc/public/basic/group" mrp="" />
<unit unitID="tedo.aiwdialdata.test" name="aiwdialdata.test" bldFile="&layer_real_source_path;/phoneclientserver/aiwdialdata/tsrc/public/basic/group" mrp="" />
- <unit unitID="tedo.dialutils.test" name="dialutils.test" bldFile="&layer_real_source_path;/phoneclientserver/dialutils/tsrc/public/basic/group" mrp="" />
<unit unitID="tedo.phoneclient.test" name="phoneclient.test" bldFile="&layer_real_source_path;/phoneclientserver/phoneclient/tsrc/public/basic/group" mrp="" />
<unit unitID="tedo.call_information_api.test" name="call_information_api.test" bldFile="&layer_real_source_path;/phonesrv_plat/call_information_api/tsrc/group" mrp="" />
<unit unitID="tedo.sat_client_api.test" name="sat_client_api.test" bldFile="&layer_real_source_path;/phonesrv_plat/sat_client_api/tsrc/group" mrp="" />
--- a/networkhandling/networkhandlingengine/Bwins/NETWORKHANDLINGU.DEF Fri Sep 17 17:09:13 2010 +0300
+++ b/networkhandling/networkhandlingengine/Bwins/NETWORKHANDLINGU.DEF Mon Oct 04 15:57:13 2010 +0300
@@ -8,6 +8,5 @@
?NewL@CNWGsmSessionImplementation@@SAPAV1@AAVMNWMessageObserver@@AAUTNWInfo@@@Z @ 7 NONAME ; class CNWGsmSessionImplementation * CNWGsmSessionImplementation::NewL(class MNWMessageObserver &, struct TNWInfo &)
?NewL@CNWNetworkModeMonitor@@SAPAV1@AAVCNWMessageHandler@@AAVRMobilePhone@@AAUTNWInfo@@AAVRMmCustomAPI@@@Z @ 8 NONAME ; class CNWNetworkModeMonitor * CNWNetworkModeMonitor::NewL(class CNWMessageHandler &, class RMobilePhone &, struct TNWInfo &, class RMmCustomAPI &)
?NewL@CNWNetworkRegistrationStatusMonitor@@SAPAV1@AAVCNWMessageHandler@@AAVRMobilePhone@@AAUTNWInfo@@AAVRMmCustomAPI@@@Z @ 9 NONAME ; class CNWNetworkRegistrationStatusMonitor * CNWNetworkRegistrationStatusMonitor::NewL(class CNWMessageHandler &, class RMobilePhone &, struct TNWInfo &, class RMmCustomAPI &)
- ?SendErrorMessage@CNWMessageHandler@@QAEXW4TNWOperation@MNWMessageObserver@@H@Z @ 10 NONAME ; void CNWMessageHandler::SendErrorMessage(enum MNWMessageObserver::TNWOperation, int)
- ?SendMessage@CNWMessageHandler@@UAEXW4TNWMessages@MNWMessageObserver@@@Z @ 11 NONAME ; void CNWMessageHandler::SendMessage(enum MNWMessageObserver::TNWMessages)
+ ?SendMessage@CNWMessageHandler@@UAEXW4TNWMessages@MNWMessageObserver@@@Z @ 10 NONAME ; void CNWMessageHandler::SendMessage(enum MNWMessageObserver::TNWMessages)
--- a/networkhandling/networkhandlingengine/EABI/networkhandlingNGu.DEF Fri Sep 17 17:09:13 2010 +0300
+++ b/networkhandling/networkhandlingengine/EABI/networkhandlingNGu.DEF Mon Oct 04 15:57:13 2010 +0300
@@ -64,4 +64,10 @@
_ZTV35CNWGsmNetworkCellReselectionHandler @ 63 NONAME ; #<VT>#
_ZTV35CNWNetworkRegistrationStatusMonitor @ 64 NONAME ; #<VT>#
_ZTV36CNWNetworkRegistrationStatusReceiver @ 65 NONAME ; #<VT>#
+ _ZN10CNWSessionD0Ev @ 66 NONAME
+ _ZN10CNWSessionD1Ev @ 67 NONAME
+ _ZN10CNWSessionD2Ev @ 68 NONAME
+ _ZN20CNWGsmMessageHandlerD0Ev @ 69 NONAME
+ _ZN20CNWGsmMessageHandlerD1Ev @ 70 NONAME
+ _ZN20CNWGsmMessageHandlerD2Ev @ 71 NONAME
--- a/networkhandling/networkhandlingengine/NetworkHandlingGsmSrc/CNWGsmMessageHandler.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/networkhandling/networkhandlingengine/NetworkHandlingGsmSrc/CNWGsmMessageHandler.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -121,7 +121,7 @@
// Destructor
-CNWGsmMessageHandler::~CNWGsmMessageHandler()
+EXPORT_C CNWGsmMessageHandler::~CNWGsmMessageHandler()
{
NWLOGSTRING( KNWOBJECT,
"NW: CNWNetworkViagBaseEngine::~CNWGsmMessageHandler() Begin " );
--- a/networkhandling/networkhandlingengine/NetworkHandlingInc/CNWMessageHandler.h Fri Sep 17 17:09:13 2010 +0300
+++ b/networkhandling/networkhandlingengine/NetworkHandlingInc/CNWMessageHandler.h Mon Oct 04 15:57:13 2010 +0300
@@ -107,7 +107,7 @@
* @param aOperation is failed operation
* @param aErrorCode is returned Symbion OS Error Code
*/
- IMPORT_C void SendErrorMessage(
+ void SendErrorMessage(
MNWMessageObserver::TNWOperation aOperation,
TInt aErrorCode );
--- a/networkhandling/networkhandlingengine/NetworkHandlingSrc/CNWMessageHandler.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/networkhandling/networkhandlingengine/NetworkHandlingSrc/CNWMessageHandler.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -456,7 +456,7 @@
}
// ----------------------------------------------------------------------------
-// CNWMessageHandler::SendMessage
+// CNWMessageHandler::SendErrorMessage
// Reroutes error messages to the Client object.
// ----------------------------------------------------------------------------
//
--- a/networkhandling/networkhandlingengine/NetworkHandlingSrc/CNWSession.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/networkhandling/networkhandlingengine/NetworkHandlingSrc/CNWSession.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -35,7 +35,7 @@
// Destructor
-CNWSession::~CNWSession()
+EXPORT_C CNWSession::~CNWSession()
{
}
--- a/package_definition.xml Fri Sep 17 17:09:13 2010 +0300
+++ b/package_definition.xml Mon Oct 04 15:57:13 2010 +0300
@@ -39,10 +39,6 @@
<meta rel="Api" href="phonesrv_plat/sat_configuration_api/sat_configuration_api.metaxml"/>
<unit bldFile="phonesrv_plat/sat_configuration_api/group"/>
</component>
- <component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
- <meta rel="Api" href="phonesrv_plat/dial_utils_api/dial_utils_api.metaxml"/>
- <unit bldFile="phonesrv_plat/dial_utils_api/group"/>
- </component>
<component id="phone_client_image_handler_api" name="Phone Client Image Handler API" class="api" filter="s60">
<meta rel="Api" href="phonesrv_plat/phone_client_image_handler_api/phone_client_image_handler_api.metaxml"/>
<unit bldFile="phonesrv_plat/phone_client_image_handler_api/group"/>
@@ -97,10 +93,6 @@
<meta rel="Api" href="phonesrv_plat/secondary_display_sat_api/secondary_display_sat_api.metaxml"/>
<unit bldFile="phonesrv_plat/secondary_display_sat_api/group"/>
</component>
- <component id="callui_reconnect_query_api" name="CallUI Reconnect Query API" class="api" filter="s60">
- <meta rel="Api" href="phonesrv_plat/callui_reconnect_query_api/callui_reconnect_query_api.metaxml"/>
- <unit bldFile="phonesrv_plat/callui_reconnect_query_api/group"/>
- </component>
<component id="service_provider_settings_api" name="Service Provider Settings API" class="api" filter="s60">
<meta rel="Api" href="phonesrv_plat/service_provider_settings_api/service_provider_settings_api.metaxml"/>
<unit bldFile="phonesrv_plat/service_provider_settings_api/group"/>
@@ -128,10 +120,6 @@
<meta rel="Api" href="phonesrv_plat/phone_settings_observer_api/phone_settings_observer_api.metaxml"/>
<unit bldFile="phonesrv_plat/phone_settings_observer_api/group"/>
</component>
- <component id="phone_settings_notes_ui_api" name="Phone Settings Notes UI API" class="api" filter="s60">
- <meta rel="Api" href="phonesrv_plat/phone_settings_notes_ui_api/phone_settings_notes_ui_api.metaxml"/>
- <unit bldFile="phonesrv_plat/phone_settings_notes_ui_api/group"/>
- </component>
<component id="phone_settings_api" name="Phone Settings API" class="api" filter="s60">
<meta rel="Api" href="phonesrv_plat/phone_settings_api/phone_settings_api.metaxml"/>
<unit bldFile="phonesrv_plat/phone_settings_api/group"/>
@@ -204,16 +192,9 @@
<!-- need to move to own component, not under sssettings -->
<unit bldFile="cellular/sssettings/xqbindings/sssettingswrapper" qt:proFile="sssettingswrapper.pro"/>
</component>
- <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI" purpose="development">
- <unit bldFile="cellular/psetnotesui/group" filter="!test"/>
- <unit bldFile="cellular/PsetNotesUi/tsrc/public/basic/group" filter="test,api_test"/>
- </component>
<component id="psuinotes" filter="s60" name="Phone Settings Notes UI" introduced="^4">
<unit bldFile="cellular/psuinotes" qt:proFile="psuinotes.pro"/>
</component>
- <component id="servicerequest" filter="s60" name="Service Request">
- <unit bldFile="cellular/servicerequest/group"/>
- </component>
</collection>
<collection id="convergedcallengine" name="Converged Call Engine" level="framework">
<component id="callprovider" filter="s60" name="Call Provider">
@@ -230,9 +211,6 @@
<component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
<unit bldFile="convergedcallengine/cenrepdatabase/group"/>
</component>
- <component id="serviceselector" filter="s60" name="Service Selector">
- <unit bldFile="convergedcallengine/serviceselector/group"/>
- </component>
</collection>
<collection id="networkhandling" name="Network Handling" level="framework">
<component id="networkhandlingengine" filter="s60" name="Network Handling Engine">
@@ -247,10 +225,6 @@
<unit bldFile="phoneclientserver/aiwdialdata/group" filter="!test"/>
<unit filter="test,api_test" bldFile="phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
</component>
- <component id="dialutils" filter="s60" name="Dial Utils">
- <unit bldFile="phoneclientserver/dialutils/group" filter="!test"/>
- <unit filter="test,api_test" bldFile="phoneclientserver/dialutils/tsrc/public/basic/group"/>
- </component>
<component id="phoneclient" filter="s60" name="Phone Client">
<unit bldFile="phoneclientserver/phoneclient/group" filter="!test"/>
<unit filter="test,api_test" bldFile="phoneclientserver/phoneclient/tsrc/public/basic/group"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/Bmarm/aiwdialtestU.DEF Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+ LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
+ SetRequirements__FRP16CTestModuleParamRUl @ 2 NONAME R3UNUSED ; SetRequirements(CTestModuleParam *&, unsigned long &)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/Bwins/aiwdialtestU.DEF Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+ ?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
+ ?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/EABI/aiwdialtestU.def Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+ _Z9LibEntryLv @ 1 NONAME
+ _Z15SetRequirementsRP16CTestModuleParamRm @ 2 NONAME
+
--- a/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/bmarm/aiwdialtestu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
- SetRequirements__FRP16CTestModuleParamRUl @ 2 NONAME R3UNUSED ; SetRequirements(CTestModuleParam *&, unsigned long &)
-
--- a/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/bwins/aiwdialtestu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- ?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
- ?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
-
--- a/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/eabi/aiwdialtestu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- _Z9LibEntryLv @ 1 NONAME
- _Z15SetRequirementsRP16CTestModuleParamRm @ 2 NONAME
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/group/Bld.inf Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,60 @@
+/*
+* Copyright (c) 2002 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: Build file for aiwdialtest component.
+*
+*/
+
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// defaults to WINS MARM so you can ignore this if you just build these
+DEFAULT
+
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
+
+PRJ_EXPORTS
+// Specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+// If there's no destination then the source file will be copied
+// to the same name in /epoc32/include
+// Example:
+/*
+/agnmodel/inc/AGMCOMON.H
+*/
+
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+aiwdialtest.mmp
+
+PRJ_MMPFILES
+// Specify the .mmp files required for building the important component
+// releasables.
+//
+// Specify "tidy" if the component you need to build doesn't need to be
+// released. Specify "ignore" if the MMP file exists but should be
+// ignored.
+// Example:
+/*
+/agnmodel/group/agnmodel.mmp
+#if defined(MARM)
+/agnmodel/group/agsvexe.mmp
+#endif
+*/
+
+
+// End of File
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/group/aiwdialtest_DoxyFile.txt Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,222 @@
+# Doxyfile 1.4.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME = aiwdialtest
+PROJECT_NUMBER =
+OUTPUT_DIRECTORY = \aiwdialtest\
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+USE_WINDOWS_ENCODING = YES
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF =
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = NO
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+DISTRIBUTE_GROUP_DOC = NO
+TAB_SIZE = 8
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = YES
+OPTIMIZE_OUTPUT_JAVA = NO
+SUBGROUPING = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = NO
+EXTRACT_STATIC = NO
+EXTRACT_LOCAL_CLASSES = NO
+EXTRACT_LOCAL_METHODS = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = YES
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = NO
+GENERATE_TESTLIST = NO
+GENERATE_BUGLIST = NO
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = YES
+FILE_VERSION_FILTER =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = \aiwdialtest\
+FILE_PATTERNS = *.h \
+ *.rh \
+ *.hrh
+RECURSIVE = YES
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = NO
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = NO
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = NO
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
+GENERATE_HTMLHELP = YES
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+BINARY_TOC = YES
+TOC_EXPAND = YES
+DISABLE_INDEX = YES
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = YES
+TREEVIEW_WIDTH = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = YES
+RTF_OUTPUT = Doc
+COMPACT_RTF = YES
+RTF_HYPERLINKS = YES
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = YES
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED = NONSHARABLE_CLASS
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = NO
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = YES
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+MAX_DOT_GRAPH_WIDTH = 1024
+MAX_DOT_GRAPH_HEIGHT = 1024
+MAX_DOT_GRAPH_DEPTH = 0
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
--- a/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/group/aiwdialtest_doxyfile.txt Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +0,0 @@
-# Doxyfile 1.4.1
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME = aiwdialtest
-PROJECT_NUMBER =
-OUTPUT_DIRECTORY = \aiwdialtest\
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-USE_WINDOWS_ENCODING = YES
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF =
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-DISTRIBUTE_GROUP_DOC = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = YES
-OPTIMIZE_OUTPUT_JAVA = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-EXTRACT_LOCAL_CLASSES = NO
-EXTRACT_LOCAL_METHODS = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = YES
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = NO
-GENERATE_TESTLIST = NO
-GENERATE_BUGLIST = NO
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = YES
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = \aiwdialtest\
-FILE_PATTERNS = *.h \
- *.rh \
- *.hrh
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = NO
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = NO
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = NO
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = YES
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = YES
-TOC_EXPAND = YES
-DISABLE_INDEX = YES
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = YES
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = YES
-RTF_OUTPUT = Doc
-COMPACT_RTF = YES
-RTF_HYPERLINKS = YES
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED = NONSHARABLE_CLASS
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = YES
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = YES
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
-MAX_DOT_GRAPH_DEPTH = 0
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
--- a/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2002 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: Build file for aiwdialtest component.
-*
-*/
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-// Specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-// Example:
-/*
-/agnmodel/inc/AGMCOMON.H
-*/
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-aiwdialtest.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
-
-
-// End of File
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/src/aiwdialtestCases.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,157 @@
+/*
+* Copyright (c) 2002 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 Caiwdialtest class.
+*
+*/
+
+
+
+// INCLUDE FILES
+#include <e32math.h>
+#include <aiwdialdata.h>
+#include <AiwCommon.h>
+#include <AiwServiceHandler.h>
+
+#include "aiwdialtest.h"
+
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// Caiwdialtest::Case
+// Returns a test case by number.
+//
+// This function contains an array of all available test cases
+// i.e pair of case name and test function. If case specified by parameter
+// aCaseNumber is found from array, then that item is returned.
+//
+// The reason for this rather complicated function is to specify all the
+// test cases only in one place. It is not necessary to understand how
+// function pointers to class member functions works when adding new test
+// cases. See function body for instructions how to add new test case.
+// -----------------------------------------------------------------------------
+//
+const TCaseInfo Caiwdialtest::Case (
+ const TInt aCaseNumber ) const
+ {
+
+ /**
+ * To add new test cases, implement new test case function and add new
+ * line to KCases array specify the name of the case and the function
+ * doing the test case
+ * In practice, do following
+ * 1) Make copy of existing test case function and change its name
+ * and functionality. Note that the function must be added to
+ * aiwdialtest.cpp file and to aiwdialtest.h
+ * header file.
+ *
+ * 2) Add entry to following KCases array either by using:
+ *
+ * 2.1: FUNCENTRY or ENTRY macro
+ * ENTRY macro takes two parameters: test case name and test case
+ * function name.
+ *
+ * FUNCENTRY macro takes only test case function name as a parameter and
+ * uses that as a test case name and test case function name.
+ *
+ * Or
+ *
+ * 2.2: OOM_FUNCENTRY or OOM_ENTRY macro. Note that these macros are used
+ * only with OOM (Out-Of-Memory) testing!
+ *
+ * OOM_ENTRY macro takes five parameters: test case name, test case
+ * function name, TBool which specifies is method supposed to be run using
+ * OOM conditions, TInt value for first heap memory allocation failure and
+ * TInt value for last heap memory allocation failure.
+ *
+ * OOM_FUNCENTRY macro takes test case function name as a parameter and uses
+ * that as a test case name, TBool which specifies is method supposed to be
+ * run using OOM conditions, TInt value for first heap memory allocation
+ * failure and TInt value for last heap memory allocation failure.
+ */
+
+ static TCaseInfoInternal const KCases[] =
+ {
+ // To add new test cases, add new items to this array
+
+ // NOTE: When compiled to GCCE, there must be Classname::
+ // declaration in front of the method name, e.g.
+ // Caiwdialtest::PrintTest. Otherwise the compiler
+ // gives errors.
+
+ FUNCENTRY( Caiwdialtest::DialTestL ),
+ // Example how to use OOM functionality
+ //OOM_ENTRY( "Loop test with OOM", Caiwdialtest::LoopTest, ETrue, 2, 3),
+ //OOM_FUNCENTRY( Caiwdialtest::PrintTest, ETrue, 1, 3 ),
+ };
+
+ // Verify that case number is valid
+ if( (TUint) aCaseNumber >= sizeof( KCases ) /
+ sizeof( TCaseInfoInternal ) )
+ {
+ // Invalid case, construct empty object
+ TCaseInfo null( (const TText*) L"" );
+ null.iMethod = NULL;
+ null.iIsOOMTest = EFalse;
+ null.iFirstMemoryAllocation = 0;
+ null.iLastMemoryAllocation = 0;
+ return null;
+ }
+
+ // Construct TCaseInfo object and return it
+ TCaseInfo tmp ( KCases[ aCaseNumber ].iCaseName );
+ tmp.iMethod = KCases[ aCaseNumber ].iMethod;
+ tmp.iIsOOMTest = KCases[ aCaseNumber ].iIsOOMTest;
+ tmp.iFirstMemoryAllocation = KCases[ aCaseNumber ].iFirstMemoryAllocation;
+ tmp.iLastMemoryAllocation = KCases[ aCaseNumber ].iLastMemoryAllocation;
+ return tmp;
+
+ }
+
+// -----------------------------------------------------------------------------
+// Test dialing a call.
+// -----------------------------------------------------------------------------
+//
+TInt Caiwdialtest::DialTestL( TTestResult& /*aResult*/ )
+ {
+ CAiwDialData* dialData = CAiwDialData::NewLC();
+ dialData->SetPhoneNumberL( *iPhoneNumber );
+
+ CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
+ dialData->FillInParamListL( *list );
+
+ CActiveScheduler* scheduler = new( ELeave )CActiveScheduler();
+ CleanupStack::PushL( scheduler );
+ CActiveScheduler::Install( scheduler );
+
+
+ RCriteriaArray criterias;
+ _LIT8( KContentType, "*" );
+ CAiwCriteriaItem* criteria = CAiwCriteriaItem::NewLC( KAiwCmdCall, KAiwCmdCall, KContentType );
+ TUid uid;
+ uid.iUid = KAiwClassBase;
+ criteria->SetServiceClass( uid );
+ criterias.AppendL( criteria );
+ CleanupClose<RCriteriaArray>::PushL( criterias );
+
+ CAiwServiceHandler* service = CAiwServiceHandler::NewLC();
+ service->AttachL( criterias );
+ service->ExecuteServiceCmdL( KAiwCmdCall, *list, service->OutParamListL() );
+
+ CleanupStack::PopAndDestroy( 6, dialData );
+ return KErrNone;
+ }
+
+// End of File
--- a/phoneclientserver/aiwdialdata/tsrc/public/adv/aiwdialtest/src/aiwdialtestcases.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-/*
-* Copyright (c) 2002 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 Caiwdialtest class.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32math.h>
-#include <aiwdialdata.h>
-#include <AiwCommon.h>
-#include <AiwServiceHandler.h>
-
-#include "aiwdialtest.h"
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Caiwdialtest::Case
-// Returns a test case by number.
-//
-// This function contains an array of all available test cases
-// i.e pair of case name and test function. If case specified by parameter
-// aCaseNumber is found from array, then that item is returned.
-//
-// The reason for this rather complicated function is to specify all the
-// test cases only in one place. It is not necessary to understand how
-// function pointers to class member functions works when adding new test
-// cases. See function body for instructions how to add new test case.
-// -----------------------------------------------------------------------------
-//
-const TCaseInfo Caiwdialtest::Case (
- const TInt aCaseNumber ) const
- {
-
- /**
- * To add new test cases, implement new test case function and add new
- * line to KCases array specify the name of the case and the function
- * doing the test case
- * In practice, do following
- * 1) Make copy of existing test case function and change its name
- * and functionality. Note that the function must be added to
- * aiwdialtest.cpp file and to aiwdialtest.h
- * header file.
- *
- * 2) Add entry to following KCases array either by using:
- *
- * 2.1: FUNCENTRY or ENTRY macro
- * ENTRY macro takes two parameters: test case name and test case
- * function name.
- *
- * FUNCENTRY macro takes only test case function name as a parameter and
- * uses that as a test case name and test case function name.
- *
- * Or
- *
- * 2.2: OOM_FUNCENTRY or OOM_ENTRY macro. Note that these macros are used
- * only with OOM (Out-Of-Memory) testing!
- *
- * OOM_ENTRY macro takes five parameters: test case name, test case
- * function name, TBool which specifies is method supposed to be run using
- * OOM conditions, TInt value for first heap memory allocation failure and
- * TInt value for last heap memory allocation failure.
- *
- * OOM_FUNCENTRY macro takes test case function name as a parameter and uses
- * that as a test case name, TBool which specifies is method supposed to be
- * run using OOM conditions, TInt value for first heap memory allocation
- * failure and TInt value for last heap memory allocation failure.
- */
-
- static TCaseInfoInternal const KCases[] =
- {
- // To add new test cases, add new items to this array
-
- // NOTE: When compiled to GCCE, there must be Classname::
- // declaration in front of the method name, e.g.
- // Caiwdialtest::PrintTest. Otherwise the compiler
- // gives errors.
-
- FUNCENTRY( Caiwdialtest::DialTestL ),
- // Example how to use OOM functionality
- //OOM_ENTRY( "Loop test with OOM", Caiwdialtest::LoopTest, ETrue, 2, 3),
- //OOM_FUNCENTRY( Caiwdialtest::PrintTest, ETrue, 1, 3 ),
- };
-
- // Verify that case number is valid
- if( (TUint) aCaseNumber >= sizeof( KCases ) /
- sizeof( TCaseInfoInternal ) )
- {
- // Invalid case, construct empty object
- TCaseInfo null( (const TText*) L"" );
- null.iMethod = NULL;
- null.iIsOOMTest = EFalse;
- null.iFirstMemoryAllocation = 0;
- null.iLastMemoryAllocation = 0;
- return null;
- }
-
- // Construct TCaseInfo object and return it
- TCaseInfo tmp ( KCases[ aCaseNumber ].iCaseName );
- tmp.iMethod = KCases[ aCaseNumber ].iMethod;
- tmp.iIsOOMTest = KCases[ aCaseNumber ].iIsOOMTest;
- tmp.iFirstMemoryAllocation = KCases[ aCaseNumber ].iFirstMemoryAllocation;
- tmp.iLastMemoryAllocation = KCases[ aCaseNumber ].iLastMemoryAllocation;
- return tmp;
-
- }
-
-// -----------------------------------------------------------------------------
-// Test dialing a call.
-// -----------------------------------------------------------------------------
-//
-TInt Caiwdialtest::DialTestL( TTestResult& /*aResult*/ )
- {
- CAiwDialData* dialData = CAiwDialData::NewLC();
- dialData->SetPhoneNumberL( *iPhoneNumber );
-
- CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
- dialData->FillInParamListL( *list );
-
- CActiveScheduler* scheduler = new( ELeave )CActiveScheduler();
- CleanupStack::PushL( scheduler );
- CActiveScheduler::Install( scheduler );
-
-
- RCriteriaArray criterias;
- _LIT8( KContentType, "*" );
- CAiwCriteriaItem* criteria = CAiwCriteriaItem::NewLC( KAiwCmdCall, KAiwCmdCall, KContentType );
- TUid uid;
- uid.iUid = KAiwClassBase;
- criteria->SetServiceClass( uid );
- criterias.AppendL( criteria );
- CleanupClose<RCriteriaArray>::PushL( criterias );
-
- CAiwServiceHandler* service = CAiwServiceHandler::NewLC();
- service->AttachL( criterias );
- service->ExecuteServiceCmdL( KAiwCmdCall, *list, service->OutParamListL() );
-
- CleanupStack::PopAndDestroy( 6, dialData );
- return KErrNone;
- }
-
-// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/adv/group/README.txt Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,2 @@
+aiwdialtest folder contains test for making a call using AIW Dial API.
+init\aiwdialtest.ini can be used to configure the phonenumber where the aiwdialtest makes the call.
\ No newline at end of file
--- a/phoneclientserver/aiwdialdata/tsrc/public/adv/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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: Build file for aiwdialtest component.
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-
-PRJ_EXPORTS
-
-PRJ_TESTMMPFILES
-../aiwdialtest/group/aiwdialtest.mmp
-
-PRJ_MMPFILES
-
--- a/phoneclientserver/aiwdialdata/tsrc/public/adv/group/readme.txt Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-aiwdialtest folder contains test for making a call using AIW Dial API.
-init\aiwdialtest.ini can be used to configure the phonenumber where the aiwdialtest makes the call.
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/basic/AiwDialDataTests/Bmarm/AiwDialDataTestsU.DEF Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+ LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
+ SetRequirements__FRP16CTestModuleParamRUl @ 2 NONAME R3UNUSED ; SetRequirements(CTestModuleParam *&, unsigned long &)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/basic/AiwDialDataTests/Bwins/AiwDialDataTestsU.DEF Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+ ?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
+ ?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/basic/AiwDialDataTests/EABI/AiwDialDataTestsU.def Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+ _Z9LibEntryLv @ 1 NONAME
+ _Z15SetRequirementsRP16CTestModuleParamRm @ 2 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/basic/AiwDialDataTests/group/AiwDialDataTests.mmp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2002 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: MMP file for AiwDialDataTests component.
+*
+*/
+
+
+#if defined(__S60_)
+ // To get the OS_LAYER_SYSTEMINCLUDE-definition
+ #include <platform_paths.hrh>
+#endif
+
+TARGET AiwDialDataTests.dll
+TARGETTYPE dll
+UID 0x1000008D 0x101FB3E7
+
+CAPABILITY ALL -TCB
+
+
+DEFFILE AiwDialDataTests.def
+
+SOURCEPATH ../src
+SOURCE AiwDialDataTests.cpp
+SOURCE AiwDialDataTestsCases.cpp
+
+USERINCLUDE ../inc
+
+OS_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE
+
+LIBRARY euser.lib
+LIBRARY stiftestinterface.lib
+LIBRARY ServiceHandler.lib
+LIBRARY aiwdialdata.lib
+
+LANG SC
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/basic/AiwDialDataTests/group/AiwDialDataTests_DoxyFile.txt Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,222 @@
+# Doxyfile 1.4.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME = AiwDialDataTests
+PROJECT_NUMBER =
+OUTPUT_DIRECTORY = \AiwDialDataTests\
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+USE_WINDOWS_ENCODING = YES
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF =
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = NO
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+DISTRIBUTE_GROUP_DOC = NO
+TAB_SIZE = 8
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = YES
+OPTIMIZE_OUTPUT_JAVA = NO
+SUBGROUPING = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = NO
+EXTRACT_STATIC = NO
+EXTRACT_LOCAL_CLASSES = NO
+EXTRACT_LOCAL_METHODS = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = YES
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = NO
+GENERATE_TESTLIST = NO
+GENERATE_BUGLIST = NO
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = YES
+FILE_VERSION_FILTER =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = \AiwDialDataTests\
+FILE_PATTERNS = *.h \
+ *.rh \
+ *.hrh
+RECURSIVE = YES
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = NO
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = NO
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = NO
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
+GENERATE_HTMLHELP = YES
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+BINARY_TOC = YES
+TOC_EXPAND = YES
+DISABLE_INDEX = YES
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = YES
+TREEVIEW_WIDTH = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = YES
+RTF_OUTPUT = Doc
+COMPACT_RTF = YES
+RTF_HYPERLINKS = YES
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = YES
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED = NONSHARABLE_CLASS
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = NO
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = YES
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+MAX_DOT_GRAPH_WIDTH = 1024
+MAX_DOT_GRAPH_HEIGHT = 1024
+MAX_DOT_GRAPH_DEPTH = 0
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/basic/AiwDialDataTests/group/Bld.inf Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,60 @@
+/*
+* Copyright (c) 2002 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: Build file for AiwDialDataTests component.
+*
+*/
+
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// defaults to WINS MARM so you can ignore this if you just build these
+DEFAULT
+
+PRJ_TESTEXPORTS
+// NOTE: If using ARS requirements all export operations should be done under this.
+// 'abld test export'
+
+PRJ_EXPORTS
+// Specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+// If there's no destination then the source file will be copied
+// to the same name in /epoc32/include
+// Example:
+/*
+/agnmodel/inc/AGMCOMON.H
+*/
+
+PRJ_TESTMMPFILES
+// NOTE: If using ARS requirements .mmp file operation should be done under this.
+// 'abld test build'
+AiwDialDataTests.mmp
+
+PRJ_MMPFILES
+// Specify the .mmp files required for building the important component
+// releasables.
+//
+// Specify "tidy" if the component you need to build doesn't need to be
+// released. Specify "ignore" if the MMP file exists but should be
+// ignored.
+// Example:
+/*
+/agnmodel/group/agnmodel.mmp
+#if defined(MARM)
+/agnmodel/group/agsvexe.mmp
+#endif
+*/
+
+
+// End of File
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/basic/AiwDialDataTests/group/aiwdialdatatests.pkg Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,38 @@
+;
+; 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:
+;
+;File: SendUIAPITest.pkg;
+;
+;Auto-generated PKG file by Nokia PKG Wizard for CodeWarrior IDE
+
+;*Languages
+&EN
+;
+;*Standard SIS file header. This section specifies the package name,
+;application UID, and version/build numbers. Add the package TYPE here if needed.
+#{"aiwdialdatatests"},(0x101FB3E7),1,0,1;
+;
+
+;*Unique (Non-Localized) Vendor name
+;This is used in combination with signing to prevent the unauthroized
+;upgrade of a a package by someone other than the rightful vendor.
+:"Nokia"
+
+;*Localized Vendor Name
+;This specifies the localized vendor name(s) corresponding to language(s).
+%{"Nokia Test EN"}
+
+;*Files To Copy...<src> <destination>
+"\epoc32\release\armv5\urel\AiwDialDataTests.dll"-"C:\sys\bin\AiwDialDataTests.dll"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/basic/AiwDialDataTests/inc/AiwDialDataTests.h Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,273 @@
+/*
+* Copyright (c) 2002 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: AiwDialDataTests test module.
+*
+*/
+
+
+
+#ifndef AIWDIALDATATESTS_H
+#define AIWDIALDATATESTS_H
+
+// INCLUDES
+#include "StifTestModule.h"
+#include <StifLogger.h>
+
+
+// Logging path
+_LIT( KAiwDialDataTestsLogPath, "\\logs\\testframework\\AiwDialDataTests\\" );
+// Log file
+_LIT( KAiwDialDataTestsLogFile, "AiwDialDataTests.txt" );
+
+
+#define GETPTR &
+#define ENTRY(str,func) {_S(str), GETPTR func,0,0,0}
+#define FUNCENTRY(func) {_S(#func), GETPTR func,0,0,0}
+#define OOM_ENTRY(str,func,a,b,c) {_S(str), GETPTR func,a,b,c}
+#define OOM_FUNCENTRY(func,a,b,c) {_S(#func), GETPTR func,a,b,c}
+
+// FORWARD DECLARATIONS
+class CAiwDialDataTests;
+
+// DATA TYPES
+
+typedef TInt (CAiwDialDataTests::* TestFunction)(TTestResult&);
+
+// CLASS DECLARATION
+
+/**
+* An internal structure containing a test case name and
+* the pointer to function doing the test
+*
+* @lib ?library
+* @since ?Series60_version
+*/
+class TCaseInfoInternal
+ {
+ public:
+ const TText* iCaseName;
+ TestFunction iMethod;
+ TBool iIsOOMTest;
+ TInt iFirstMemoryAllocation;
+ TInt iLastMemoryAllocation;
+ };
+
+// CLASS DECLARATION
+
+/**
+* A structure containing a test case name and
+* the pointer to function doing the test
+*
+* @lib ?library
+* @since ?Series60_version
+*/
+class TCaseInfo
+ {
+ public:
+ TPtrC iCaseName;
+ TestFunction iMethod;
+ TBool iIsOOMTest;
+ TInt iFirstMemoryAllocation;
+ TInt iLastMemoryAllocation;
+
+ TCaseInfo( const TText* a ) : iCaseName( (TText*) a )
+ {
+ };
+
+ };
+
+
+// CLASS DECLARATION
+
+/**
+* This a AiwDialDataTests class.
+* ?other_description_lines
+*
+* @lib ?library
+* @since ?Series60_version
+*/
+NONSHARABLE_CLASS(CAiwDialDataTests) : public CTestModuleBase
+ {
+ public: // Constructors and destructor
+
+
+ /**
+ * Two-phased constructor.
+ */
+ static CAiwDialDataTests* NewL();
+
+ /**
+ * Destructor.
+ */
+ virtual ~CAiwDialDataTests();
+
+ public: // New functions
+
+ /**
+ * ?member_description.
+ * @since ?Series60_version
+ * @param ?arg1 ?description
+ * @return ?description
+ */
+ //?type ?member_function( ?type ?arg1 );
+
+ public: // Functions from base classes
+
+ /**
+ * From CTestModuleBase InitL is used to initialize the
+ * AiwDialDataTests. It is called once for every instance of
+ * TestModuleAiwDialDataTests after its creation.
+ * @since ?Series60_version
+ * @param aIniFile Initialization file for the test module (optional)
+ * @param aFirstTime Flag is true when InitL is executed for first
+ * created instance of AiwDialDataTests.
+ * @return Symbian OS error code
+ */
+ TInt InitL( TFileName& aIniFile, TBool aFirstTime );
+
+ /**
+ * From CTestModuleBase GetTestCasesL is used to inquiry test cases
+ * from AiwDialDataTests.
+ * @since ?Series60_version
+ * @param aTestCaseFile Test case file (optional)
+ * @param aTestCases Array of TestCases returned to test framework
+ * @return Symbian OS error code
+ */
+ TInt GetTestCasesL( const TFileName& aTestCaseFile,
+ RPointerArray<TTestCaseInfo>& aTestCases );
+
+ /**
+ * From CTestModuleBase RunTestCaseL is used to run an individual
+ * test case.
+ * @since ?Series60_version
+ * @param aCaseNumber Test case number
+ * @param aTestCaseFile Test case file (optional)
+ * @param aResult Test case result returned to test framework (PASS/FAIL)
+ * @return Symbian OS error code (test case execution error, which is
+ * not reported in aResult parameter as test case failure).
+ */
+ TInt RunTestCaseL( const TInt aCaseNumber,
+ const TFileName& aTestCaseFile,
+ TTestResult& aResult );
+
+ /**
+ * From CTestModuleBase; OOMTestQueryL is used to specify is particular
+ * test case going to be executed using OOM conditions
+ * @param aTestCaseFile Test case file (optional)
+ * @param aCaseNumber Test case number (optional)
+ * @param aFailureType OOM failure type (optional)
+ * @param aFirstMemFailure The first heap memory allocation failure value (optional)
+ * @param aLastMemFailure The last heap memory allocation failure value (optional)
+ * @return TBool
+ */
+ virtual TBool OOMTestQueryL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */,
+ TOOMFailureType& aFailureType,
+ TInt& /* aFirstMemFailure */,
+ TInt& /* aLastMemFailure */ );
+
+ /**
+ * From CTestModuleBase; OOMTestInitializeL may be used to initialize OOM
+ * test environment
+ * @param aTestCaseFile Test case file (optional)
+ * @param aCaseNumber Test case number (optional)
+ * @return None
+ */
+ virtual void OOMTestInitializeL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */ );
+
+ /**
+ * From CTestModuleBase; OOMHandleWarningL
+ * @param aTestCaseFile Test case file (optional)
+ * @param aCaseNumber Test case number (optional)
+ * @param aFailNextValue FailNextValue for OOM test execution (optional)
+ * @return None
+ *
+ * User may add implementation for OOM test warning handling. Usually no
+ * implementation is required.
+ */
+ virtual void OOMHandleWarningL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */,
+ TInt& /* aFailNextValue */);
+
+ /**
+ * From CTestModuleBase; OOMTestFinalizeL may be used to finalize OOM
+ * test environment
+ * @param aTestCaseFile Test case file (optional)
+ * @param aCaseNumber Test case number (optional)
+ * @return None
+ *
+ */
+ virtual void OOMTestFinalizeL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */ );
+
+
+ private:
+
+ /**
+ * C++ default constructor.
+ */
+ CAiwDialDataTests();
+
+ /**
+ * By default Symbian 2nd phase constructor is private.
+ */
+ void ConstructL();
+
+ /**
+ * Function returning test case name and pointer to test case function.
+ * @since ?Series60_version
+ * @param aCaseNumber test case number
+ * @return TCaseInfo
+ */
+ const TCaseInfo Case ( const TInt aCaseNumber ) const;
+
+ /**
+ * Actual Hardcoded test case functions are listed below.
+ */
+
+ /**
+ * Tests CAiwDialData construction.
+ **/
+ TInt ConstructionTestL( TTestResult& aResult );
+
+ /**
+ * Tests CAiwDialData setting and getting values.
+ */
+ TInt SetAndGetTestL( TTestResult& aResult );
+
+ /**
+ * Tests CAiwDialDataExt construction.
+ */
+ TInt ExtConstructionTestL( TTestResult& aResult );
+
+ /**
+ * Tests CAiwDialDataExt setting and getting values.
+ */
+ TInt ExtSetAndGetTestL( TTestResult& aResult );
+
+
+ private: // Data
+ // Pointer to test (function) to be executed
+ TestFunction iMethod;
+
+ // Pointer to logger
+ CStifLogger * iLog;
+
+
+ };
+
+#endif // AIWDIALDATATESTS_H
+
+// End of File
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/basic/AiwDialDataTests/src/AiwDialDataTests.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,314 @@
+/*
+* Copyright (c) 2002 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: AiwDialDataTests class member functions
+*
+*/
+
+
+
+// INCLUDE FILES
+#include <Stiftestinterface.h>
+#include "AiwDialDataTests.h"
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::CAiwDialDataTests
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CAiwDialDataTests::CAiwDialDataTests()
+ {
+
+ }
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::ConstructL
+// Symbian 2nd phase constructor can leave.
+//
+// Note: If OOM test case uses STIF Logger, then STIF Logger must be created
+// with static buffer size parameter (aStaticBufferSize). Otherwise Logger
+// allocates memory from heap and therefore causes error situations with OOM
+// testing. For more information about STIF Logger construction, see STIF Users
+// Guide.
+// -----------------------------------------------------------------------------
+//
+void CAiwDialDataTests::ConstructL()
+ {
+ iLog = CStifLogger::NewL( KAiwDialDataTestsLogPath,
+ KAiwDialDataTestsLogFile);
+
+ // Sample how to use logging
+ _LIT( KLogStart, "AiwDialDataTests logging starts!" );
+ iLog->Log( KLogStart );
+
+ }
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::NewL
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CAiwDialDataTests* CAiwDialDataTests::NewL()
+ {
+ CAiwDialDataTests* self = new (ELeave) CAiwDialDataTests;
+
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop();
+
+ return self;
+
+ }
+
+// Destructor
+CAiwDialDataTests::~CAiwDialDataTests()
+ {
+ delete iLog;
+ }
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::InitL
+// InitL is used to initialize the Test Module.
+// -----------------------------------------------------------------------------
+//
+TInt CAiwDialDataTests::InitL(
+ TFileName& /*aIniFile*/,
+ TBool /*aFirstTime*/ )
+ {
+ return KErrNone;
+
+ }
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::GetTestCasesL
+// GetTestCases is used to inquire test cases from the Test Module. Test
+// cases are stored to array of test cases. The Test Framework will be
+// the owner of the data in the RPointerArray after GetTestCases return
+// and it does the memory deallocation.
+// -----------------------------------------------------------------------------
+//
+TInt CAiwDialDataTests::GetTestCasesL(
+ const TFileName& /*aConfig*/,
+ RPointerArray<TTestCaseInfo>& aTestCases )
+ {
+
+ // Loop through all test cases and create new
+ // TTestCaseInfo items and append items to aTestCase array
+ for( TInt i = 0; Case(i).iMethod != NULL; i++ )
+ {
+
+ // Allocate new TTestCaseInfo from heap for a testcase definition.
+ TTestCaseInfo* newCase = new( ELeave ) TTestCaseInfo();
+
+ // PushL TTestCaseInfo to CleanupStack.
+ CleanupStack::PushL( newCase );
+
+ // Set number for the testcase.
+ // When the testcase is run, this comes as a parameter to RunTestCaseL.
+ newCase->iCaseNumber = i;
+
+ // Set title for the test case. This is shown in UI to user.
+ newCase->iTitle.Copy( Case(i).iCaseName );
+
+ // Append TTestCaseInfo to the testcase array. After appended
+ // successfully the TTestCaseInfo object is owned (and freed)
+ // by the TestServer.
+ User::LeaveIfError(aTestCases.Append ( newCase ) );
+
+ // Pop TTestCaseInfo from the CleanupStack.
+ CleanupStack::Pop( newCase );
+
+ }
+
+ return KErrNone;
+
+ }
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::RunTestCaseL
+// RunTestCaseL is used to run an individual test case specified
+// by aTestCase. Test cases that can be run may be requested from
+// Test Module by GetTestCases method before calling RunTestCase.
+// -----------------------------------------------------------------------------
+//
+TInt CAiwDialDataTests::RunTestCaseL(
+ const TInt aCaseNumber,
+ const TFileName& /*aConfig*/,
+ TTestResult& aResult )
+ {
+
+ // Return value
+ TInt execStatus = KErrNone;
+
+ // Get the pointer to test case function
+ TCaseInfo tmp = Case ( aCaseNumber );
+
+ _LIT( KLogStartTC, "Starting testcase [%S]" );
+ iLog->Log( KLogStartTC, &tmp.iCaseName);
+
+ // Check that case number was valid
+ if ( tmp.iMethod != NULL )
+ {
+ // Valid case was found, call it via function pointer
+ iMethod = tmp.iMethod;
+ execStatus = ( this->*iMethod )( aResult );
+ }
+ else
+ {
+ // Valid case was not found, return error.
+ execStatus = KErrNotFound;
+ }
+
+ // Return case execution status (not the result of the case execution)
+ return execStatus;
+
+ }
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::OOMTestQueryL
+// Used to check if a particular test case should be run in OOM conditions and
+// which memory allocations should fail.
+// -----------------------------------------------------------------------------
+//
+TBool CAiwDialDataTests::OOMTestQueryL(
+ const TFileName& /* aTestCaseFile */,
+ const TInt aCaseNumber,
+ TOOMFailureType& /* aFailureType */,
+ TInt& aFirstMemFailure,
+ TInt& aLastMemFailure )
+ {
+ _LIT( KLogOOMTestQueryL, "CAiwDialDataTests::OOMTestQueryL" );
+ iLog->Log( KLogOOMTestQueryL );
+
+ aFirstMemFailure = Case( aCaseNumber ).iFirstMemoryAllocation;
+ aLastMemFailure = Case( aCaseNumber ).iLastMemoryAllocation;
+
+ return Case( aCaseNumber ).iIsOOMTest;
+
+ }
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::OOMTestInitializeL
+// Used to perform the test environment setup for a particular OOM test case.
+// Test Modules may use the initialization file to read parameters for Test
+// Module initialization but they can also have their own configure file or
+// some other routine to initialize themselves.
+//
+// NOTE: User may add implementation for OOM test environment initialization.
+// Usually no implementation is required.
+// -----------------------------------------------------------------------------
+//
+void CAiwDialDataTests::OOMTestInitializeL(
+ const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */ )
+ {
+ }
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::OOMHandleWarningL
+// In some cases the heap memory allocation should be skipped, either due to
+// problems in the OS code or components used by the code being tested, or even
+// inside the tested components which are implemented this way on purpose (by
+// design), so it is important to give the tester a way to bypass allocation
+// failures.
+//
+// NOTE: User may add implementation for OOM test warning handling. Usually no
+// implementation is required.
+// -----------------------------------------------------------------------------
+//
+void CAiwDialDataTests::OOMHandleWarningL(
+ const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */,
+ TInt& /* aFailNextValue */ )
+ {
+ }
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::OOMTestFinalizeL
+// Used to perform the test environment cleanup for a particular OOM test case.
+//
+// NOTE: User may add implementation for OOM test environment finalization.
+// Usually no implementation is required.
+// -----------------------------------------------------------------------------
+//
+void CAiwDialDataTests::OOMTestFinalizeL(
+ const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */ )
+ {
+ }
+
+// ========================== OTHER EXPORTED FUNCTIONS =========================
+
+// -----------------------------------------------------------------------------
+// LibEntryL is a polymorphic Dll entry point
+// Returns: CTestModuleBase*: Pointer to Test Module object
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CTestModuleBase* LibEntryL()
+ {
+ return CAiwDialDataTests::NewL();
+
+ }
+
+// -----------------------------------------------------------------------------
+// SetRequirements handles test module parameters(implements evolution
+// version 1 for test module's heap and stack sizes configuring).
+// Returns: TInt: Symbian error code.
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TInt SetRequirements( CTestModuleParam*& /*aTestModuleParam*/,
+ TUint32& /*aParameterValid*/ )
+ {
+
+ /* --------------------------------- NOTE ---------------------------------
+ USER PANICS occurs in test thread creation when:
+ 1) "The panic occurs when the value of the stack size is negative."
+ 2) "The panic occurs if the minimum heap size specified is less
+ than KMinHeapSize".
+ KMinHeapSize: "Functions that require a new heap to be allocated will
+ either panic, or will reset the required heap size to this value if
+ a smaller heap size is specified".
+ 3) "The panic occurs if the minimum heap size specified is greater than
+ the maximum size to which the heap can grow".
+ Other:
+ 1) Make sure that your hardware or Symbian OS is supporting given sizes.
+ e.g. Hardware might support only sizes that are divisible by four.
+ ------------------------------- NOTE end ------------------------------- */
+
+ // Normally STIF uses default heap and stack sizes for test thread, see:
+ // KTestThreadMinHeap, KTestThreadMinHeap and KStackSize.
+ // If needed heap and stack sizes can be configured here by user. Remove
+ // comments and define sizes.
+
+/*
+ aParameterValid = KStifTestModuleParameterChanged;
+
+ CTestModuleParamVer01* param = CTestModuleParamVer01::NewL();
+ // Stack size
+ param->iTestThreadStackSize= 16384; // 16K stack
+ // Heap sizes
+ param->iTestThreadMinHeap = 4096; // 4K heap min
+ param->iTestThreadMaxHeap = 1048576;// 1M heap max
+
+ aTestModuleParam = param;
+*/
+ return KErrNone;
+
+ }
+
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneclientserver/aiwdialdata/tsrc/public/basic/AiwDialDataTests/src/AiwDialDataTestsCases.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,244 @@
+/*
+* Copyright (c) 2002 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: Tests for domain AIWDialData API.
+*
+*/
+
+
+
+// INCLUDE FILES
+#include "AiwDialDataTests.h"
+
+#include <e32math.h>
+#include <aiwdialdata.h>
+#include <aiwdialdataext.h>
+#include <aiwgenericparam.h>
+// ============================= LOCAL FUNCTIONS ===============================
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CAiwDialDataTests::Case
+// Returns a test case by number.
+//
+// This function contains an array of all available test cases
+// i.e pair of case name and test function. If case specified by parameter
+// aCaseNumber is found from array, then that item is returned.
+//
+// The reason for this rather complicated function is to specify all the
+// test cases only in one place. It is not necessary to understand how
+// function pointers to class member functions works when adding new test
+// cases. See function body for instructions how to add new test case.
+// -----------------------------------------------------------------------------
+//
+const TCaseInfo CAiwDialDataTests::Case (
+ const TInt aCaseNumber ) const
+ {
+
+ /**
+ * To add new test cases, implement new test case function and add new
+ * line to KCases array specify the name of the case and the function
+ * doing the test case
+ * In practice, do following
+ * 1) Make copy of existing test case function and change its name
+ * and functionality. Note that the function must be added to
+ * AiwDialDataTests.cpp file and to AiwDialDataTests.h
+ * header file.
+ *
+ * 2) Add entry to following KCases array either by using:
+ *
+ * 2.1: FUNCENTRY or ENTRY macro
+ * ENTRY macro takes two parameters: test case name and test case
+ * function name.
+ *
+ * FUNCENTRY macro takes only test case function name as a parameter and
+ * uses that as a test case name and test case function name.
+ *
+ * Or
+ *
+ * 2.2: OOM_FUNCENTRY or OOM_ENTRY macro. Note that these macros are used
+ * only with OOM (Out-Of-Memory) testing!
+ *
+ * OOM_ENTRY macro takes five parameters: test case name, test case
+ * function name, TBool which specifies is method supposed to be run using
+ * OOM conditions, TInt value for first heap memory allocation failure and
+ * TInt value for last heap memory allocation failure.
+ *
+ * OOM_FUNCENTRY macro takes test case function name as a parameter and uses
+ * that as a test case name, TBool which specifies is method supposed to be
+ * run using OOM conditions, TInt value for first heap memory allocation
+ * failure and TInt value for last heap memory allocation failure.
+ */
+
+ static TCaseInfoInternal const KCases[] =
+ {
+ // To add new test cases, add new items to this array
+
+ // NOTE: When compiled to GCCE, there must be Classname::
+ // declaration in front of the method name, e.g.
+ // CAiwDialDataTests::PrintTest. Otherwise the compiler
+ // gives errors.
+
+ FUNCENTRY( CAiwDialDataTests::ConstructionTestL ),
+ FUNCENTRY( CAiwDialDataTests::SetAndGetTestL ),
+ FUNCENTRY( CAiwDialDataTests::ExtConstructionTestL ),
+ FUNCENTRY( CAiwDialDataTests::ExtSetAndGetTestL ),
+ // Example how to use OOM functionality
+ //OOM_ENTRY( "Loop test with OOM", CAiwDialDataTests::LoopTest, ETrue, 2, 3),
+ //OOM_FUNCENTRY( CAiwDialDataTests::PrintTest, ETrue, 1, 3 ),
+ };
+
+ // Verify that case number is valid
+ if( (TUint) aCaseNumber >= sizeof( KCases ) /
+ sizeof( TCaseInfoInternal ) )
+ {
+ // Invalid case, construct empty object
+ TCaseInfo null( (const TText*) L"" );
+ null.iMethod = NULL;
+ null.iIsOOMTest = EFalse;
+ null.iFirstMemoryAllocation = 0;
+ null.iLastMemoryAllocation = 0;
+ return null;
+ }
+
+ // Construct TCaseInfo object and return it
+ TCaseInfo tmp ( KCases[ aCaseNumber ].iCaseName );
+ tmp.iMethod = KCases[ aCaseNumber ].iMethod;
+ tmp.iIsOOMTest = KCases[ aCaseNumber ].iIsOOMTest;
+ tmp.iFirstMemoryAllocation = KCases[ aCaseNumber ].iFirstMemoryAllocation;
+ tmp.iLastMemoryAllocation = KCases[ aCaseNumber ].iLastMemoryAllocation;
+ return tmp;
+
+ }
+
+// -----------------------------------------------------------------------------
+// Tests CAiwDialData construction
+// -----------------------------------------------------------------------------
+//
+TInt CAiwDialDataTests::ConstructionTestL( TTestResult& /*aResult*/ )
+ {
+ CAiwDialData* dialData = CAiwDialData::NewL();
+ delete dialData;
+
+ dialData = CAiwDialData::NewLC();
+
+ TL( dialData->PhoneNumber() == KNullDesC() );
+ T1L( dialData->CallType(), CAiwDialData::EAIWVoice );
+ T1L( dialData->WindowGroup(), 0 );
+
+ CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
+ dialData->FillInParamListL( *list );
+
+ CleanupStack::PopAndDestroy( 2, dialData );
+
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// Tests CAiwDialData setting and getting values.
+// -----------------------------------------------------------------------------
+//
+TInt CAiwDialDataTests::SetAndGetTestL( TTestResult& /*aResult*/ )
+ {
+ _LIT( KPhoneNumber, "1234567890");
+
+ CAiwDialData* dialData = CAiwDialData::NewLC();
+
+ dialData->SetPhoneNumberL( KPhoneNumber );
+ dialData->SetCallType( CAiwDialData::EAIWVideo );
+ dialData->SetWindowGroup( 1 );
+
+ TL( dialData->PhoneNumber() == KPhoneNumber() );
+ T1L( dialData->CallType(), CAiwDialData::EAIWVideo );
+ T1L( dialData->WindowGroup(), 1 );
+
+ CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
+ dialData->FillInParamListL( *list );
+
+ CleanupStack::PopAndDestroy( 2, dialData );
+
+ return KErrNone;
+ }
+
+// -----------------------------------------------------------------------------
+// Tests CAiwDialDataExt construction
+// -----------------------------------------------------------------------------
+//
+TInt CAiwDialDataTests::ExtConstructionTestL( TTestResult& /*aResult*/ )
+ {
+ CAiwDialDataExt* dialData = CAiwDialDataExt::NewL();
+ delete dialData;
+
+ dialData = CAiwDialDataExt::NewLC();
+
+ TL( dialData->PhoneNumber() == KNullDesC() );
+ T1L( dialData->CallType(), CAiwDialData::EAIWVoice );
+ T1L( dialData->WindowGroup(), 0 );
+ TL( !dialData->InitiateCall() );
+ TL( dialData->Name() == KNullDesC() );
+ T1L( dialData->Redial(), AIWDialDataExt::KAIWRedialDefault );
+ TL( dialData->ShowNumber() );
+ TL( dialData->ContactLink() == KNullDesC8() );
+
+ CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
+ dialData->FillInParamListL( *list );
+
+ CleanupStack::PopAndDestroy( 2, dialData );
+
+ return KErrNone;
+
+ }
+
+// -----------------------------------------------------------------------------
+// Tests CAiwDialDataExt setting and getting values.
+// -----------------------------------------------------------------------------
+//
+TInt CAiwDialDataTests::ExtSetAndGetTestL( TTestResult& /*aResult*/ )
+ {
+ _LIT( KPhoneNumber, "1234567890");
+ _LIT8( KContactLink, "ContactLink");
+ _LIT( KName, "Mr Smith" );
+
+ CAiwDialDataExt* dialData = CAiwDialDataExt::NewLC();
+
+ dialData->SetPhoneNumberL( KPhoneNumber );
+ dialData->SetCallType( CAiwDialData::EAIWVideo );
+ dialData->SetWindowGroup( 1 );
+ dialData->SetInitiateCall( ETrue );
+ dialData->SetNameL( KName );
+
+ dialData->SetRedial( AIWDialDataExt::KAIWRedialOff );
+ dialData->SetShowNumber( EFalse );
+ dialData->SetContactLinkL( KContactLink );
+
+ TL( dialData->PhoneNumber() == KPhoneNumber() );
+ T1L( dialData->CallType(), CAiwDialData::EAIWVideo );
+ T1L( dialData->WindowGroup(), 1 );
+ TL( dialData->InitiateCall() );
+ TL( dialData->Name() == KName() );
+ T1L( dialData->Redial(), AIWDialDataExt::KAIWRedialOff );
+ TL( !dialData->ShowNumber() );
+ TL( dialData->ContactLink() == KContactLink() );
+
+
+ CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
+ dialData->FillInParamListL( *list );
+
+ CleanupStack::PopAndDestroy( 2, dialData );
+
+ return KErrNone;
+ }
+
+
+// End of File
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/aiwdialdatatests/bmarm/aiwdialdatatestsu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
- SetRequirements__FRP16CTestModuleParamRUl @ 2 NONAME R3UNUSED ; SetRequirements(CTestModuleParam *&, unsigned long &)
-
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/aiwdialdatatests/bwins/aiwdialdatatestsu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- ?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
- ?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
-
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/aiwdialdatatests/eabi/aiwdialdatatestsu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- _Z9LibEntryLv @ 1 NONAME
- _Z15SetRequirementsRP16CTestModuleParamRm @ 2 NONAME
-
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/aiwdialdatatests/group/aiwdialdatatests.mmp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2002 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: MMP file for AiwDialDataTests component.
-*
-*/
-
-
-#if defined(__S60_)
- // To get the OS_LAYER_SYSTEMINCLUDE-definition
- #include <platform_paths.hrh>
-#endif
-
-TARGET AiwDialDataTests.dll
-TARGETTYPE dll
-UID 0x1000008D 0x101FB3E7
-
-CAPABILITY ALL -TCB
-
-
-DEFFILE AiwDialDataTests.def
-
-SOURCEPATH ../src
-SOURCE AiwDialDataTests.cpp
-SOURCE AiwDialDataTestsCases.cpp
-
-USERINCLUDE ../inc
-
-OS_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
-LIBRARY ServiceHandler.lib
-LIBRARY aiwdialdata.lib
-
-LANG SC
-
-// End of File
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/aiwdialdatatests/group/aiwdialdatatests.pkg Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +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:
-;
-;File: SendUIAPITest.pkg;
-;
-;Auto-generated PKG file by Nokia PKG Wizard for CodeWarrior IDE
-
-;*Languages
-&EN
-;
-;*Standard SIS file header. This section specifies the package name,
-;application UID, and version/build numbers. Add the package TYPE here if needed.
-#{"aiwdialdatatests"},(0x101FB3E7),1,0,1;
-;
-
-;*Unique (Non-Localized) Vendor name
-;This is used in combination with signing to prevent the unauthroized
-;upgrade of a a package by someone other than the rightful vendor.
-:"Nokia"
-
-;*Localized Vendor Name
-;This specifies the localized vendor name(s) corresponding to language(s).
-%{"Nokia Test EN"}
-
-;*Files To Copy...<src> <destination>
-"\epoc32\release\armv5\urel\AiwDialDataTests.dll"-"C:\sys\bin\AiwDialDataTests.dll"
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/aiwdialdatatests/group/aiwdialdatatests_doxyfile.txt Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +0,0 @@
-# Doxyfile 1.4.1
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME = AiwDialDataTests
-PROJECT_NUMBER =
-OUTPUT_DIRECTORY = \AiwDialDataTests\
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-USE_WINDOWS_ENCODING = YES
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF =
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-DISTRIBUTE_GROUP_DOC = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = YES
-OPTIMIZE_OUTPUT_JAVA = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-EXTRACT_LOCAL_CLASSES = NO
-EXTRACT_LOCAL_METHODS = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = YES
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = NO
-GENERATE_TESTLIST = NO
-GENERATE_BUGLIST = NO
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = YES
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = \AiwDialDataTests\
-FILE_PATTERNS = *.h \
- *.rh \
- *.hrh
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = NO
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = NO
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = NO
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = YES
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = YES
-TOC_EXPAND = YES
-DISABLE_INDEX = YES
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = YES
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = YES
-RTF_OUTPUT = Doc
-COMPACT_RTF = YES
-RTF_HYPERLINKS = YES
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED = NONSHARABLE_CLASS
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = YES
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = YES
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
-MAX_DOT_GRAPH_DEPTH = 0
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/aiwdialdatatests/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2002 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: Build file for AiwDialDataTests component.
-*
-*/
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-// Specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-// Example:
-/*
-/agnmodel/inc/AGMCOMON.H
-*/
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-AiwDialDataTests.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
-
-
-// End of File
\ No newline at end of file
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/aiwdialdatatests/inc/aiwdialdatatests.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,273 +0,0 @@
-/*
-* Copyright (c) 2002 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: AiwDialDataTests test module.
-*
-*/
-
-
-
-#ifndef AIWDIALDATATESTS_H
-#define AIWDIALDATATESTS_H
-
-// INCLUDES
-#include "StifTestModule.h"
-#include <StifLogger.h>
-
-
-// Logging path
-_LIT( KAiwDialDataTestsLogPath, "\\logs\\testframework\\AiwDialDataTests\\" );
-// Log file
-_LIT( KAiwDialDataTestsLogFile, "AiwDialDataTests.txt" );
-
-
-#define GETPTR &
-#define ENTRY(str,func) {_S(str), GETPTR func,0,0,0}
-#define FUNCENTRY(func) {_S(#func), GETPTR func,0,0,0}
-#define OOM_ENTRY(str,func,a,b,c) {_S(str), GETPTR func,a,b,c}
-#define OOM_FUNCENTRY(func,a,b,c) {_S(#func), GETPTR func,a,b,c}
-
-// FORWARD DECLARATIONS
-class CAiwDialDataTests;
-
-// DATA TYPES
-
-typedef TInt (CAiwDialDataTests::* TestFunction)(TTestResult&);
-
-// CLASS DECLARATION
-
-/**
-* An internal structure containing a test case name and
-* the pointer to function doing the test
-*
-* @lib ?library
-* @since ?Series60_version
-*/
-class TCaseInfoInternal
- {
- public:
- const TText* iCaseName;
- TestFunction iMethod;
- TBool iIsOOMTest;
- TInt iFirstMemoryAllocation;
- TInt iLastMemoryAllocation;
- };
-
-// CLASS DECLARATION
-
-/**
-* A structure containing a test case name and
-* the pointer to function doing the test
-*
-* @lib ?library
-* @since ?Series60_version
-*/
-class TCaseInfo
- {
- public:
- TPtrC iCaseName;
- TestFunction iMethod;
- TBool iIsOOMTest;
- TInt iFirstMemoryAllocation;
- TInt iLastMemoryAllocation;
-
- TCaseInfo( const TText* a ) : iCaseName( (TText*) a )
- {
- };
-
- };
-
-
-// CLASS DECLARATION
-
-/**
-* This a AiwDialDataTests class.
-* ?other_description_lines
-*
-* @lib ?library
-* @since ?Series60_version
-*/
-NONSHARABLE_CLASS(CAiwDialDataTests) : public CTestModuleBase
- {
- public: // Constructors and destructor
-
-
- /**
- * Two-phased constructor.
- */
- static CAiwDialDataTests* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CAiwDialDataTests();
-
- public: // New functions
-
- /**
- * ?member_description.
- * @since ?Series60_version
- * @param ?arg1 ?description
- * @return ?description
- */
- //?type ?member_function( ?type ?arg1 );
-
- public: // Functions from base classes
-
- /**
- * From CTestModuleBase InitL is used to initialize the
- * AiwDialDataTests. It is called once for every instance of
- * TestModuleAiwDialDataTests after its creation.
- * @since ?Series60_version
- * @param aIniFile Initialization file for the test module (optional)
- * @param aFirstTime Flag is true when InitL is executed for first
- * created instance of AiwDialDataTests.
- * @return Symbian OS error code
- */
- TInt InitL( TFileName& aIniFile, TBool aFirstTime );
-
- /**
- * From CTestModuleBase GetTestCasesL is used to inquiry test cases
- * from AiwDialDataTests.
- * @since ?Series60_version
- * @param aTestCaseFile Test case file (optional)
- * @param aTestCases Array of TestCases returned to test framework
- * @return Symbian OS error code
- */
- TInt GetTestCasesL( const TFileName& aTestCaseFile,
- RPointerArray<TTestCaseInfo>& aTestCases );
-
- /**
- * From CTestModuleBase RunTestCaseL is used to run an individual
- * test case.
- * @since ?Series60_version
- * @param aCaseNumber Test case number
- * @param aTestCaseFile Test case file (optional)
- * @param aResult Test case result returned to test framework (PASS/FAIL)
- * @return Symbian OS error code (test case execution error, which is
- * not reported in aResult parameter as test case failure).
- */
- TInt RunTestCaseL( const TInt aCaseNumber,
- const TFileName& aTestCaseFile,
- TTestResult& aResult );
-
- /**
- * From CTestModuleBase; OOMTestQueryL is used to specify is particular
- * test case going to be executed using OOM conditions
- * @param aTestCaseFile Test case file (optional)
- * @param aCaseNumber Test case number (optional)
- * @param aFailureType OOM failure type (optional)
- * @param aFirstMemFailure The first heap memory allocation failure value (optional)
- * @param aLastMemFailure The last heap memory allocation failure value (optional)
- * @return TBool
- */
- virtual TBool OOMTestQueryL( const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */,
- TOOMFailureType& aFailureType,
- TInt& /* aFirstMemFailure */,
- TInt& /* aLastMemFailure */ );
-
- /**
- * From CTestModuleBase; OOMTestInitializeL may be used to initialize OOM
- * test environment
- * @param aTestCaseFile Test case file (optional)
- * @param aCaseNumber Test case number (optional)
- * @return None
- */
- virtual void OOMTestInitializeL( const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */ );
-
- /**
- * From CTestModuleBase; OOMHandleWarningL
- * @param aTestCaseFile Test case file (optional)
- * @param aCaseNumber Test case number (optional)
- * @param aFailNextValue FailNextValue for OOM test execution (optional)
- * @return None
- *
- * User may add implementation for OOM test warning handling. Usually no
- * implementation is required.
- */
- virtual void OOMHandleWarningL( const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */,
- TInt& /* aFailNextValue */);
-
- /**
- * From CTestModuleBase; OOMTestFinalizeL may be used to finalize OOM
- * test environment
- * @param aTestCaseFile Test case file (optional)
- * @param aCaseNumber Test case number (optional)
- * @return None
- *
- */
- virtual void OOMTestFinalizeL( const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */ );
-
-
- private:
-
- /**
- * C++ default constructor.
- */
- CAiwDialDataTests();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- /**
- * Function returning test case name and pointer to test case function.
- * @since ?Series60_version
- * @param aCaseNumber test case number
- * @return TCaseInfo
- */
- const TCaseInfo Case ( const TInt aCaseNumber ) const;
-
- /**
- * Actual Hardcoded test case functions are listed below.
- */
-
- /**
- * Tests CAiwDialData construction.
- **/
- TInt ConstructionTestL( TTestResult& aResult );
-
- /**
- * Tests CAiwDialData setting and getting values.
- */
- TInt SetAndGetTestL( TTestResult& aResult );
-
- /**
- * Tests CAiwDialDataExt construction.
- */
- TInt ExtConstructionTestL( TTestResult& aResult );
-
- /**
- * Tests CAiwDialDataExt setting and getting values.
- */
- TInt ExtSetAndGetTestL( TTestResult& aResult );
-
-
- private: // Data
- // Pointer to test (function) to be executed
- TestFunction iMethod;
-
- // Pointer to logger
- CStifLogger * iLog;
-
-
- };
-
-#endif // AIWDIALDATATESTS_H
-
-// End of File
\ No newline at end of file
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/aiwdialdatatests/src/aiwdialdatatests.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,314 +0,0 @@
-/*
-* Copyright (c) 2002 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: AiwDialDataTests class member functions
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "AiwDialDataTests.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::CAiwDialDataTests
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CAiwDialDataTests::CAiwDialDataTests()
- {
-
- }
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::ConstructL
-// Symbian 2nd phase constructor can leave.
-//
-// Note: If OOM test case uses STIF Logger, then STIF Logger must be created
-// with static buffer size parameter (aStaticBufferSize). Otherwise Logger
-// allocates memory from heap and therefore causes error situations with OOM
-// testing. For more information about STIF Logger construction, see STIF Users
-// Guide.
-// -----------------------------------------------------------------------------
-//
-void CAiwDialDataTests::ConstructL()
- {
- iLog = CStifLogger::NewL( KAiwDialDataTestsLogPath,
- KAiwDialDataTestsLogFile);
-
- // Sample how to use logging
- _LIT( KLogStart, "AiwDialDataTests logging starts!" );
- iLog->Log( KLogStart );
-
- }
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CAiwDialDataTests* CAiwDialDataTests::NewL()
- {
- CAiwDialDataTests* self = new (ELeave) CAiwDialDataTests;
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop();
-
- return self;
-
- }
-
-// Destructor
-CAiwDialDataTests::~CAiwDialDataTests()
- {
- delete iLog;
- }
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::InitL
-// InitL is used to initialize the Test Module.
-// -----------------------------------------------------------------------------
-//
-TInt CAiwDialDataTests::InitL(
- TFileName& /*aIniFile*/,
- TBool /*aFirstTime*/ )
- {
- return KErrNone;
-
- }
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::GetTestCasesL
-// GetTestCases is used to inquire test cases from the Test Module. Test
-// cases are stored to array of test cases. The Test Framework will be
-// the owner of the data in the RPointerArray after GetTestCases return
-// and it does the memory deallocation.
-// -----------------------------------------------------------------------------
-//
-TInt CAiwDialDataTests::GetTestCasesL(
- const TFileName& /*aConfig*/,
- RPointerArray<TTestCaseInfo>& aTestCases )
- {
-
- // Loop through all test cases and create new
- // TTestCaseInfo items and append items to aTestCase array
- for( TInt i = 0; Case(i).iMethod != NULL; i++ )
- {
-
- // Allocate new TTestCaseInfo from heap for a testcase definition.
- TTestCaseInfo* newCase = new( ELeave ) TTestCaseInfo();
-
- // PushL TTestCaseInfo to CleanupStack.
- CleanupStack::PushL( newCase );
-
- // Set number for the testcase.
- // When the testcase is run, this comes as a parameter to RunTestCaseL.
- newCase->iCaseNumber = i;
-
- // Set title for the test case. This is shown in UI to user.
- newCase->iTitle.Copy( Case(i).iCaseName );
-
- // Append TTestCaseInfo to the testcase array. After appended
- // successfully the TTestCaseInfo object is owned (and freed)
- // by the TestServer.
- User::LeaveIfError(aTestCases.Append ( newCase ) );
-
- // Pop TTestCaseInfo from the CleanupStack.
- CleanupStack::Pop( newCase );
-
- }
-
- return KErrNone;
-
- }
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::RunTestCaseL
-// RunTestCaseL is used to run an individual test case specified
-// by aTestCase. Test cases that can be run may be requested from
-// Test Module by GetTestCases method before calling RunTestCase.
-// -----------------------------------------------------------------------------
-//
-TInt CAiwDialDataTests::RunTestCaseL(
- const TInt aCaseNumber,
- const TFileName& /*aConfig*/,
- TTestResult& aResult )
- {
-
- // Return value
- TInt execStatus = KErrNone;
-
- // Get the pointer to test case function
- TCaseInfo tmp = Case ( aCaseNumber );
-
- _LIT( KLogStartTC, "Starting testcase [%S]" );
- iLog->Log( KLogStartTC, &tmp.iCaseName);
-
- // Check that case number was valid
- if ( tmp.iMethod != NULL )
- {
- // Valid case was found, call it via function pointer
- iMethod = tmp.iMethod;
- execStatus = ( this->*iMethod )( aResult );
- }
- else
- {
- // Valid case was not found, return error.
- execStatus = KErrNotFound;
- }
-
- // Return case execution status (not the result of the case execution)
- return execStatus;
-
- }
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::OOMTestQueryL
-// Used to check if a particular test case should be run in OOM conditions and
-// which memory allocations should fail.
-// -----------------------------------------------------------------------------
-//
-TBool CAiwDialDataTests::OOMTestQueryL(
- const TFileName& /* aTestCaseFile */,
- const TInt aCaseNumber,
- TOOMFailureType& /* aFailureType */,
- TInt& aFirstMemFailure,
- TInt& aLastMemFailure )
- {
- _LIT( KLogOOMTestQueryL, "CAiwDialDataTests::OOMTestQueryL" );
- iLog->Log( KLogOOMTestQueryL );
-
- aFirstMemFailure = Case( aCaseNumber ).iFirstMemoryAllocation;
- aLastMemFailure = Case( aCaseNumber ).iLastMemoryAllocation;
-
- return Case( aCaseNumber ).iIsOOMTest;
-
- }
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::OOMTestInitializeL
-// Used to perform the test environment setup for a particular OOM test case.
-// Test Modules may use the initialization file to read parameters for Test
-// Module initialization but they can also have their own configure file or
-// some other routine to initialize themselves.
-//
-// NOTE: User may add implementation for OOM test environment initialization.
-// Usually no implementation is required.
-// -----------------------------------------------------------------------------
-//
-void CAiwDialDataTests::OOMTestInitializeL(
- const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */ )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::OOMHandleWarningL
-// In some cases the heap memory allocation should be skipped, either due to
-// problems in the OS code or components used by the code being tested, or even
-// inside the tested components which are implemented this way on purpose (by
-// design), so it is important to give the tester a way to bypass allocation
-// failures.
-//
-// NOTE: User may add implementation for OOM test warning handling. Usually no
-// implementation is required.
-// -----------------------------------------------------------------------------
-//
-void CAiwDialDataTests::OOMHandleWarningL(
- const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */,
- TInt& /* aFailNextValue */ )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::OOMTestFinalizeL
-// Used to perform the test environment cleanup for a particular OOM test case.
-//
-// NOTE: User may add implementation for OOM test environment finalization.
-// Usually no implementation is required.
-// -----------------------------------------------------------------------------
-//
-void CAiwDialDataTests::OOMTestFinalizeL(
- const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */ )
- {
- }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point
-// Returns: CTestModuleBase*: Pointer to Test Module object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CTestModuleBase* LibEntryL()
- {
- return CAiwDialDataTests::NewL();
-
- }
-
-// -----------------------------------------------------------------------------
-// SetRequirements handles test module parameters(implements evolution
-// version 1 for test module's heap and stack sizes configuring).
-// Returns: TInt: Symbian error code.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TInt SetRequirements( CTestModuleParam*& /*aTestModuleParam*/,
- TUint32& /*aParameterValid*/ )
- {
-
- /* --------------------------------- NOTE ---------------------------------
- USER PANICS occurs in test thread creation when:
- 1) "The panic occurs when the value of the stack size is negative."
- 2) "The panic occurs if the minimum heap size specified is less
- than KMinHeapSize".
- KMinHeapSize: "Functions that require a new heap to be allocated will
- either panic, or will reset the required heap size to this value if
- a smaller heap size is specified".
- 3) "The panic occurs if the minimum heap size specified is greater than
- the maximum size to which the heap can grow".
- Other:
- 1) Make sure that your hardware or Symbian OS is supporting given sizes.
- e.g. Hardware might support only sizes that are divisible by four.
- ------------------------------- NOTE end ------------------------------- */
-
- // Normally STIF uses default heap and stack sizes for test thread, see:
- // KTestThreadMinHeap, KTestThreadMinHeap and KStackSize.
- // If needed heap and stack sizes can be configured here by user. Remove
- // comments and define sizes.
-
-/*
- aParameterValid = KStifTestModuleParameterChanged;
-
- CTestModuleParamVer01* param = CTestModuleParamVer01::NewL();
- // Stack size
- param->iTestThreadStackSize= 16384; // 16K stack
- // Heap sizes
- param->iTestThreadMinHeap = 4096; // 4K heap min
- param->iTestThreadMaxHeap = 1048576;// 1M heap max
-
- aTestModuleParam = param;
-*/
- return KErrNone;
-
- }
-
-
-// End of File
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/aiwdialdatatests/src/aiwdialdatatestscases.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,244 +0,0 @@
-/*
-* Copyright (c) 2002 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: Tests for domain AIWDialData API.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "AiwDialDataTests.h"
-
-#include <e32math.h>
-#include <aiwdialdata.h>
-#include <aiwdialdataext.h>
-#include <aiwgenericparam.h>
-// ============================= LOCAL FUNCTIONS ===============================
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CAiwDialDataTests::Case
-// Returns a test case by number.
-//
-// This function contains an array of all available test cases
-// i.e pair of case name and test function. If case specified by parameter
-// aCaseNumber is found from array, then that item is returned.
-//
-// The reason for this rather complicated function is to specify all the
-// test cases only in one place. It is not necessary to understand how
-// function pointers to class member functions works when adding new test
-// cases. See function body for instructions how to add new test case.
-// -----------------------------------------------------------------------------
-//
-const TCaseInfo CAiwDialDataTests::Case (
- const TInt aCaseNumber ) const
- {
-
- /**
- * To add new test cases, implement new test case function and add new
- * line to KCases array specify the name of the case and the function
- * doing the test case
- * In practice, do following
- * 1) Make copy of existing test case function and change its name
- * and functionality. Note that the function must be added to
- * AiwDialDataTests.cpp file and to AiwDialDataTests.h
- * header file.
- *
- * 2) Add entry to following KCases array either by using:
- *
- * 2.1: FUNCENTRY or ENTRY macro
- * ENTRY macro takes two parameters: test case name and test case
- * function name.
- *
- * FUNCENTRY macro takes only test case function name as a parameter and
- * uses that as a test case name and test case function name.
- *
- * Or
- *
- * 2.2: OOM_FUNCENTRY or OOM_ENTRY macro. Note that these macros are used
- * only with OOM (Out-Of-Memory) testing!
- *
- * OOM_ENTRY macro takes five parameters: test case name, test case
- * function name, TBool which specifies is method supposed to be run using
- * OOM conditions, TInt value for first heap memory allocation failure and
- * TInt value for last heap memory allocation failure.
- *
- * OOM_FUNCENTRY macro takes test case function name as a parameter and uses
- * that as a test case name, TBool which specifies is method supposed to be
- * run using OOM conditions, TInt value for first heap memory allocation
- * failure and TInt value for last heap memory allocation failure.
- */
-
- static TCaseInfoInternal const KCases[] =
- {
- // To add new test cases, add new items to this array
-
- // NOTE: When compiled to GCCE, there must be Classname::
- // declaration in front of the method name, e.g.
- // CAiwDialDataTests::PrintTest. Otherwise the compiler
- // gives errors.
-
- FUNCENTRY( CAiwDialDataTests::ConstructionTestL ),
- FUNCENTRY( CAiwDialDataTests::SetAndGetTestL ),
- FUNCENTRY( CAiwDialDataTests::ExtConstructionTestL ),
- FUNCENTRY( CAiwDialDataTests::ExtSetAndGetTestL ),
- // Example how to use OOM functionality
- //OOM_ENTRY( "Loop test with OOM", CAiwDialDataTests::LoopTest, ETrue, 2, 3),
- //OOM_FUNCENTRY( CAiwDialDataTests::PrintTest, ETrue, 1, 3 ),
- };
-
- // Verify that case number is valid
- if( (TUint) aCaseNumber >= sizeof( KCases ) /
- sizeof( TCaseInfoInternal ) )
- {
- // Invalid case, construct empty object
- TCaseInfo null( (const TText*) L"" );
- null.iMethod = NULL;
- null.iIsOOMTest = EFalse;
- null.iFirstMemoryAllocation = 0;
- null.iLastMemoryAllocation = 0;
- return null;
- }
-
- // Construct TCaseInfo object and return it
- TCaseInfo tmp ( KCases[ aCaseNumber ].iCaseName );
- tmp.iMethod = KCases[ aCaseNumber ].iMethod;
- tmp.iIsOOMTest = KCases[ aCaseNumber ].iIsOOMTest;
- tmp.iFirstMemoryAllocation = KCases[ aCaseNumber ].iFirstMemoryAllocation;
- tmp.iLastMemoryAllocation = KCases[ aCaseNumber ].iLastMemoryAllocation;
- return tmp;
-
- }
-
-// -----------------------------------------------------------------------------
-// Tests CAiwDialData construction
-// -----------------------------------------------------------------------------
-//
-TInt CAiwDialDataTests::ConstructionTestL( TTestResult& /*aResult*/ )
- {
- CAiwDialData* dialData = CAiwDialData::NewL();
- delete dialData;
-
- dialData = CAiwDialData::NewLC();
-
- TL( dialData->PhoneNumber() == KNullDesC() );
- T1L( dialData->CallType(), CAiwDialData::EAIWVoice );
- T1L( dialData->WindowGroup(), 0 );
-
- CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
- dialData->FillInParamListL( *list );
-
- CleanupStack::PopAndDestroy( 2, dialData );
-
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// Tests CAiwDialData setting and getting values.
-// -----------------------------------------------------------------------------
-//
-TInt CAiwDialDataTests::SetAndGetTestL( TTestResult& /*aResult*/ )
- {
- _LIT( KPhoneNumber, "1234567890");
-
- CAiwDialData* dialData = CAiwDialData::NewLC();
-
- dialData->SetPhoneNumberL( KPhoneNumber );
- dialData->SetCallType( CAiwDialData::EAIWVideo );
- dialData->SetWindowGroup( 1 );
-
- TL( dialData->PhoneNumber() == KPhoneNumber() );
- T1L( dialData->CallType(), CAiwDialData::EAIWVideo );
- T1L( dialData->WindowGroup(), 1 );
-
- CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
- dialData->FillInParamListL( *list );
-
- CleanupStack::PopAndDestroy( 2, dialData );
-
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// Tests CAiwDialDataExt construction
-// -----------------------------------------------------------------------------
-//
-TInt CAiwDialDataTests::ExtConstructionTestL( TTestResult& /*aResult*/ )
- {
- CAiwDialDataExt* dialData = CAiwDialDataExt::NewL();
- delete dialData;
-
- dialData = CAiwDialDataExt::NewLC();
-
- TL( dialData->PhoneNumber() == KNullDesC() );
- T1L( dialData->CallType(), CAiwDialData::EAIWVoice );
- T1L( dialData->WindowGroup(), 0 );
- TL( !dialData->InitiateCall() );
- TL( dialData->Name() == KNullDesC() );
- T1L( dialData->Redial(), AIWDialDataExt::KAIWRedialDefault );
- TL( dialData->ShowNumber() );
- TL( dialData->ContactLink() == KNullDesC8() );
-
- CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
- dialData->FillInParamListL( *list );
-
- CleanupStack::PopAndDestroy( 2, dialData );
-
- return KErrNone;
-
- }
-
-// -----------------------------------------------------------------------------
-// Tests CAiwDialDataExt setting and getting values.
-// -----------------------------------------------------------------------------
-//
-TInt CAiwDialDataTests::ExtSetAndGetTestL( TTestResult& /*aResult*/ )
- {
- _LIT( KPhoneNumber, "1234567890");
- _LIT8( KContactLink, "ContactLink");
- _LIT( KName, "Mr Smith" );
-
- CAiwDialDataExt* dialData = CAiwDialDataExt::NewLC();
-
- dialData->SetPhoneNumberL( KPhoneNumber );
- dialData->SetCallType( CAiwDialData::EAIWVideo );
- dialData->SetWindowGroup( 1 );
- dialData->SetInitiateCall( ETrue );
- dialData->SetNameL( KName );
-
- dialData->SetRedial( AIWDialDataExt::KAIWRedialOff );
- dialData->SetShowNumber( EFalse );
- dialData->SetContactLinkL( KContactLink );
-
- TL( dialData->PhoneNumber() == KPhoneNumber() );
- T1L( dialData->CallType(), CAiwDialData::EAIWVideo );
- T1L( dialData->WindowGroup(), 1 );
- TL( dialData->InitiateCall() );
- TL( dialData->Name() == KName() );
- T1L( dialData->Redial(), AIWDialDataExt::KAIWRedialOff );
- TL( !dialData->ShowNumber() );
- TL( dialData->ContactLink() == KContactLink() );
-
-
- CAiwGenericParamList* list = CAiwGenericParamList::NewLC();
- dialData->FillInParamListL( *list );
-
- CleanupStack::PopAndDestroy( 2, dialData );
-
- return KErrNone;
- }
-
-
-// End of File
--- a/phoneclientserver/aiwdialdata/tsrc/public/basic/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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: Build file for AiwDialDataTests component.
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-
-PRJ_EXPORTS
-
-PRJ_TESTMMPFILES
-../AiwDialDataTests/group/AiwDialDataTests.mmp
-
-PRJ_MMPFILES
-
--- a/phoneclientserver/callui/bmarm/cauiengineu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- CreateCaUiEngFactoryL__Fv @ 1 NONAME R3UNUSED ; CreateCaUiEngFactoryL(void)
-
--- a/phoneclientserver/callui/bwins/cauiengineu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- ?CreateCaUiEngFactoryL@@YAPAVCCaUiEngFactory@@XZ @ 1 NONAME ; class CCaUiEngFactory * __cdecl CreateCaUiEngFactoryL(void)
- ?NewL@CCaUiReconnectQuery@@SAPAV1@AAVMCaUiReconnectQueryObserver@@@Z @ 2 NONAME ; class CCaUiReconnectQuery * CCaUiReconnectQuery::NewL(class MCaUiReconnectQueryObserver &)
-
--- a/phoneclientserver/callui/data/101f868e.rss Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2004 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: ECom resource file for CallUI.
-*
-*/
-
-
-
-// INCLUDES
-#include <registryinfov2.rh>
-#include <aiwcommon.hrh>
-#include "caui.hrh"
-
-
-// RESOURCE DEFINITIONS
-
-// -----------------------------------------------------------------------------
-//
-// theInfo
-// ECOM registry information - defined as ROM only.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE REGISTRY_INFO theInfo
- {
- resource_format_version = RESOURCE_FORMAT_VERSION_2;
-
- dll_uid = KCallUIImplementationUid;
- interfaces =
- {
- INTERFACE_INFO
- {
- interface_uid = KAiwClassMenu;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = KCallUIImplementationUid;
- version_no = 1;
- display_name = "";
- default_data = "*";
- opaque_data = KAiwCmdCallStr;
- rom_only = 1;
- }
- };
- },
- INTERFACE_INFO
- {
- interface_uid = KAiwClassBase;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = KCallUIImplementationUid2;
- version_no = 1;
- display_name = "";
- default_data = "*";
- opaque_data = KAiwCmdCallStr;
- rom_only = 1;
- }
- };
- }
- };
- }
-
-// End of File
-
-
--- a/phoneclientserver/callui/data/callui.rss Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,558 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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: This file contains all the resources
-* for the CallUI.
-*
-*/
-
-
-// RESOURCE IDENTIFIER
-NAME CAUI
-
-// INCLUDES
-#include <eikon.rh>
-#include <avkon.rh>
-#include <avkon.hrh>
-#include <avkon.rsg>
-#include <avkon.loc>
-
-#include "caui.hrh"
-#include <callui.loc>
-#include <aiwcommon.hrh>
-
-
-
-// RESOURCE DEFINITIONS
-
-// -----------------------------------------------------------------------------
-//
-// RSS_SIGNATURE
-//
-// Signature.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE RSS_SIGNATURE { }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_call_menu
-//
-// Call menu (non-cascaded).
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_callui_call_menu
- {
- items=
- {
- MENU_ITEM
- {
- command = ECallUIVoice;
- txt = qtn_options_call;
- extratxt = qtn_call_sub_voice;
- },
- MENU_ITEM
- {
- command = AIW_SUBMENU_TITLE;
- txt = qtn_options_call;
- }
- };
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_cascaded_submenu
-//
-// Cascaded call submenu.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_callui_cascaded_submenu
- {
- items=
- {
- MENU_ITEM
- {
- command = ECallUIVoice;
- txt = qtn_call_sub_voice;
- },
- MENU_ITEM
- {
- command = ECallUIVideo;
- txt = qtn_call_sub_video;
- },
- MENU_ITEM
- {
- command = ECallUIInternet;
- txt = qtn_call_sub_internet;
- },
- MENU_ITEM
- {
- command = AIW_SUBMENU_TITLE;
- txt = qtn_options_call;
- }
- };
- }
-
-
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_create_list_query
-//
-// List query dialog for call type query or confirmation.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_callui_create_list_query
- {
- flags = EGeneralQueryFlags;
- buttons = R_AVKON_SOFTKEYS_CALL_CANCEL__CALL;
- items =
- {
- DLG_LINE
- {
- type = EAknCtListQueryControl;
- id = EListQueryControl;
- control = AVKON_LIST_QUERY_CONTROL
- {
- listtype = EAknCtSinglePopupMenuListBox;
- listbox = LISTBOX
- {
- flags = EAknListBoxMenuList;
- height = ECaUiCreateListQueryHeight;
- width = ECaUiCreateListQueryWidth;
- array_id = r_callui_create_list_items;
- };
- heading = qtn_popup_title_create;
- };
- }
- };
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_create_list_items
-//
-// List items for call types used in create query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE ARRAY r_callui_create_list_items
- {
- items=
- {
- LBUF { txt = qtn_popup_create_voice; },
- LBUF { txt = qtn_popup_create_video; }
- };
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_create_list_voice
-//
-// The voice call item string in call type query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_create_list_voice
- {
- buf = qtn_popup_create_voice;
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_create_list_video
-//
-// The video item string in call type query
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_create_list_video
- {
- buf = qtn_popup_create_video;
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_create_list_internet
-//
-// The internet item string in call type query
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_create_list_internet
- {
- buf = qtn_popup_create_internet;
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_no_video_network
-//
-// The text shown in information note when there is no
-// network support for video call.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_no_video_network
- {
- buf = qtn_tel_no_video_network;
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_reconnect_query_header
-//
-// The header string in reconnect confirmation query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_reconnect_query_header
- {
- buf = qtn_tel_retry_voicevideo_call;
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_reconnect_list_item_voice
-//
-// The voice call option item string in create confirmation query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_reconnect_list_item_voice
- {
- buf = qtn_tel_retry_voice_call_item;
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_reconnect_list_item_video
-//
-// The video call option item string in create confirmation query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_reconnect_list_item_video
- {
- buf = qtn_tel_retry_video_call_item;
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_reconnect_list_item_mms
-//
-// The mms option item string in create confirmation query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_reconnect_list_item_mms
- {
- buf = qtn_tel_retry_mms_call_item;
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_reconnect_list_item_sms
-//
-// The sms option item string in create confirmation query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_reconnect_list_item_sms
- {
- buf = qtn_tel_retry_sms_call_item;
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_call_internet_menu
-//
-// Call menu Voice call, Internet call
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_callui_call_internet_menu
- {
- items=
- {
- MENU_ITEM
- {
- command = ECallUIVoice;
- txt = qtn_call_sub_voice;
- },
- MENU_ITEM
- {
- command = ECallUIInternet;
- txt = qtn_call_sub_internet;
- },
- MENU_ITEM
- {
- command = AIW_SUBMENU_TITLE;
- txt = qtn_options_call;
- }
- };
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_internet_menu
-//
-// Call menu Internet call (non-cascaded).
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_callui_internet_menu
- {
- items=
- {
- MENU_ITEM
- {
- command = ECallUIInternet;
- txt = qtn_options_internet_call;
- },
- MENU_ITEM
- {
- command = AIW_SUBMENU_TITLE;
- txt = qtn_options_call;
- }
- };
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_call_menu
-//
-// Call menu Voice call, Video call
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_callui_call_video_menu
- {
- items=
- {
- MENU_ITEM
- {
- command = ECallUIVoice;
- txt = qtn_call_sub_voice;
- },
- MENU_ITEM
- {
- command = ECallUIVideo;
- txt = qtn_call_sub_video;
- },
- MENU_ITEM
- {
- command = AIW_SUBMENU_TITLE;
- txt = qtn_options_call;
- }
- };
- }
-
-
-
-// -----------------------------------------------------------------------------
-//
-// NEW_MESSAGE_MTM_TYPE
-//
-// Message MTM types
-//
-// -----------------------------------------------------------------------------
-//
-STRUCT NEW_MESSAGE_MTM_TYPE
- {
- LONG id = 0;
- LTEXT name = "";
- }
-
-// -----------------------------------------------------------------------------
-//
-// NEW_MESSAGE_MTM_ARRAY
-//
-// Message MTM items struct
-//
-// -----------------------------------------------------------------------------
-//
-STRUCT NEW_MESSAGE_MTM_ARRAY
- {
- STRUCT items[];
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// new_message_types_array
-//
-// Message type array
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE NEW_MESSAGE_MTM_ARRAY new_message_types_array
- {
- items =
- {
-#ifndef RD_UNIFIED_EDITOR
- NEW_MESSAGE_MTM_TYPE
- {
- id = 0x1000102C;
- name = qtn_mce_pop_up_sms;
- }
-#ifdef __MMS
- ,
- NEW_MESSAGE_MTM_TYPE
- {
- id = 0x100058E1;
- name = qtn_mce_pop_up_mms;
- }
-#endif //__MMS
-#else // RD_UNIFIED_EDITOR
- NEW_MESSAGE_MTM_TYPE
- {
- id = 0x102072D6;
- name = qtn_tel_retry_message_call_item;
- }
-#endif // RD_UNIFIED_EDITOR
-#ifdef __EMAIL_UI
- ,
- NEW_MESSAGE_MTM_TYPE
- {
- id = 0x10001028;
- name = qtn_mce_pop_up_email;
- }
-#endif //__EMAIL_UI
- ,
- NEW_MESSAGE_MTM_TYPE
- {
- id = 0x10207245;
- name = qtn_mce_pop_up_PostCard;
- }
- };
- }
-// -----------------------------------------------------------------------------
-//
-// r_callui_reconnect_list_item_message
-//
-// The mms option item string in create confirmation query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_reconnect_list_item_message
- {
- buf = qtn_tel_retry_message_call_item;
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_vt_setting_note
-//
-// Text for query dialog
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_vt_setting_note
- {
- buf = qtn_incal_set_long_press_call_video;
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_vt_setting_note
-//
-// The string in VT setting note
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_callui_popup_vt_title_setting
- {
- buf = qtn_popup_vt_title_setting;
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_callui_vt_setting_query
-//
-// Query dialog for Video Telephony setting
-//
-//
-// -----------------------------------------------------------------------------
-//
-
-RESOURCE DIALOG r_callui_vt_setting_query
- {
- flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;
- buttons = R_AVKON_SOFTKEYS_YES_NO;
- items=
- {
- DLG_LINE
- {
- type = EAknCtPopupHeadingPane;
- id = EAknMessageQueryHeaderId;
- control = AVKON_HEADING
- {
- headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
- };
- },
- DLG_LINE
- {
- type = EAknCtMessageQuery;
- id = EAknMessageQueryContentId;
- control = AVKON_MESSAGE_QUERY
- {
- message = qtn_incal_set_long_press_call_video;
- };
- }
- };
- }
-
-RESOURCE TBUF r_callui_cs_voice_call
- {
- buf = qtn_call_sub_voice;
- }
-
-RESOURCE TBUF r_callui_cs_video_call
- {
- buf = qtn_call_sub_video;
- }
-
-RESOURCE TBUF r_callui_internet_call
- {
- buf = qtn_call_sub_internet;
- }
-
-RESOURCE TBUF r_callui_xsp_call_with_service_name
- {
- buf = qtn_call_sub_voip_with_name;
- }
-
-RESOURCE TBUF r_callui_call_submenu_title
- {
- buf = qtn_options_call;
- }
-
-RESOURCE TBUF r_callui_xsp_test_temp
- {
- buf = qtn_call_sub_test;
- }
-
-// End of File
--- a/phoneclientserver/callui/eabi/cauiengineu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
- _Z21CreateCaUiEngFactoryLv @ 1 NONAME
- _ZN19CCaUiReconnectQuery4NewLER27MCaUiReconnectQueryObserver @ 2 NONAME
- _ZTI16CCaUiEngFactImpl @ 3 NONAME
- _ZTI18CCaUiMessageSender @ 4 NONAME
- _ZTI19CCaUiReconnectQuery @ 5 NONAME
- _ZTV16CCaUiEngFactImpl @ 6 NONAME
- _ZTV18CCaUiMessageSender @ 7 NONAME
- _ZTV19CCaUiReconnectQuery @ 8 NONAME
-
--- a/phoneclientserver/callui/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2004-2007 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: Build information specification for CallUI.
-*
-*/
-
-
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-
-PRJ_EXPORTS
-
-// Private
-../inc/cauiengine/cauidialresultobserver.h |../inc/cauidialresultobserver.h
-../inc/cauiengine/cauilogger.h |../inc/cauilogger.h
-../inc/cauiengine/cauieng.h |../inc/cauieng.h
-
-// Internal
-../inc/caui.hrh |../../../inc/caui.hrh
-
-../rom/callui_stub.sis /epoc32/data/z/system/install/callui_stub.sis
-
-// LOC files
-../loc/callui.loc MW_LAYER_LOC_EXPORT_PATH(callui.loc)
-
-// IBY files
-../rom/callui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(callui.iby)
-../rom/callui_variant.iby CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(callui_variant.iby)
-../rom/calluiresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(calluiresources.iby)
-
-
-PRJ_MMPFILES
-../group/cauiengine.mmp
-../group/cauiplugin.mmp
-
-
-// End of File
--- a/phoneclientserver/callui/group/cauiengine.mmp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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: Project specification for CaUiEngine.
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-// Capability assignment.
-CAPABILITY CAP_GENERAL_DLL
-
-TARGET cauiengine.dll
-TARGETTYPE dll
-UID 0x1000008d 0x101F868F
-VERSION 10.0
-
-SOURCEPATH ../src/cauiengine
-SOURCE cauiengfactimpl.cpp
-
-SOURCE cauiquery.cpp
-SOURCE cauiengine.cpp
-SOURCE cauiactiveobject.cpp
-SOURCE cauimessagesender.cpp
-SOURCE cauidialogs.cpp
-
-SOURCE cauivoipextension.cpp
-SOURCE ccauireconnectquery.cpp
-SOURCE ccauireconnectqueryimpl.cpp
-
-SOURCEPATH ../data
-START RESOURCE callui.rss
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-END
-
-// TEMPORARY DEFINITION FOR CONTACT FINDER HEADERS
-SYSTEMINCLUDE ../../../../../app/phone/inc
-
-USERINCLUDE ../inc
-USERINCLUDE ../inc/cauiengine
-USERINCLUDE ../data
-USERINCLUDE ../loc
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE ../../../inc
-SYSTEMINCLUDE ../../inc // phoneclientserver inc
-
-LIBRARY cone.lib
-LIBRARY euser.lib
-LIBRARY commonengine.lib
-LIBRARY phoneclient.lib
-LIBRARY featmgr.lib // FeatureManager
-LIBRARY pbkeng.lib // PhoneBook engine
-LIBRARY pbkview.lib
-LIBRARY centralrepository.lib
-LIBRARY cenrepnotifhandler.lib // Cenrep notifier
-LIBRARY flogger.lib
-LIBRARY phonecntfinder.lib
-
-LIBRARY avkon.lib
-LIBRARY aknnotify.lib
-LIBRARY eikcore.lib // For test printing.
-LIBRARY sendui.lib
-LIBRARY eikcoctl.lib
-LIBRARY eikdlg.lib
-LIBRARY bafl.lib // CDesC16ArrayFlat
-LIBRARY mmscli.lib
-LIBRARY msgs.lib
-LIBRARY muiu.lib
-LIBRARY serviceselector.lib
-LIBRARY serviceprovidersettings.lib
-
-LIBRARY aiwdialdata.lib
-
-LANGUAGE_IDS
-
-// End of file
--- a/phoneclientserver/callui/group/cauiplugin.mmp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2004 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: Project specification for CallUI plugin.
-*
-*/
-
-
-#include <platform_paths.hrh>
-// Capability assignment.
-CAPABILITY CAP_ECOM_PLUGIN
-
-TARGET cauiplugin.dll
-
-TARGETTYPE PLUGIN
-
-UID 0x10009D8D 0x101F868E
-
-VERSION 10.0
-
-SOURCEPATH ../src/cauiplugin
-SOURCE cauiplugin.cpp
-SOURCE cauimain.cpp
-
-
-SOURCEPATH ../data
-
-START RESOURCE 101f868e.rss
-TARGET cauiplugin.rsc
-END
-
-
-USERINCLUDE ../inc
-USERINCLUDE ../inc/cauiplugin
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE ../../../inc
-
-LIBRARY euser.lib
-LIBRARY servicehandler.lib
-LIBRARY flogger.lib
-LIBRARY commonengine.lib
-
-LANGUAGE_IDS
-
-// End of file
--- a/phoneclientserver/callui/inc/caui.hrh Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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: Defines UIDs used in CallUI.
-*
-*/
-
-
-#ifndef CAUI_HRH
-#define CAUI_HRH
-
-
-// CONSTANTS
-
-// Connection utility implementation uid.
-#define KCallUIImplementationUid 0x101F868E
-#define KCallUIImplementationUid2 0x102029A1
-
-// Create list query listbox height.
-enum
- {
- ECaUiCreateListQueryHeight = 3
- };
-
-// Create list query listbox width.
-enum
- {
- ECaUiCreateListQueryWidth = 3
- };
-
-
-// Values for different kinds of call commands.
-enum
- {
- ECallUIVoice = 500, // Normal, i.e. voice call.
- ECallUIVideo = 501, // Video call.
- ECallUIInternet = 502 // Internet call ( VoIP )
- };
-
-// Values used in communication between CaUiEngine and CaUiPlugin.
-enum TCaUiCallType
- {
- ECaUiCallTypeUnknown = 0, // Call type is unknown.
- ECaUiCallTypeVoice = 1, // Call type is voice call.
- ECaUiCallTypeVideo = 2, // Call type is video call.
- ECaUiCallTypeInternet = 3 // Call type is Internet call
- };
-
-enum EMenuItemType {
- ECSVoice,
- ECSVideo,
- EInternet,
- EInternetWithName
-};
-
-#endif // CAUI_HRH
-
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauiactiveobject.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,258 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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: Active object to handle global list query results.
-*
-*/
-
-
-#ifndef CAUIACTIVEOBJECT_H
-#define CAUIACTIVEOBJECT_H
-
-
-// INCLUDES
-#include <e32base.h>
-#include <badesca.h>
-
-
-// DATA TYPES
-typedef CArrayFixFlat<TInt> CCaUiTIntArray;
-
-
-// FORWARD DECLARATIONS
-class MCaUiReconnectQueryObserver;
-class CCoeEnv;
-class CPhCntFactory;
-class CPhCntMatcher;
-class CCaUiMessageSender;
-
-// CLASS DECLARATION
-
-/**
-* Active object to handle global list query results.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-NONSHARABLE_CLASS( CCaUiGlnActiveObject )
-: public CActive
- {
- public: // Data types
-
- /*
- * The reconnect query options.
- */
- enum TCaUiReconnectType
- {
- ECaUiVoiceCall = 0, // Voice call.
- ECaUiVideoCall = 1, // Video call.
- #ifdef RD_UNIFIED_EDITOR
- ECaUiMsg = 2 // Unified editor.
- #else // RD_UNIFIED_EDITOR
- ECaUiMms = 2, // MMS.
- ECaUiSms = 3 // SMS.
- #endif // // RD_UNIFIED_EDITOR
- };
-
-
- /**
- * The editor types that can be launched.
- *
- * ECaUiEditorSMS SMS editor.
- * ECaUiEditorMMS MMS editor.
- */
- enum TCaUiEditorType
- {
- #ifdef RD_UNIFIED_EDITOR
- ECaUiEditorMSG = 0
- #else // RD_UNIFIED_EDITOR
- ECaUiEditorSMS = 0,
- ECaUiEditorMMS = 1
- #endif // RD_UNIFIED_EDITOR
- };
-
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- *
- * @param aObserver The observer to handle query results.
- * @param aPhCntMatcher The Phone Contact Matcher.
- * Ownership not transferred. If NULL, then matcher is created
- * inside CCaUiGlnActiveObject.
- * @param aPhoneNumber Pointer to the number where dial was tried.
- * @param aAlias The alias corresponding the number. Can be NULL.
- * @return Constructed CCaUiGlnActiveObject instance.
- */
- static CCaUiGlnActiveObject* NewL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TPtrC aAlias );
-
- /**
- * Destructor.
- */
- virtual ~CCaUiGlnActiveObject();
-
-
- public: // New functions
-
-
- /**
- * Returns reconnect query options array, that must include options
- * in the same order and in the same locations than they are in
- * reconnect query. Insert only TCaUiReconnectType members.
- *
- * @return Reconnect query options array.
- */
- CCaUiTIntArray* ReconQueryOptionsArray();
-
-
- public: // Functions from base classes
-
- /**
- * @see CActive::DoCancel.
- */
- void DoCancel();
-
- /**
- * @see CActive::RunL.
- */
- void RunL();
-
-
- /**
- * @see CActive::SetActive.
- */
- void SetActive();
-
-
- private:
-
- /**
- * C++ constructor.
- *
- * @param aObserver The observer to handle query results.
- */
- CCaUiGlnActiveObject(
- MCaUiReconnectQueryObserver& aObserver );
-
- /**
- * By default Symbian 2nd phase constructor is private.
- *
- * @see CCaUiGlnActiveObject::NewL().
- */
- void ConstructL(
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TPtrC aAlias );
-
-
- /**
- * Launch the desired editor.
- *
- * @param aEditorType The editor type to be launched.
- */
- void LaunchEditorL( TCaUiEditorType aEditorType );
-
- /**
- * Creates message sender.
- *
- */
- void CreateMessageSenderL();
-
- private: // Data
-
-
- // The query observer.
- MCaUiReconnectQueryObserver* iObserver;
-
- // Storage for real addresses.
- CDesCArrayFlat* iRealAddress;
-
- // Storage for aliases.
- CDesCArrayFlat* iAliases;
-
- // Storage for reconnect query options.
- CCaUiTIntArray* iReConQueryOptions;
-
- // Phone Contact finder factory.
- CPhCntFactory* iPhCntFactory;
-
- // Phone Contact matcher.
- CPhCntMatcher* iPhCntMatcher;
-
- // Is CPhCntMatcher owned.
- TBool iOwnMatcher;
-
- // Message sender
- CCaUiMessageSender* iMessageSender;
-
- };
-
-/**
-* Active object to handle note results.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-NONSHARABLE_CLASS( CCaUiNoteActiveObject )
-: public CActive
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- *
- * @return Constructed CCaUiNoteActiveObject instance.
- */
- static CCaUiNoteActiveObject* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CCaUiNoteActiveObject();
-
-
-
- public: // Functions from base classes
-
- /**
- * @see CActive::DoCancel.
- */
- void DoCancel();
-
- /**
- * @see CActive::RunL.
- */
- void RunL();
-
- /**
- * @see CActive::SetActive.
- */
- void SetActive();
-
-
- private:
-
- /**
- * C++ default constructor.
- *
- */
- CCaUiNoteActiveObject();
- };
-
-#endif // CCAUIACTIVEOBJECT_H
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauidialdatacontainer.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
-* Copyright (c) 2004 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: Contains PhoneClient Dial Data.
-*
-*/
-
-
-
-#ifndef CAUIDIALDATACONTAINER_H
-#define CAUIDIALDATACONTAINER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <tphcltextphonedialdata.h>
-
-
-/**
-* Defines the class that contains PhoneClient Dial Data.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-class CCaUiDialDataContainer
-: public CBase
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- *
- * @return Created CCaUiDialDataContainer instance.
- */
- static CCaUiDialDataContainer* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CCaUiDialDataContainer();
-
-
- public: // New functions
-
- /**
- * Returns reference to owned dial data.
- *
- * @return Owned PhoneClient dial data.
- */
- TPhCltExtPhoneDialData& DialData();
-
-
- private:
-
- /**
- * C++ default constructor.
- */
- CCaUiDialDataContainer();
-
-
- private: // Data
-
- // PhoneClient Dial data.
- TPhCltExtPhoneDialData iDialData;
- };
-
-#endif // CAUIDIALDATACONTAINER_H
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauidialogs.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +0,0 @@
-/*
-* Copyright (c) 2008 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 engine implementation for CallUI.
-*
-*/
-
-
-#ifndef __CAUIDIALOGS_H__
-#define __CAUIDIALOGS_H__
-
-// Includes
-
-#include "phclttypes.h"
-#include "cauivoipextension.h"
-
-// Forward declarations
-
-class CCaUiEngine;
-class MCaUiReconnectQueryObserver;
-class CPhCntMatcher;
-class CAknGlobalListQuery;
-class CCaUiGlnActiveObject;
-class CCaUiReConQueryInformation;
-class CAknGlobalNote;
-class CCaUiNoteActiveObject;
-
-
-// Contants
-
-// The first item in list query (CCaUiQuery).
-const TInt KCallUiVoiceCall = 0;
-
-// The second item in list query (CCaUiQuery).
-const TInt KCallUiVideoCall = 1;
-
-// The third item in list query (CCaUiQuery).
-const TInt KCallUiInternetCall = 2;
-
-// Priority of the note
-const TInt KNoVideoSupportNotePriority = 3500;
-
-// Timeout for note launch.
-const TInt KCaUiEngNoteTimeout = 3000000; // 3s
-
-NONSHARABLE_CLASS( CCaUiDialogs )
- : public CBase
- {
-
- public:
-
- /**
- * Two-phased constructor.
- * @return an instance of CCaUiDialogs.
- */
- static CCaUiDialogs* NewL( CCaUiEngine& aCaUiEngine );
-
- /**
- * Destructor.
- */
- virtual ~CCaUiDialogs();
-
- /**
- * Launch a query whether video call will be created with long
- * press of Send key
- *
- * @return The selection user made
- */
- TInt QueryVideoCallDefaultActionL();
-
- /**
- * Launch a list query asking what type of call the caller wants
- * to make.
- *
- * @param aCallType The call type chosen by user in query.
- * @return ETrue if query was successful, EFalse otherwise.
- */
- TBool LaunchCreateListQueryL( TPhCltCallType& aCallType );
-
- /**
- * Launch the qtn.tel.no.video.network information note.
- *
- * @see CCaUiEngApi::LaunchNoNetSupNoteL().
- */
- void LaunchNoNetSupNoteL();
-
- /**
- * Launch reconnect confirmation query.
- *
- * @see CCaUiEngApi::LaunchReconConfQueryL().
- * @param aAlias The alias corresponding the number. Can be empty TPtrC.
- */
- void LaunchReconConfQueryL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption,
- const TPtrC aAlias );
-
- /**
- * Cancel reconnect query.
- *
- * @see CCaUiEngApi::CancelReconConfQuery().
- */
- void CancelReconConfQuery();
-
- /**
- * Cancel note and reconnect query.
- *
- * @see CCaUiEngApi::CancelNoteAndReconConfQuery().
- */
- void CancelNoteAndReconConfQuery();
-
- /**
- * Launch note and reconnect confirmation query.
- *
- * @see CCaUiEngApi::LaunchNoteAndReconConfQueryL().
- * @param aAlias The alias corresponding the number. Can be empty TPtrC.
- */
- void LaunchNoteAndReconConfQueryL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption,
- const TPtrC aNoteText,
- const TPtrC aAlias );
-
- /**
- * Check if reconfigure query is ongoing.
- * @since 3.2
- * @return TBool, ETrue if query is ongoing
- * EFalse if not ongoing.
- */
- TBool IsReconfQueryOngoing();
-
- /**
- * Set reconfigure query is ongoing.
- * @since 5.0
- */
- void SetReconfQueryOngoing( TBool aOngoing );
-
- private:
-
- /**
- * C++ default constructor.
- */
- CCaUiDialogs( CCaUiEngine& aCaUiEngine );
-
- /**
- * Symbian 2nd phase constructor
- */
- void ConstructL();
-
- /**
- * Fill list query items
- *
- * @since 5.0
- * @param aTextArray
- * @param aMappingList
- */
- void FillListQueryItemsL(
- CDesCArray& aTextArray,
- CListMappingArray& aMappingList );
-
- /**
- * Handle note expiration call back.
- *
- * @param aAny This pointer.
- * @return KErrNone if successful, Symbian error code otherwise.
- */
- static TInt DoPerformNoteLaunchCallBackL( TAny* aAny );
-
- public: // data
-
- // tkuuva, create getter/setter
- //TBool iReconfQueryOngoing;
-
- private: //data
-
- // The reconnect global list query.
- CAknGlobalListQuery* iReconListQuery;
-
- // The active object to handle reconnect query results.
- CCaUiGlnActiveObject* iReconActObject;
-
- CCaUiEngine& iCaUiEngine;
-
- // Owned timer for note launch time-out.
- CPeriodic* iNoteTimer;
-
- // Storage for Reconnect query information.
- CCaUiReConQueryInformation* iReConQueryInformation;
-
- // The qtn.tel.no.video.network note shown to the user.
- CAknInformationNote* iInfoNote;
-
- // ReconfQuery ongoing flag
- TBool iReconfQueryOngoing;
-
- };
-
-#endif // __CAUIDIALOGS_H__
--- a/phoneclientserver/callui/inc/cauiengine/cauidialresultobserver.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2004 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: It defines the interface for the observers of
-* the CCaUiEngApi DialL function results.
-*
-*/
-
-
-#ifndef MCAUIDIALRESULTOBSERVER_H
-#define MCAUIDIALRESULTOBSERVER_H
-
-// CLASS DECLARATION
-
-/**
-* Defines the interface for the observers of the CCaUiEngApi DialL function.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-class MCaUiDialResultObserver
- {
- public: // New functions
-
- /**
- * It is called whenever dial request is completed.
- *
- * @param aStatus It is the status of the operation.
- * KErrNone if successful.
- * < 0 means Symbian OS error code.
- */
- virtual void HandleDialResultL( const TInt aStatus ) = 0;
-
- };
-
-#endif // MCAUIDIALRESULTOBSERVER_H
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauieng.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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: API for CallUiEngine usage.
-*
-*/
-
-
-#ifndef CAUIENG_H
-#define CAUIENG_H
-
-
-// INCLUDES
-#include <e32base.h>
-#include <spdefinitions.h> //RIdArray
-#include "caui.hrh"
-
-
-// FORWARD DECLARATIONS
-class MCaUiReconnectQueryObserver;
-class MDesC16Array;
-class MCaUiDialResultObserver;
-class CPhCntMatcher;
-
-
-// CLASS DECLARATION
-
-/**
-* The API for CallUIEngine usage.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-class CCaUiEngApi
-: public CBase
- {
- public: // Data types
-
- /**
- * Enumerate all supported resource types.
- *
- * ECaUiResVoice - Pure voice call resources.
- * ECaUiResVoiceAndVideo - Voice and video call resources.
- * ECaUiResVoiceInternetAndVideo - All Internet, voice and video call resources.
- * ECaUiResOnlyInternet - Only Internet call resources.
- */
- enum TCaUiEngResource
- {
- ECaUiResVoice = 0,
- ECaUiResVoiceAndVideo = 1,
- ECaUiResVoiceInternetAndVideo = 2,
- ECaUiResOnlyInternet = 3
- };
-
-
- /**
- * Enumerate all supported localized text.
- *
- * ECallMenuItemText - Menu item text for call.
- * EVoiceCallMenuItemText - Menu item text for voice call.
- * EVideoCallMenuItemText - Menu item text for video call.
- * EInternetCallMenuItemText - Menu item text for internet call.
- */
- enum TCaUiEngText
- {
- ECallMenuItemText = 0,
- EVoiceCallMenuItemText = 1,
- EVideoCallMenuItemText = 2,
- EInternetCallMenuItemText = 3
- };
-
- public: // New functions
-
- /**
- * Make the dial operation.
- *
- * @param aObserver The observer to handle dial result.
- * @param aDialData The TCallUIDialDataV1 dial data information in
- * packaged format.
- * @param aCallType If not equal to ECaUiCallTypeUnknown, then
- * overwrites the call type in aDialData.
- */
- virtual void DialL(
- MCaUiDialResultObserver& aObserver,
- const TDesC8& aDialData,
- const TCaUiCallType aCallType ) = 0;
-
- /**
- * Launch the qtn.tel.no.video.network information note.
- *
- */
- virtual void LaunchNoNetSupNoteL() = 0;
-
-
- /**
- * Launch the reconnect confirmation query shown to user.
- *
- * @param aObserver The observer to handle query result.
- * @param aPhCntMatcher The Phone Contact Matcher.
- * Ownership not transferred. If NULL, then matcher is created
- * inside CaUIEngine.
- * @param aPhoneNumber Pointer to the number where dial was tried.
- * @param aIncludeVideoCallOption If set to ETrue, video call option is
- * included to query, otherwise it is left out.
- */
- virtual void LaunchReconConfQueryL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption ) = 0;
-
-
- /**
- * Cancel reconnect query launched with LaunchReconConfQueryL.
- *
- */
- virtual void CancelReconConfQuery() = 0;
-
-
- /**
- * Launch note and reconnect confirmation query in sequence.
- *
- * @param aObserver The observer to handle query result.
- * @param aPhCntMatcher The Phone Contact Matcher.
- * Ownership not transferred. If NULL, then matcher is created
- * inside CaUIEngine.
- * @param aPhoneNumber Pointer to the number where dial was tried.
- * @param aIncludeVideoCallOption If set to ETrue, video call option is
- * included to query, otherwise it is left out.
- * @param aNoteText The text shown in information note. If empty, then
- * qtn.tel.no.video.network text is shown.
- */
- virtual void LaunchNoteAndReconConfQueryL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption,
- const TPtrC aNoteText ) = 0;
-
- /**
- * Cancel note and reconnection query launched with
- * LaunchNoteAndReconConfQueryL.
- *
- */
- virtual void CancelNoteAndReconConfQuery() = 0;
-
- /**
- * Launch address selection. If contact contains default number or
- * only one number, number will be returned directly.
- * Otherwise address selection list displayed.
- * @since 3.0
- *
- * @param aTelNum Contains selected number after execution.
- * @param aContactId The contact id from PhoneBook.
- * @param aVoIPAddressSelect If ETrue VoIP address select is used.
- * @return TBool, ETrue if number selected,
- * EFalse otherwice (E.g. list canceled).
- */
- virtual TBool LaunchAddressSelectL(
- TDes& aTelNum,
- const TInt aContactId,
- const TBool aVoIPAddressSelect ) = 0;
-
- /**
- * Cancel address selection launched with LaunchAddressSelectL.
- *
- */
- virtual void CancelAddressSelect() = 0;
-
- /**
- * Get VoIP services
- * @param aVoipServiceIds On return, contains the list of VoIP services
- */
- virtual void GetVoIPServiceIdsL( RIdArray& aVoipServiceIds ) const = 0;
-
- /**
- * Get the service provider name
- * @param aServiceId The service, whose name is requested
- * @param aServiceName On return, contains the service name
- */
- virtual void GetVoipServiceNameL( TServiceId aServiceId, TDes& aServiceName ) const = 0;
- };
-
-
-
-
-/**
-* Interface for CaUiEngine creation.
-*
-* @lib
-* @since 2.6
-*/
-class CCaUiEngFactory : public CBase
- {
- public:
-
- /**
- * Creates CallUIEngine.
- * CCaUiEngFactory instance is deleted even in leave case.
- *
- * @return CCaUiEngApi implementation. NULL if not supported.
- * Ownership transferred.
- */
- virtual CCaUiEngApi* CCaUiEngApiLD() = 0;
-
- };
-
-/**
-* Only exported function. This is in index 1 in the lookup table.
-* Call this function to create CCaUiEngFactory instance.
-*
-* IMPORT_C CCaUiEngFactory* CreateCaUiEngFactoryL();
-*/
-
-
-
-
-#endif // CAUIENG_H
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauiengfactimpl.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2004 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 CaUiEngine factory interface.
-*
-*/
-
-
-
-#ifndef CAUIENGFACTIMPL_H
-#define CAUIENGFACTIMPL_H
-
-
-// INCLUDES
-#include "cauieng.h"
-
-
-/**
-* Implementation of the PhoneClient Extension factory.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-class CCaUiEngFactImpl
-: public CCaUiEngFactory
- {
- public:
-
- /**
- * @see CCaUiEngFactory.
- */
- CCaUiEngApi* CCaUiEngApiLD();
-
-
- private:
-
- /*
- * Destructor
- */
- ~CCaUiEngFactImpl();
- };
-
-
-#endif // CAUIENGFACTIMPL_H
-
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauiengine.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,511 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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 engine implementation for CallUI.
-*
-*/
-
-
-#ifndef CAUIENGINE_H
-#define CAUIENGINE_H
-
-// INCLUDES
-#include <e32std.h>
-#include <coneresloader.h> // RconeResourceLoader.
-#include <mphcltextphoneobserver.h> // MPhCltExtPhoneObserver.
-#include "cauieng.h"
-#include "cauidialresultobserver.h"
-#include "cauiqueryobserver.h"
-#include <phclttypes.h>
-#include <mphcltemergencycallobserver.h>
-#include <cphcntcontactdataselection.h> // MPhCntSelectionObserver
-#include <cphcltemergencycall.h> // CPhCltEmergencyCall
-#include <mcauireconnectqueryobserver.h>
-#include <cconvergedserviceselector.h>
-#include <mphcntstoreloaderobserver.h>
-#include <aiwdialdata.h>
-
-// FORWARD DECLARATIONS
-class CPhCltExtPhoneBase;
-class CAknGlobalListQuery;
-class CAknGlobalConfirmationQuery;
-class CAknGlobalNote;
-class CCaUiReConQueryInformation;
-class CAiwInternalDialData;
-class CPhCltExtPhoneDialData;
-class CPhCntSingleItemFetch;
-class CPhCntFactory;
-class CCaUiVoIPExtension;
-class MPhCntStoreLoader;
-class MVPbkContactStore;
-
-class CCaUiDialogs;
-
-// CONSTANTS
-
-// Owned and used resource file.
-_LIT( KCallUIResFile, "z:\\resource\\CallUI.rsc" );
-
-
- /**
- * Indicates state of long press key
- * Default value: 0
- * Default value for iMode variant: 1
- */
-enum TCaUiLongPressKey
- {
- ECaUiLongPressKeyNotSet = 0, // Long press key is not set
- ECaUiLongPressKeyNotInUse = 1, // Long press key is not in use
- ECaUiLongPressKeyInUse = 2, // Long press key is in use
- };
-
-// CLASS DECLARATION
-
-/**
-* CaUIEngine implementation.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-NONSHARABLE_CLASS( CCaUiEngine )
-: public CCaUiEngApi,
- public MPhCltExtPhoneObserver,
- public MCaUiReconnectQueryObserver,
- public MPhCntSelectionObserver,
- public MPhCltEmergencyCallObserver,
- public MPhCntStoreLoaderObserver
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- * @return an instance of CallUI.
- */
- static CCaUiEngine* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CCaUiEngine();
-
-
- public: // New functions
-
- /**
- * Make the dial operation.
- *
- * @see CCaUiEngApi::DialL().
- */
- void DialL(
- MCaUiDialResultObserver& aObserver,
- const TDesC8& aDialData,
- const TCaUiCallType aCallType );
-
- /**
- * Launch the qtn.tel.no.video.network information note.
- *
- * @see CCaUiEngApi::LaunchNoNetSupNoteL().
- */
- void LaunchNoNetSupNoteL();
-
-
- /**
- * Launch reconnect confirmation query.
- *
- * @see CCaUiEngApi::LaunchReconConfQueryL().
- */
- void LaunchReconConfQueryL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption );
-
- /**
- * Cancel reconnect query.
- *
- * @see CCaUiEngApi::CancelReconConfQuery().
- */
- void CancelReconConfQuery();
-
-
- /**
- * Launch note and reconnect confirmation query.
- *
- * @see CCaUiEngApi::LaunchNoteAndReconConfQueryL().
- */
- void LaunchNoteAndReconConfQueryL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption,
- const TPtrC aNoteText );
-
- /**
- * Cancel note and reconnect query.
- *
- * @see CCaUiEngApi::CancelNoteAndReconConfQuery().
- */
- void CancelNoteAndReconConfQuery();
-
- /**
- * Launch address selection.
- * @since 3.0
- *
- * @see CCaUiEngApi::LaunchAddressSelectL().
- */
- TBool LaunchAddressSelectL(
- TDes& aTelNum,
- const TInt aContactId,
- const TBool aVoIPAddressSelect );
-
- /**
- * Cancel address select launched with LaunchAddressSelectL.
- * @since 3.0
- *
- * @see CCaUiEngApi::CancelAddressSelect().
- */
- void CancelAddressSelect();
-
- public: // from MPhCntStoreLoaderObserver
-
- /**
- * From MPhCntStoreLoaderObserver;
- * @since S60 v9.1
- * @see MPhCntStoreLoaderObserver.
- */
- void ContactStoreLoadingCompleted(
- MVPbkContactStore* aStore, TInt aErrorCode );
-
- private: // Functions from base classes
-
- /**
- * Handle dial request completion.
- *
- * @see MPhCltExtPhoneObserver::HandleDialL().
- */
- void HandleDialL( const TInt aStatus );
-
- /**
- * Called when CCaUiReconnectQuery has got a key press.
- *
- * @see MCaUiReconnectQueryObserver::OptionSelectedL().
- */
- void OptionSelected( MCaUiReconnectQueryObserver::TCaUiReconType aReconType );
-
-
- private:
-
- /**
- * C++ default constructor.
- */
- CCaUiEngine();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- /**
- * Convert the AIW dialdata to PhoneClient format.
- *
- * @param aAiwDialData AIW DialData format.
- */
- void ConvertDialDataL(
- const CAiwInternalDialData& aAiwDialData );
-
-
- /**
- * Clear the Dial related contents if they exist.
- */
- void ClearDialContents();
-
-
-
- public:
-
- /**
- * Check is there VoIP profiles in phone.
- *
- * @since 3.0
- * @return ETrue if found, EFalse otherwise.
- */
- TBool IsVoIPProfiles();
-
- /**
- * @see CCaUiEngApi::GetVoIPServiceIdsL
- */
- void GetVoIPServiceIdsL( RIdArray& aVoipServiceIds ) const;
-
- /**
- * @see CCaUiEngApi::GetVoipServiceNameL
- */
- void GetVoipServiceNameL( TServiceId aServiceId, TDes& aServiceName ) const;
-
- private:
-
- /**
- * Launch address selection. If contact contains default number or
- * only one number, number will be returned directly.
- * Otherwise address selection list displayed.
- * @since 3.0
- *
- * @param aTelNum Contains selected number after execution.
- * @param aContactId The contact id from PhoneBook.
- * @param aCallType If calltype is ECaUiCallTypeInternet VoIP address
- * select is used.
- * @param aRemoveInvalidChars Removes invalid chars from selected number
- * if set ETrue.
- * @param aFocusedField Focused field from PhoneBook
- * @return TBool, ETrue if number selected, EFalse otherwice
- * (E.g. list canceled)
- */
- void LaunchAddressSelectL(
- const TDesC8& aContactLink,
- const TCaUiCallType aCallType
- );
-
-
- /**
- * Looks for tel URI parameters from a specified phone number.
- * @param aNumber The phone number that might contain URI parameters
- * @return HBufC containing URI parameters, if parameters couldn't
- * be found the HBufC with zero length is returned
- * NOTE: The parameters will be ripped off from the given phone
- * number (aNumber) if found.
- */
- HBufC* FindAndRipURIParametersL( TDes& aNumber ) const;
-
- /**
- * Looks call-type parameter from, URI params and converts the
- * possible found hint as a return value.
- * @param aUriParams The descriptor containing URI part of the tel URI.
- * Parameters can be extracted from URI by using
- * FindAndRipURIParametersL method.
- * @return The hinted call type defined in URI parameters.
- * If call-type parameter couldn't be found the EPhCltVoice is returned.
- */
- TPhCltCallType CallTypeFromUriParams( const TDesC& aUriParams ) const;
-
- /**
- * Utility method to search value of named parameter from tel URI.
- * @param aName The name of parameter what is searched
- * @param aUri The URI from from which parameter is searched
- * @return The descriptor containing the valud of named parameter.
- * If named parameter couldn't be found, KNullDesC is returned
- */
- TPtrC ParamValue( const TDesC& aName, const TDesC& aUri ) const;
-
- /**
- * Utility method to loop through all parameters in Tel URI.
- * @param aUri Tel URI from which the parameters are searched.
- * @param aStartIndex Offset from which searching is started.
- * NOTE: method modifies aStartIndex parameter, always when
- * it returns. So
- * @return The descriptor containing the next parameter name=value pair.
- */
- TPtrC FindNextParamValuePair( const TDesC& aUri,
- TInt& aStartIndex ) const;
-
- /**
- * Handle first long press of send key
- * @since 3.2
- * Leaves if cenrep data can't be read.
- * @return User decision about the VT setting
- */
- TBool HandleFirstLongPressOfSendKeyL();
-
- /**
- * General handling of long press of send key
- * @since 3.2
- * Leaves if cenrep data can't be read.
- */
- void HandleLongPressOfSendKeyL();
-
- /**
- * from MPhCntSelectionObserver class
- * @since 3.2
- * Leaves if aContactData data can't be read.
- */
- void SelectionDone( CPhCntSelectedData* aContactData, TInt aErrorCode );
-
- /**
- * Makes phoneclient dial request
- * @since 3.2
- * @param fieldLink link to phonenumber in contacts. If NULL call is
- * not created from Phonebook.
- */
- void PhoneClientDialL( const TDesC8* fieldLink );
-
- /**
- * Sets call type to phoneclient dial data struct.
- * @since 3.2
- * @param aCallType Call type to set in dialdata struct.
- */
- void SetDialDataCallType( const TCaUiCallType aCallType );
-
- /**
- * Checks if number is emergency number using
- * Emergency call API
- * @since 3.2
- * returns ETrue if number is emergency number. Default EFalse.
- */
- TBool IsEmergencyNumber();
-
- /**
- * Handling of emergency dial result.
- * @since 3.2
- * @see MPhCltEmergencyCallObserver::HandleEmergencyDialL().
- */
- void HandleEmergencyDialL( const TInt aStatus );
-
- /**
- * Checks if Video Call can be made
- * @since 3.2
- * Leaves if cenrep data can't be read.
- * returns ETrue if call can be made.
- */
- TBool IsVideoCallAllowedL();
-
- /**
- * Gets Central repository value
- * @since 3.2
- * @param aUid Central repository uid.
- * @param aId, Central repository key Id.
- * @param aValue Cen Rep key value.
- * Leaves if cenrep data can't be read.
- */
- void GetCenRepValueL( const TUid& aUid,
- const TUint aId,
- TInt& aValue ) const;
-
- /**
- * Converts given TCaUiCallType to CPhCntContactDataSelection::TCallType
- * @since 3.2
- * @param aCallType CallType to convert
- * @param aResultCallType converted type
- *
- */
- void ConvertCaUiCallType( const TCaUiCallType aCallType,
- CPhCntContactDataSelection::TCallType& aResultCallType );
-
- /**
- * Converts CPhCltExtPhoneDialData callType
- * to CPhCntContactDataSelection::TCallType
- * @since 3.2
- * @param aResultCallType converted type
- *
- */
- void ConvertDialDataCallType(
- CPhCntContactDataSelection::TCallType& aResultCallType );
-
- /**
- * Converts TPhCltCallType callType to TCaUiCallType.
- * @since S60 v9.1
- * @param aCallType Source type
- * @param aResultCallType Converted type
- */
- void ConvertPhCltCallType( const TPhCltCallType aCallType,
- TCaUiCallType& aResultCallType ) const;
-
- /**
- * Returns Service Selectors calltype by dial data calltype.
- * @since 5.0
- * @param Selector calltype.
- */
- CConvergedServiceSelector::TSsCallType ServiceSelectorCallType() const;
-
- /**
- * Converts CCConvergedServiceSelector results
- * to CPhCltExtPhoneDialData (calltype and service id)
- * @since 5.0
- * @param aResults Service selectors results.
- */
- void SetSelectorResults(
- CConvergedServiceSelector::TSsResult& aResults );
-
- /**
- * Starts to load specified contact store if not yet loaded.
- * If loading is needed, MPhCntStoreLoaderObserver::ContactStoreLoaded
- * is called when store is ready for use.
- *
- * @since S60 v9.1
- * @param aContactLink Contact link specifying store to load.
- * @return ETrue if store is already loaded.
- */
- TBool LaunchContactStoreLoadingL( const TDesC8& aContactLink );
-
- /**
- * Resolves with a help of call type values whether call is initiated
- * with a send command or through the explicit menu option.
- *
- * @since S60 v9.1
- * @param aCallType Call UI call type.
- * @param aAiwCallType AIW call type.
- * @return ETrue if send key pressed, EFalse otherwise.
- */
- TBool IsSendKeyPressed( TCaUiCallType aCallType,
- CAiwDialData::TCallType aAiwCallType ) const;
-
- private: // Data
-
- // Owned resource loader.
- RConeResourceLoader iResourceLoader;
-
- // Buffer for returned localized texts.
- HBufC* iBuf;
-
- // PhoneClient for call creation.
- CPhCltExtPhoneBase* iPhCltDialer;
-
- // Handler class for PhoneClient Dial data.
- CPhCltExtPhoneDialData* iDialData;
- // Emergency call API
- CPhCltEmergencyCall* iEmergencyCall;
-
- // The observer to handle CallUI dial results.
- MCaUiDialResultObserver* iObserver;
-
- // VoIP extension.
- CCaUiVoIPExtension* iVoIPProfileHandler;
-
- // Long press of Send key setting state, NOT SET/ON/OFF
- TInt iLongPressSet;
-
- // The qtn.tel.xxx note shown to the user.
- CAknGlobalConfirmationQuery* iVTSettingQuery;
-
- // Long key press note buffer
- HBufC* iVTString;
- // Contact factory for PhoneCntFinder connection
- CPhCntFactory* iFactory;
-
- // Contact selector for fetching contact information from phonebook
- CPhCntContactDataSelection* iContactSelector;
-
- // Service selector for calling service (service id and type)
- CConvergedServiceSelector* iServiceSelector;
-
- /**
- * Contact store loader.
- * Own.
- */
- MPhCntStoreLoader* iContactStoreLoader;
-
- // Dialogs class. Own
- CCaUiDialogs* iDialogs;
-
- };
-
-#endif // CAUIENGINE_H
-
-// End of file
--- a/phoneclientserver/callui/inc/cauiengine/cauilogger.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/*
-* Copyright (c) 2004 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: Logger headerfile for CallUi
-*
-*/
-
-
-
-#ifndef CAUILOGGER_H
-#define CAUILOGGER_H
-
-/*
------------------------------------------------------------------------------
- LOG SELECTION
------------------------------------------------------------------------------
-*/
-#ifndef _DEBUG
- // UREL BUILD:
- #define CAUI_LOGGING_METHOD 0 // No logging in UREL builds
-#else
- // UDEB BUILD:
- #define CAUI_LOGGING_METHOD 1 // 0 = No logging,
- // 1 = Flogger,
- // 2 = RDebug
-#endif //_DEBUG
-
-
-#if CAUI_LOGGING_METHOD > 0
- #define CAUI_LOGGING_ENABLED // This is for backward compatibility
-#endif //CAUI_LOGGING_METHOD
-
-/*
------------------------------------------------------------------------------
- FLOGGER SETTINGS
------------------------------------------------------------------------------
-*/
-#if CAUI_LOGGING_METHOD == 1 // Flogger
-
- #include <flogger.h>
-
- _LIT(KCAUILogFolder, "TF");
- _LIT(KCAUILogFile, "TFLOG.TXT");
-
-#elif CAUI_LOGGING_METHOD == 2 // RDebug
-
- #include <e32svr.h>
-
-#endif //CAUI_LOGGING_METHOD
-
-
-/*
------------------------------------------------------------------------------
- LOGGING MACROs
-
- USE THESE MACROS IN YOUR CODE !
------------------------------------------------------------------------------
-*/
-
-
-#if CAUI_LOGGING_METHOD == 1 // Flogger
-
-#define CAUILOGTEXT(AAA) /*lint -save -e960 */ { RFileLogger::Write(KCAUILogFolder(),KCAUILogFile(),EFileLoggingModeAppend,AAA); } /*lint -restore */
-#define CAUILOGSTRING(AAA) /*lint -save -e960 */ { _LIT(tempLogDes,AAA); RFileLogger::Write(KCAUILogFolder(),KCAUILogFile(),EFileLoggingModeAppend,tempLogDes()); } /*lint -restore */
-#define CAUILOGSTRING2(AAA,BBB) /*lint -save -e960 -e437 */ { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KCAUILogFolder(),KCAUILogFile(),EFileLoggingModeAppend,TRefByValue<const TDesC>(tempLogDes()),BBB); } /*lint -restore */
-#define CAUILOGSTRING3(AAA,BBB,CCC) /*lint -save -e960 */ { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KCAUILogFolder(),KCAUILogFile(),EFileLoggingModeAppend,TRefByValue<const TDesC>(tempLogDes()),BBB,CCC); } /*lint -restore */
-
-#elif CAUI_LOGGING_METHOD == 2 // RDebug
-
-#define CAUILOGTEXT(AAA) RDebug::Print(AAA);
-#define CAUILOGSTRING(AAA) RDebug::Print(_L(AAA));
-#define CAUILOGSTRING2(AAA,BBB) RDebug::Print(_L(AAA),BBB);
-#define CAUILOGSTRING3(AAA,BBB,CCC) RDebug::Print(_L(AAA),BBB,CCC);
-
-#else // CAUI_LOGGING_METHOD == 0 or invalid
-
-// Example: CAUILOGTEXT(own_desc);
-#define CAUILOGTEXT(AAA)
-// Example: CAUILOGSTRING("Test");
-#define CAUILOGSTRING(AAA)
-// Example: CAUILOGSTRING("Test %i", aValue);
-#define CAUILOGSTRING2(AAA,BBB)
-// Example: CAUILOGSTRING("Test %i %i", aValue1, aValue2);
-#define CAUILOGSTRING3(AAA,BBB,CCC)
-
-#endif // CAUI_LOGGING_METHOD
-
-#endif // CAUILOGGER_H
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauimessagesender.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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: Launches Send Ui.
-*
-*/
-
-
-#ifndef CAUIMESSAGESENDER_H
-#define CAUIMESSAGESENDER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <msvapi.h>
-#include <msgarrays.h> // CUidNameArray
-
-// CLASS DECLARATION
-class CMsvSession;
-class CSendUi;
-
-// CLASS DECLARATION
-
-/**
-* CaUIMessageSender implementation.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-class CCaUiMessageSender :
- public CBase,
- private MMsvSessionObserver
- {
- public: // Constructors and destructor
-
- /**
- * Destructor.
- */
- ~CCaUiMessageSender();
-
- /**
- * Two-phased constructor.
- * @return an instance of CCaUiMessageSender.
- */
- static CCaUiMessageSender* NewL();
-
- public: // New functions
-
- /**
- * Create new message by given Id. The message editor will always
- * be lauched stand alone.
- * @param aMessageType mtmUid indicate the message type
- * aRealAddress address list to send message
- */
- void CreateNewMessageL( TInt aMessageType,
- MDesC16Array* aRealAddress,
- MDesC16Array* aAliases,
- CRichText* aRichText );
-
- /**
- * Get messgae types array
- */
- const CUidNameArray& MessageTypesArrayL();
-
- private:
-
- /**
- * C++ constructor.
- *
- * @param aIndex After the query is dismissed, the index will hold
- * the value of selected item.
- */
- CCaUiMessageSender( );
-
- /**
- * Create SendUi
- */
- void CreateSendUiL();
-
- /**
- * Get message types from mtm registry
- *
- * @param aMsgTypes array of UIDs (MTM types)
- *
- */
- void UpdateMessageTypesArrayL( CUidNameArray* aMsgTypes );
-
- /**
- * Check if mail box is defined
- */
- TBool IsMailboxDefinedL();
-
- /**
- * Create connection to message service
- */
- void CreateMessageServiceConnectionL();
-
- protected: // Functions from base classes
-
- /**
- * From MMsvSessionObserver
- */
- virtual void HandleSessionEventL(TMsvSessionEvent aEvent,
- TAny* aArg1, TAny* aArg2, TAny* aArg3);
-
- private:
-
- // Message service session
- CMsvSession* iSession;
-
- // Send UI
- CSendUi* iSendUi;
-
- // Array of MTM types
- CUidNameArray* iMsgTypes;
-
- };
-
-#endif // CAUIMESSAGESENDER_H
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauimessagesenderstub.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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: Message sender stub.
-*
-*/
-
-
-#ifndef CAUIMESSAGESENDER_H
-#define CAUIMESSAGESENDER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <msgarrays.h> // cuidnamearray
-
-// CLASS DECLARATION
-
-/**
-* CaUIMessageSender implementation.
-*
-* @lib CaUiEngine.lib
-* @since 3.1
-*/
-class CCaUiMessageSender :
- public CBase
- {
- public: // Constructors and destructor
-
- /**
- * Destructor.
- */
- ~CCaUiMessageSender();
-
- /**
- * Two-phased constructor.
- * @return an instance of CCaUiMessageSender.
- */
- static CCaUiMessageSender* NewL();
-
- public: // New functions
-
- /**
- * Create new message by given Id. The message editor will always
- * be lauched stand alone.
- * @param aMessageType mtmUid indicate the message type
- * aRealAddress address list to send message
- */
- void CreateNewMessageL( TInt aMessageType,
- MDesC16Array* aRealAddress,
- MDesC16Array* aAliases,
- CRichText* aRichText );
-
- private:
-
- /**
- * C++ constructor.
- *
- * @param aIndex After the query is dismissed, the index will hold
- * the value of selected item.
- */
- CCaUiMessageSender( );
-
- /**
- * Create SendUi
- */
- void CreateSendUiL();
-
- /**
- * Get message types from mtm registry
- *
- * @param aMsgTypes array of UIDs (MTM types)
- *
- */
- void UpdateMessageTypesArrayL( CUidNameArray* aMsgTypes );
-
- /**
- * Check if mail box is defined
- */
- TBool IsMailboxDefinedL();
-
- /**
- * Create connection to message service
- */
- void CreateMessageServiceConnectionL();
-
- private:
-
- };
-
-#endif // CAUIMESSAGESENDER_H
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauiquery.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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: Defines the query used in CallUI to ask call type from user.
-*
-*/
-
-
-#ifndef CAUIQUERY_H
-#define CAUIQUERY_H
-
-
-// INCLUDES
-#include <aknlistquerydialog.h>
-
-
-
-// CLASS DECLARATION
-
-/**
-* Defines create list query that is used in CaUiEngine to ask
-* call type confirmation from user.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-NONSHARABLE_CLASS( CCaUiCreateListQuery )
- : public CAknListQueryDialog
- {
- public: // Constructors and destructor
-
- /**
- * C++ constructor.
- *
- * @param aIndex After the query is dismissed, the index will hold
- * the value of selected item.
- */
- CCaUiCreateListQuery( TInt* aIndex );
-
- /**
- * Destructor.
- */
- ~CCaUiCreateListQuery();
-
-
- public: // Functions from base classes
-
- /**
- * Loaded version to enable Send key handling.
- *
- * @see CAknListQueryDialog::OfferKeyEventL.
- */
- TKeyResponse OfferKeyEventL(
- const TKeyEvent& aKeyEvent,
- TEventCode aType );
-
- private: //data
-
- /**
- * Flag indicating the validity of the received key event.
- */
- TBool iValidKeyEvent;
- };
-
-#endif // CAUIQUERY_H
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauiqueryobserver.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2004 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: Defines the query observer interfaces used in CallUI
-* confirmation query handling.
-*
-*/
-
-
-#ifndef CAUIQUERYOBSERVER_H
-#define CAUIQUERYOBSERVER_H
-
-
-/**
-* Defines the observer interface for reconnect confirmation query observers.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-class MCaUiReconConfQueryObserver
- {
- public: // Data types
-
- enum TCaUiReconType
- {
- ECallUiReconTypeCancel = -1, // Query canceled.
- ECallUiReconTypeVoice = 0, // Voice call.
- ECallUiReconTypeVideo = 1, // Video call.
-#ifndef RD_UNIFIED_EDITOR
- ECallUiReconTypeMms = 2, // MMS.
- ECallUiReconTypeSms = 3 // SMS.
-#else // RD_UNIFIED_EDITOR
- ECallUiReconTypeMsg = 2
-#endif // RD_UNIFIED_EDITOR
- };
-
- public: // New functions
-
- /**
- * Called when CCaUiReconConfQuery has got a key press.
- *
- * @param aReconType The reconnect choice of the user.
- */
- virtual void HandleReconConfQueryResultL(
- TCaUiReconType aReconType ) = 0;
- };
-
-
-
-#endif // CAUIQUERYOBSERVER_H
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/cauivoipextension.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
-* Copyright (c) 2005-2008 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: VoIP profile handler
-*
-*/
-
-
-
-#ifndef CAUIVOIPEXTENSION_H
-#define CAUIVOIPEXTENSION_H
-
-// INCLUDES
-#include <e32base.h>
-#include <badesca.h>
-#include <phclttypes.h>
-#include <spdefinitions.h> //RIdArray
-
-/**
-* Mapping for list items.
-*
-* @lib CaUiEngine.lib
-* @since 3.2
-*/
-NONSHARABLE_CLASS( TListMappingItem )
- {
- public: //Data
- // Index of the list item.
- TInt iIndex;
- // Call type ot the list item.
- TPhCltCallType iCallType;
- };
-
-// DATATYPES
-typedef CArrayFixFlat <TListMappingItem> CListMappingArray;
-
-// CLASS DECLARATION
-/**
-* VoIP profile handler.
-*
-*
-* @lib CaUiEngine.lib
-* @since Series60 3.0
-*/
-NONSHARABLE_CLASS( CCaUiVoIPExtension ) : public CBase
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- static CCaUiVoIPExtension* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CCaUiVoIPExtension();
-
-
- public: // New functions
-
- /**
- * Check has user set VoIP profiles.
- * @return TBool, ETrue if profiles exists
- */
- TBool IsVoIPProfilesL();
-
- /**
- * @see CCaUiEngApi::GetVoIPServiceIdsL
- */
- void GetVoIPServiceIdsL( RIdArray& aVoipServiceIds ) const;
-
- /**
- * @see CCaUiEngApi::GetVoipServiceNameL
- */
- void GetVoipServiceNameL( TServiceId aServiceId, TDes& aServiceName ) const;
-
- private:
-
- /**
- * C++ default constructor.
- */
- CCaUiVoIPExtension();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- private: // Data
- };
-
-#endif // CAUIVOIPEXTENSION_H
-
-// End of File
--- a/phoneclientserver/callui/inc/cauiengine/ccauireconnectqueryimpl.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
-* Copyright (c) 2007 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 reconnectquery implementation for CallUI.
-*
-*/
-
-
-#ifndef CCAUIRECONNECTQUERYIMPL_H
-#define CCAUIRECONNECTQUERYIMPL_H
-
-// INCLUDES
-#include <ccauireconnectquery.h>
-
-#include <e32std.h>
-
-
-// FORWARD DECLARATIONS
-class CCaUiEngine;
-
-// CONSTANTS
-
-
-
-
-// CLASS DECLARATION
-
-/**
-* CaUIEngine implementation.
-*
-* @lib CaUiReconnectQueryImpl.lib
-* @since 5.0
-*/
-NONSHARABLE_CLASS( CCaUiReconnectQueryImpl )
-: public CCaUiReconnectQuery
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- * @return an instance of CallUI.
- */
- static CCaUiReconnectQueryImpl* NewL(
- MCaUiReconnectQueryObserver& aObserver );
-
-
- /**
- * Destructor.
- */
- virtual ~CCaUiReconnectQueryImpl();
-
-
-
- private: // Functions from base classes
-
- /**
- * Launch reconnect confirmation query.
- *
- */
- void ShowL(
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption );
-
- private: // internal functions
-
- /**
- * Constructor.
- */
- CCaUiReconnectQueryImpl(MCaUiReconnectQueryObserver& aObserver);
-
- /**
- * Second phase construction.
- */
- void ConstructL();
-
-
- private: // Data
-
- CCaUiEngine* iEng;
-
- };
-
-#endif // CCAUIRECONNECTQUERYIMPL_H
-
-// End of file
--- a/phoneclientserver/callui/inc/cauiplugin/cauiplugin.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-/*
-* Copyright (c) 2004 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 ECOM interface implementation for CallUI.
-*
-*/
-
-
-#ifndef CAUIPLUGIN_H
-#define CAUIPLUGIN_H
-
-
-// INCLUDES
-#include <aiwserviceifmenu.h>
-#include <aiwcommon.h> // AIW dialdata.
-#include <spdefinitions.h> //TServiceId
-#include "cauidialresultobserver.h"
-#include "caui.hrh"
-
-// FORWARD DECLARATIONS
-class CCaUiEngApi;
-class MAiwNotifyCallback;
-class CAiwMenuPane;
-
-
-
-// CLASS DECLARATION
-
-/**
-* CaUiPlugin implementation.
-*
-* @since 2.6
-*/
-class CCaUiPlugin
-: public CAiwServiceIfMenu,
- public MCaUiDialResultObserver
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- *
- * @return An instance of CaUiPlugin.
- */
- static CCaUiPlugin* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CCaUiPlugin();
-
-
- public: // Functions from base classes
-
- /**
- * @see CAiwServiceIfMenu::InitialiseL.
- */
- void InitialiseL(
- MAiwNotifyCallback& aFrameworkCallback,
- const RCriteriaArray& aInterest );
-
- /**
- * @see CAiwServiceIfMenu::HandleServiceCmdL.
- */
- void HandleServiceCmdL(
- const TInt& aCmdId,
- const CAiwGenericParamList& aInParamList,
- CAiwGenericParamList& aOutParamList,
- TUint aCmdOptions = 0,
- const MAiwNotifyCallback* aCallback = NULL );
-
- /**
- * @see CAiwServiceIfMenu::InitializeMenuPaneL.
- */
- void InitializeMenuPaneL(
- CAiwMenuPane& aMenuPane,
- TInt aIndex,
- TInt aCascadeId,
- const CAiwGenericParamList& aInParamList );
-
- /**
- * @see CAiwServiceIfMenu::HandleMenuCmdL.
- */
- void HandleMenuCmdL(
- TInt aMenuCmdId,
- const CAiwGenericParamList& aInParamList,
- CAiwGenericParamList& aOutParamList,
- TUint aCmdOptions = 0,
- const MAiwNotifyCallback* aCallback = NULL );
-
- /**
- * @see MCaUiDialResultObserver::HandleDialResultL.
- */
- void HandleDialResultL( const TInt aStatus );
-
-
- private:
-
- /**
- * C++ default constructor.
- */
- CCaUiPlugin();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- /**
- * Adds a new call sub menu items. If the call type is internet call
- * and there is only one service, the service's provider ID is used
- * in menu item.
- * @param aMenuPane Menu pane to insert commands
- * @param aIndex The index of call sub menu
- * @param aType The type of item being added
- * @param aServiceId The service ID of VoIP call item, needed when
- * getting the service name
- */
- void AddAiwMenuItemL(
- CAiwMenuPane& aMenuPane,
- TInt aIndex,
- EMenuItemType aType,
- TServiceId aServiceId = 0 );
-
- private: // Data
-
- // The library loader.
- RLibrary iLibrary;
-
- // CaUiEngine.
- CCaUiEngApi* iCaUiEngine;
-
- // The AIW callback instance.
- const MAiwNotifyCallback* iAiwNotifyCallback;
-
- // AIW Input parameters.
- const CAiwGenericParamList* iInParamList;
-
- // AIW Output parameters, result of call is returned here.
- CAiwGenericParamList* iOutParamList;
-
- // The menu command given to HandleMenuCmdL.
- TInt iMenuCmdId;
- };
-
-#endif // CAUIPLUGIN_H
-
-// End of file
--- a/phoneclientserver/callui/loc/callui.loc Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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: This file contains the localised strings for CallUI.
-*
-*/
-
-
-
-// LOCALISATION STRINGS
-
-// d: It is text for a menu option. If it is selected,
-// d: normal, i.e. voice call will be made.
-// l: list_single_popup_submenu_pane_t1
-//
-#define qtn_call_sub_voice "Voice call"
-
-
-// d: It is text for a menu option. If it is selected,
-// d: video call will be made.
-// l: list_single_popup_submenu_pane_t1
-//
-#define qtn_call_sub_video "Video call"
-
-// d: It is text for a menu option. If it is selected,
-// d: an internet call will be made.
-// d: %U is replaced with the VoIP service name.
-// l: list_single_popup_submenu_pane_t1
-// r: 5.0
-//
-#define qtn_call_sub_voip_with_name "%U call"
-
-
-// d: Defines list query header for call type inquiry.
-// l: heading_pane_t1
-//
-#define qtn_popup_title_create "Create:"
-
-
-// d: In list query selecting this option
-// d: means that normal, i.e. voice call is created.
-// l: list_single_pane_t1_cp2
-//
-#define qtn_popup_create_voice "Voice call"
-
-
-// d: In list query selecting this option
-// d: means that video call is created.
-// l: list_single_pane_t1_cp2
-//
-#define qtn_popup_create_video "Video call"
-
-
-// d: In list query selecting this option
-// d: means that internet call is created.
-// l: list_single_pane_t1_cp2
-// w:
-// r: 3.0
-//
-//
-#define qtn_popup_create_internet "Internet call"
-
-
-// d: Defines the information note text shown to user when there is
-// d: no network support for video call.
-// l: popup_note_window
-//
-#define qtn_tel_no_video_network "No network support for video call."
-
-
-// d: Defines list query header for reconnect type inquiry.
-// l: heading_pane_t1
-//
-#define qtn_tel_retry_voicevideo_call "Reconnect via:"
-
-
-// d: In reconnect query selecting this option means that
-// d: voice call is created.
-// l: list_single_pane_t1_cp2
-//
-#define qtn_tel_retry_voice_call_item "Voice call"
-
-
-// d: In reconnect query selecting this option means that
-// d: video call is created.
-// l: list_single_pane_t1_cp2
-//
-#define qtn_tel_retry_video_call_item "Video call"
-
-
-// d: In reconnect query selecting this option means that
-// d: multimedia messaging service editor is opened.
-// l: list_single_pane_t1_cp2
-//
-#define qtn_tel_retry_mms_call_item "Multimedia message"
-
-
-// d: In reconnect query selecting this option means that
-// d: short message service editor is opened.
-// l: list_single_pane_t1_cp2
-//
-#define qtn_tel_retry_sms_call_item "Short message"
-
-// d: It is text for a menu option. If it is selected,
-// d: internet call will be made.
-// l: list_single_popup_submenu_pane_t1
-// r: 3.0
-//
-#define qtn_call_sub_internet "Internet call"
-
-// d: In reconnect query selecting this option means that
-// d: Send message service editor is opened.
-// l: list_single_pane_t1_cp2
-// r: 3.1
-#define qtn_tel_retry_message_call_item "Message"
-
-
-// d: Text for query dialog
-// l: popup_info_list_pane_t1
-// r: 3.2
-#define qtn_incal_set_long_press_call_video "By long pressing the Call creation key, a video call can be created if defined in Call settings as the default action. Activate now?"
-
-// This is only used for Phone NG development.
-// Will be fixed/removed
-#ifdef RD_PHONE_NG
-
-// LOCALISATION STRINGS
-
-//d: When user personalize the softkey on idle state to be "New message",
-//d: after press softkey, a menu with following text will appear. User chose
-//d: one item to activate corresponding message editor. This is the same text
-//d: appeared on Message Center application.
-//l: list_single_pane_t1_cp2
-// r: 3.2
-//
-#define qtn_mce_pop_up_email "Email"
-
-//d: When user personalize the softkey on idle state to be "New message",
-//d: after press softkey, a menu with following text will appear. User chose
-//d: one item to activate corresponding message editor. This is the same text
-//d: appeared on Message Center application.
-//l: list_single_pane_t1_cp2
-// r: 3.2
-//
-#define qtn_mce_pop_up_sms "Short message"
-
-//d: When user personalize the softkey on idle state to be "New message",
-//d: after press softkey, a menu with following text will appear. User chose
-//d: one item to activate corresponding message editor. This is the same text
-//d: appeared on Message Center application.
-//l: list_single_pane_t1_cp2
-// r: 3.2
-//
-#define qtn_mce_pop_up_mms "Multimedia message"
-
-//d: When user personalize the softkey on idle state to be "New message",
-//d: after press softkey, a menu with following text will appear. User chose
-//d: one item to activate corresponding message editor. This is the same text
-//d: appeared on Message Center application.
-//l: list_single_pane_t1_cp2
-// r: 3.2
-//
-#define qtn_mce_pop_up_PostCard "Postcard"
-
-#endif
-
-// End of File
--- a/phoneclientserver/callui/rom/callui.iby Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2005 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: CallUi's iby definitions.
- *
-*/
-
-
-#ifndef __CALLUI_IBY__
-#define __CALLUI_IBY__
-
-REM CallUI Plugin
-ECOM_PLUGIN(cauiplugin.dll,101f868e.rsc)
-
-REM CallUI Engine
-file=ABI_DIR\BUILD_DIR\cauiengine.dll SHARED_LIB_DIR\cauiengine.dll
-
-REM Enabler for exlipsing ROM binaries
-data=ZSYSTEM\install\callui_stub.sis system\install\callui_stub.sis
-#endif
--- a/phoneclientserver/callui/rom/callui_stub.pkg Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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: For packing CalUi component.
-;
-; Languages
-&EN
-
-; Header
-#{"CallUI"}, (0x101F868F), 1, 0, 0, TYPE=SA
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-""-"z:\sys\bin\CaUiEngine.dll"
-""-"z:\sys\bin\CaUiPlugin.dll"
-""-"z:\resource\CallUI.rsc"
Binary file phoneclientserver/callui/rom/callui_stub.sis has changed
--- a/phoneclientserver/callui/rom/callui_variant.iby Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2005 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: CallUi's iby definitions.
- *
-*/
-
-
-#ifndef __CALLUI_VARIANT_IBY__
-#define __CALLUI_VARIANT_IBY__
-
-#ifdef __JAPAN_PREFIX_CHANGE
-file=ABI_DIR\BUILD_DIR\dialutils.dll SHARED_LIB_DIR\dialutils.dll
-data=ZSYSTEM\install\dialutils_stub.sis System\Install\dialutils_stub.sis
-#endif // __JAPAN_PREFIX_CHANGE
-
-#endif
--- a/phoneclientserver/callui/rom/calluiresources.iby Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2005 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: CallUIResource's iby definitions.
- *
-*/
-
-
-#ifndef __CALLUI_RESOURCES_IBY__
-#define __CALLUI_RESOURCES_IBY__
-
-data=DATAZ_\RESOURCE_FILES_DIR\CallUI.rsc RESOURCE_FILES_DIR\CallUI.rsc
-
-#endif
\ No newline at end of file
--- a/phoneclientserver/callui/src/cauiengine/cauiactiveobject.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,467 +0,0 @@
-/*
-* Copyright (c) 2004 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: Active object to handle global list query results.
-*
-*/
-
-
-
-
-// INCLUDE FILES
-#include "cauiactiveobject.h"
-#include "cauiqueryobserver.h"
-#include <coemain.h>
-
-#include <mcauireconnectqueryobserver.h>
-#include <cphonecntfactory.h>
-#include <cphcntmatcher.h>
-#include <mphcntmatch.h>
-#include "cauimessagesender.h"
-#include "cauilogger.h"
-// CONSTANTS
-
-
-
-// The message editor granularity.
-const TInt KCaUiMessageEditorArrayGranularity = 1;
-
-// The reconnect query options granularity.
-#ifdef RD_UNIFIED_EDITOR
-const TInt KCaUiReConQueryOptionsArrayGranularity = 3;
-#else // RD_UNIFIED_EDITOR
-const TInt KCaUiReConQueryOptionsArrayGranularity = 4;
-#endif // RD_UNIFIED_EDITOR
-// The editor values that this active object supports.
-enum
- {
-#ifdef RD_UNIFIED_EDITOR
- ECaUiEditorMSG = 0 // Unified editor.
-#else // RD_UNIFIED_EDITOR
- ECaUiEditorSMS = 0, // SMS editor.
- ECaUiEditorMMS = 1 // MMS editor.
-#endif // RD_UNIFIED_EDITOR
- };
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-// -----------------------------------------------------------------------------
-// CCaUiGlnActiveObject::CCaUiGlnActiveObject
-//
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiGlnActiveObject::CCaUiGlnActiveObject(
- MCaUiReconnectQueryObserver& aObserver )
-: CActive( EPriorityStandard ),
- iObserver( &aObserver )
- {
- CActiveScheduler::Add( this );
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiGlnActiveObject::ConstructL
-//
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CCaUiGlnActiveObject::ConstructL(
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TPtrC aAlias )
- {
- CAUILOGSTRING("CALLUI: >>> CCaUiGlnActiveObject::ConstructL() begin");
- iReConQueryOptions = new ( ELeave ) CCaUiTIntArray(
- KCaUiReConQueryOptionsArrayGranularity );
-
- // Get recipient info - is always available here
- iRealAddress =
- new ( ELeave ) CDesCArrayFlat( KCaUiMessageEditorArrayGranularity );
- iRealAddress->AppendL( aPhoneNumber );
-
- iAliases = new ( ELeave ) CDesC16ArrayFlat(
- KCaUiMessageEditorArrayGranularity );
-
- if ( aAlias.Length() != 0 )
- {
- // Alias was given, so matcher is not needed.
- iAliases->AppendL( aAlias );
-
- // Matcher does not exist.
- iOwnMatcher = EFalse;
- }
- else
- {
- // Create matcher objects if needed.
- if ( !aPhCntMatcher )
- {
- iOwnMatcher = ETrue;
- iPhCntFactory = CreateCntFactoryL();
- iPhCntMatcher = iPhCntFactory->CreateContactMatcherL();
- }
- else
- {
- iOwnMatcher = EFalse;
- iPhCntMatcher = aPhCntMatcher;
- }
- }
- CAUILOGSTRING("CALLUI: >>> CCaUiGlnActiveObject::ConstructL() end");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiGlnActiveObject::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiGlnActiveObject* CCaUiGlnActiveObject::NewL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TPtrC aAlias )
- {
- CCaUiGlnActiveObject* self = new( ELeave ) CCaUiGlnActiveObject (
- aObserver );
-
- CleanupStack::PushL( self );
- self->ConstructL(
- aPhCntMatcher,
- aPhoneNumber,
- aAlias );
- CleanupStack::Pop();
-
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiGlnActiveObject::~CCaUiGlnActiveObject
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiGlnActiveObject::~CCaUiGlnActiveObject()
- {
- Cancel();
-
- delete iReConQueryOptions;
-
- // Delete arrays.
- delete iRealAddress;
- delete iAliases;
-
- // Delete Phone Contact Finder objects if owned.
- if ( iOwnMatcher )
- {
- delete iPhCntMatcher;
- delete iPhCntFactory;
- }
-
- if( iMessageSender )
- {
- delete iMessageSender;
- }
-
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiGlnActiveObject::ReconQueryOptionsArray
-//
-//
-// -----------------------------------------------------------------------------
-//
-CCaUiTIntArray* CCaUiGlnActiveObject::ReconQueryOptionsArray()
- {
- return iReConQueryOptions;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiGlnActiveObject::DoCancel
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiGlnActiveObject::DoCancel()
- {
- iObserver = NULL;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiGlnActiveObject::RunL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiGlnActiveObject::RunL()
- {
- CAUILOGSTRING("CALLUI: >>> CCaUiGlnActiveObject::RunL() Begin");
-
- MCaUiReconnectQueryObserver::TCaUiReconType recontype =
- MCaUiReconnectQueryObserver::ECallUiReconTypeCancel;
- TInt result = iStatus.Int();
- TInt count = ReconQueryOptionsArray()->Count();
-
- // If some option was chosen, change the result to contain right value.
- if ( result >= 0 && result <= count )
- {
- result = ( *ReconQueryOptionsArray() )[ result ];
- }
- else
- {
- result = KErrCancel;
- }
-
- CAUILOGSTRING2("CALLUI: CCaUiGlnActiveObject::RunL(): result: %d", result);
- switch ( result )
- {
- case ECaUiVoiceCall:
- recontype = MCaUiReconnectQueryObserver::ECallUiReconTypeVoice;
- break;
-
- case ECaUiVideoCall:
- recontype = MCaUiReconnectQueryObserver::ECallUiReconTypeVideo;
- break;
-#ifndef RD_UNIFIED_EDITOR
- case ECaUiMms:
- CAUILOGSTRING("CALLUI: <<< CCaUiGlnActiveObject::RunL() ECaUiMms");
- recontype = MCaUiReconConfQueryObserver::ECallUiReconTypeMms;
- LaunchEditorL( ECaUiEditorMMS );
- break;
-
- case ECaUiSms:
- CAUILOGSTRING("CALLUI: <<< CCaUiGlnActiveObject::RunL() ECaUiSms");
- recontype = MCaUiReconConfQueryObserver::ECallUiReconTypeSms;
- LaunchEditorL( ECaUiEditorSMS );
- break;
-#else // RD_UNIFIED_EDITOR
- case ECaUiMsg:
- CAUILOGSTRING("CALLUI: <<< CCaUiGlnActiveObject::RunL() ECaUiMsg");
- recontype = MCaUiReconnectQueryObserver::ECallUiReconTypeMsg;
- LaunchEditorL( ECaUiEditorMSG );
- break;
-#endif // RD_UNIFIED_EDITOR
- default:
- break;
- }
-
- iObserver->OptionSelected( recontype );
-
- Cancel();
-
- CAUILOGSTRING("CALLUI: <<< CCaUiGlnActiveObject::RunL() end");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiGlnActiveObject::SetActive
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiGlnActiveObject::SetActive()
- {
- if( !IsActive() )
- {
- CActive::SetActive();
- }
- }
-
-// ---------------------------------------------------------
-// CCaUiGlnActiveObject::CreateMessageSenderL
-// ---------------------------------------------------------
-//
-void CCaUiGlnActiveObject::CreateMessageSenderL()
- {
- // Create instance of send ui.
- if( !iMessageSender )
- {
- iMessageSender = CCaUiMessageSender::NewL();
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiGlnActiveObject::LaunchEditorL
-// -----------------------------------------------------------------------------
-//
-void CCaUiGlnActiveObject::LaunchEditorL( TCaUiEditorType aEditorType )
- {
- CAUILOGSTRING("CALLUI: >>> CCaUiGlnActiveObject::LaunchEditorL()");
-
- CreateMessageSenderL();
-
- const CUidNameArray& msgTypes = iMessageSender->MessageTypesArrayL();
-
- if ( !( iAliases->Count() ) )
- {
- // Name not yet known, so try to solve it.
- MPhCntMatch* match = NULL;
- TInt ret = iPhCntMatcher->MatchNumber(
- match,
- ( *iRealAddress )[0] ); // First and only phonenumber.
- CleanupStack::PushL( match );
-
- if ( ret == KErrNone && match )
- {
- HBufC* cliText = NULL;
-
- MPhCntMatch::TCliType cliType = match->Cli( cliText );
- CleanupStack::PushL( cliText );
-
- if ( cliType == MPhCntMatch::ECliName )
- {
- iAliases->AppendL( *cliText );
- }
- CleanupStack::PopAndDestroy( cliText );
- }
-
- // Pop and destroy match.
- CleanupStack::Pop( match );
- if ( match )
- {
- match->Release();
- }
- }
-
-
- TInt messageType = 0; // Editor type, default value.
- TBool launchQuery = EFalse;
-
- switch ( aEditorType )
- {
- #ifndef RD_UNIFIED_EDITOR
- case ECaUiEditorSMS:
- messageType = msgTypes[ ECaUiEditorSMS ].iUid.iUid; // SMS editor.
- launchQuery = ETrue;
- break;
-
- case ECaUiEditorMMS:
- messageType = msgTypes[ ECaUiEditorMMS ].iUid.iUid; // MMS editor.
- launchQuery = ETrue;
- break;
- #else // RD_UNIFIED_EDITOR
- case ECaUiEditorMSG:
- messageType = msgTypes[ ECaUiEditorMSG ].iUid.iUid; // Unified message editor.
- launchQuery = ETrue;
- break;
- #endif // RD_UNIFIED_EDITOR
- default:
- break;
- }
-
- CAUILOGSTRING2("CALLUI: CCaUiGlnActiveObject::LaunchEditorL(): Message type: %d", messageType);
- CAUILOGSTRING2("CALLUI: CCaUiGlnActiveObject::LaunchEditorL(): Launch query: %d", launchQuery);
-
- // If the editor type was valid, launch the editor.
- if ( launchQuery )
- {
- //Launch SMS Editor.
- iMessageSender->CreateNewMessageL(
- messageType,
- iRealAddress,
- iAliases,
- NULL );
- }
-
- CAUILOGSTRING("CALLUI: <<< CCaUiGlnActiveObject::LaunchEditorL()");
- }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-// -----------------------------------------------------------------------------
-// CCaUiNoteActiveObject::CCaUiNoteActiveObject
-//
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiNoteActiveObject::CCaUiNoteActiveObject()
-: CActive( EPriorityStandard )
- {
- CActiveScheduler::Add( this );
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiNoteActiveObject::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiNoteActiveObject* CCaUiNoteActiveObject::NewL()
- {
- CCaUiNoteActiveObject* self = new( ELeave ) CCaUiNoteActiveObject ();
-
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiNoteActiveObject::~CCaUiNoteActiveObject
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiNoteActiveObject::~CCaUiNoteActiveObject()
- {
- Cancel();
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiNoteActiveObject::DoCancel
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiNoteActiveObject::DoCancel()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiNoteActiveObject::RunL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiNoteActiveObject::RunL()
- {
- Cancel();
- }
-
-
-
-// -----------------------------------------------------------------------------
-// CCaUiNoteActiveObject::SetActive
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiNoteActiveObject::SetActive()
- {
- if( !IsActive() )
- {
- CActive::SetActive();
- }
- }
-
-
-// End of File
--- a/phoneclientserver/callui/src/cauiengine/cauidialdatacontainer.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2004 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: Contains PhoneClient Dial Data.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "cauidialdatacontainer.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialDataContainer::CCaUiDialDataContainer
-//
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiDialDataContainer::CCaUiDialDataContainer()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialDataContainer::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiDialDataContainer* CCaUiDialDataContainer::NewL()
- {
- CCaUiDialDataContainer* self = new( ELeave ) CCaUiDialDataContainer;
-
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialDataContainer::~CCaUiDialDataContainer
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiDialDataContainer::~CCaUiDialDataContainer()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialDataContainer::DialData
-//
-//
-// -----------------------------------------------------------------------------
-//
-TPhCltExtPhoneDialData& CCaUiDialDataContainer::DialData()
- {
- return iDialData;
- }
-
-
-// End of File
--- a/phoneclientserver/callui/src/cauiengine/cauidialogs.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,658 +0,0 @@
-/*
-* Copyright (c) 2008 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 CallUIEngine.
-*
-*/
-
-
-// INCLUDES
-
-#include <e32base.h>
-#include <e32cmn.h>
-#include <featmgr.h>
-#include <stringloader.h>
-#include <callui.rsg> // Resources.
-#include <aknmessagequerydialog.h>
-#include <aknnotewrappers.h>
-#include <akngloballistquery.h>
-#include <aknglobalnote.h>
-#include <mcauireconnectqueryobserver.h>
-#include "cauidialogs.h"
-#include "cauilogger.h"
-#include "cauiquery.h"
-#include "cauiengine.h"
-#include "cphcntmatcher.h"
-#include "cauiactiveobject.h"
-
-// CLASS DECLARATION
-
-/**
-* Container for informatioin needed in Reconnection query.
-*
-* @lib CaUiEngine.lib
-* @since 2.6
-*/
-NONSHARABLE_CLASS( CCaUiReConQueryInformation )
- : public CBase
- {
- public: // Constructors and destructor
-
- /**
- * C++ constructor.
- *
- * @see CCaUiEngApi::LaunchNoteAndReconConfQueryL().
- */
- CCaUiReConQueryInformation(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption,
- const TPtrC aNoteText );
-
- /**
- * Destructor.
- */
- ~CCaUiReConQueryInformation();
-
-
- public: // Data
-
- // Observer storage.
- MCaUiReconnectQueryObserver& iObserver;
-
- // Matcher storage.
- CPhCntMatcher* iPhCntMatcher;
-
- // Phone number storage.
- const TPtrC iPhoneNumber;
-
- // Video call option storage.
- const TBool iIncludeVideoCallOption;
-
- // The name corresponding the phone number.
- const TPtrC iAlias;
-
- };
-
-
-// -----------------------------------------------------------------------------
-// CCaUiReConQueryInformation::CCaUiReConQueryInformation
-//
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiReConQueryInformation::CCaUiReConQueryInformation(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption,
- const TPtrC aAlias )
- : iObserver( aObserver ),
- iPhCntMatcher( aPhCntMatcher ),
- iPhoneNumber( aPhoneNumber ),
- iIncludeVideoCallOption( aIncludeVideoCallOption ),
- iAlias( aAlias )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiReConQueryInformation::~CCaUiReConQueryInformation
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiReConQueryInformation::~CCaUiReConQueryInformation()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::CCaUiDialogs
-//
-//
-// -----------------------------------------------------------------------------
-//
-CCaUiDialogs::CCaUiDialogs( CCaUiEngine& aCaUiEngine )
- : iCaUiEngine( aCaUiEngine )
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::NewL
-//
-//
-// -----------------------------------------------------------------------------
-//
-CCaUiDialogs* CCaUiDialogs::NewL( CCaUiEngine& aCaUiEngine )
- {
- CCaUiDialogs* self = new( ELeave ) CCaUiDialogs( aCaUiEngine );
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
-
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::ConstructL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiDialogs::ConstructL()
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::ConstructL() Begin");
- // Create reconnect query, not visible yet.
- iReconListQuery = CAknGlobalListQuery::NewL();
-
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::ConstructL() End");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::~CCaUiDialogs
-//
-//
-// -----------------------------------------------------------------------------
-//
-CCaUiDialogs::~CCaUiDialogs()
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::~CCaUiDialogs() Begin");
- // Cancel confirmation query if exists.
- CancelReconConfQuery();
- delete iReconListQuery;
-
- // Delete reconnection query information.
- delete iReConQueryInformation;
-
- // Cancel and delete note timer if exists.
- if ( iNoteTimer )
- {
- iNoteTimer->Cancel();
- delete iNoteTimer;
- }
-
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::~CCaUiDialogs() End");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::QueryVideoCallDefaultActionL
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt CCaUiDialogs::QueryVideoCallDefaultActionL()
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::QueryVideoCallDefaultActionL() Begin");
- HBufC* vtstring = NULL;
- HBufC* header = NULL;
- vtstring = StringLoader::LoadLC( R_CALLUI_VT_SETTING_NOTE );
- header = StringLoader::LoadLC( R_CALLUI_POPUP_VT_TITLE_SETTING );
-
- CAknMessageQueryDialog* dlg = CAknMessageQueryDialog::NewL( *vtstring );
- CleanupStack::PushL( dlg );
- dlg->SetHeaderTextL( *header );
- CleanupStack::Pop( dlg );
-
- // Show query note to user
- TInt result = dlg->ExecuteLD( R_CALLUI_VT_SETTING_QUERY );
-
- CleanupStack::PopAndDestroy( 2, vtstring ); // header, vtstring
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::QueryVideoCallDefaultActionL() End");
-
- return result;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::LaunchCreateListQueryL
-//
-//
-// -----------------------------------------------------------------------------
-//
-TBool CCaUiDialogs::LaunchCreateListQueryL( TPhCltCallType& aCallType )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::LaunchCreateListQueryL() Begin");
-
- TInt choice = KErrNotFound;
-
- CListMappingArray* mappingList = new ( ELeave ) CListMappingArray( 4 );
- CleanupStack::PushL( mappingList );
-
- // Create query dialog.
- CCaUiCreateListQuery* dlg =
- new ( ELeave ) CCaUiCreateListQuery( &choice );
- dlg->PrepareLC( R_CALLUI_CREATE_LIST_QUERY );
-
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::LaunchCreateListQueryL() 1");
-
- // new clean list item array
- CDesCArray* textArray = new( ELeave ) CDesCArrayFlat( 4 );
- CleanupStack::PushL( textArray );
-
- FillListQueryItemsL( *textArray, *mappingList );
-
- CleanupStack::Pop( textArray );
-
- // Dialog takes the ownership of textArray
- if( textArray )
- {
- dlg->SetOwnershipType( ELbmOwnsItemArray );
- dlg->SetItemTextArray( textArray );
- }
-
- // Highlight preferred item from listbox
- if( aCallType == EPhCltVideo )
- {
- dlg->ListBox()->SetCurrentItemIndex( KCallUiVideoCall );
- }
-
- TBool ok = dlg->RunLD();
- CAUILOGSTRING2("CALLUI: >>>CCaUiDialogs::LaunchCreateListQueryL() ok = %d", ok );
- CAUILOGSTRING2("CALLUI: >>>CCaUiDialogs::LaunchCreateListQueryL() choice = %d", choice );
- if ( ok )
- {
- // Check what call type was selected.
-
- // Dynamic list made because of voip support
- // take calltype from mappinglist
- aCallType = mappingList->At( choice ).iCallType;
- }
-
- CleanupStack::PopAndDestroy( mappingList );
-
- return ok;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::FillListQueryItemsL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiDialogs::FillListQueryItemsL(
- CDesCArray& aTextArray,
- CListMappingArray& aMappingList )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::FillListQueryItemsL() Begin");
-
- // Pointer for strings to be loaded.
- HBufC* bufPtr = NULL;
- TInt index = 0;
- TListMappingItem item;
-
- // Voice call option.
- bufPtr = StringLoader::LoadLC( R_CALLUI_CREATE_LIST_VOICE );
- aTextArray.AppendL( *bufPtr );
- CleanupStack::PopAndDestroy( bufPtr );
- bufPtr = NULL;
- item.iIndex = index;
- item.iCallType = EPhCltVoice;
- aMappingList.AppendL( item );
- index++;
-
- // Video call option.
- if ( FeatureManager::FeatureSupported( KFeatureIdCsVideoTelephony ) )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::FillListQueryItemsL() Adding video call option");
- bufPtr = StringLoader::LoadLC( R_CALLUI_CREATE_LIST_VIDEO );
- aTextArray.AppendL( *bufPtr );
- CleanupStack::PopAndDestroy( bufPtr );
- bufPtr = NULL;
- item.iIndex = index;
- item.iCallType = EPhCltVideo;
- aMappingList.AppendL( item );
- index++;
- }
- // Internet call option is shown if dynamic voip is set on
- // and there are VoIP profiles defined
- if( iCaUiEngine.IsVoIPProfiles() )
- {
- // Internet call option.
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::FillListQueryItemsL() Adding internet call option");
- bufPtr = StringLoader::LoadLC( R_CALLUI_CREATE_LIST_INTERNET );
- aTextArray.AppendL( *bufPtr );
- CleanupStack::PopAndDestroy( bufPtr );
- bufPtr = NULL;
- item.iIndex = index;
- item.iCallType = EPhCltCallVoIP;
- aMappingList.AppendL( item );
- index++;
- }
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::FillListQueryItemsL() End");
- }
-
-
-/** not tested **/
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::LaunchNoNetSupNoteL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiDialogs::LaunchNoNetSupNoteL()
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::LaunchNoNetSupNoteL() Begin");
- HBufC* string = StringLoader::LoadLC( R_CALLUI_NO_VIDEO_NETWORK );
-
- CAknInformationNote* dlg = new ( ELeave ) CAknInformationNote( EFalse );
- dlg->ExecuteLD( *string );
- dlg = NULL;
-
- CleanupStack::PopAndDestroy( string );
- string = NULL;
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::LaunchNoNetSupNoteL() End");
- }
-
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::LaunchReconConfQueryL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiDialogs::LaunchReconConfQueryL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption,
- const TPtrC aAlias )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::LaunchReconConfQueryL() Begin ");
- CDesCArray* textArray = new( ELeave ) CDesCArrayFlat( 4 );
- CleanupStack::PushL( textArray );
-
- // Delete the old query if exists.
- CancelReconConfQuery();
-
- // Create new active object to handle query results.
- iReconActObject = CCaUiGlnActiveObject::NewL(
- aObserver,
- aPhCntMatcher,
- aPhoneNumber,
- aAlias );
-
- CCaUiTIntArray* objectArray = iReconActObject->ReconQueryOptionsArray();
-
- // Pointer for strings to be loaded.
- HBufC* bufPtr = NULL;
-
- // Voice call option.
- bufPtr = StringLoader::LoadLC( R_CALLUI_RECONNECT_LIST_ITEM_VOICE );
- textArray->AppendL( *bufPtr );
- CleanupStack::PopAndDestroy( bufPtr );
- bufPtr = NULL;
- objectArray->AppendL( CCaUiGlnActiveObject::ECaUiVoiceCall );
-
- // Video call option is included only if it is wanted.
- if ( aIncludeVideoCallOption )
- {
- bufPtr = StringLoader::LoadLC( R_CALLUI_RECONNECT_LIST_ITEM_VIDEO );
- textArray->AppendL( *bufPtr );
- CleanupStack::PopAndDestroy( bufPtr );
- bufPtr = NULL;
- objectArray->AppendL( CCaUiGlnActiveObject::ECaUiVideoCall );
- }
-
-#ifndef RD_UNIFIED_EDITOR
- // MMS option.
- if (FeatureManager::FeatureSupported(KFeatureIdMMS))
- {
- bufPtr = StringLoader::LoadLC( R_CALLUI_RECONNECT_LIST_ITEM_MMS );
- textArray->AppendL( *bufPtr );
- CleanupStack::PopAndDestroy( bufPtr );
- bufPtr = NULL;
- objectArray->AppendL( CCaUiGlnActiveObject::ECaUiMms );
- }
-
- // SMS option.
- bufPtr = StringLoader::LoadLC( R_CALLUI_RECONNECT_LIST_ITEM_SMS );
- textArray->AppendL( *bufPtr );
- CleanupStack::PopAndDestroy( bufPtr );
- bufPtr = NULL;
- objectArray->AppendL( CCaUiGlnActiveObject::ECaUiSms );
-
-#else
- // Send message option.
- bufPtr = StringLoader::LoadLC( R_CALLUI_RECONNECT_LIST_ITEM_MESSAGE );
- textArray->AppendL( *bufPtr );
- CleanupStack::PopAndDestroy( bufPtr );
- bufPtr = NULL;
- objectArray->AppendL( CCaUiGlnActiveObject::ECaUiMsg );
-#endif // RD_UNIFIED_EDITOR
-
- // Load query header.
- bufPtr = StringLoader::LoadLC( R_CALLUI_RECONNECT_QUERY_HEADER );
- iReconListQuery->SetHeadingL( *bufPtr ); // Set query heading.
- CleanupStack::PopAndDestroy( bufPtr );
- bufPtr = NULL;
-
- // Show query.
- iReconActObject->SetActive();
- iReconListQuery->ShowListQueryL( textArray, iReconActObject->iStatus );
-
- CleanupStack::PopAndDestroy( textArray );
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::LaunchReconConfQueryL() End ");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::CancelReconConfQuery
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiDialogs::CancelReconConfQuery()
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::CancelReconConfQuery() Begin ");
- // Cancel the earlier query if exists.
- if( iReconListQuery )
- {
- iReconListQuery->CancelListQuery();
- }
-
- // Cancel the active object.
- if( iReconActObject )
- {
- if ( iReconActObject->IsActive() )
- {
- iReconActObject->Cancel();
- }
- }
- iReconfQueryOngoing = EFalse;
- delete iReconActObject;
- iReconActObject = NULL;
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::CancelReconConfQuery() End ");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::CancelNoteAndReconConfQuery
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiDialogs::CancelNoteAndReconConfQuery()
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::CancelNoteAndReconConfQuery() Begin ");
- // Delete reconnection query information.
- delete iReConQueryInformation;
- iReConQueryInformation = NULL;
-
- // Cancel Note timer if exists.
- if ( iNoteTimer )
- {
- // Cancel note timer.
- iNoteTimer->Cancel();
- }
-
- // Cancel the reconnect query if exists.
- if( iReconListQuery )
- {
- iReconListQuery->CancelListQuery();
- }
-
- // Cancel the active object.
- if( iReconActObject )
- {
- if ( iReconActObject->IsActive() )
- {
- iReconActObject->Cancel();
- }
- }
-
- delete iReconActObject;
- iReconActObject = NULL;
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::CancelNoteAndReconConfQuery() End ");
- }
-
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::LaunchNoteAndReconConfQueryL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiDialogs::LaunchNoteAndReconConfQueryL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption,
- const TPtrC aNoteText,
- const TPtrC aAlias )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::LaunchNoteAndReconConfQueryL() Begin ");
- iReconfQueryOngoing = ETrue;
- delete iReConQueryInformation;
- iReConQueryInformation = NULL;
- iReConQueryInformation = new ( ELeave ) CCaUiReConQueryInformation(
- aObserver,
- aPhCntMatcher,
- aPhoneNumber,
- aIncludeVideoCallOption,
- aAlias );
-
- HBufC* string = NULL;
- TInt noteTextLength = aNoteText.Length();
-
- // Use either given note string or the qtn.tel.no.video.network string.
- if ( noteTextLength )
- {
- string = HBufC::NewLC( noteTextLength );
- string->Des() = aNoteText;
- }
- else
- {
- string = StringLoader::LoadLC( R_CALLUI_NO_VIDEO_NETWORK );
- }
-
- if ( !iInfoNote )
- {
- iInfoNote = new ( ELeave ) CAknInformationNote( EFalse );
- iInfoNote->SetTimeout( CAknNoteDialog::ELongTimeout );
- iInfoNote->ExecuteLD( *string );
- }
-
- // Start note wait timer.
- if ( !iNoteTimer )
- {
- iNoteTimer = CPeriodic::NewL( CActive::EPriorityStandard );
- }
- iNoteTimer->Cancel();
- iNoteTimer->Start(
- KCaUiEngNoteTimeout,
- KCaUiEngNoteTimeout,
- TCallBack( DoPerformNoteLaunchCallBackL, this ) );
-
- CleanupStack::PopAndDestroy( string );
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::LaunchNoteAndReconConfQueryL() End");
- }
-
-
-
-// -----------------------------------------------------------------------------
-// CCaUiDialogs::DoPerformNoteLaunchCallBackL
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt CCaUiDialogs::DoPerformNoteLaunchCallBackL( TAny* aAny )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::DPNoteLaunchCallBackL() Begin");
-
- CCaUiDialogs* self = static_cast< CCaUiDialogs* >( aAny );
-
- if ( self )
- {
- if ( self->iNoteTimer )
- {
- // Cancel note timer.
- self->iNoteTimer->Cancel();
- }
-
- if ( self->iInfoNote )
- {
- // Information note still displayed
- return KErrNone;
- }
-
- if ( self->iReConQueryInformation && self->IsReconfQueryOngoing() )
- {
- // Launch reconnect query.
- self->LaunchReconConfQueryL(
- self->iReConQueryInformation->iObserver,
- self->iReConQueryInformation->iPhCntMatcher,
- self->iReConQueryInformation->iPhoneNumber,
- self->iReConQueryInformation->iIncludeVideoCallOption,
- self->iReConQueryInformation->iAlias );
- }
-
- delete self->iReConQueryInformation;
- self->iReConQueryInformation = NULL;
- }
- CAUILOGSTRING("CALLUI: >>>CCaUiDialogs::DPNoteLaunchCallBackL() end");
- return KErrNone;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::IsReconfQueryOngoing
-//
-//
-// -----------------------------------------------------------------------------
-//
-TBool CCaUiDialogs::IsReconfQueryOngoing()
- {
- return iReconfQueryOngoing;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::IsReconfQueryOngoing
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiDialogs::SetReconfQueryOngoing( const TBool aOngoing )
- {
- iReconfQueryOngoing = aOngoing;
- }
--- a/phoneclientserver/callui/src/cauiengine/cauiengfactimpl.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2004 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 CaUiEngine factory interface.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "cauiengfactimpl.h"
-#include "cauiengine.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngFactImpl::CCaUiEngApiLD
-//
-//
-// -----------------------------------------------------------------------------
-//
-CCaUiEngApi* CCaUiEngFactImpl::CCaUiEngApiLD()
- {
- CleanupStack::PushL( this );
-
- CCaUiEngine* caUiEng = CCaUiEngine::NewL();
- CleanupStack::PopAndDestroy( this );
- return caUiEng;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngFactImpl::~CCaUiEngFactImpl
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiEngFactImpl::~CCaUiEngFactImpl()
- {
- }
-
-
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// CreateCaUiEngFactoryL
-//
-// Creates CallUIEngineFactory. This is only exported function.
-// Returns: CCaUiEngFactory*: CallUIEngine Factory instance.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CCaUiEngFactory* CreateCaUiEngFactoryL()
- {
- return new ( ELeave ) CCaUiEngFactImpl;
- }
-
-
-// End of File
--- a/phoneclientserver/callui/src/cauiengine/cauiengine.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1392 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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 CallUIEngine.
-*
-*/
-
-
-// INCLUDE FILES
-#include "cauiengine.h"
-#include "cauiquery.h" // CCaUiQuery.
-#include <mcauireconnectqueryobserver.h> // MCaUiReconnectQueryObserver.
-#include <callui.rsg> // Resources.
-#include <cphcltdialer.h> // CPhcltDialer.
-#include <cphonecntfactory.h>
-#include <cphcntsingleitemfetch.h>
-#include <aiwinternaldialdata.h>
-#include <aiwservicehandler.h>
-#include <cphcltextphonedialdata.h> // CPhCltExtPhoneDialData
-
-#include "callui.loc" // Localized strings.
-
-#include <stringloader.h> // String Loader.
-#include <aknnotewrappers.h> // CAknInformationNote.
-#include <akngloballistquery.h> // CAknGloballistQuery.
-#include <featmgr.h> // FeatureManager.
-
-#include <aknglobalconfirmationquery.h> // Confirmation query.
-
-#include <phcltutils.h> // Character removal.
-#include <aiwcommon.h> // AIW dialdata.
-
-#include <networkhandlingdomainpskeys.h>
-#include <e32property.h> // Pub&Sub functionality.
-
-#include "cauivoipextension.h" // VoIP/SCCP profile store
-
-#include <centralrepository.h>
-#include <settingsinternalcrkeys.h>
-#include "cauilogger.h" // Call Ui Logger
-#include <aknmessagequerydialog.h>
-#include <aknglobalnote.h>
-#include <mphcntstoreloader.h>
-#include <mvpbkcontactstore.h>
-
-#include "cauidialogs.h"
-
-// CONSTANTS
-
-// GSM Network.
-const TInt KCaUiEngGsmNetwork = ENWNetworkModeGsm;
-// WCDMA Network.
-const TInt KCaUiEngWcdmaNetwork = ENWNetworkModeWcdma;
-
-
-_LIT( KCallTypeUriParam, "call-type" );
-_LIT( KCallTypeVideo, "video" );
-_LIT( KSemiColon, ";" );
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::CCaUiEngine
-//
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiEngine::CCaUiEngine()
-: iResourceLoader( *CCoeEnv::Static() )
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::ConstructL
-//
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::ConstructL()
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::ConstructL() Begin");
- // Sets up TLS, must be done before FeatureManager is used.
- FeatureManager::InitializeLibL();
-
- if ( CCoeEnv::Static() )
- {
- // Open CallUI resource file.
- TFileName* name = new ( ELeave ) TFileName( KCallUIResFile );
- CleanupStack::PushL( name );
- User::LeaveIfError( iResourceLoader.Open( *name ) );
- CleanupStack::PopAndDestroy( name );
- }
-
- // Get info is VoIP supported
- iVoIPProfileHandler = CCaUiVoIPExtension::NewL();
- iLongPressSet = ECaUiLongPressKeyNotSet;
-
- iServiceSelector = CConvergedServiceSelector::NewL();
-
- iDialogs = CCaUiDialogs::NewL( *this );
-
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::ConstructL() Complete");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiEngine* CCaUiEngine::NewL()
- {
- CCaUiEngine* self = new( ELeave ) CCaUiEngine;
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop();
-
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::~CCaUEngine
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiEngine::~CCaUiEngine()
- {
- delete iServiceSelector;
-
- // Delete VoIP extension if VoIP is supported
- if ( iVoIPProfileHandler )
- {
- delete iVoIPProfileHandler;
- }
-
- delete iEmergencyCall;
- delete iContactSelector;
- delete iFactory;
- delete iVTSettingQuery;
-
- // Clear dial components.
- ClearDialContents();
-
- if ( CCoeEnv::Static() )
- {
- // Close resource loader.
- iResourceLoader.Close();
- }
- // Delete the menubuffer.
- delete iBuf;
- iBuf = NULL;
-
- delete iVTString;
- iVTString = NULL;
-
- delete iContactStoreLoader;
- delete iDialogs;
-
- // Frees the TLS! Must be done after FeatureManager is used.
- FeatureManager::UnInitializeLib();
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::DialL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::DialL(
- MCaUiDialResultObserver& aObserver,
- const TDesC8& aDialData,
- const TCaUiCallType aCallType )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::DialL() Begin");
- iDialogs->SetReconfQueryOngoing( EFalse );
- // If iPhCltDialer and iDialData exist,
- // destroy them and create new ones. This clears the dial data.
- ClearDialContents();
- iPhCltDialer = CPhCltExtPhoneBase::NewL( this );
- iObserver = &aObserver;
- iDialData = CPhCltExtPhoneDialData::NewL();
-
- CAiwInternalDialData* aiwDialData = CAiwInternalDialData::NewLC( aDialData );
-
- TPhCltTelephoneNumber aiwTelNumber( aiwDialData->PhoneNumber() );
- HBufC* uriParams = FindAndRipURIParametersL( aiwTelNumber );
- CleanupStack::PushL( uriParams );
- aiwDialData->SetPhoneNumberL( aiwTelNumber );
-
-
- // ConvertDialDataL overwrites, if given in aDialData
- SetDialDataCallType( aCallType );
-
- // Convert AIW dial data to PhoneClient format.
- ConvertDialDataL( *aiwDialData );
-
- // Check if there has been a long press of Send key
- if ( iDialData->InitiateCall() )
- {
- HandleLongPressOfSendKeyL();
- }
-
- iDialData->SetSendKeyPressed(
- IsSendKeyPressed( aCallType, aiwDialData->CallType() ) );
-
-
- // By default call is made, unless user cancels the procedure.
- TBool createCall = ETrue;
-
- TPhCltCallType callType = iDialData->CallType();
-
- if ( aCallType == ECaUiCallTypeVoice )
- {
- iDialData->SetCallType( EPhCltVoice );
- }
- // If not forced video call is wanted, ask user to confirm it.
- // ECaUiCallTypeUnknown indicates that the call is not made from options menu.
- else if ( iDialData->CallType() == EPhCltVideo
- && aCallType == ECaUiCallTypeUnknown )
- {
- // Get preferred call-type from URI params, it will be passed to
- // list query and selected by default
- callType = CallTypeFromUriParams( *uriParams );
- // If query is canceled, then call is not made.
- createCall = iDialogs->LaunchCreateListQueryL( callType );
- // Set the call type, video must be forced
- if ( EPhCltVideo == callType )
- {
- iDialData->SetCallType( EPhCltForcedVideo );
- }
- else
- {
- iDialData->SetCallType( callType );
- }
- }
- else if ( aCallType == ECaUiCallTypeInternet )
- {
- iDialData->SetCallType( EPhCltCallVoIP );
- }
- else if ( aCallType == ECaUiCallTypeVideo )
- {
- // (Forced) video call must be created.
- iDialData->SetCallType( EPhCltForcedVideo );
- }
-
- CleanupStack::PopAndDestroy( uriParams );
-
-
-
- // If user did not Cancel query or query was not shown,
- // perform the dial operation.
- if ( createCall )
- {
- if ( iDialData->ContactLink() != KNullDesC8()
- && !aiwDialData->PhoneNumber().Length() )
- {
-
- TBool storeLoaded
- = LaunchContactStoreLoadingL( iDialData->ContactLink() );
- if ( storeLoaded )
- {
- // Launch address select.
- // aCallType describes which selector is used. ( VoIP/PhoneNumber )
- LaunchAddressSelectL( iDialData->ContactLink(), aCallType );
- }
- }
- else
- {
- PhoneClientDialL( NULL );
- }
- }
- else
- {
- HandleDialL( KErrCancel );
- }
-
- CleanupStack::PopAndDestroy( aiwDialData );
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::DialL() End");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::LaunchNoNetSupNoteL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::LaunchNoNetSupNoteL()
- {
-
- iDialogs->LaunchNoNetSupNoteL();
-
- }
-
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::LaunchReconConfQueryL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::LaunchReconConfQueryL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption )
- {
- // Empty pointer.
- TPtrC ptrc;
-
- iDialogs->LaunchReconConfQueryL(
- aObserver,
- aPhCntMatcher,
- aPhoneNumber,
- aIncludeVideoCallOption,
- ptrc );
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::CancelReconConfQuery
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::CancelReconConfQuery()
- {
-
- iDialogs->CancelReconConfQuery();
-
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::LaunchNoteAndReconConfQueryL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::LaunchNoteAndReconConfQueryL(
- MCaUiReconnectQueryObserver& aObserver,
- CPhCntMatcher* aPhCntMatcher,
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption,
- const TPtrC aNoteText )
- {
- // Empty pointer.
- const TPtrC ptrc;
-
- iDialogs->LaunchNoteAndReconConfQueryL(
- aObserver,
- aPhCntMatcher,
- aPhoneNumber,
- aIncludeVideoCallOption,
- aNoteText,
- ptrc );
-
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::CancelNoteAndReconConfQuery
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::CancelNoteAndReconConfQuery()
- {
-
- iDialogs->CancelNoteAndReconConfQuery();
-
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::LaunchAddressSelectL
-//
-//
-// -----------------------------------------------------------------------------
-//
-TBool CCaUiEngine::LaunchAddressSelectL(
- TDes& aTelNum,
- const TInt aContactId,
- const TBool aVoIPAddressSelect )
- {
- TBool addressSelected( EFalse );
- TCaUiCallType callType( ECaUiCallTypeVoice );
-
- if ( aVoIPAddressSelect )
- {
- callType = ECaUiCallTypeInternet;
- }
-
- addressSelected = LaunchAddressSelectL( aTelNum, aContactId, callType );
-
- return addressSelected;
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::CancelAddressSelect
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::CancelAddressSelect()
- {
- }
-
-// -----------------------------------------------------------------------------
-// From MPhCntStoreLoaderObserver.
-// CCaUiEngine::ContactStoreLoadingCompleted
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::ContactStoreLoadingCompleted(
- MVPbkContactStore* /*aStore*/, TInt aErrorCode )
- {
- TInt result( aErrorCode );
-
- if ( KErrNone == result )
- {
- TCaUiCallType caUiCallType( ECaUiCallTypeUnknown );
- ConvertPhCltCallType( iDialData->CallType(), caUiCallType );
-
- TRAP( result,
- LaunchAddressSelectL( iDialData->ContactLink(), caUiCallType ) );
- }
-
- if ( KErrNone != result )
- {
- TRAP_IGNORE( HandleDialL( aErrorCode ) );
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::HandleDialL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::HandleDialL( const TInt aStatus )
- {
- if ( iObserver )
- {
- iObserver->HandleDialResultL( aStatus );
- }
- if ( !iDialogs->IsReconfQueryOngoing() )
- {
- ClearDialContents();
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::OptionSelected
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::OptionSelected( TCaUiReconType aReconType )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::OptionSelected() Begin");
- if ( aReconType == ECallUiReconTypeVoice ||
- aReconType == ECallUiReconTypeVideo )
- {
- // Call is wanted to be made. Do it only if Dial data exists.
- if ( iDialData )
- {
-
- iDialogs->SetReconfQueryOngoing( EFalse );
-
- if( aReconType == ECallUiReconTypeVoice )
- {
- // Make sure that call type is correct, i.e. voice call.
- iDialData->SetCallType( EPhCltVoice );
- }
- else
- {
- // Make sure that call type is correct, i.e. video call.
- iDialData->SetCallType( EPhCltVideo );
- }
-
- TRAPD( err, iPhCltDialer->DialL( *iDialData ) );
- if( err )
- {
- CAUILOGSTRING2("CALLUI: >>>CCaUiEngine DialL error = %d", err );
- }
- }
- }
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::OptionSelected() End");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::ConvertDialDataL
-//
-//
-// -----------------------------------------------------------------------------
-//
-
-void CCaUiEngine::ConvertDialDataL(
- const CAiwInternalDialData& aAiwDialData )
- {
- // Telephony number.
- iDialData->SetTelephoneNumber( aAiwDialData.PhoneNumber().Left(
- iDialData->TelephoneNumber().MaxLength() ) );
-
- // Call type.
- CAiwDialData::TCallType aiwCallType = aAiwDialData.CallType();
- TPhCltCallType phCltCallType = EPhCltVoice;
-
- // After this the call type should be correct one.
- if ( aiwCallType == CAiwDialData::EAIWVideo )
- {
- phCltCallType = EPhCltVideo;
- iDialData->SetCallType( phCltCallType );
- }
- else if ( aiwCallType == CAiwDialData::EAIWForcedVideo )
- {
- phCltCallType = EPhCltForcedVideo;
- iDialData->SetCallType( phCltCallType );
- }
- else if ( aiwCallType == CAiwDialData::EAIWVoiP )
- {
- phCltCallType = EPhCltCallVoIP;
- iDialData->SetCallType( phCltCallType );
- }
- else if ( aiwCallType == CAiwDialData::EAIWForcedCS )
- {
- phCltCallType = EPhCltVoice;
- iDialData->SetCallType( phCltCallType );
- }
-
-
- // Name.
- iDialData->SetNameL( aAiwDialData.Name().Left(
- iDialData->Name().MaxLength() ) );
-
- // Contact link.
- iDialData->SetContactLinkL( aAiwDialData.ContactLink() );
-
- // Window group.
- iDialData->SetWindowGroup( aAiwDialData.WindowGroup() );
-
- // Redial.
- iDialData->SetRedial( aAiwDialData.Redial() );
-
- // Redial maximum duration.
- iDialData->SetRedialMaximumDuration( aAiwDialData.RedialMaximumDuration() );
-
- // Show number.
- iDialData->SetShowNumber( aAiwDialData.ShowNumber() );
-
- // Match.
- iDialData->SetAllowMatch( aAiwDialData.AllowMatch() );
-
- // End other calls.
- iDialData->SetEndOtherCalls( aAiwDialData.EndOtherCalls() );
-
- // Subaddress.
- iDialData->SetSubAddressL( aAiwDialData.SubAddress().Left(
- iDialData->SubAddress().MaxLength() ) );
-
- // SAT call.
- iDialData->SetSATCall( aAiwDialData.SATCall() );
-
- // Bearer.
- iDialData->SetBearerL( aAiwDialData.Bearer().Left(
- iDialData->Bearer().MaxLength() ) );
-
- // Set Long keypress activity. ETrue if client wants to initate
- // voice/video call.
- iDialData->SetInitiateCall( aAiwDialData.InitiateCall() );
-
- if ( aAiwDialData.ServiceId() )
- {
- iDialData->SetServiceId( aAiwDialData.ServiceId() );
- }
- // Remove invalid chars.
- if( iDialData->CallType() != EPhCltCallVoIP )
-
- {
- TPhCltTelephoneNumber telnum;
- telnum.Zero();
- telnum = iDialData->TelephoneNumber();
- PhCltUtils::RemoveInvalidChars( telnum );
-
- iDialData->SetTelephoneNumber( telnum );
- }
- iDialData->SetUUIL( aAiwDialData.UUI() );
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::ClearDialContents
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::ClearDialContents()
- {
- if ( iPhCltDialer )
- {
- delete iPhCltDialer;
- iPhCltDialer = NULL;
- }
-
- if ( iDialData )
- {
- delete iDialData;
- iDialData = NULL;
- }
-
- // Not owned, so just set to NULL.
- iObserver = NULL;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::IsVoIPProfiles()
-//
-//
-// -----------------------------------------------------------------------------
-//
-TBool CCaUiEngine::IsVoIPProfiles()
- {
- TBool isProfiles = EFalse;
-
- TRAP_IGNORE( isProfiles = iVoIPProfileHandler->IsVoIPProfilesL() );
-
- return isProfiles;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::GetVoIPServiceIdsL()
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::GetVoIPServiceIdsL( RIdArray& aVoipServiceIds ) const
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdCommonVoip ) )
- {
- iVoIPProfileHandler->GetVoIPServiceIdsL( aVoipServiceIds );
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::GetVoipServiceNameL()
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::GetVoipServiceNameL( TServiceId aServiceId, TDes& aServiceName ) const
- {
- iVoIPProfileHandler->GetVoipServiceNameL( aServiceId, aServiceName );
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::LaunchAddressSelectL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::LaunchAddressSelectL(
- const TDesC8& aContactLink,
- const TCaUiCallType aCallType )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::LaunchAddressSelectL() start");
- if ( !iFactory )
- {
- iFactory = CreateCntFactoryL();
- }
- if ( !iContactSelector )
- {
- iContactSelector = iFactory->CreateContactDataSelectionL();
- }
-
- CPhCntContactDataSelection::TCallType callType;
-
- // if aCallType is ECaUiCallTypeUnknown call is not intitated from Call ui menu
- // so have to use iDialDataCallType
- if ( aCallType != ECaUiCallTypeUnknown )
- {
- ConvertCaUiCallType( aCallType, callType );
- }
- else
- {
- ConvertDialDataCallType( callType );
- }
-
- iContactSelector->Cancel();
- iContactSelector->SelectPhoneNumberForCallL( aContactLink,
- callType, *this );
-
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::LaunchAddressSelectL() end");
- }
-
-
-//------------------------------------------------------------------------------
-// CCaUiEngine::FindAndRipURIParametersL()
-//
-//
-// -----------------------------------------------------------------------------
-//
-HBufC* CCaUiEngine::FindAndRipURIParametersL( TDes& aNumber ) const
- {
- HBufC* buf = NULL;
- TInt offset = aNumber.Locate( TChar( KSemiColon()[0] ) );
- if( offset > 0 ) // Separator is no allowed to be a first char
- {
- __ASSERT_ALWAYS( offset <= aNumber.Length(),
- User::Leave( KErrGeneral ) );
- buf = aNumber.Mid( offset ).AllocL();
- aNumber.SetLength( offset );
- }
- else
- {
- buf = HBufC::NewL( 0 );
- }
- return buf;
- }
-
-//------------------------------------------------------------------------------
-// CBrowserTelService::CallTypeFromUriParams()
-//
-//
-// -----------------------------------------------------------------------------
-//
-TPhCltCallType CCaUiEngine::CallTypeFromUriParams(
- const TDesC& aUriParams ) const
- {
- TPhCltCallType type( EPhCltVoice ); // Default type is voice call
-
- TPtrC value( ParamValue( KCallTypeUriParam, aUriParams ) );
- if( value.CompareF( KCallTypeVideo ) == 0 ) // URIs are case-insensitive.
- {
- type = EPhCltVideo;
- }
- // Otherwise return default type
- return type;
- }
-
-//------------------------------------------------------------------------------
-// CBrowserTelService::ParamValue()
-//
-//
-// -----------------------------------------------------------------------------
-//
-TPtrC CCaUiEngine::ParamValue( const TDesC& aName, const TDesC& aUri ) const
- {
- TInt startIndex = 0;
- TInt offset = 0;
- TPtrC pairTmp( KNullDesC() );
- TPtrC ret( KNullDesC() );
- TBool found = EFalse;
-
- if( aName.Length() > 0 )
- {
- while( startIndex < aUri.Length() && !found )
- {
- pairTmp.Set( FindNextParamValuePair( aUri, startIndex ) );
- offset = pairTmp.FindF( aName ); // URIs are case-insensitive.
- if( offset >= 0 &&
- ( offset + aName.Length() + 1 < pairTmp.Length() ) )
- {
- ret.Set( pairTmp.Mid( offset + aName.Length() + 1 ) );
- found = ETrue;
- }
- }
- }
-
- return ret;
- }
-
-//------------------------------------------------------------------------------
-// CCaUiEngine::FindNextParamValuePair()
-//
-//
-// -----------------------------------------------------------------------------
-//
-TPtrC CCaUiEngine::FindNextParamValuePair( const TDesC& aUri,
- TInt& aStartIndex ) const
- {
- TInt offset = 0;
- TPtrC tmp( KNullDesC() );
- TPtrC ret( KNullDesC() );
-
- tmp.Set( aUri.Mid( aStartIndex ) );
- // Search start mark for new paramter.
- offset = tmp.Find( KSemiColon );
- if( offset >= 0 )
- {
- if( aStartIndex + offset + KSemiColon().Length() < aUri.Length() )
- {
- // Move start index
- aStartIndex += offset + KSemiColon().Length();
-
- // Store descriptor after start mark
- tmp.Set( aUri.Mid( aStartIndex ) );
-
- // Search end mark (semi-colon)
- offset = tmp.Find( KSemiColon );
- if ( offset >= 0 )
- {
- // If end mark was found store the param/value pair
- ret.Set( tmp.Left( offset ) );
- }
- else
- {
- // If end mark is not found,
- // the rest of descriptor belong to this parameter
- ret.Set( tmp );
- }
- }
- }
-
- // Move start offset based on findings
- if( ret.Length() )
- {
- aStartIndex += ret.Length();
- }
- else
- {
- aStartIndex = aUri.Length();
- }
-
- return ret;
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::HandleFirstLongPressOfSendKeyL()
-// ---------------------------------------------------------
-//
-TBool CCaUiEngine::HandleFirstLongPressOfSendKeyL()
- {
- TBool set( EFalse );
-
- TInt result = iDialogs->QueryVideoCallDefaultActionL();
-
- // Check user decision and set return value accordingly
- switch ( result )
- {
- case EAknSoftkeyYes: // from avkon.hrh
- set = ETrue;
- break;
- case EAknSoftkeyNo:
- set = EFalse;
- break;
- default:
- set = EFalse;
- break;
- }
- return set;
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::HandleLongPressOfSendKeyL()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::HandleLongPressOfSendKeyL()
- {
-
- // Check if the setting is already ON -> make a video call
- if ( iLongPressSet == ECaUiLongPressKeyInUse )
- {
- // ON -> initiate a video call
- // (Forced) video call must be created
- iDialData->SetCallType( EPhCltForcedVideo );
- }
- // Check if the setting is already OFF -> make a voice call
- else if ( iLongPressSet == ECaUiLongPressKeyNotInUse )
- {
- // OFF -> initiate a voice call
- // Voice call must be created
- iDialData->SetCallType( EPhCltVoice );
- }
- // If the setting has never been set, check what the user wants to do
- else if ( iLongPressSet == ECaUiLongPressKeyNotSet )
- {
- // Ask from the user how long press of Send key should be handled
- TBool set = HandleFirstLongPressOfSendKeyL();
-
- if ( set )
- {
- // User answered YES -> initiate a video call
- // (Forced) video call must be created
- iLongPressSet = ECaUiLongPressKeyInUse;
- iDialData->SetCallType( EPhCltForcedVideo );
- }
- else
- {
- // User answered NO -> initiate a voice call
- // Voice call must be created
- iLongPressSet = ECaUiLongPressKeyNotInUse;
- iDialData->SetCallType( EPhCltVoice );
- }
- }
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::SelectionDone()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::SelectionDone( CPhCntSelectedData* aContactData,
- TInt aErrorCode )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::SelectionDone() Start");
- CAUILOGSTRING2("CALLUI: >>>SelectionDone() ECode = %d", aErrorCode );
- if ( aErrorCode == KErrNone )
- {
- TPhCltTelephoneNumber phoneNumber;
- HBufC8* fieldLink = NULL;
-
- if ( iDialData->TelephoneNumber() == KNullDesC )
- {
- phoneNumber = aContactData->Data();
-
- // Do not remove illegal chars if call type is VOIP and
- // call is made to a voip number
- if ( !( EPhCltCallVoIP == iDialData->CallType() &&
- aContactData->NumberType()==MPhCntMatch::EVoipNumber ) )
- {
- PhCltUtils::RemoveInvalidChars( phoneNumber );
- }
- iDialData->SetTelephoneNumber( phoneNumber );
- }
- if ( aContactData->FieldLink().Length() > 0 )
- {
- fieldLink = aContactData->FieldLink().Alloc();
- }
-
- TRAP( aErrorCode, PhoneClientDialL( fieldLink ) );
-
- delete fieldLink;
- fieldLink = NULL;
- }
-
- if ( aErrorCode != KErrNone )
- {
- TRAP_IGNORE( HandleDialL( aErrorCode ) );
- }
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::SelectionDone() End");
- }
-// ---------------------------------------------------------
-// CCaUiEngine::PhoneClientDialL()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::PhoneClientDialL( const TDesC8* aFieldLink )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::DialL()::PhoneClient dial Start");
-
- TBool createCall( ETrue );
- TInt error( KErrNone );
-
- if ( aFieldLink )
- {
- iDialData->SetContactLinkL( *aFieldLink );
- }
-
- // Check if number is emergency number and if it is
- // then call emeregency call
- if ( !iEmergencyCall )
- {
- iEmergencyCall = CPhCltEmergencyCall::NewL( this );
- }
- if ( IsEmergencyNumber() )
- {
- createCall = EFalse;
- error = KErrNone;
- iEmergencyCall->DialEmergencyCallL( iDialData->TelephoneNumber() );
- }
-
- if ( createCall )
- {
- CConvergedServiceSelector::TSsResult results;
-
- error = iServiceSelector->GetCallingServiceByCallType(
- results,
- ServiceSelectorCallType(),
- iDialData->ServiceId(),
- iDialData->SendKeyPressed(),
- iDialData->TelephoneNumber() );
-
- if ( KErrNone == error )
- {
- SetSelectorResults( results );
- }
- else
- {
- createCall = EFalse;
- }
- }
-
- // Here note launch + query if this is video call and we
- // are not in 3G network.
-
- if ( createCall )
- {
- if ( ( iDialData->CallType() == EPhCltVideo ) ||
- ( iDialData->CallType() == EPhCltForcedVideo ) )
- {
- if ( !IsVideoCallAllowedL() )
- {
- createCall = EFalse;
- error = KErrCancel;
- }
- }
- }
- if ( createCall )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::DialL(): Call PhoneClientdial");
- iPhCltDialer->DialL( *iDialData );
- }
- else
- {
- //User cancelled. Need to inform client.
- if ( error != KErrNone ) // Emergency call does not need to inform client.
- {
- HandleDialL( error );
- }
- }
- CAUILOGSTRING("CALLUI: >>>CCaUiEngine::DialL()::PhoneClient dial End");
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::SetDialDataCallType()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::SetDialDataCallType( const TCaUiCallType aCallType )
- {
- if ( aCallType == ECaUiCallTypeVoice )
- {
- // Voice call must be created.
- iDialData->SetCallType( EPhCltVoice );
- }
- else if ( aCallType == ECaUiCallTypeVideo )
- {
- // (Forced) video call must be created.
- iDialData->SetCallType( EPhCltForcedVideo );
- }
- else if ( aCallType == ECaUiCallTypeInternet )
- {
- // VoIP call must be created.
- iDialData->SetCallType( EPhCltCallVoIP );
- }
- else
- {
- // else Voice call is ok.
- iDialData->SetCallType( EPhCltVoice );
- }
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::IsEmergencyNumber()
-// ---------------------------------------------------------
-//
-TBool CCaUiEngine::IsEmergencyNumber()
- {
- TBool isEmergencyNumber( EFalse );
-
- // get phonenumber from iDialData and heck number using phoneclient
- // emergencycall api
- TInt result = iEmergencyCall->IsEmergencyPhoneNumber(
- iDialData->TelephoneNumber(),
- isEmergencyNumber );
-
- return isEmergencyNumber;
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::IsVideoCallAllowedL()
-// ---------------------------------------------------------
-//
-TBool CCaUiEngine::IsVideoCallAllowedL()
- {
- TInt err = KErrNone;
- TInt createCall( ETrue );
- TInt networkMode = KCaUiEngGsmNetwork; // Default: GSM.
- err = RProperty::Get( KPSUidNetworkInfo,
- KNWTelephonyNetworkMode,
- networkMode );
-
- if ( err )
- {
- // Information is not ok, so assume that
- // we are in GSM network.
- networkMode = KCaUiEngGsmNetwork;
- }
- // check network status
- TInt nwStatus = ENWStatusRegistrationUnknown;
- RProperty::Get( KPSUidNetworkInfo, KNWRegistrationStatus, nwStatus );
-
- // If we are not in WCDMA network, then it is not allowed
- // to create a video call.
- if ( networkMode != KCaUiEngWcdmaNetwork )
- {
- TInt automaticredial = 0;
-
- GetCenRepValueL( KCRUidTelephonySettings, KSettingsAutomaticRedial, automaticredial );
-
- // if no network, fall back to voice call for proper error handling
- if ( (FeatureManager::FeatureSupported( KFeatureIdAutoRedialForVideoCall ) && automaticredial)
- || nwStatus == ENWStatusRegistrationUnknown
- || nwStatus == ENWStatusNotRegisteredNoService
- || nwStatus == ENWStatusNotRegisteredEmergencyOnly
- || nwStatus == ENWStatusNotRegisteredSearching )
- {
- // fallback to voice when no network support to videocall
- // handled in Phone.
- }
- else
- {
- createCall = EFalse;
- // Video call can not be done.
- // => Launch Note + Reconnect Query.
-
- // Empty pointer.
- TPtrC ptrc;
-
- iDialogs->LaunchNoteAndReconConfQueryL(
- *this,
- NULL,
- iDialData->TelephoneNumber(),
- EFalse,
- ptrc,
- iDialData->Name() );
- }
- }
- return createCall;
- }
-// ---------------------------------------------------------
-// CCaUiEngine::HandleEmergencyDialL()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::HandleEmergencyDialL( const TInt aStatus )
- {
- if ( iObserver )
- {
- iObserver->HandleDialResultL( aStatus );
- }
- }
-// ---------------------------------------------------------
-// CCaUiEngine::GetCenRepValue()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::GetCenRepValueL(
- const TUid& aUid,
- const TUint aId,
- TInt& aValue ) const
- {
- CRepository* repository = CRepository::NewL( aUid );
- TInt err = repository->Get( aId, aValue );
-
- delete repository;
- repository = NULL;
-
- if ( err != KErrNotFound ) // KErrNotFound acceptable.
- {
- User::LeaveIfError( err );
- }
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::ConvertCaUiCallType( )
-// ---------------------------------------------------------
-//
-void CCaUiEngine::ConvertCaUiCallType( const TCaUiCallType aCallType,
- CPhCntContactDataSelection::TCallType& aResultCallType )
- {
- switch ( aCallType )
- {
- case ECaUiCallTypeVoice:
- {
- aResultCallType = CPhCntContactDataSelection::ECallPhoneNumber;
- break;
- }
- case ECaUiCallTypeVideo:
- {
- aResultCallType = CPhCntContactDataSelection::ECallVideoNumber;
- break;
- }
- case ECaUiCallTypeInternet:
- {
- aResultCallType = CPhCntContactDataSelection::ECallVoip;
- break;
- }
- default:
- {
- aResultCallType = CPhCntContactDataSelection::ECallPhoneNumber;
- break;
- }
- }
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::ConvertDialDataCallType()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::ConvertDialDataCallType( CPhCntContactDataSelection::TCallType& aResultCallType )
- {
- switch ( iDialData->CallType() )
- {
- case EPhCltVoice:
- {
- aResultCallType = CPhCntContactDataSelection::ECallPhoneNumber;
- break;
- }
- case EPhCltVideo:
- case EPhCltForcedVideo:
- {
- aResultCallType = CPhCntContactDataSelection::ECallVideoNumber;
- break;
- }
- case EPhCltCallVoIP:
- {
- aResultCallType = CPhCntContactDataSelection::ECallVoip;
- break;
- }
- default:
- {
- aResultCallType = CPhCntContactDataSelection::ECallPhoneNumber;
- break;
- }
- }
- }
-
-
-// ---------------------------------------------------------
-// CCaUiEngine::ConvertPhCltCallType
-// ---------------------------------------------------------
-//
-void CCaUiEngine::ConvertPhCltCallType( const TPhCltCallType aCallType,
- TCaUiCallType& aResultCallType ) const
- {
- switch ( aCallType )
- {
- case EPhCltVoice:
- {
- aResultCallType = ECaUiCallTypeVoice;
- break;
- }
- case EPhCltVideo:
- case EPhCltForcedVideo:
- {
- aResultCallType = ECaUiCallTypeVideo;
- break;
- }
- case EPhCltCallVoIP:
- {
- aResultCallType = ECaUiCallTypeInternet;
- break;
- }
- default:
- {
- break;
- }
- }
- }
-
-
-// ---------------------------------------------------------
-// CCaUiEngine::ServiceSelectorCallType()
-// ---------------------------------------------------------
-//
-CConvergedServiceSelector::TSsCallType CCaUiEngine::ServiceSelectorCallType() const
- {
- CConvergedServiceSelector::TSsCallType ret;
-
- switch ( iDialData->CallType() )
- {
- case EPhCltVoice:
- {
- ret = CConvergedServiceSelector::ESsVoiceCall;
- break;
- }
- case EPhCltVideo:
- case EPhCltForcedVideo:
- {
- ret = CConvergedServiceSelector::ESsVideoCall;
- break;
- }
- case EPhCltCallVoIP:
- {
- ret = CConvergedServiceSelector::ESsVoipCall;
- break;
- }
- default:
- {
- ret = CConvergedServiceSelector::ESsVoiceCall;
- break;
- }
- }
-
- return ret;
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::SetSelectorResults()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::SetSelectorResults(
- CConvergedServiceSelector::TSsResult& aResults )
- {
- switch ( aResults.iCallType )
- {
- case CConvergedServiceSelector::ESsVoipCall:
- {
- iDialData->SetCallType( EPhCltCallVoIP );
- break;
- }
- case CConvergedServiceSelector::ESsVideoCall:
- {
- iDialData->SetCallType( EPhCltForcedVideo );
- break;
- }
- case CConvergedServiceSelector::ESsVoiceCall:
- default:
- {
- iDialData->SetCallType( EPhCltVoice );
- break;
- }
- }
-
- iDialData->SetServiceId( aResults.iServiceId );
- }
-
-
-// ---------------------------------------------------------
-// CCaUiEngine::LaunchContactStoreLoadingL
-// ---------------------------------------------------------
-//
-TBool CCaUiEngine::LaunchContactStoreLoadingL( const TDesC8& aContactLink )
- {
- if ( !iFactory )
- {
- iFactory = CreateCntFactoryL();
- }
-
- if ( !iContactStoreLoader )
- {
- iContactStoreLoader = iFactory->CreateContactStoreLoaderL();
- }
-
- TBool isStoreLoaded(
- iContactStoreLoader->IsContactStoreLoaded( aContactLink ) );
- if ( !isStoreLoaded )
- {
- iContactStoreLoader->LoadContactStoreL( aContactLink, *this );
- }
-
- return isStoreLoaded;
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::IsSendKeyPressed
-// ---------------------------------------------------------
-//
-TBool CCaUiEngine::IsSendKeyPressed( TCaUiCallType aCallType,
- CAiwDialData::TCallType aAiwCallType ) const
- {
- TBool isSendKeyPressed( EFalse );
- if ( CAiwDialData::EAIWForcedCS != aAiwCallType )
- {
- if ( ECaUiCallTypeUnknown == aCallType )
- {
- isSendKeyPressed = ETrue;
- }
- }
-
- return isSendKeyPressed;
- }
-
-// End of file
--- a/phoneclientserver/callui/src/cauiengine/cauienginemain.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2004 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: Global functions for CaUiEngine.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32std.h>
-
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-
-// -----------------------------------------------------------------------------
-// E32Dll
-//
-// Returns always KErrNone.
-// -----------------------------------------------------------------------------
-//
-GLDEF_C TInt E32Dll( TDllReason )
- {
- return KErrNone;
- }
-
-// End of File
--- a/phoneclientserver/callui/src/cauiengine/cauienginestub.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,656 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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 CallUIEngine, stub version.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "cauiengine.h"
-#include "cauidialogs.h"
-
-#include <callui.rsg> // resources.
-#include <cphcltdialer.h> // cphcltdialer.
-#include <cphonecntfactory.h>
-#include <aiwinternaldialdata.h>
-#include <aiwservicehandler.h>
-#include <cphcltextphonedialdata.h> // cphcltextphonedialdata
-
-#include "callui.loc" // localized strings.
-
-#include <stringloader.h> // string loader.
-#include <featmgr.h> // featuremanager.
-
-#include <phcltutils.h> // character removal.
-#include <aiwcommon.h> // aiw dialdata.
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::CCaUiEngine
-//
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiEngine::CCaUiEngine()
-: iResourceLoader( *CCoeEnv::Static() )
-#ifndef RD_PHONE_NG
- ,iResourceLoaderPhoneApE( *CCoeEnv::Static() )
-#endif
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::ConstructL
-//
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::ConstructL()
- {
- // Sets up TLS, must be done before FeatureManager is used.
- FeatureManager::InitializeLibL();
-
- if( CCoeEnv::Static() )
- {
- // Open CallUI resource file.
- TFileName* name = new ( ELeave ) TFileName( KCallUIResFile );
- CleanupStack::PushL( name );
- User::LeaveIfError( iResourceLoader.Open( *name ) );
- CleanupStack::PopAndDestroy( name );
- }
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiEngine* CCaUiEngine::NewL()
- {
- CCaUiEngine* self = new( ELeave ) CCaUiEngine;
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop();
-
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::~CCaUEngine
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiEngine::~CCaUiEngine()
- {
- delete iContactSelector;
- delete iFactory;
-
- // Clear dial components.
- ClearDialContents();
-
- if( CCoeEnv::Static() )
- {
- // Close resource loader.
- iResourceLoader.Close();
-
-#ifndef RD_PHONE_NG
- // Release PhoneAppEngine resources.
- iResourceLoaderPhoneApE.Close();
-#endif
- }
-
- // Delete the menubuffer.
- delete iBuf;
- iBuf = NULL;
-
- // Frees the TLS! Must be done after FeatureManager is used.
- FeatureManager::UnInitializeLib();
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::GetResources
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::GetResources(
- const TCaUiEngResource aResource,
- TFileName& aResFile,
- TInt& aResId )
- {
- aResFile = KCallUIResFile;
- if ( aResource == ECaUiResOnlyInternet )
- {
- aResId = 0;
- }
- else
- {
- // Return pure voice menu item.
- aResId = R_CALLUI_CALL_MENU;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::DialL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::DialL(
- MCaUiDialResultObserver& aObserver,
- const TDesC8& aDialData,
- const TCaUiCallType aCallType )
- {
- TInt length = aDialData.Length();
-
- // If iPhCltDialer and iDialDataContainer exist,
- // destroy them and create new ones. This clears the dial data.
- ClearDialContents();
- iPhCltDialer = CPhCltExtPhoneBase::NewL( this );
- iObserver = &aObserver;
-
- iDialData = CPhCltExtPhoneDialData::NewL();
- CAiwInternalDialData* aiwDialData = CAiwInternalDialData::NewLC( aDialData );
-
- // Convert AIW dial data to PhoneClient format.
-
- ConvertDialDataL( *aiwDialData );
-
- iDialData->SetCallType( EPhCltVoice );
-
- //a call type is still unknown if the dialing is made via phonebook
- //send key (doesn't use HandleMenuCmdL, check the call type in
- //aiwDialData to make sure if unknown is really unknown
- //only do if call type unknown
- TCaUiCallType callType = aCallType;
- if ( callType == ECaUiCallTypeUnknown )
- {
- CAiwDialData::TCallType aiwCalltype = aiwDialData->CallType();
-
- switch ( aiwCalltype )
- {
- case CAiwDialData::EAIWVoice:
- callType = ECaUiCallTypeVoice;
- break;
- case CAiwDialData::EAIWVideo:
- case CAiwDialData::EAIWForcedVideo:
- callType = ECaUiCallTypeVideo;
- break;
- case CAiwDialData::EAIWVoiP:
- callType = ECaUiCallTypeInternet;
- break;
- default:
- //already unknown
- break;
- }
- }
-
- //aiwDialData not needed anymore, remove from stack
- CleanupStack::PopAndDestroy( aiwDialData );
-
- // If Contact link is provided fetch field link from Phone Book.
- if ( iDialData->ContactLink() != KNullDesC8() )
- {
- // Launch address select.
- // aCallType describes which selector is used. ( VoIP/PhoneNumber )
- LaunchAddressSelectL(
- iDialData->ContactLink(),
- callType );
- }
-
-
- else
- {
- iPhCltDialer->DialL( *iDialData );
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::LaunchNoNetSupNoteL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::LaunchNoNetSupNoteL()
- {
- User::Leave( KErrNotSupported );
- }
-
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::LaunchReconConfQueryL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::LaunchReconConfQueryL(
- MCaUiReconnectQueryObserver& /*aObserver*/,
- CPhCntMatcher* /*aPhCntMatcher*/,
- const TPtrC /*aPhoneNumber*/,
- const TBool /*aIncludeVideoCallOption*/ )
- {
- User::Leave( KErrNotSupported );
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::CancelReconConfQuery
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::CancelReconConfQuery()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::LaunchNoteAndReconConfQueryL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::LaunchNoteAndReconConfQueryL(
- MCaUiReconnectQueryObserver& /*aObserver*/,
- CPhCntMatcher* /*aPhCntMatcher*/,
- const TPtrC /*aPhoneNumber*/,
- const TBool /*aIncludeVideoCallOption*/,
- const TPtrC /*aNoteText*/ )
- {
- User::Leave( KErrNotSupported );
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::CancelNoteAndReconConfQuery
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::CancelNoteAndReconConfQuery()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::LaunchAddressSelectL
-//
-//
-// -----------------------------------------------------------------------------
-//
-TBool CCaUiEngine::LaunchAddressSelectL(
- TDes& aTelNum,
- const TInt aContactId,
- const TBool aVoIPAddressSelect )
- {
- if ( aVoIPAddressSelect )
- {
- User::Leave( KErrNotSupported );
- }
-
- TBool addressSelected( EFalse );
- TCaUiCallType callType( ECaUiCallTypeVoice );
-
- addressSelected = LaunchAddressSelectL( aTelNum, aContactId, callType );
-
- return addressSelected;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::CancelAddressSelect
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::CancelAddressSelect()
- {
- }
-
-// -----------------------------------------------------------------------------
-// From MPhCntStoreLoaderObserver.
-// CCaUiEngine::ContactStoreLoadingCompleted
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::ContactStoreLoadingCompleted(
- MVPbkContactStore* /*aStore*/, TInt /*aErrorCode*/ )
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::HandleDialL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::HandleDialL( const TInt aStatus )
- {
- if ( iObserver )
- {
- iObserver->HandleDialResultL( aStatus );
- }
-
- ClearDialContents();
- }
-
-// -----------------------------------------------------------------------------
-// From base class MCaUiReconnectQueryObserver
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::OptionSelected(
- MCaUiReconnectQueryObserver::TCaUiReconType /*aReconType*/ )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::ConvertDialData
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::ConvertDialDataL(
- const CAiwInternalDialData& aAiwDialData )
- {
- // Telephony number.
- iDialData->SetTelephoneNumber( aAiwDialData.PhoneNumber().Left(
- iDialData->TelephoneNumber().MaxLength() ) );
-
- // Call type.
- CAiwDialData::TCallType aiwCallType = aAiwDialData.CallType();
- TPhCltCallType phCltCallType = EPhCltVoice;
-
- // After this the call type should be correct one.
- if ( aiwCallType == CAiwDialData::EAIWVideo )
- {
- phCltCallType = EPhCltVideo;
- iDialData->SetCallType( phCltCallType );
- }
- else if ( aiwCallType == CAiwDialData::EAIWForcedVideo )
- {
- phCltCallType = EPhCltForcedVideo;
- iDialData->SetCallType( phCltCallType );
- }
- else if ( aiwCallType == CAiwDialData::EAIWVoiP )
- {
- phCltCallType = EPhCltCallVoIP;
- iDialData->SetCallType( phCltCallType );
- }
-
- // Name.
- iDialData->SetNameL( aAiwDialData.Name().Left(
- iDialData->Name().MaxLength() ) );
-
- // Contact link.
- iDialData->SetContactLinkL( aAiwDialData.ContactLink() );
-
- // Window group.
- iDialData->SetWindowGroup( aAiwDialData.WindowGroup() );
-
- // Redial.
- iDialData->SetRedial( aAiwDialData.Redial() );
-
- // Redial maximum duration.
- iDialData->SetRedialMaximumDuration( aAiwDialData.RedialMaximumDuration() );
-
- // Show number.
- iDialData->SetShowNumber( aAiwDialData.ShowNumber() );
-
- // Match.
- iDialData->SetAllowMatch( aAiwDialData.AllowMatch() );
-
- // End other calls.
- iDialData->SetEndOtherCalls( aAiwDialData.EndOtherCalls() );
-
- // Subaddress.
- iDialData->SetSubAddressL( aAiwDialData.SubAddress().Left(
- iDialData->SubAddress().MaxLength() ) );
-
- // SAT call.
- iDialData->SetSATCall( aAiwDialData.SATCall() );
-
- // Bearer.
- iDialData->SetBearerL( aAiwDialData.Bearer().Left(
- iDialData->Bearer().MaxLength() ) );
-
- TPhCltTelephoneNumber telnum;
- telnum.Zero();
- telnum = iDialData->TelephoneNumber();
- PhCltUtils::RemoveInvalidChars( telnum );
- iDialData->SetTelephoneNumber( telnum );
-
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::ClearDialContents
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::ClearDialContents()
- {
- if ( iPhCltDialer )
- {
- delete iPhCltDialer;
- iPhCltDialer = NULL;
- }
-
- if ( iDialData )
- {
- delete iDialData;
- iDialData = NULL;
- }
-
- // Not owned, so just set to NULL.
- iObserver = NULL;
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::LaunchAddressSelectL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiEngine::LaunchAddressSelectL(
- const TDesC8& aContactLink,
- const TCaUiCallType aCallType )
- {
- if ( aCallType != ECaUiCallTypeVoice )
- {
- HandleDialL( KErrNotSupported );
- }
-
- else
- {
- if ( !iFactory )
- {
- iFactory = CreateCntFactoryL();
- }
- if ( !iContactSelector )
- {
- iContactSelector = iFactory->CreateContactDataSelectionL();
- }
-
- CPhCntContactDataSelection::TCallType callType;
-
- if ( aCallType == ECaUiCallTypeVoice )
- {
- callType = CPhCntContactDataSelection::ECallPhoneNumber;
- }
- else if ( aCallType == ECaUiCallTypeVideo )
- {
- callType = CPhCntContactDataSelection::ECallVideoNumber;
- }
- else if ( aCallType == ECaUiCallTypeInternet )
- {
- callType = CPhCntContactDataSelection::ECallVoip;
- }
- else
- {
- callType = CPhCntContactDataSelection::ECallPhoneNumber;
- }
-
- iContactSelector->Cancel();
- iContactSelector->SelectPhoneNumberForCallL( aContactLink, callType, *this );
-
- }
-
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::HandleEmergencyDialL()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::HandleEmergencyDialL( const TInt /*aStatus*/ )
- {
- // Do nothing
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::SelectionDone()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::SelectionDone( CPhCntSelectedData* aContactData,
- TInt aErrorCode )
- {
- if ( aErrorCode == KErrNone )
- {
- TPhCltTelephoneNumber phoneNumber;
- HBufC8* fieldLink = NULL;
-
- if ( iDialData->TelephoneNumber() == KNullDesC )
- {
- phoneNumber = aContactData->Data();
- PhCltUtils::RemoveInvalidChars( phoneNumber );
- iDialData->SetTelephoneNumber( phoneNumber );
- }
- if ( aContactData->FieldLink().Length() > 0 )
- {
- fieldLink = aContactData->FieldLink().Alloc();
- }
-
- TRAP( aErrorCode, PhoneClientDialL( fieldLink ) );
-
- delete fieldLink;
- fieldLink = NULL;
- }
-
- if ( aErrorCode != KErrNone )
- {
- TRAP_IGNORE( HandleDialL( aErrorCode ) );
- }
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::PhoneClientDialL()
-// ---------------------------------------------------------
-//
-void CCaUiEngine::PhoneClientDialL( const TDesC8* aFieldLink )
- {
-
- TBool createCall( ETrue );
- TInt error( KErrNone );
-
- if ( aFieldLink )
- {
- iDialData->SetContactLinkL( *aFieldLink );
- }
-
- // Check if number is emergency number and if it is
- // then call emeregency call
- if ( !iEmergencyCall )
- {
- iEmergencyCall = CPhCltEmergencyCall::NewL( this );
- }
- if ( IsEmergencyNumber() )
- {
- createCall = EFalse;
- if ( aFieldLink )
- {
- error = KErrNone;
- iEmergencyCall->DialEmergencyCallL( iDialData->TelephoneNumber() );
- }
- else
- {
- error = KErrNotSupported;
- }
- }
-
- // Here note launch + query if this is video call and we
- // are not in 3G network.
-
- if ( createCall )
- {
- if ( ( iDialData->CallType() == EPhCltVideo ) ||
- ( iDialData->CallType() == EPhCltForcedVideo ) ||
- ( iDialData->CallType() == EPhCltCallVoIP ) )
- {
- createCall = EFalse;
- error = KErrNotSupported;
- }
-
- }
- if ( createCall )
- {
- iPhCltDialer->DialL( *iDialData );
- }
- else
- {
- //User cancelled. Need to inform client.
- if ( error != KErrNone ) // Emergency call does not need to inform client.
- {
- HandleDialL( error );
- }
- }
- }
-
-// ---------------------------------------------------------
-// CCaUiEngine::IsEmergencyNumber()
-// ---------------------------------------------------------
-//
-TBool CCaUiEngine::IsEmergencyNumber()
- {
- TBool isEmergencyNumber( EFalse );
-
- // get phonenumber from iDialData and heck number using phoneclient
- // emergencycall api
- TInt result = iEmergencyCall->IsEmergencyPhoneNumber(
- iDialData->TelephoneNumber(),
- isEmergencyNumber );
-
- return isEmergencyNumber;
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiEngine::IsVoIPProfiles()
-//
-//
-// -----------------------------------------------------------------------------
-//
-TBool CCaUiEngine::IsVoIPProfiles()
- {
- return EFalse;
- }
-
-// End of file
--- a/phoneclientserver/callui/src/cauiengine/cauimessagesender.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,342 +0,0 @@
-/*
-* Copyright (c) 2004 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: Launches Sendui Editor.
-*
-*/
-
-
-
-
-// INCLUDES
-#include "cauimessagesender.h"
-
-#include <coemain.h> // CCoeEnv
-#include <callui.rsg> // Resources.
-
-#include <msvids.h> // KUidMsvLocalServiceMtmValue
-
-#include <sendui.h> // CSendAppUi, CSendUi
-#include <cmessagedata.h> // Message data for CSendUi
-#include <featmgr.h> // Feature manager
-#include "cauilogger.h" // Call Ui Logger
-
-// CONSTANTS
-// The reconnect query options granularity.
-#ifdef RD_UNIFIED_EDITOR
-const TInt KCaUiReConQueryOptionsArrayGranularity = 3;
-#else // RD_UNIFIED_EDITOR
-const TInt KCaUiReConQueryOptionsArrayGranularity = 4;
-#endif // RD_UNIFIED_EDITOR
-
-const TInt KMtmPop3Uid = 0x10001029;
-const TInt KMtmImap4Uid = 0x1000102a;
-const TInt KUidEmail = 0x10001028;
-const TInt KUidPostCard = 0x10207245;
-
-// -----------------------------------------------------------------------------
-// CCaUiMessageSender::CCaUiMessageSender
-//
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiMessageSender::CCaUiMessageSender()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiMessageSender::~CCaUiMessageSender
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiMessageSender::~CCaUiMessageSender()
- {
-
- CAUILOGSTRING("CALLUI: >>> CCaUiMessageSender::~CCaUiMessageSender()");
-
- if ( iMsgTypes )
- {
- iMsgTypes->Reset();
- delete iMsgTypes;
- }
-
- if( iSession )
- {
- iSession->Cancel();
- }
- delete iSession;
-
- if( iSendUi )
- {
- delete iSendUi;
- }
-
- CAUILOGSTRING("CALLUI: <<< CCaUiMessageSender::~CCaUiMessageSender()");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiMessageSender::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiMessageSender* CCaUiMessageSender::NewL()
- {
-
- CAUILOGSTRING("CALLUI: >>> CCaUiMessageSender::NewL()");
-
- CCaUiMessageSender* self = new( ELeave ) CCaUiMessageSender ();
-
- CAUILOGSTRING("CALLUI: <<< CCaUiMessageSender::NewL()");
-
- return self;
- }
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::CreateNewMessageL
-// Create a new message of the given type, in the given location
-// ---------------------------------------------------------
-//
-void CCaUiMessageSender::CreateNewMessageL(
- TInt aMessageType,
- MDesC16Array* aRealAddress,
- MDesC16Array* aAliases,
- CRichText* aRichText )
- {
-
- CAUILOGSTRING("CALLUI: >>> CCaUiMessageSender::CreateNewMessageL()");
-
- TRAPD( err, CreateSendUiL());
- if ( err != KErrNone )
- User::Leave( KErrGeneral );
-
- //Launch message editor standalone
- TUid mtmUid = { aMessageType };
-
- CMessageData* messageData = CMessageData::NewL();
- CleanupStack::PushL( messageData );
- if ( aRichText )
- {
- messageData->SetBodyTextL( aRichText );
- }
-
- // Set real address and check if aliases exist
- if ( aRealAddress )
- {
- TBool aAliasesExist = EFalse;
- if ( aAliases &&
- aAliases->MdcaCount() == aRealAddress->MdcaCount() )
- {
- aAliasesExist = ETrue;
- }
- for ( TInt i=0; i < aRealAddress->MdcaCount(); i++ )
- {
- if ( aAliasesExist )
- {
- messageData->AppendToAddressL(
- aRealAddress->MdcaPoint( i ),
- aAliases->MdcaPoint( i ) );
- }
- else
- {
- messageData->AppendToAddressL(
- aRealAddress->MdcaPoint( i ) );
- }
- }
- }
-
- iSendUi->CreateAndSendMessageL( mtmUid, messageData, KNullUid, EFalse );
- CleanupStack::PopAndDestroy(); // messageData
-
- CAUILOGSTRING("CALLUI: <<< CCaUiMessageSender::CreateNewMessageL()");
- }
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::CreateSendUiL
-// ---------------------------------------------------------
-//
-void CCaUiMessageSender::CreateSendUiL()
- {
- CAUILOGSTRING("CALLUI: >>> CCaUiMessageSender::CreateSendUiL()");
-
- // Create instance of send ui.
- if( !iSendUi )
- {
- iSendUi = CSendUi::NewL();
- }
-
- CAUILOGSTRING("CALLUI: <<< CCaUiMessageSender::CreateSendUiL()");
- }
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::MessageTypesArray
-// ---------------------------------------------------------
-const CUidNameArray& CCaUiMessageSender::
- MessageTypesArrayL()
- {
-
- CAUILOGSTRING("CALLUI: >>> CCaUiMessageSender::MessageTypesArrayL()");
-
- delete iMsgTypes;
- iMsgTypes = NULL;
-
- CUidNameArray* msgTypes = new ( ELeave )
- CUidNameArray( KCaUiReConQueryOptionsArrayGranularity );
- CleanupStack::PushL( msgTypes );
- UpdateMessageTypesArrayL( msgTypes );
- CleanupStack::Pop();
- iMsgTypes = msgTypes;
-
- CAUILOGSTRING("CALLUI: <<< CCaUiMessageSender::MessageTypesArrayL()");
-
- return *iMsgTypes;
- }
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::UpdateMessageTypesArrayL
-// Updates the array of UIDs which defines the MTM types for which the user
-// can create new messages.
-// ---------------------------------------------------------
-void CCaUiMessageSender::UpdateMessageTypesArrayL(
- CUidNameArray* aMsgTypes )
- {
-
- CAUILOGSTRING("CALLUI:>>> CCaUiMessageSender::UpdateMessageTypesArrayL()");
-
- aMsgTypes->Reset();
-
- FeatureManager::InitializeLibL();
- //Read MTM types from resource file
- TResourceReader resReader;
- CCoeEnv::Static()->CreateResourceReaderLC( resReader,
- NEW_MESSAGE_TYPES_ARRAY );
-
- TInt count = resReader.ReadInt16();
-
- for ( TInt i = 0; i < count; i++ )
- {
- TInt32 id = resReader.ReadInt32();
- HBufC* name = resReader.ReadHBufCL();
- CleanupStack::PushL( name );
-
- switch( id )
- {
- case KUidEmail:
- {
- if ( IsMailboxDefinedL() )
- {
- aMsgTypes->AppendL( TUidNameInfo( TUid::Uid( id ), *name ) );
- }
- break;
- }
- case KUidPostCard:
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdMmsPostcard ) )
- {
- aMsgTypes->AppendL( TUidNameInfo( TUid::Uid( id ), *name ) );
- }
- break;
- }
- default:
- {
- aMsgTypes->AppendL( TUidNameInfo( TUid::Uid( id ), *name ) );
- break;
- }
- }
-
- CleanupStack::PopAndDestroy( name );
- }
-
- CleanupStack::PopAndDestroy();//resReader
- FeatureManager::UnInitializeLib();
-
- CAUILOGSTRING("CALLUI:<<< CCaUiMessageSender::UpdateMessageTypesArrayL() end");
- }
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::CreateMessageServiceConnectionL
-// ---------------------------------------------------------
-//
-void CCaUiMessageSender::CreateMessageServiceConnectionL()
- {
- CAUILOGSTRING("CALLUI:>>> CCaUiMessageSender::CreateMessageServiceConnectionL()");
-
- if ( !iSession )
- {
- iSession = CMsvSession::OpenSyncL( *this );
- }
- CAUILOGSTRING("CALLUI:<<< CCaUiMessageSender::CreateMessageServiceConnectionL()");
- }
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::IsMailboxDefinedL
-// ---------------------------------------------------------
-//
-TBool CCaUiMessageSender::IsMailboxDefinedL()
- {
- CAUILOGSTRING("CALLUI:>>> CCaUiMessageSender::IsMailboxDefinedL()");
-
- CreateMessageServiceConnectionL();
-
- TBool isDefined = EFalse;
- CMsvEntry* root = iSession->GetEntryL( KMsvRootIndexEntryId );
-
- TInt count = root->Count();
- for ( TInt i = 0; i < count; i++ )
- {
- const TMsvEntry& tentry = (*root)[i];
- if ( tentry.iMtm.iUid == KMtmPop3Uid ||
- tentry.iMtm.iUid == KMtmImap4Uid )
- {
- isDefined = ETrue;
- break;
- }
- }
- delete root;
-
- CAUILOGSTRING("CALLUI:<<< CCaUiMessageSender::IsMailboxDefinedL()");
- return isDefined;
- }
-
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::HandleSessionEventL
-// ---------------------------------------------------------
-void CCaUiMessageSender::HandleSessionEventL(TMsvSessionEvent aEvent,
- TAny* /*aArg1*/, TAny* /*aArg2*/, TAny* /*aArg3*/)
- {
- CAUILOGSTRING("CALLUI:>>> CCaUiMessageSender::HandleSessionEventL()");
-
- CreateMessageServiceConnectionL();
-
- switch ( aEvent )
- {
- case EMsvCloseSession:
- //Server close.
- delete iSession;
- iSession = NULL;
- CAUILOGSTRING("CALLUI:<<< CCaUiMessageSender::HandleSessionEventL(): case: EMsvCloseSession");
- break;
- default:
- CAUILOGSTRING("CALLUI:<<< CCaUiMessageSender::HandleSessionEventL(): case: default");
- break;
- }
-
- }
-
-
-// End of File
--- a/phoneclientserver/callui/src/cauiengine/cauimessagesenderstub.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/*
-* Copyright (c) 2004 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: Message sender stub
-*
-*/
-
-
-// INCLUDES
-#include "cauimessagesenderstub.h"
-
-// -----------------------------------------------------------------------------
-// CCaUiMessageSender::CCaUiMessageSender
-//
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiMessageSender::CCaUiMessageSender()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiMessageSender::~CCaUiMessageSender
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiMessageSender::~CCaUiMessageSender()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiMessageSender::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiMessageSender* CCaUiMessageSender::NewL()
- {
- CCaUiMessageSender* self = new( ELeave ) CCaUiMessageSender ();
-
- return self;
- }
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::CreateNewMessageL
-// Create a new message of the given type, in the given location
-// ---------------------------------------------------------
-//
-void CCaUiMessageSender::CreateNewMessageL(
- TInt /*aMessageType*/,
- MDesC16Array* /*aRealAddress*/,
- MDesC16Array* /*aAliases*/,
- CRichText* /*aRichText*/ )
- {
- }
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::CreateSendUiL
-// ---------------------------------------------------------
-//
-void CCaUiMessageSender::CreateSendUiL()
- {
- }
-
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::UpdateMessageTypesArrayL
-// Updates the array of UIDs which defines the MTM types for which the user
-// can create new messages.
-// ---------------------------------------------------------
-void CCaUiMessageSender::UpdateMessageTypesArrayL(
- CUidNameArray* /*aMsgTypes*/ )
- {
- }
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::CreateMessageServiceConnectionL
-// ---------------------------------------------------------
-//
-void CCaUiMessageSender::CreateMessageServiceConnectionL()
- {
- }
-
-// ---------------------------------------------------------
-// CCaUiMessageSender::IsMailboxDefinedL
-// ---------------------------------------------------------
-//
-TBool CCaUiMessageSender::IsMailboxDefinedL()
- {
- TBool isDefined( EFalse );
- return isDefined;
- }
-
-// End of File
--- a/phoneclientserver/callui/src/cauiengine/cauiquery.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2004 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: Query that is used in asking call type (confirmation)
-* from user.
-*
-*/
-
-
-
-
-// INCLUDES
-#include "cauiquery.h"
-
-
-// -----------------------------------------------------------------------------
-// CCaUiCreateListQuery::CCaUiListQuery
-//
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiCreateListQuery::CCaUiCreateListQuery( TInt* aIndex )
-: CAknListQueryDialog( aIndex )
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiCreateListQuery::~CCaUiCreateListQuery
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiCreateListQuery::~CCaUiCreateListQuery()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiCreateListQuery::OfferKeyEventL
-//
-//
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CCaUiCreateListQuery::OfferKeyEventL(
- const TKeyEvent& aKeyEvent,
- TEventCode aType )
- {
- TKeyResponse response = EKeyWasConsumed;
-
- if ( aType == EEventKeyDown )
- {
- // The first key event received will be a partial one, and will therefore be ignored.
- iValidKeyEvent = ETrue;
- }
-
- if ( iValidKeyEvent && aKeyEvent.iScanCode == EStdKeyYes )
- {
- if ( aType == EEventKey )
- {
- // The send key is specified to act (in Video Telephony UI specification) so that it
- // initiates the call. This means that the event is modified and faked to be a select
- // key event, so that the list box can handle it correctly.
- TKeyEvent keyEvent = aKeyEvent;
- keyEvent.iCode = EKeyOK;
- keyEvent.iScanCode = EStdKeyDevice3;
- response = CAknListQueryDialog::OfferKeyEventL( keyEvent, EEventKey );
- }
- }
- else
- {
- response = CAknListQueryDialog::OfferKeyEventL( aKeyEvent, aType );
- }
-
- return response;
- }
-
-
-// End of File
--- a/phoneclientserver/callui/src/cauiengine/cauivoipextension.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-/*
-* Copyright (c) 2005-2008 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: VoIP profile handler
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "cauivoipextension.h"
-#include <callui.rsg>
-#include <featmgr.h>
-#include <spsettings.h>
-#include <spproperty.h>
-#include <stringloader.h> // String Loader.
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CCaUiVoIPExtension::CCaUiVoIPExtension
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiVoIPExtension::CCaUiVoIPExtension()
- {
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiVoIPExtension::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CCaUiVoIPExtension::ConstructL()
- {
-
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiVoIPExtension::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiVoIPExtension* CCaUiVoIPExtension::NewL()
- {
- CCaUiVoIPExtension* self = new( ELeave ) CCaUiVoIPExtension;
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
-
- return self;
- }
-
-
-// Destructor
-CCaUiVoIPExtension::~CCaUiVoIPExtension()
- {
-
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiVoIPExtension::IsVoIPProfilesL()
-// Checks if any service supports internet call
-// -----------------------------------------------------------------------------
-//
-TBool CCaUiVoIPExtension::IsVoIPProfilesL()
- {
- TBool isProfiles = EFalse;
-
- RIdArray voipServiceIds;
- CleanupClosePushL( voipServiceIds );
- GetVoIPServiceIdsL( voipServiceIds );
- if ( voipServiceIds.Count() )
- {
- isProfiles = ETrue;
- }
- CleanupStack::PopAndDestroy( &voipServiceIds );
-
- return isProfiles;
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiVoIPExtension::GetVoIPServiceIdsL()
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiVoIPExtension::GetVoIPServiceIdsL( RIdArray& aVoipServiceIds ) const
- {
- aVoipServiceIds.Reset();
-
- // Fetch the settings api.
- CSPSettings* settingsApi = CSPSettings::NewLC();
-
- // read all service ids to array
- RIdArray idArray;
- CleanupClosePushL( idArray );
-
- if ( FeatureManager::FeatureSupported( KFeatureIdCommonVoip ) )
- {
- User::LeaveIfError( settingsApi->FindServiceIdsL( idArray ) );
-
- // go throught all the services and check if any
- // of them supports internet call
- for ( TInt i = 0; idArray.Count() > i; i++)
- {
- // check if the service supports internet call
- CSPProperty* property = CSPProperty::NewLC();
- // get attribute mask of the service
- User::LeaveIfError( settingsApi->FindPropertyL( idArray[i],
- EPropertyServiceAttributeMask, *property ) );
-
- // read the value of mask property
- TInt mask = 0;
- if ( KErrNone == property->GetValue( mask ) )
- {
- if ( ( mask & ESupportsInternetCall )
- && ( mask & EIsVisibleInCallMenu ) )
- {
- aVoipServiceIds.Append( idArray[i] );
- }
- }
- CleanupStack::PopAndDestroy( property );
- }
- }
- CleanupStack::PopAndDestroy( 2, settingsApi );
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiVoIPExtension::GetVoipServiceNameL()
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiVoIPExtension::GetVoipServiceNameL( TServiceId aServiceId, TDes& aServiceName ) const
- {
- CSPSettings* settingsApi = CSPSettings::NewLC();
- CSPProperty* property = CSPProperty::NewLC();
-
- settingsApi->FindPropertyL( aServiceId, EServiceName, *property );
- User::LeaveIfError( property->GetValue( aServiceName ) );
-
- CleanupStack::PopAndDestroy( 2, settingsApi );
- }
-
-// End of File
--- a/phoneclientserver/callui/src/cauiengine/ccauireconnectquery.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2007 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: Creates CallUIEngine reconnect query implementation.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "ccauireconnectquery.h"
-#include "ccauireconnectqueryimpl.h"
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CCaUiReconnectQuery::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CCaUiReconnectQuery* CCaUiReconnectQuery::NewL(
- MCaUiReconnectQueryObserver& aObserver )
- {
- return CCaUiReconnectQueryImpl::NewL( aObserver );
- }
-
-CCaUiReconnectQuery::~CCaUiReconnectQuery()
- {
- // No implementation needed
- }
-// -----------------------------------------------------------------------------
-// CCaUiReconnectQuery::CCaUiReconnectQuery
-// C++ constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiReconnectQuery::CCaUiReconnectQuery( MCaUiReconnectQueryObserver& aObserver )
- : iObserver( aObserver )
- {
- }
-
-
-
-
-// End of File
--- a/phoneclientserver/callui/src/cauiengine/ccauireconnectqueryimpl.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2007 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 CallUIEngine reconnect query.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "ccauireconnectqueryimpl.h"
-#include "cauiengine.h"
-
-CCaUiReconnectQueryImpl* CCaUiReconnectQueryImpl::NewL(
- MCaUiReconnectQueryObserver& aObserver )
- {
- CCaUiReconnectQueryImpl* self =
- new ( ELeave ) CCaUiReconnectQueryImpl( aObserver);
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop();
- return self;
- }
-
-CCaUiReconnectQueryImpl::~CCaUiReconnectQueryImpl( )
- {
- if ( iEng )
- {
- iEng->CancelReconConfQuery();
- delete iEng;
- }
- }
-
-void CCaUiReconnectQueryImpl::ShowL(
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption )
- {
- iEng->LaunchReconConfQueryL(iObserver,
- NULL,
- aPhoneNumber,
- aIncludeVideoCallOption );
- }
-
-void CCaUiReconnectQueryImpl::ConstructL()
- {
- iEng = CCaUiEngine::NewL();
- }
-
-CCaUiReconnectQueryImpl::CCaUiReconnectQueryImpl(
- MCaUiReconnectQueryObserver& aObserver ):
- CCaUiReconnectQuery(aObserver)
- {
-
- }
-
-// End of file
-
-
--- a/phoneclientserver/callui/src/cauiplugin/cauimain.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2004 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: Global functions for CaUiPlugin.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <ecom.h>
-#include <implementationproxy.h>
-#include "caui.hrh"
-#include "cauiplugin.h"
-
-
-// CONSTANTS
-
-// Holds implementation table.
-const TImplementationProxy KCallUIImplementationTable[] =
- {
- IMPLEMENTATION_PROXY_ENTRY(
- KCallUIImplementationUid,
- CCaUiPlugin::NewL ),
- IMPLEMENTATION_PROXY_ENTRY(
- KCallUIImplementationUid2,
- CCaUiPlugin::NewL )
- };
-
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ImplementationGroupProxy
-//
-// Returns implementation table and updates aTableCount parameter to hold
-// amount of elements in table.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
- TInt& aTableCount )
- {
- aTableCount =
- sizeof( KCallUIImplementationTable ) /
- sizeof( TImplementationProxy );
-
- return KCallUIImplementationTable;
- }
-
-// End of File
--- a/phoneclientserver/callui/src/cauiplugin/cauiplugin.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,441 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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 CallUI plugin.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "cauiplugin.h" // This class interface.
-#include "cauieng.h" // CaUiEngine.
-#include <aiwcommon.hrh> // AIW constants.
-#include "caui.hrh" // CallUI constants.
-#include <aiwmenu.h> // AIW Menu pane.
-
-#include <aiwservicehandler.h>
-#include <phclttypes.h> // PhoneClient types.
-#include "cauilogger.h" // Call Ui Logger
-#include <stringloader.h>
-#include <callui.rsg>
-
-// CONSTANTS
-
-// Empty filename for initialization.
-_LIT( KCaUiNullResFile, "" );
-
-// The library to be loaded.
-_LIT( KCaUiLoadedLib, "cauiengine.dll" );
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CCaUiPlugin::CCaUiPlugin
-//
-// C++ constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-CCaUiPlugin::CCaUiPlugin()
- {
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiPlugin::ConstructL
-//
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CCaUiPlugin::ConstructL()
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::ConstructL() Begin");
- User::LeaveIfError( iLibrary.Load( KCaUiLoadedLib ) );
-
- // Call function CreateCaUiEngFactoryL()
- TInt res = iLibrary.Lookup( 1 )();
- CCaUiEngFactory* caUiEngFactory =
- reinterpret_cast< CCaUiEngFactory* >( res );
-
- iCaUiEngine = caUiEngFactory->CCaUiEngApiLD();
-
- if( !iCaUiEngine )
- {
- // Null returned, so leave.
- User::Leave( KErrNotSupported );
- }
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::ConstructL() End");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiPlugin::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiPlugin* CCaUiPlugin::NewL()
- {
- CCaUiPlugin* self = new( ELeave ) CCaUiPlugin;
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop();
-
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiPlugin::~CCaUiPlugin
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CCaUiPlugin::~CCaUiPlugin()
- {
- delete iCaUiEngine;
-
- iLibrary.Close();
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiPlugin::InitialiseL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiPlugin::InitialiseL(
- MAiwNotifyCallback& /*aFrameworkCallback*/,
- const RCriteriaArray& /*aInterest*/)
- {
- // Stub. Not used.
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiPlugin::HandleServiceCmdL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiPlugin::HandleServiceCmdL(
- const TInt& aCmdId,
- const CAiwGenericParamList& aInParamList,
- CAiwGenericParamList& aOutParamList,
- TUint aCmdOptions,
- const MAiwNotifyCallback* aCallback )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::HandleServiceCmdL() Begin");
- // Handle only call command.
- if ( aCmdId == KAiwCmdCall )
- {
- if ( aCmdOptions & KAiwOptCancel )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::HandleServiceCmdL() Cancel");
- return;
- }
- // Check if there is CallUI Dialdata parameter.
- TInt index = 0;
- const TAiwGenericParam* genericParam = NULL;
-
- genericParam = aInParamList.FindFirst(
- index,
- EGenericParamCallDialData,
- EVariantTypeDesC8 );
-
- if ( index >= 0 && genericParam )
- {
- // Get the data.
- TPtrC8 ptr = genericParam->Value().AsData();
-
- // If this function was called through HandleMenuCmdL,
- // iMenuCmdId was set, otherwise it is zero.
- TCaUiCallType callType = ECaUiCallTypeUnknown;
-
- if ( iMenuCmdId == ECallUIVoice )
- {
- callType = ECaUiCallTypeVoice;
- }
- else if ( iMenuCmdId == ECallUIVideo )
- {
- callType = ECaUiCallTypeVideo;
- }
- else if ( iMenuCmdId == ECallUIInternet )
- {
- callType = ECaUiCallTypeInternet;
- }
-
- iMenuCmdId = 0;
-
- // Save the parameters given.
- iAiwNotifyCallback = aCallback;
- iInParamList = &aInParamList;
- iOutParamList = &aOutParamList;
-
- // Perform the dial operation.
- iCaUiEngine->DialL( *this, ptr, callType );
- }
- }
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::HandleServiceCmdL() End");
- }
-
-
-
-// -----------------------------------------------------------------------------
-// CCaUiPlugin::InitializeMenuPaneL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiPlugin::InitializeMenuPaneL(
- CAiwMenuPane& aMenuPane,
- TInt aIndex,
- TInt /* aCascadeId */,
- const CAiwGenericParamList& aInParamList )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::InitializeMenuPaneL() Begin");
-
- // By default we want all internet, voice and video call resources
- TBool csVoiceMenuItemAvailable( ETrue );
- TBool csVideoMenuItemAvailable( ETrue );
- TBool voipMenuItemAvailable( ETrue );
-
- // If there is PhoneNumber parameter given, then only voice call
- // resource is wanted.
- TInt count = aInParamList.Count();
- if ( count )
- {
- TInt index = 0;
- aInParamList.FindFirst(
- index,
- EGenericParamPhoneNumber,
- EVariantTypeAny );
-
- if ( index >= 0 )
- {
- csVideoMenuItemAvailable = EFalse;
- voipMenuItemAvailable = EFalse;
- }
-
- if ( index == KErrNotFound )
- {
- index = 0;
- aInParamList.FindFirst(
- index,
- EGenericParamSIPAddress,
- EVariantTypeAny );
-
- if ( index >= 0 )
- {
- // Internet number parameter was found,
- csVoiceMenuItemAvailable = EFalse;
- csVideoMenuItemAvailable = EFalse;
- }
- }
- }
-
- // Add menu items
-
- TInt menuIndex = aIndex;
-
- if ( csVoiceMenuItemAvailable )
- {
- AddAiwMenuItemL( aMenuPane, menuIndex, ECSVoice );
- menuIndex++;
- }
-
- if ( csVideoMenuItemAvailable )
- {
- AddAiwMenuItemL( aMenuPane, menuIndex, ECSVideo );
- menuIndex++;
- }
-
- if ( voipMenuItemAvailable )
- {
- RIdArray voipServiceIds;
- CleanupClosePushL( voipServiceIds );
- iCaUiEngine->GetVoIPServiceIdsL( voipServiceIds );
- TInt numberOfVoipServices = voipServiceIds.Count();
-
- if ( 1 == numberOfVoipServices )
- {
- // Single VoIP service, use service name in menu item
- AddAiwMenuItemL( aMenuPane, menuIndex, EInternetWithName, voipServiceIds[0] );
- menuIndex++;
- }
- else if ( numberOfVoipServices > 1 )
- {
- // Regular internet call menu
- AddAiwMenuItemL( aMenuPane, menuIndex, EInternet );
- menuIndex++;
- }
-
- CleanupStack::PopAndDestroy( &voipServiceIds );
- }
-
- // Set submenu title
- if ( csVoiceMenuItemAvailable ||
- csVideoMenuItemAvailable ||
- voipMenuItemAvailable )
- {
- HBufC* menuTitle = StringLoader::LoadLC( R_CALLUI_CALL_SUBMENU_TITLE );
- aMenuPane.AddTitleItemL( *menuTitle, aIndex );
- CleanupStack::PopAndDestroy( menuTitle );
- }
-
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::InitializeMenuPaneL() End");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiPlugin::HandleMenuCmdL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiPlugin::HandleMenuCmdL(
- TInt aMenuCmdId,
- const CAiwGenericParamList& aInParamList,
- CAiwGenericParamList& aOutParamList,
- TUint aCmdOptions,
- const MAiwNotifyCallback* aCallback )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::HandleMenuCmdL() Begin");
- // Handle only call commands.
- if ( ( aMenuCmdId == ECallUIVideo ) ||
- ( aMenuCmdId == ECallUIVoice ) ||
- ( aMenuCmdId == ECallUIInternet ) )
- {
- // Save the menu command.
- iMenuCmdId = aMenuCmdId;
-
- // Menu commands are handled as service commands.
- HandleServiceCmdL(
- KAiwCmdCall,
- aInParamList,
- aOutParamList,
- aCmdOptions,
- aCallback );
- }
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::HandleMenuCmdL() End");
- }
-
-
-// -----------------------------------------------------------------------------
-// CCaUiPlugin::HandleDialResultL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiPlugin::HandleDialResultL( const TInt aStatus )
- {
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::HandleDialResultL() Start");
- // If callback exists, inform client of call result.
- if ( iAiwNotifyCallback )
- {
- // Add the call result to the out parameter list.
- TAiwVariant variant( aStatus );
- TAiwGenericParam genericParam( EGenericParamError, variant );
- iOutParamList->AppendL( genericParam);
-
- // R&D solution: Remove constness.
- MAiwNotifyCallback* callback =
- const_cast< MAiwNotifyCallback* >( iAiwNotifyCallback );
-
- // Notify client.
- callback->HandleNotifyL(
- KAiwCmdCall,
- KAiwEventStarted,
- *iOutParamList,
- *iInParamList );
- }
-
- // Callback not active anymore, make clearing.
- iAiwNotifyCallback = NULL;
- iInParamList = NULL;
- iOutParamList = NULL;
- CAUILOGSTRING("CALLUI: >>>CCaUiPlugin::HandleDialResultL() End");
- }
-
-// -----------------------------------------------------------------------------
-// CCaUiPlugin::AddAiwMenuItemL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CCaUiPlugin::AddAiwMenuItemL( CAiwMenuPane& aMenuPane, TInt aIndex, EMenuItemType aType, TServiceId aServiceId )
- {
- CEikMenuPaneItem::SData data;
- data.iCascadeId = 0;
- data.iFlags = 0;
- data.iExtraText = KNullDesC();
-
- HBufC* menuItemText = NULL;
-
- switch ( aType )
- {
- case ECSVoice:
- {
- data.iCommandId = ECallUIVoice;
- menuItemText = StringLoader::LoadLC( R_CALLUI_CS_VOICE_CALL );
- data.iText.Copy( *menuItemText );
- break;
- }
-
- case ECSVideo:
- {
- data.iCommandId = ECallUIVideo;
- menuItemText = StringLoader::LoadLC( R_CALLUI_CS_VIDEO_CALL );
- data.iText.Copy( *menuItemText );
- break;
- }
-
- case EInternet:
- {
- data.iCommandId = ECallUIInternet;
- menuItemText = StringLoader::LoadLC( R_CALLUI_INTERNET_CALL );
- data.iText.Copy( *menuItemText );
- break;
- }
-
- case EInternetWithName:
- {
- data.iCommandId = ECallUIInternet;
-
- // Get the service provider name
- TBuf<100> buf;
- iCaUiEngine->GetVoipServiceNameL( aServiceId, buf );
- menuItemText = StringLoader::LoadLC( R_CALLUI_XSP_CALL_WITH_SERVICE_NAME, buf );
- data.iText.Copy( *menuItemText );
- break;
- }
-
- default:
- break;
- }
-
- if ( NULL != menuItemText )
- {
- CleanupStack::PopAndDestroy( menuItemText );
- }
-
- aMenuPane.AddMenuItemL(
- KAiwCmdCall,
- data,
- aIndex );
- }
-
-// End of file
--- a/phoneclientserver/dialutils/bwins/dialutilsu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- ?CreateDialUtilsFactoryL@@YAPAVCDialUtilsFactory@@XZ @ 1 NONAME ; class CDialUtilsFactory * CreateDialUtilsFactoryL(void)
-
--- a/phoneclientserver/dialutils/eabi/dialutilsu.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-EXPORTS
- _Z23CreateDialUtilsFactoryLv @ 1 NONAME
- _ZTI14CDialUtilsImpl @ 2 NONAME ; #<TI>#
- _ZTI18CDialUtilsFactImpl @ 3 NONAME ; #<TI>#
- _ZTV14CDialUtilsImpl @ 4 NONAME ; #<VT>#
- _ZTV18CDialUtilsFactImpl @ 5 NONAME ; #<VT>#
-
--- a/phoneclientserver/dialutils/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2004-2007 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: Build information specification for DialUtils.
-*
-*/
-
-
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-
-PRJ_EXPORTS
-// Domain
-
-../rom/dialutils_stub.sis /epoc32/data/z/system/install/dialutils_stub.sis
-
-PRJ_MMPFILES
-../group/dialutils.mmp
-
-
-// End of File
--- a/phoneclientserver/dialutils/group/dialutils.mmp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2007 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: Project specification for DialUtils.
-*
-*/
-
-#include <platform_paths.hrh>
-// Capability assignment.
-CAPABILITY CAP_GENERAL_DLL
-
-TARGET dialutils.dll
-TARGETTYPE dll
-UID 0x1000008d 0x101F8747
-VERSION 10.0
-
-SOURCEPATH ../src
-SOURCE dialutilsimpl.cpp
-SOURCE dialutilsfactimpl.cpp
-
-USERINCLUDE ../inc
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE ../../../inc
-
-LIBRARY euser.lib
-LIBRARY featmgr.lib
-LIBRARY commonengine.lib
-LIBRARY centralrepository.lib
-
-
-// End of file
--- a/phoneclientserver/dialutils/inc/dialutilsfactimpl.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2004 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 DialUtils factory interface.
-*
-*/
-
-
-
-#ifndef DIALUTILSFACTIMPL_H
-#define DIALUTILSFACTIMPL_H
-
-
-// INCLUDES
-#include <dialutils.h>
-
-
-/**
-* Implementation of the DialUtils factory.
-*
-* @lib DialUtils.lib
-* @since 2.6
-*/
-class CDialUtilsFactImpl
-: public CDialUtilsFactory
- {
- public:
-
- /**
- * @see CDialUtilsFactory::CDialUtilsApiLD.
- */
- CDialUtilsApi* CDialUtilsApiLD();
-
-
- private:
-
- /*
- * Destructor
- */
- ~CDialUtilsFactImpl();
- };
-
-
-#endif // DIALUTILSFACTIMPL_H
-
-
-// End of File
--- a/phoneclientserver/dialutils/inc/dialutilsimpl.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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 implementation for DialUtils.
-*
-*/
-
-
-#ifndef DIALUTILSIMPL_H
-#define DIALUTILSIMPL_H
-
-// INCLUDES
-#include <e32std.h>
-#include <dialutils.h>
-
-
-// FORWARD DECLARATIONS
-class RSharedDataClient;
-class CRepository;
-
-
-// CONSTANTS
-
-// The prefix text.
-typedef TBuf<10> TDiUtPrefixText;
-
-
-// CLASS DECLARATION
-
-/**
-* DialUtils implementation.
-*
-* @lib DialUtils.lib
-* @since 2.6
-*/
-class CDialUtilsImpl
-: public CDialUtilsApi
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- * @return an instance of DialUtilsImpl.
- */
- static CDialUtilsImpl* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CDialUtilsImpl();
-
-
- public: // New functions
-
- /**
- * Check and modify the phone number.
- *
- * @see CDialUtilsApi::CheckNumber.
- */
- TInt CheckNumber( HBufC& aPhoneNumber );
-
-
-
- private:
-
- /**
- * C++ default constructor.
- */
- CDialUtilsImpl();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- /**
- * Combine the given texts if needed.
- *
- * @param aPhoneNumber The number to be modified.
- * @param aPrefixText The prefixText to be added
- * to aPhoneNumber if needed.
- */
- TInt CombineTexts(
- TPtr aPhoneNumber,
- const TDiUtPrefixText& aPrefixText ) const;
-
-
- private: // Data
-
- // The shared data client.
- RSharedDataClient* iSharedDataClient;
-
- // The central repository.
- CRepository* iRepository;
- };
-
-#endif // DIALUTILSIMPL_H
-
-// End of file
--- a/phoneclientserver/dialutils/rom/dialutils_stub.pkg Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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: For packing DialUtils stub component.
-;
-; Languages
-&EN
-
-; Header
-#{"DialUtils"}, (0x101F8747), 1, 0, 0, TYPE=SA
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-""-"z:\sys\bin\DialUtils.dll"
-
Binary file phoneclientserver/dialutils/rom/dialutils_stub.sis has changed
--- a/phoneclientserver/dialutils/src/dialutilsfactimpl.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2004 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 DialUtils factory interface.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <dialutils.h>
-#include "dialutilsfactimpl.h"
-#include "dialutilsimpl.h"
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-// -----------------------------------------------------------------------------
-// CDialUtilsFactImpl::CDialUtilsApiLD
-//
-//
-// -----------------------------------------------------------------------------
-//
-CDialUtilsApi* CDialUtilsFactImpl::CDialUtilsApiLD()
- {
- CleanupStack::PushL( this );
-
- CDialUtilsImpl* dialutils = CDialUtilsImpl::NewL();
- CleanupStack::PopAndDestroy( this );
- return dialutils;
- }
-
-
-// -----------------------------------------------------------------------------
-// CDialUtilsFactImpl::~CDialUtilsFactImpl
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CDialUtilsFactImpl::~CDialUtilsFactImpl()
- {
- }
-
-
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// CreateDialUtilsFactoryL
-//
-// Creates DialUtilsFactory. This is only exported function.
-// Returns: CDialUtilsFactory*: DialUtils Factory instance.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CDialUtilsFactory* CreateDialUtilsFactoryL()
- {
- return new ( ELeave ) CDialUtilsFactImpl;
- }
-
-
-// End of File
--- a/phoneclientserver/dialutils/src/dialutilsimpl.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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 DialUtils.
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include <featmgr.h> // Feature Manager.
-#include "dialutilsimpl.h" // Interface.
-
-#include <centralrepository.h> // Central repository
-#include <settingsinternalcrkeys.h> // Settings Central Repository keys.
-
-// CONSTANTS
-
-// Prefix change Off. See SharedDataKeys.h and SettingsInternalCRKeys.h
-const TInt KDiUtPrefixChangeOff = 0;
-// Prefix change On. See SharedDataKeys.h and SettingsInternalCRKeys.h
-const TInt KDiUtPrefixChangeOn = 1;
-
-// International prefix.
-_LIT( KDiUtIntPrefix, "+" );
-// International prefix.
-_LIT( KDiUtJapanPrefix, "+81" );
-// Zero prefix.
-_LIT( KDiUtZeroPrefix, "0" );
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CDialUtilsImpl::CDialUtilsImpl
-//
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-CDialUtilsImpl::CDialUtilsImpl()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// CDialUtilsImpl::ConstructL
-//
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CDialUtilsImpl::ConstructL()
- {
- // Sets up TLS, must be done before FeatureManager is used.
- FeatureManager::InitializeLibL();
-
- iRepository = CRepository::NewL( KCRUidTelephonySettings );
- }
-
-
-// -----------------------------------------------------------------------------
-// CDialUtilsImpl::NewL
-//
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CDialUtilsImpl* CDialUtilsImpl::NewL()
- {
- CDialUtilsImpl* self = new( ELeave ) CDialUtilsImpl;
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop();
-
- return self;
- }
-
-
-// -----------------------------------------------------------------------------
-// CDialUtilsImpl::~CDialUtilsImpl
-//
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CDialUtilsImpl::~CDialUtilsImpl()
- {
- delete iRepository;
-
- // Frees the TLS! Must be done after FeatureManager is used.
- FeatureManager::UnInitializeLib();
- }
-
-
-
-// -----------------------------------------------------------------------------
-// CDialUtilsImpl::CheckNumber
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt CDialUtilsImpl::CheckNumber( HBufC& aPhoneNumber )
- {
- TInt err = KErrNone;
- TBool checkPrefix =
- FeatureManager::FeatureSupported( KFeatureIdJapanPrefixChange );
-
- if ( checkPrefix )
- {
- TInt prefixMode = KDiUtPrefixChangeOff; // Default: Off.
-
- if ( !err )
- {
- err = iRepository->Get(
- KSettingsDialPrefixChangeMode,
- prefixMode );
-
- if ( !err )
- {
- // Shared data information is ok, so act according to it.
- switch ( prefixMode )
- {
- case KDiUtPrefixChangeOff:
- {
- // Nothing needs to be done, so let the phone number to
- // be unchanged and just break.
- break;
- }
-
- case KDiUtPrefixChangeOn:
- {
- TDiUtPrefixText prefixText;
-
- err = iRepository->Get(
- KSettingsDialPrefixText,
- prefixText );
-
- if ( !err )
- {
- err = CombineTexts( aPhoneNumber.Des(), prefixText );
- }
- break;
- }
-
- default:
- // Should never happen, value is corrupted.
- err = KErrCorrupt;
- break;
- }
- }
- }
- }
- return err;
- }
-
-
-// -----------------------------------------------------------------------------
-// CDialUtilsImpl::CombineTexts
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt CDialUtilsImpl::CombineTexts(
- TPtr aPhoneNumber,
- const TDiUtPrefixText& aPrefixText ) const
- {
- TInt err = KErrNone;
-
- TInt beginning = 0; // The beginning for replacement.
- TInt replaceLength = 0; // The string length to be replaced.
- TInt location = KErrNotFound; // The location of searched string.
-
- // Try to find Japan prefix.
- location = aPhoneNumber.Find( KDiUtJapanPrefix );
- if ( location == beginning )
- {
- // The string was found, so make replacement.
- // Safe because zeroPrefix < KDiUtJapanPrefix.
- replaceLength = KDiUtJapanPrefix().Length();
- aPhoneNumber.Replace( beginning, replaceLength, KDiUtZeroPrefix );
- }
- else
- {
- // Try to find international prefix.
- location = aPhoneNumber.Find( KDiUtIntPrefix );
- if ( location == beginning )
- {
- replaceLength = KDiUtIntPrefix().Length();
- // The string was found, so try to make replacement.
- const TInt phoneNumLength = aPhoneNumber.Length();
- const TInt prefixLength = aPrefixText.Length();
-
- TInt stringLength =
- ( phoneNumLength + prefixLength - replaceLength );
-
- if ( aPhoneNumber.MaxLength() >= stringLength )
- {
- // There is enough space to make this replace.
- aPhoneNumber.Replace( beginning, replaceLength, aPrefixText );
- }
- else
- {
- // There is no space to combine the strings, so inform it.
- err = KErrOverflow;
- }
- }
- }
-
- return err;
- }
-
-
-// End of file
--- a/phoneclientserver/dialutils/src/dialutilsmain.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2004 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: Global functions for DialUtils.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32std.h>
-
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-
-// -----------------------------------------------------------------------------
-// E32Dll
-//
-// Returns always KErrNone.
-// -----------------------------------------------------------------------------
-//
-GLDEF_C TInt E32Dll( TDllReason )
- {
- return KErrNone;
- }
-
-// End of File
--- a/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/Bmarm/DialUtilsTestsU.DEF Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
- SetRequirements__FRP16CTestModuleParamRUl @ 2 NONAME R3UNUSED ; SetRequirements(CTestModuleParam *&, unsigned long &)
-
--- a/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/Bwins/DialUtilsTestsU.DEF Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- ?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
- ?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
-
--- a/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/EABI/DialUtilsTestsU.def Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- _Z9LibEntryLv @ 1 NONAME
- _Z15SetRequirementsRP16CTestModuleParamRm @ 2 NONAME
-
--- a/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/group/DialUtilsTests.mmp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2002 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: MMP file for DialUtilsTests component.
-*
-*/
-
-
-#if defined(__S60_)
- // To get the OS_LAYER_SYSTEMINCLUDE-definition
- #include <platform_paths.hrh>
-#endif
-#include <platform_paths.hrh>
-TARGET DialUtilsTests.dll
-TARGETTYPE dll
-UID 0x1000008D 0x101FB3E7
-
-CAPABILITY ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID 0x00000000
-/* Remove comments and replace 0x00000000 with correct secure id */
-// SECUREID 0x00000000
-
-//TARGETPATH ?target_path
-DEFFILE DialUtilsTests.def
-
-SOURCEPATH ../src
-SOURCE DialUtilsTests.cpp
-SOURCE DialUtilsTestsCases.cpp
-
-//RESOURCE resource_file
-//RESOURCE resource_file2
-
-USERINCLUDE ../inc
-
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
-
-LANG SC
-
-/*
-START WINS
-?wins_specific_information
-END
-
-START MARM
-?marm_specific_information
-END
-*/
-// Other possible keywords:
-
-// DOCUMENT ?file, that is not compiled, but added to MSVC project workspace (i.e. release notes)
-/*
-START BITMAP ?target
-TARGETPATH ?emulated_path_on_target_machine
-HEADER
-SOURCE ?color_depth ?source_bitmap
-END
-*/
-// DEFFILE ?filename
-// AIF ?filename// End of File
--- a/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2002 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: Build file for DialUtilsTests component.
-*
-*/
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-// Specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-// Example:
-/*
-/agnmodel/inc/AGMCOMON.H
-*/
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-DialUtilsTests.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
-
-
-// End of File
\ No newline at end of file
--- a/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/group/dialutilstests.pkg Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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:
-;
-
-&EN
-;
-;*Standard SIS file header. This section specifies the package name,
-;application UID, and version/build numbers. Add the package TYPE here if needed.
-#{"dialutilstests"},(0x101FB3E7),1,0,1;
-;
-
-;*Unique (Non-Localized) Vendor name
-;This is used in combination with signing to prevent the unauthroized
-;upgrade of a a package by someone other than the rightful vendor.
-:"Nokia"
-
-;*Localized Vendor Name
-;This specifies the localized vendor name(s) corresponding to language(s).
-%{"Nokia Test EN"}
-
-;*Files To Copy...<src> <destination>
-"\epoc32\release\armv5\urel\DialUtilsTests.dll"-"C:\sys\bin\DialUtilsTests.dll"
-
--- a/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/inc/DialUtilsTests.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,328 +0,0 @@
-/*
-* Copyright (c) 2002 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: DialUtilsTests test module.
-*
-*/
-
-
-
-#ifndef DIALUTILSTESTS_H
-#define DIALUTILSTESTS_H
-
-// INCLUDES
-#include "StifTestModule.h"
-#include <StifLogger.h>
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// Logging path
-_LIT( KDialUtilsTestsLogPath, "\\logs\\testframework\\DialUtilsTests\\" );
-// Log file
-_LIT( KDialUtilsTestsLogFile, "DialUtilsTests.txt" );
-
-
-#define GETPTR &
-#define ENTRY(str,func) {_S(str), GETPTR func,0,0,0}
-#define FUNCENTRY(func) {_S(#func), GETPTR func,0,0,0}
-#define OOM_ENTRY(str,func,a,b,c) {_S(str), GETPTR func,a,b,c}
-#define OOM_FUNCENTRY(func,a,b,c) {_S(#func), GETPTR func,a,b,c}
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-class CDialUtilsTests;
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-// A typedef for function that does the actual testing,
-// function is a type
-// TInt CDialUtilsTests::<NameOfFunction> ( TTestResult& aResult )
-typedef TInt (CDialUtilsTests::* TestFunction)(TTestResult&);
-
-// CLASS DECLARATION
-
-/**
-* An internal structure containing a test case name and
-* the pointer to function doing the test
-*
-* @lib ?library
-* @since ?Series60_version
-*/
-class TCaseInfoInternal
- {
- public:
- const TText* iCaseName;
- TestFunction iMethod;
- TBool iIsOOMTest;
- TInt iFirstMemoryAllocation;
- TInt iLastMemoryAllocation;
- };
-
-// CLASS DECLARATION
-
-/**
-* A structure containing a test case name and
-* the pointer to function doing the test
-*
-* @lib ?library
-* @since ?Series60_version
-*/
-class TCaseInfo
- {
- public:
- TPtrC iCaseName;
- TestFunction iMethod;
- TBool iIsOOMTest;
- TInt iFirstMemoryAllocation;
- TInt iLastMemoryAllocation;
-
- TCaseInfo( const TText* a ) : iCaseName( (TText*) a )
- {
- };
-
- };
-
-
-// CLASS DECLARATION
-
-/**
-* This a DialUtilsTests class.
-* ?other_description_lines
-*
-* @lib ?library
-* @since ?Series60_version
-*/
-NONSHARABLE_CLASS(CDialUtilsTests) : public CTestModuleBase
- {
- public: // Constructors and destructor
-
-
- /**
- * Two-phased constructor.
- */
- static CDialUtilsTests* NewL();
-
- /**
- * Destructor.
- */
- virtual ~CDialUtilsTests();
-
- public: // New functions
-
- /**
- * ?member_description.
- * @since ?Series60_version
- * @param ?arg1 ?description
- * @return ?description
- */
- //?type ?member_function( ?type ?arg1 );
-
- public: // Functions from base classes
-
- /**
- * From CTestModuleBase InitL is used to initialize the
- * DialUtilsTests. It is called once for every instance of
- * TestModuleDialUtilsTests after its creation.
- * @since ?Series60_version
- * @param aIniFile Initialization file for the test module (optional)
- * @param aFirstTime Flag is true when InitL is executed for first
- * created instance of DialUtilsTests.
- * @return Symbian OS error code
- */
- TInt InitL( TFileName& aIniFile, TBool aFirstTime );
-
- /**
- * From CTestModuleBase GetTestCasesL is used to inquiry test cases
- * from DialUtilsTests.
- * @since ?Series60_version
- * @param aTestCaseFile Test case file (optional)
- * @param aTestCases Array of TestCases returned to test framework
- * @return Symbian OS error code
- */
- TInt GetTestCasesL( const TFileName& aTestCaseFile,
- RPointerArray<TTestCaseInfo>& aTestCases );
-
- /**
- * From CTestModuleBase RunTestCaseL is used to run an individual
- * test case.
- * @since ?Series60_version
- * @param aCaseNumber Test case number
- * @param aTestCaseFile Test case file (optional)
- * @param aResult Test case result returned to test framework (PASS/FAIL)
- * @return Symbian OS error code (test case execution error, which is
- * not reported in aResult parameter as test case failure).
- */
- TInt RunTestCaseL( const TInt aCaseNumber,
- const TFileName& aTestCaseFile,
- TTestResult& aResult );
-
- /**
- * From CTestModuleBase; OOMTestQueryL is used to specify is particular
- * test case going to be executed using OOM conditions
- * @param aTestCaseFile Test case file (optional)
- * @param aCaseNumber Test case number (optional)
- * @param aFailureType OOM failure type (optional)
- * @param aFirstMemFailure The first heap memory allocation failure value (optional)
- * @param aLastMemFailure The last heap memory allocation failure value (optional)
- * @return TBool
- */
- virtual TBool OOMTestQueryL( const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */,
- TOOMFailureType& aFailureType,
- TInt& /* aFirstMemFailure */,
- TInt& /* aLastMemFailure */ );
-
- /**
- * From CTestModuleBase; OOMTestInitializeL may be used to initialize OOM
- * test environment
- * @param aTestCaseFile Test case file (optional)
- * @param aCaseNumber Test case number (optional)
- * @return None
- */
- virtual void OOMTestInitializeL( const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */ );
-
- /**
- * From CTestModuleBase; OOMHandleWarningL
- * @param aTestCaseFile Test case file (optional)
- * @param aCaseNumber Test case number (optional)
- * @param aFailNextValue FailNextValue for OOM test execution (optional)
- * @return None
- *
- * User may add implementation for OOM test warning handling. Usually no
- * implementation is required.
- */
- virtual void OOMHandleWarningL( const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */,
- TInt& /* aFailNextValue */);
-
- /**
- * From CTestModuleBase; OOMTestFinalizeL may be used to finalize OOM
- * test environment
- * @param aTestCaseFile Test case file (optional)
- * @param aCaseNumber Test case number (optional)
- * @return None
- *
- */
- virtual void OOMTestFinalizeL( const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */ );
-
- protected: // New functions
-
- /**
- * ?member_description.
- * @since ?Series60_version
- * @param ?arg1 ?description
- * @return ?description
- */
- //?type ?member_function( ?type ?arg1 );
-
- protected: // Functions from base classes
-
- /**
- * From ?base_class ?member_description
- */
- //?type ?member_function();
-
- private:
-
- /**
- * C++ default constructor.
- */
- CDialUtilsTests();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- // Prohibit copy constructor if not deriving from CBase.
- // ?classname( const ?classname& );
- // Prohibit assigment operator if not deriving from CBase.
- // ?classname& operator=( const ?classname& );
-
- /**
- * Function returning test case name and pointer to test case function.
- * @since ?Series60_version
- * @param aCaseNumber test case number
- * @return TCaseInfo
- */
- const TCaseInfo Case ( const TInt aCaseNumber ) const;
-
- /**
- * Actual Hardcoded test case functions are listed below.
- */
- //ADD NEW METHOD DEC HERE"
-
- /**
- * Printing test case.
- * @since ?Series60_version
- * @param aResult Test case result (PASS/FAIL)
- * @return Symbian OS error code (test case execution error
- * that is not returned as test case result in aResult)
- */
- TInt PrintTest( TTestResult& aResult );
-
- /**
- * Printing loop test case.
- * @since ?Series60_version
- * @param aResult Test case result (PASS/FAIL)
- * @return Symbian OS error code (test case execution error
- * that is not returned as test case result in aResult)
- */
- TInt LoopTest( TTestResult& aResult );
-
- TInt Create( TTestResult& aResult );
- TInt CheckNumber( TTestResult& aResult );
- public: // Data
- // ?one_line_short_description_of_data
- //?data_declaration;
-
- protected: // Data
- // ?one_line_short_description_of_data
- //?data_declaration;
-
- private: // Data
- // Pointer to test (function) to be executed
- TestFunction iMethod;
-
- // Pointer to logger
- CStifLogger * iLog;
-
- // ?one_line_short_description_of_data
- //?data_declaration;
-
- // Reserved pointer for future extension
- //TAny* iReserved;
-
- public: // Friend classes
- //?friend_class_declaration;
- protected: // Friend classes
- //?friend_class_declaration;
- private: // Friend classes
- //?friend_class_declaration;
-
- };
-
-#endif // DIALUTILSTESTS_H
-
-// End of File
\ No newline at end of file
--- a/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/src/DialUtilsTests.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,362 +0,0 @@
-/*
-* Copyright (c) 2002 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: DialUtilsTests class member functions
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "DialUtilsTests.h"
-
-// EXTERNAL DATA STRUCTURES
-//extern ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// ?function_name ?description.
-// ?description
-// Returns: ?value_1: ?description
-// ?value_n: ?description_line1
-// ?description_line2
-// -----------------------------------------------------------------------------
-//
-/*
-?type ?function_name(
- ?arg_type arg, // ?description
- ?arg_type arg) // ?description
- {
-
- ?code // ?comment
-
- // ?comment
- ?code
- }
-*/
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::CDialUtilsTests
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CDialUtilsTests::CDialUtilsTests()
- {
-
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::ConstructL
-// Symbian 2nd phase constructor can leave.
-//
-// Note: If OOM test case uses STIF Logger, then STIF Logger must be created
-// with static buffer size parameter (aStaticBufferSize). Otherwise Logger
-// allocates memory from heap and therefore causes error situations with OOM
-// testing. For more information about STIF Logger construction, see STIF Users
-// Guide.
-// -----------------------------------------------------------------------------
-//
-void CDialUtilsTests::ConstructL()
- {
- iLog = CStifLogger::NewL( KDialUtilsTestsLogPath,
- KDialUtilsTestsLogFile);
-
- // Sample how to use logging
- _LIT( KLogStart, "DialUtilsTests logging starts!" );
- iLog->Log( KLogStart );
-
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CDialUtilsTests* CDialUtilsTests::NewL()
- {
- CDialUtilsTests* self = new (ELeave) CDialUtilsTests;
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop();
-
- return self;
-
- }
-
-// Destructor
-CDialUtilsTests::~CDialUtilsTests()
- {
- delete iLog;
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::InitL
-// InitL is used to initialize the Test Module.
-// -----------------------------------------------------------------------------
-//
-TInt CDialUtilsTests::InitL(
- TFileName& /*aIniFile*/,
- TBool /*aFirstTime*/ )
- {
- return KErrNone;
-
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::GetTestCasesL
-// GetTestCases is used to inquire test cases from the Test Module. Test
-// cases are stored to array of test cases. The Test Framework will be
-// the owner of the data in the RPointerArray after GetTestCases return
-// and it does the memory deallocation.
-// -----------------------------------------------------------------------------
-//
-TInt CDialUtilsTests::GetTestCasesL(
- const TFileName& /*aConfig*/,
- RPointerArray<TTestCaseInfo>& aTestCases )
- {
-
- // Loop through all test cases and create new
- // TTestCaseInfo items and append items to aTestCase array
- for( TInt i = 0; Case(i).iMethod != NULL; i++ )
- {
-
- // Allocate new TTestCaseInfo from heap for a testcase definition.
- TTestCaseInfo* newCase = new( ELeave ) TTestCaseInfo();
-
- // PushL TTestCaseInfo to CleanupStack.
- CleanupStack::PushL( newCase );
-
- // Set number for the testcase.
- // When the testcase is run, this comes as a parameter to RunTestCaseL.
- newCase->iCaseNumber = i;
-
- // Set title for the test case. This is shown in UI to user.
- newCase->iTitle.Copy( Case(i).iCaseName );
-
- // Append TTestCaseInfo to the testcase array. After appended
- // successfully the TTestCaseInfo object is owned (and freed)
- // by the TestServer.
- User::LeaveIfError(aTestCases.Append ( newCase ) );
-
- // Pop TTestCaseInfo from the CleanupStack.
- CleanupStack::Pop( newCase );
-
- }
-
- return KErrNone;
-
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::RunTestCaseL
-// RunTestCaseL is used to run an individual test case specified
-// by aTestCase. Test cases that can be run may be requested from
-// Test Module by GetTestCases method before calling RunTestCase.
-// -----------------------------------------------------------------------------
-//
-TInt CDialUtilsTests::RunTestCaseL(
- const TInt aCaseNumber,
- const TFileName& /*aConfig*/,
- TTestResult& aResult )
- {
-
- // Return value
- TInt execStatus = KErrNone;
-
- // Get the pointer to test case function
- TCaseInfo tmp = Case ( aCaseNumber );
-
- _LIT( KLogStartTC, "Starting testcase [%S]" );
- iLog->Log( KLogStartTC, &tmp.iCaseName);
-
- // Check that case number was valid
- if ( tmp.iMethod != NULL )
- {
- // Valid case was found, call it via function pointer
- iMethod = tmp.iMethod;
- execStatus = ( this->*iMethod )( aResult );
- }
- else
- {
- // Valid case was not found, return error.
- execStatus = KErrNotFound;
- }
-
- // Return case execution status (not the result of the case execution)
- return execStatus;
-
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::OOMTestQueryL
-// Used to check if a particular test case should be run in OOM conditions and
-// which memory allocations should fail.
-// -----------------------------------------------------------------------------
-//
-TBool CDialUtilsTests::OOMTestQueryL(
- const TFileName& /* aTestCaseFile */,
- const TInt aCaseNumber,
- TOOMFailureType& /* aFailureType */,
- TInt& aFirstMemFailure,
- TInt& aLastMemFailure )
- {
- _LIT( KLogOOMTestQueryL, "CDialUtilsTests::OOMTestQueryL" );
- iLog->Log( KLogOOMTestQueryL );
-
- aFirstMemFailure = Case( aCaseNumber ).iFirstMemoryAllocation;
- aLastMemFailure = Case( aCaseNumber ).iLastMemoryAllocation;
-
- return Case( aCaseNumber ).iIsOOMTest;
-
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::OOMTestInitializeL
-// Used to perform the test environment setup for a particular OOM test case.
-// Test Modules may use the initialization file to read parameters for Test
-// Module initialization but they can also have their own configure file or
-// some other routine to initialize themselves.
-//
-// NOTE: User may add implementation for OOM test environment initialization.
-// Usually no implementation is required.
-// -----------------------------------------------------------------------------
-//
-void CDialUtilsTests::OOMTestInitializeL(
- const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */ )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::OOMHandleWarningL
-// In some cases the heap memory allocation should be skipped, either due to
-// problems in the OS code or components used by the code being tested, or even
-// inside the tested components which are implemented this way on purpose (by
-// design), so it is important to give the tester a way to bypass allocation
-// failures.
-//
-// NOTE: User may add implementation for OOM test warning handling. Usually no
-// implementation is required.
-// -----------------------------------------------------------------------------
-//
-void CDialUtilsTests::OOMHandleWarningL(
- const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */,
- TInt& /* aFailNextValue */ )
- {
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::OOMTestFinalizeL
-// Used to perform the test environment cleanup for a particular OOM test case.
-//
-// NOTE: User may add implementation for OOM test environment finalization.
-// Usually no implementation is required.
-// -----------------------------------------------------------------------------
-//
-void CDialUtilsTests::OOMTestFinalizeL(
- const TFileName& /* aTestCaseFile */,
- const TInt /* aCaseNumber */ )
- {
- }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point
-// Returns: CTestModuleBase*: Pointer to Test Module object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CTestModuleBase* LibEntryL()
- {
- return CDialUtilsTests::NewL();
-
- }
-
-// -----------------------------------------------------------------------------
-// SetRequirements handles test module parameters(implements evolution
-// version 1 for test module's heap and stack sizes configuring).
-// Returns: TInt: Symbian error code.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TInt SetRequirements( CTestModuleParam*& /*aTestModuleParam*/,
- TUint32& /*aParameterValid*/ )
- {
-
- /* --------------------------------- NOTE ---------------------------------
- USER PANICS occurs in test thread creation when:
- 1) "The panic occurs when the value of the stack size is negative."
- 2) "The panic occurs if the minimum heap size specified is less
- than KMinHeapSize".
- KMinHeapSize: "Functions that require a new heap to be allocated will
- either panic, or will reset the required heap size to this value if
- a smaller heap size is specified".
- 3) "The panic occurs if the minimum heap size specified is greater than
- the maximum size to which the heap can grow".
- Other:
- 1) Make sure that your hardware or Symbian OS is supporting given sizes.
- e.g. Hardware might support only sizes that are divisible by four.
- ------------------------------- NOTE end ------------------------------- */
-
- // Normally STIF uses default heap and stack sizes for test thread, see:
- // KTestThreadMinHeap, KTestThreadMinHeap and KStackSize.
- // If needed heap and stack sizes can be configured here by user. Remove
- // comments and define sizes.
-
-/*
- aParameterValid = KStifTestModuleParameterChanged;
-
- CTestModuleParamVer01* param = CTestModuleParamVer01::NewL();
- // Stack size
- param->iTestThreadStackSize= 16384; // 16K stack
- // Heap sizes
- param->iTestThreadMinHeap = 4096; // 4K heap min
- param->iTestThreadMaxHeap = 1048576;// 1M heap max
-
- aTestModuleParam = param;
-*/
- return KErrNone;
-
- }
-
-
-// End of File
--- a/phoneclientserver/dialutils/tsrc/public/basic/DialUtilsTests/src/DialUtilsTestsCases.cpp Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,390 +0,0 @@
-/*
-* Copyright (c) 2002 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 CDialUtilsTests class.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32math.h>
-#include "DialUtilsTests.h"
-
-#include <dialutils.h>
-
-// EXTERNAL DATA STRUCTURES
-//extern ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-// Ordinal of NewL in DialUtils.
-const TInt KPhoneDialUtilsNewLOrdinal = 1;
-
-const TInt KPhoneTelephoneNumberLength = 100; // 48 -> 100
-
-_LIT(KPhoneNumber1, "111");
-
-// The library to be loaded.
-_LIT( KDialUtilsLoadLib, "DialUtils.dll" );
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// ?function_name ?description.
-// ?description
-// Returns: ?value_1: ?description
-// ?value_n: ?description_line1
-// ?description_line2
-// -----------------------------------------------------------------------------
-//
-/*
-?type ?function_name(
- ?arg_type arg, // ?description
- ?arg_type arg) // ?description
- {
-
- ?code // ?comment
-
- // ?comment
- ?code
- }
-*/
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::Case
-// Returns a test case by number.
-//
-// This function contains an array of all available test cases
-// i.e pair of case name and test function. If case specified by parameter
-// aCaseNumber is found from array, then that item is returned.
-//
-// The reason for this rather complicated function is to specify all the
-// test cases only in one place. It is not necessary to understand how
-// function pointers to class member functions works when adding new test
-// cases. See function body for instructions how to add new test case.
-// -----------------------------------------------------------------------------
-//
-const TCaseInfo CDialUtilsTests::Case (
- const TInt aCaseNumber ) const
- {
-
- /**
- * To add new test cases, implement new test case function and add new
- * line to KCases array specify the name of the case and the function
- * doing the test case
- * In practice, do following
- * 1) Make copy of existing test case function and change its name
- * and functionality. Note that the function must be added to
- * DialUtilsTests.cpp file and to DialUtilsTests.h
- * header file.
- *
- * 2) Add entry to following KCases array either by using:
- *
- * 2.1: FUNCENTRY or ENTRY macro
- * ENTRY macro takes two parameters: test case name and test case
- * function name.
- *
- * FUNCENTRY macro takes only test case function name as a parameter and
- * uses that as a test case name and test case function name.
- *
- * Or
- *
- * 2.2: OOM_FUNCENTRY or OOM_ENTRY macro. Note that these macros are used
- * only with OOM (Out-Of-Memory) testing!
- *
- * OOM_ENTRY macro takes five parameters: test case name, test case
- * function name, TBool which specifies is method supposed to be run using
- * OOM conditions, TInt value for first heap memory allocation failure and
- * TInt value for last heap memory allocation failure.
- *
- * OOM_FUNCENTRY macro takes test case function name as a parameter and uses
- * that as a test case name, TBool which specifies is method supposed to be
- * run using OOM conditions, TInt value for first heap memory allocation
- * failure and TInt value for last heap memory allocation failure.
- */
-
- static TCaseInfoInternal const KCases[] =
- {
- // To add new test cases, add new items to this array
-
- // NOTE: When compiled to GCCE, there must be Classname::
- // declaration in front of the method name, e.g.
- // CDialUtilsTests::PrintTest. Otherwise the compiler
- // gives errors.
-
- //FUNCENTRY( CDialUtilsTests::PrintTest ),
- //ENTRY( "Loop test", CDialUtilsTests::LoopTest ),
- ENTRY( "CDialUtilsApiLD", Create ),
- ENTRY( "CheckNumber", CheckNumber ),
- // Example how to use OOM functionality
- //OOM_ENTRY( "Loop test with OOM", CDialUtilsTests::LoopTest, ETrue, 2, 3),
- //OOM_FUNCENTRY( CDialUtilsTests::PrintTest, ETrue, 1, 3 ),
- };
-
- // Verify that case number is valid
- if( (TUint) aCaseNumber >= sizeof( KCases ) /
- sizeof( TCaseInfoInternal ) )
- {
- // Invalid case, construct empty object
- TCaseInfo null( (const TText*) L"" );
- null.iMethod = NULL;
- null.iIsOOMTest = EFalse;
- null.iFirstMemoryAllocation = 0;
- null.iLastMemoryAllocation = 0;
- return null;
- }
-
- // Construct TCaseInfo object and return it
- TCaseInfo tmp ( KCases[ aCaseNumber ].iCaseName );
- tmp.iMethod = KCases[ aCaseNumber ].iMethod;
- tmp.iIsOOMTest = KCases[ aCaseNumber ].iIsOOMTest;
- tmp.iFirstMemoryAllocation = KCases[ aCaseNumber ].iFirstMemoryAllocation;
- tmp.iLastMemoryAllocation = KCases[ aCaseNumber ].iLastMemoryAllocation;
- return tmp;
-
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::PrintTest
-// Simple printing to UI test.
-// -----------------------------------------------------------------------------
-//
-TInt CDialUtilsTests::PrintTest(
- TTestResult& aResult )
- {
- /* Simple print test */
- _LIT( KPrintTest, "PrintTest" );
- _LIT( KEnter, "Enter" );
- _LIT( KOnGoing, "On-going" );
- _LIT( KExit, "Exit" );
-
- TestModuleIf().Printf( 0, KPrintTest, KEnter );
-
- TestModuleIf().Printf( 1, KPrintTest, KOnGoing );
-
- TestModuleIf().Printf( 0, KPrintTest, KExit );
-
- // Test case passed
-
- // Sets test case result and description(Maximum size is KStifMaxResultDes)
- _LIT( KDescription, "PrintTest passed" );
- aResult.SetResult( KErrNone, KDescription );
-
- // Case was executed
- return KErrNone;
-
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::LoopTest
-// Another printing to UI test.
-// -----------------------------------------------------------------------------
-//
-TInt CDialUtilsTests::LoopTest( TTestResult& aResult )
- {
-
- /* Simple print and wait loop */
- _LIT( KState, "State" );
- _LIT( KLooping, "Looping" );
-
- TestModuleIf().Printf( 0, KState, KLooping );
-
- _LIT( KRunning, "Running" );
- _LIT( KLoop, "%d" );
- for( TInt i=0; i<10; i++)
- {
- TestModuleIf().Printf( 1, KRunning, KLoop, i);
- User::After( 1000000 );
- }
-
- _LIT( KFinished, "Finished" );
- TestModuleIf().Printf( 0, KState, KFinished );
-
- // Test case passed
-
- // Sets test case result and description(Maximum size is KStifMaxResultDes)
- _LIT( KDescription, "LoopTest passed" );
- aResult.SetResult( KErrNone, KDescription );
-
- // Case was executed
- return KErrNone;
-
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::Create
-// -----------------------------------------------------------------------------
-//
-TInt CDialUtilsTests::Create( TTestResult& aResult )
- {
- __UHEAP_MARK;
-
- //Owned DialUtilities library.
- CDialUtilsApi* dialUtils;
-
- // Library loader.
- RLibrary iLibrary;
-
- TInt error = iLibrary.Load( KDialUtilsLoadLib );
-
- if ( !error )
- {
- // Call function CreateDialUtilsFactoryL()
- TInt res = iLibrary.Lookup( KPhoneDialUtilsNewLOrdinal )();
-
- CDialUtilsFactory * dialUtilsFactory =
- reinterpret_cast< CDialUtilsFactory * >( res );
-
- if ( res )
- {
- dialUtils = dialUtilsFactory->CDialUtilsApiLD();
- }
-
- if ( dialUtils )
- {
- delete dialUtils;
- iLibrary.Close();
- }
-
- }
- __UHEAP_MARKEND;
-
-
- // Sets test case result and description(Maximum size is KStifMaxResultDes)
- _LIT( KDescription, "Create done" );
- aResult.SetResult( KErrNone, KDescription );
-
- // Case was executed
- return KErrNone;
-
- }
-
-// -----------------------------------------------------------------------------
-// CDialUtilsTests::CheckNumber
-// -----------------------------------------------------------------------------
-//
-TInt CDialUtilsTests::CheckNumber( TTestResult& aResult )
- {
- __UHEAP_MARK;
-
- //Owned DialUtilities library.
- CDialUtilsApi* dialUtils;
-
- // Library loader.
- RLibrary iLibrary;
-
- TInt error = iLibrary.Load( KDialUtilsLoadLib );
-
- if ( !error )
- {
- // Call function CreateDialUtilsFactoryL()
- TInt res = iLibrary.Lookup( KPhoneDialUtilsNewLOrdinal )();
-
- CDialUtilsFactory * dialUtilsFactory =
- reinterpret_cast< CDialUtilsFactory * >( res );
-
- if ( res )
- {
- dialUtils = dialUtilsFactory->CDialUtilsApiLD();
- }
-
- if ( dialUtils )
- {
- HBufC* number = HBufC::New( KPhoneTelephoneNumberLength );
-
- //If allocation succeeds, send number to Dial Utils.
- if ( number )
- {
- *number = KPhoneNumber1;
- TInt err = dialUtils->CheckNumber( *number );
- }
- delete number;
- }
-
- if ( dialUtils )
- {
- delete dialUtils;
- iLibrary.Close();
- }
- }
- __UHEAP_MARKEND;
- // Sets test case result and description(Maximum size is KStifMaxResultDes)
- _LIT( KDescription, "Create done" );
- aResult.SetResult( KErrNone, KDescription );
-
- // Case was executed
- return KErrNone;
-
- }
-
-
-// -----------------------------------------------------------------------------
-// ?classname::?member_function
-// ?implementation_description
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-/*
-?type ?classname::?member_function(
- ?arg_type arg,
- ?arg_type arg )
- {
-
- ?code
-
- }
-*/
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ?function_name implements...
-// ?implementation_description.
-// Returns: ?value_1: ?description
-// ?value_n: ?description
-// ?description
-// -----------------------------------------------------------------------------
-//
-/*
-?type ?function_name(
- ?arg_type arg, // ?description
- ?arg_type arg ) // ?description
- {
-
- ?code
-
- }
-*/
-// End of File
--- a/phoneclientserver/dialutils/tsrc/public/basic/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2002 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: Build file for DialUtilsTests component.
-*
-*/
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-
-PRJ_TESTMMPFILES
-../DialUtilsTests/group/DialUtilsTests.mmp
-
-PRJ_MMPFILES
-
-
-
-// End of File
\ No newline at end of file
--- a/phoneclientserver/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ b/phoneclientserver/group/bld.inf Mon Oct 04 15:57:13 2010 +0300
@@ -18,7 +18,6 @@
#include "../enpolicy/group/bld.inf"
#include "../aiwdialdata/group/bld.inf"
-#include "../dialutils/group/bld.inf"
#include "../phoneclient/group/bld.inf"
#include "../phoneserver/group/bld.inf"
--- a/phoneclientserver/inc/cphcltextphonedialdata.h Fri Sep 17 17:09:13 2010 +0300
+++ b/phoneclientserver/inc/cphcltextphonedialdata.h Mon Oct 04 15:57:13 2010 +0300
@@ -185,28 +185,28 @@
* @since Series 60 3.2
* @return Returns the allow match setting information.
*/
- IMPORT_C TBool AllowMatch() const;
+ TBool AllowMatch() const;
/**
* Bearer capability.
* @since Series 60 3.2
* @return Returns bearer capability.
*/
- IMPORT_C const TPhCltBearerCapability& Bearer() const;
+ const TPhCltBearerCapability& Bearer() const;
/**
* Gives the current call type.
* @since Series 60 3.2
* @return Current call type.
*/
- IMPORT_C TPhCltCallType CallType() const ;
+ TPhCltCallType CallType() const ;
/**
* Contact link field.
* @since Series 60 3.2
* @return Returns contack link item.
*/
- IMPORT_C const TDesC8& ContactLink() const;
+ const TDesC8& ContactLink() const;
/**
@@ -215,21 +215,21 @@
* @return Returns ETrue if other calls will be terminated.
* EFalse if calls are not terminated.
*/
- IMPORT_C TBool EndOtherCalls() const;
+ TBool EndOtherCalls() const;
/**
* Intiate Call
* @since Series 60 3.2
* @return Returns ETrue if call is itiate call EFalse otherwise
*/
- IMPORT_C TBool InitiateCall() const;
+ TBool InitiateCall() const;
/**
* Name.
* @since Series 60 3.2
* @return Returns name.
*/
- IMPORT_C const TPhCltNameBuffer& Name() const;
+ const TPhCltNameBuffer& Name() const;
/**
@@ -237,14 +237,14 @@
* @since Series 60 3.2
* @return Return the redial status,
*/
- IMPORT_C TInt Redial() const;
+ TInt Redial() const;
/**
* Redial maximum duration
* @since Series 60 3.2
* @return Returns redial max duration.
*/
- IMPORT_C const TTimeIntervalSeconds RedialMaximumDuration() const;
+ const TTimeIntervalSeconds RedialMaximumDuration() const;
/**
@@ -259,49 +259,49 @@
* @since Series 60 3.2
* @return Returns ETrue if SAT call EFalse if not.
*/
- IMPORT_C TBool SATCall() const;
+ TBool SATCall() const;
/**
* SendKey pressed.
* @since Series 60 3.2
* @return Return ETrue if SendKey used.
*/
- IMPORT_C TBool SendKeyPressed() const;
+ TBool SendKeyPressed() const;
/**
* Show Number.
* @since Series 60 3.2
* @return Returns the number visibility.
*/
- IMPORT_C TBool ShowNumber() const;
+ TBool ShowNumber() const;
/**
* Sub address.
* @since Series 60 3.2
* @return Returns SAT call sub address.
*/
- IMPORT_C const TPhCltSubAddress& SubAddress() const;
+ const TPhCltSubAddress& SubAddress() const;
/**
* Gives the current phone number.
* @since Series 60 3.2
* @return Telephone number.
*/
- IMPORT_C const TPhCltTelephoneNumber& TelephoneNumber() const;
+ const TPhCltTelephoneNumber& TelephoneNumber() const;
/**
* Gives the current window group id.
* @since Series 60 3.2
* @return Window group id.
*/
- IMPORT_C TInt WindowGroup() const;
+ TInt WindowGroup() const;
/**
* Gives the user to user information.
* @since S60 v3.2
* @return User to user information.
*/
- IMPORT_C const TDesC& UUI() const;
+ const TDesC& UUI() const;
public: // Access - Setters
@@ -314,7 +314,7 @@
*
* @param aAllowMatch Whether to allow matches.
*/
- IMPORT_C void SetAllowMatch( TBool aAllowMatch );
+ void SetAllowMatch( TBool aAllowMatch );
/**
* Set the bearer capability.
@@ -322,21 +322,21 @@
* @param aBearer The bearer capabilities as defined in GSM 04.08.
* @leaves KErrArgument if aBearer's length is longer than KAiwBearerLength
*/
- IMPORT_C void SetBearerL( const TPhCltBearerCapability& aBearer );
+ void SetBearerL( const TPhCltBearerCapability& aBearer );
/**
* Sets call type.
* @since Series 60 3.2
* @param aCallType calls' type.
*/
- IMPORT_C void SetCallType( TPhCltCallType aCallType );
+ void SetCallType( TPhCltCallType aCallType );
/**
* Set contact link.
* @since Series 60 3.2
* @param aContactLink Contact link information.
*/
- IMPORT_C void SetContactLinkL( const TDesC8& aContactLink );
+ void SetContactLinkL( const TDesC8& aContactLink );
/**
@@ -346,14 +346,14 @@
* dial. Default is EFalse.
* @param aEndCalls Are the other calls ended.
*/
- IMPORT_C void SetEndOtherCalls( TBool aEndCalls );
+ void SetEndOtherCalls( TBool aEndCalls );
/**
* Set Initiate call Etrue or EFalse
*@since Series 60 3.2
* @param aInitCall ETrue if call is intiate call
*/
- IMPORT_C void SetInitiateCall( TBool aInitCall );
+ void SetInitiateCall( TBool aInitCall );
/**
@@ -362,7 +362,7 @@
* @param aName The name of the person being called.
* @leaves KErrArgument if aName length is over 50 characters.
*/
- IMPORT_C void SetNameL( const TPhCltNameBuffer& aName );
+ void SetNameL( const TPhCltNameBuffer& aName );
/**
@@ -370,23 +370,21 @@
* @since Series 60 3.2
* @param aRedial The new redial status
*/
-
- IMPORT_C void SetRedial( TInt aRedial );
+ void SetRedial( TInt aRedial );
/**
* Set redial max duration.
* @since Series 60 3.2
* @param aDuration redial max duration.
*/
- IMPORT_C void SetRedialMaximumDuration( TTimeIntervalSeconds aMaximumRedialDuration );
-
+ void SetRedialMaximumDuration( TTimeIntervalSeconds aMaximumRedialDuration );
/**
* Set whether to return to number entry.
*
* @param aReturn Whether to return to the number entry editor.
*/
- IMPORT_C void SetReturnToNumberEntryOnFailure( TBool aReturn );
+ void SetReturnToNumberEntryOnFailure( TBool aReturn );
/**
* Set wheteher this is a SAT originated call or not.
@@ -395,7 +393,7 @@
* @since Series 60 3.2
* @param aSATCall ETrue if SAT originated the call, EFalse otherwise.
*/
- IMPORT_C void SetSATCall( TBool aSATCall );
+ void SetSATCall( TBool aSATCall );
/**
@@ -403,7 +401,7 @@
* @since Series 60 3.2
* @param aSendKey The value of SendKey.
*/
- IMPORT_C void SetSendKeyPressed( TBool aSendKey );
+ void SetSendKeyPressed( TBool aSendKey );
/**
* Set the number visibility in the phone app.
@@ -412,7 +410,7 @@
* log event.
* @param aShowNumber Whether or not to show the number.
*/
- IMPORT_C void SetShowNumber( TBool aShowNumber );
+ void SetShowNumber( TBool aShowNumber );
/**
* Set the calling party subaddress.
@@ -422,7 +420,7 @@
* @leaves KErrArgument if aSubAddress length is longer than
* KAiwSubAddressLength
*/
- IMPORT_C void SetSubAddressL( const TPhCltSubAddress& aSubAddress );
+ void SetSubAddressL( const TPhCltSubAddress& aSubAddress );
/**
* Sets the phone number.
@@ -431,14 +429,14 @@
* KMaximumPhoneNumberLength.
* @leaves KErrArgument if aPhoneNumber length is over KMaximumPhoneNumberLength
*/
- IMPORT_C void SetTelephoneNumber( const TPhCltTelephoneNumber& aNumber );
+ void SetTelephoneNumber( const TPhCltTelephoneNumber& aNumber );
/**
* Sets the window group identifier. When call is ended, set window group is actived.
* @since Series 60 3.2
* @param aWindowGroup Window group id.
*/
- IMPORT_C void SetWindowGroup( TInt aWindowGroup );
+ void SetWindowGroup( TInt aWindowGroup );
/**
* Set the value of xSP Service Id.
@@ -461,11 +459,7 @@
* @param aUUI User to user information.
* @since S60 v3.2
*/
- IMPORT_C void SetUUIL( const TDesC& aUUI );
-
-
-
-
+ void SetUUIL( const TDesC& aUUI );
// Constructors
Binary file phoneclientserver/phoneclient/conf/ci_telephonyservices.confml has changed
Binary file phoneclientserver/phoneclient/conf/telephonyservices.confml has changed
--- a/phoneclientserver/phoneclient/inc/extcall/extcall_aiw/cphcltextphonedialdata.h Fri Sep 17 17:09:13 2010 +0300
+++ b/phoneclientserver/phoneclient/inc/extcall/extcall_aiw/cphcltextphonedialdata.h Mon Oct 04 15:57:13 2010 +0300
@@ -185,28 +185,28 @@
* @since Series 60 3.2
* @return Returns the allow match setting information.
*/
- IMPORT_C TBool AllowMatch() const;
+ TBool AllowMatch() const;
/**
* Bearer capability.
* @since Series 60 3.2
* @return Returns bearer capability.
*/
- IMPORT_C const TPhCltBearerCapability& Bearer() const;
+ const TPhCltBearerCapability& Bearer() const;
/**
* Gives the current call type.
* @since Series 60 3.2
* @return Current call type.
*/
- IMPORT_C TPhCltCallType CallType() const ;
+ TPhCltCallType CallType() const ;
/**
* Contact link field.
* @since Series 60 3.2
* @return Returns contack link item.
*/
- IMPORT_C const TDesC8& ContactLink() const;
+ const TDesC8& ContactLink() const;
/**
@@ -215,21 +215,21 @@
* @return Returns ETrue if other calls will be terminated.
* EFalse if calls are not terminated.
*/
- IMPORT_C TBool EndOtherCalls() const;
+ TBool EndOtherCalls() const;
/**
* Intiate Call
* @since Series 60 3.2
* @return Returns ETrue if call is itiate call EFalse otherwise
*/
- IMPORT_C TBool InitiateCall() const;
+ TBool InitiateCall() const;
/**
* Name.
* @since Series 60 3.2
* @return Returns name.
*/
- IMPORT_C const TPhCltNameBuffer& Name() const;
+ const TPhCltNameBuffer& Name() const;
/**
@@ -237,14 +237,14 @@
* @since Series 60 3.2
* @return Return the redial status,
*/
- IMPORT_C TInt Redial() const;
+ TInt Redial() const;
/**
* Redial maximum duration
* @since Series 60 3.2
* @return Returns redial max duration.
*/
- IMPORT_C const TTimeIntervalSeconds RedialMaximumDuration() const;
+ const TTimeIntervalSeconds RedialMaximumDuration() const;
/**
@@ -259,49 +259,49 @@
* @since Series 60 3.2
* @return Returns ETrue if SAT call EFalse if not.
*/
- IMPORT_C TBool SATCall() const;
+ TBool SATCall() const;
/**
* SendKey pressed.
* @since Series 60 3.2
* @return Return ETrue if SendKey used.
*/
- IMPORT_C TBool SendKeyPressed() const;
+ TBool SendKeyPressed() const;
/**
* Show Number.
* @since Series 60 3.2
* @return Returns the number visibility.
*/
- IMPORT_C TBool ShowNumber() const;
+ TBool ShowNumber() const;
/**
* Sub address.
* @since Series 60 3.2
* @return Returns SAT call sub address.
*/
- IMPORT_C const TPhCltSubAddress& SubAddress() const;
+ const TPhCltSubAddress& SubAddress() const;
/**
* Gives the current phone number.
* @since Series 60 3.2
* @return Telephone number.
*/
- IMPORT_C const TPhCltTelephoneNumber& TelephoneNumber() const;
+ const TPhCltTelephoneNumber& TelephoneNumber() const;
/**
* Gives the current window group id.
* @since Series 60 3.2
* @return Window group id.
*/
- IMPORT_C TInt WindowGroup() const;
+ TInt WindowGroup() const;
/**
* Gives the user to user information.
* @since S60 v3.2
* @return User to user information.
*/
- IMPORT_C const TDesC& UUI() const;
+ const TDesC& UUI() const;
public: // Access - Setters
@@ -314,7 +314,7 @@
*
* @param aAllowMatch Whether to allow matches.
*/
- IMPORT_C void SetAllowMatch( TBool aAllowMatch );
+ void SetAllowMatch( TBool aAllowMatch );
/**
* Set the bearer capability.
@@ -322,21 +322,21 @@
* @param aBearer The bearer capabilities as defined in GSM 04.08.
* @leaves KErrArgument if aBearer's length is longer than KAiwBearerLength
*/
- IMPORT_C void SetBearerL( const TPhCltBearerCapability& aBearer );
+ void SetBearerL( const TPhCltBearerCapability& aBearer );
/**
* Sets call type.
* @since Series 60 3.2
* @param aCallType calls' type.
*/
- IMPORT_C void SetCallType( TPhCltCallType aCallType );
+ void SetCallType( TPhCltCallType aCallType );
/**
* Set contact link.
* @since Series 60 3.2
* @param aContactLink Contact link information.
*/
- IMPORT_C void SetContactLinkL( const TDesC8& aContactLink );
+ void SetContactLinkL( const TDesC8& aContactLink );
/**
@@ -346,14 +346,14 @@
* dial. Default is EFalse.
* @param aEndCalls Are the other calls ended.
*/
- IMPORT_C void SetEndOtherCalls( TBool aEndCalls );
+ void SetEndOtherCalls( TBool aEndCalls );
/**
* Set Initiate call Etrue or EFalse
*@since Series 60 3.2
* @param aInitCall ETrue if call is intiate call
*/
- IMPORT_C void SetInitiateCall( TBool aInitCall );
+ void SetInitiateCall( TBool aInitCall );
/**
@@ -362,7 +362,7 @@
* @param aName The name of the person being called.
* @leaves KErrArgument if aName length is over 50 characters.
*/
- IMPORT_C void SetNameL( const TPhCltNameBuffer& aName );
+ void SetNameL( const TPhCltNameBuffer& aName );
/**
@@ -370,23 +370,21 @@
* @since Series 60 3.2
* @param aRedial The new redial status
*/
-
- IMPORT_C void SetRedial( TInt aRedial );
+ void SetRedial( TInt aRedial );
/**
* Set redial max duration.
* @since Series 60 3.2
* @param aDuration redial max duration.
*/
- IMPORT_C void SetRedialMaximumDuration( TTimeIntervalSeconds aMaximumRedialDuration );
-
+ void SetRedialMaximumDuration( TTimeIntervalSeconds aMaximumRedialDuration );
/**
* Set whether to return to number entry.
*
* @param aReturn Whether to return to the number entry editor.
*/
- IMPORT_C void SetReturnToNumberEntryOnFailure( TBool aReturn );
+ void SetReturnToNumberEntryOnFailure( TBool aReturn );
/**
* Set wheteher this is a SAT originated call or not.
@@ -395,7 +393,7 @@
* @since Series 60 3.2
* @param aSATCall ETrue if SAT originated the call, EFalse otherwise.
*/
- IMPORT_C void SetSATCall( TBool aSATCall );
+ void SetSATCall( TBool aSATCall );
/**
@@ -403,7 +401,7 @@
* @since Series 60 3.2
* @param aSendKey The value of SendKey.
*/
- IMPORT_C void SetSendKeyPressed( TBool aSendKey );
+ void SetSendKeyPressed( TBool aSendKey );
/**
* Set the number visibility in the phone app.
@@ -412,7 +410,7 @@
* log event.
* @param aShowNumber Whether or not to show the number.
*/
- IMPORT_C void SetShowNumber( TBool aShowNumber );
+ void SetShowNumber( TBool aShowNumber );
/**
* Set the calling party subaddress.
@@ -422,7 +420,7 @@
* @leaves KErrArgument if aSubAddress length is longer than
* KAiwSubAddressLength
*/
- IMPORT_C void SetSubAddressL( const TPhCltSubAddress& aSubAddress );
+ void SetSubAddressL( const TPhCltSubAddress& aSubAddress );
/**
* Sets the phone number.
@@ -431,14 +429,14 @@
* KMaximumPhoneNumberLength.
* @leaves KErrArgument if aPhoneNumber length is over KMaximumPhoneNumberLength
*/
- IMPORT_C void SetTelephoneNumber( const TPhCltTelephoneNumber& aNumber );
+ void SetTelephoneNumber( const TPhCltTelephoneNumber& aNumber );
/**
* Sets the window group identifier. When call is ended, set window group is actived.
* @since Series 60 3.2
* @param aWindowGroup Window group id.
*/
- IMPORT_C void SetWindowGroup( TInt aWindowGroup );
+ void SetWindowGroup( TInt aWindowGroup );
/**
* Set the value of xSP Service Id.
@@ -461,11 +459,7 @@
* @param aUUI User to user information.
* @since S60 v3.2
*/
- IMPORT_C void SetUUIL( const TDesC& aUUI );
-
-
-
-
+ void SetUUIL( const TDesC& aUUI );
// Constructors
--- a/phoneclientserver/phoneclient/src/ussdwrapper/cphcltussdnotecontroller.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/phoneclientserver/phoneclient/src/ussdwrapper/cphcltussdnotecontroller.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -172,7 +172,6 @@
//CHbDeviceProgressDialogSymbian
iGlobalWaitNote = CHbDeviceProgressDialogSymbian::NewL(
CHbDeviceProgressDialogSymbian::EProgressDialog );
- CleanupStack::PushL( iGlobalWaitNote );
HBufC* context = HbTextResolverSymbian::LoadLC( KUssdRequesting );
iGlobalWaitNote->SetTextL( context->Des() );
HBufC* bottonText = HbTextResolverSymbian::LoadLC( KUssdHide );
@@ -186,7 +185,6 @@
TFLOGSTRING("CPhCltUssdNoteController: ShowGlobalWaitNoteL after ShowL")
CleanupStack::PopAndDestroy( bottonText );
CleanupStack::PopAndDestroy( context );
- CleanupStack::Pop( iGlobalWaitNote );
TFLOGSTRING("CPhCltUssdNoteController: ShowGlobalWaitNoteL after setactive")
TFLOGSTRING("CPhCltUssdNoteController: ShowGlobalWaitNoteL exit")
}
--- a/phoneclientserver/phoneserver/src/ussd/cphsrvussdmanager.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/phoneclientserver/phoneserver/src/ussd/cphsrvussdmanager.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -1299,7 +1299,7 @@
// -----------------------------------------------------------------------------
//
void CPhSrvUssdManager::MessageBoxClosed(
- const CHbDeviceMessageBoxSymbian* aMessageBox,
+ const CHbDeviceMessageBoxSymbian* /*aMessageBox*/,
CHbDeviceMessageBoxSymbian::TButtonId aButton)
{
_DPRINT( 4, "PhSrv.MsgClose.Start" );
--- a/phonesrv_plat/call_information_api/tsrc/run_auto_tests.bat Fri Sep 17 17:09:13 2010 +0300
+++ b/phonesrv_plat/call_information_api/tsrc/run_auto_tests.bat Mon Oct 04 15:57:13 2010 +0300
@@ -147,7 +147,7 @@
call cd %1\group
call sbs --config winscw_udeb.test --keepgoing CLEAN
if [%INSTRUMENT%] EQU [TRUE] (
-call ctcwrap -2comp -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
) else (
call %SBS_CALL%
)
@@ -187,7 +187,7 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::
:CALCULATECOVERAGE
echo Calculating coverage
-ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym -p - | ctcmerge -i - -o profile.txt
call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
goto end
--- a/phonesrv_plat/call_remote_party_information_api/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ b/phonesrv_plat/call_remote_party_information_api/group/bld.inf Mon Oct 04 15:57:13 2010 +0300
@@ -27,5 +27,6 @@
../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)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonesrv_plat/call_remote_party_information_api/inc/xqcallremotepartyinfo.h Mon Oct 04 15:57:13 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 "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
--- a/phonesrv_plat/callui_reconnect_query_api/callui_reconnect_query_api.metaxml Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" ?>
-<api id="6f32967a8971f50379a5af918d2ac9ed" dataversion="1.0">
-<name>CallUI Reconnect Query API</name>
-<description>An interface for showing reconnect query in case of unsuccessfull dial request.</description>
-<type>c++</type>
-<subsystem>phoneclientserver</subsystem>
-<libs><lib name="CaUiEngine.lib"/>
-</libs>
-<release category="domain" sinceversion="5.0"/>
-<attributes>
-<htmldocprovided>no</htmldocprovided>
-<adaptation>no</adaptation>
-</attributes>
-</api>
--- a/phonesrv_plat/callui_reconnect_query_api/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2007 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: File that exports the files belonging to
-: Call Ui Reconnect Query API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/ccauireconnectquery.h MW_LAYER_PLATFORM_EXPORT_PATH(ccauireconnectquery.h)
-../inc/mcauireconnectqueryobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(mcauireconnectqueryobserver.h)
--- a/phonesrv_plat/callui_reconnect_query_api/inc/ccauireconnectquery.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* Copyright (c) 2007 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: Shows the reconnect query used in CallUI.
-*
-*/
-
-
-#ifndef CCAUIRECONNECTQUERY_H
-#define CCAUIRECONNECTQUERY_H
-
-// INCLUDES
-#include <e32base.h>
-
-// FORWARD DECLARATIONS
-class MCaUiReconnectQueryObserver;
-
-
-// CLASS DECLARATION
-class CCaUiReconnectQuery : public CBase
- {
- public: // Constructors and destructor
-
- /**
- * Create an instance that implements the interface.
- *
- * @param aObserver It is the observer for the instance.
- * @return Returns the created instance.
- */
- IMPORT_C static CCaUiReconnectQuery* NewL(
- MCaUiReconnectQueryObserver& aObserver );
-
- /**
- * Destructor.
- * If note has been shown, this removes the note away
- * and frees the resources.
- */
- ~CCaUiReconnectQuery();
-
-
- public: // New functions
-
- /**
- * Shows the query and destroys it after use.
- *
- * @param aPhoneNumber Number to be used for query.
- * @param aIncludeVideoCallOption flag if video call option is included
- */
- virtual void ShowL(
- const TPtrC aPhoneNumber,
- const TBool aIncludeVideoCallOption ) = 0;
-
- protected:
-
- /**
- * C++ constructor.
- * @param aObserver observer for query result
- */
- CCaUiReconnectQuery( MCaUiReconnectQueryObserver& aObserver );
-
-
- protected: // Data
-
- /** Observer for query result. */
- MCaUiReconnectQueryObserver& iObserver;
-
- };
-
-#endif // CCAUIRECONNECTQUERY_H
-
-// End of File
--- a/phonesrv_plat/callui_reconnect_query_api/inc/mcauireconnectqueryobserver.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2007 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: Observer for reconnect query.
-*
-*/
-
-
-#ifndef MCAUIRECONNECTQUERYOBSERVER_H
-#define MCAUIRECONNECTQUERYOBSERVER_H
-
-// INCLUDES
-#include <e32std.h>
-
-// CLASS DECLARATION
-
-/**
-* Defines the interface for the observers of the CCaUiReconnectQuery.
-*
-* @lib cauiengine.lib
-* @since 5.0
-*/
-class MCaUiReconnectQueryObserver
- {
- public: // New functions
-
- enum TCaUiReconType
- {
- ECallUiReconTypeCancel = -1, // Query canceled.
- ECallUiReconTypeVoice = 0, // Voice call.
- ECallUiReconTypeVideo = 1, // Video call.
- ECallUiReconTypeMsg = 2
- };
-
- /**
- * User selected option notification.
- *
- * @param aOption User selected option for reconnect query.
- */
- virtual void OptionSelected( TCaUiReconType aOption ) = 0;
-
- };
-
-#endif // MCAUIRECONNECTQUERYOBSERVER_H
-
-// End of File
--- a/phonesrv_plat/dial_utils_api/dial_utils_api.metaxml Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="bc5ea00a4653ae7d09479956f1d9a6e6" dataversion="1.0">
- <name>Dial Utils API</name>
- <description>An interface for checking if telephony number should be modified prior a call. Supports Japanese prefix insertion.</description>
- <type>c++</type>
- <subsystem>phoneclientserver</subsystem>
- <libs>
- <lib name="DialUtils.lib" />
- </libs>
- <release category="domain"/>
- <attributes>
- <!-- This indicates wether the api provedes separate html documentation -->
- <!-- or is the additional documentation generated from headers. -->
- <!-- If you are unsuere then the value is "no" -->
- <htmldocprovided>yes</htmldocprovided>
- <adaptation>no</adaptation>
- </attributes>
-</api>
--- a/phonesrv_plat/dial_utils_api/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2006 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: File that exports the files belonging to
-: Dial Utils API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/dialutils.h MW_LAYER_PLATFORM_EXPORT_PATH(dialutils.h)
--- a/phonesrv_plat/dial_utils_api/inc/dialutils.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) 2004 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: API for DialUtils usage.
-*
-*/
-
-
-#ifndef DIALUTILS_H
-#define DIALUTILS_H
-
-
-// INCLUDES
-#include <e32base.h>
-
-
-// CLASS DECLARATION
-
-/**
-* The API for DialUtils usage.
-*
-* @lib DialUtils.lib
-* @since 2.6
-*/
-class CDialUtilsApi
-: public CBase
- {
- public: // New functions
-
- /**
- * Check and if needed modify the given phone number according to
- * current configuration and location. Currently supports:
- * 1) Japan prefix modifications.
- *
- * @param aPhoneNumber The phone number to be checked and modified.
- * @return - KErrNone if successful,
- * - KErrOverflow if the aPhoneNumber is too short for the
- * combined original phone number + prefix number,
- * - Symbian error code otherwise.
- * In error case the aPhoneNumber is untouched.
- */
- virtual TInt CheckNumber( HBufC& aPhoneNumber ) = 0;
- };
-
-
-
-/**
-* Interface for DialUtils creation.
-*
-* @lib DialUtils.lib
-* @since 2.6
-*/
-class CDialUtilsFactory
-: public CBase
- {
- public:
-
- /**
- * Creates DialUtils.
- * CDialUtilsFactory instance is deleted even in leave case.
- *
- * @return CDialUtilsApi implementation. NULL if not supported.
- * Ownership transferred.
- */
- virtual CDialUtilsApi* CDialUtilsApiLD() = 0;
-
- };
-
-/**
-* Only exported function. This is in index 1 in the lookup table.
-* Call this function to create CDialUtilsFactory instance.
-*
-* IMPORT_C CDialUtilsFactory* CreateDialUtilsFactoryL();
-*/
-
-
-#endif // DIALUTILS_H
-
-// End of File
--- a/phonesrv_plat/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ b/phonesrv_plat/group/bld.inf Mon Oct 04 15:57:13 2010 +0300
@@ -26,7 +26,6 @@
#include "../network_handling_engine_api/group/bld.inf"
#include "../phone_client_emergency_call_api/group/bld.inf"
#include "../sat_configuration_api/group/bld.inf"
-#include "../dial_utils_api/group/bld.inf"
#include "../phone_client_image_handler_api/group/bld.inf"
#include "../phone_client_messenger_api/group/bld.inf"
#include "../sat_client_api/group/bld.inf"
@@ -40,7 +39,6 @@
#include "../phone_client_utility_api/group/bld.inf"
#include "../telephony_network_information_api/group/bld.inf"
#include "../secondary_display_sat_api/group/bld.inf"
-#include "../callui_reconnect_query_api/group/bld.inf"
#include "../service_provider_settings_api/group/bld.inf"
#include "../converged_call_provider_api/group/bld.inf"
#include "../incoming_call_monitor_api/group/bld.inf"
@@ -48,7 +46,6 @@
#include "../cenrep_database_api/group/bld.inf"
#include "../ss_settings_api/group/bld.inf"
#include "../phone_settings_observer_api/group/bld.inf"
-#include "../phone_settings_notes_ui_api/group/bld.inf"
#include "../phone_settings_api/group/bld.inf"
#include "../voice_mailbox_number_api/group/bld.inf"
#include "../voice_mailbox_settings_api/group/bld.inf"
--- a/phonesrv_plat/phone_client_ussd_internal_api/inc/cphcltussdint.h Fri Sep 17 17:09:13 2010 +0300
+++ b/phonesrv_plat/phone_client_ussd_internal_api/inc/cphcltussdint.h Mon Oct 04 15:57:13 2010 +0300
@@ -91,8 +91,8 @@
protected:
- // CUssdComms can call the protected functions mentioned above.
- friend class CUssdComms;
+ // UssdComms can call the protected functions mentioned above.
+ friend class UssdComms;
};
--- a/phonesrv_plat/phone_settings_notes_ui_api/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2006 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: File that exports the files belonging to
-: Phone Settings Notes UI API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/psuicontainer.h MW_LAYER_PLATFORM_EXPORT_PATH(psuicontainer.h)
-../inc/psuibarringobs.h MW_LAYER_PLATFORM_EXPORT_PATH(psuibarringobs.h)
-../inc/psuicliobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(psuicliobserver.h)
-../inc/psuiconstants.h MW_LAYER_PLATFORM_EXPORT_PATH(psuiconstants.h)
-../inc/psuiwaitingobs.h MW_LAYER_PLATFORM_EXPORT_PATH(psuiwaitingobs.h)
-../inc/psuidivertobs.h MW_LAYER_PLATFORM_EXPORT_PATH(psuidivertobs.h)
--- a/phonesrv_plat/phone_settings_notes_ui_api/inc/psuibarringobs.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-/*
-* Copyright (c) 2002,2003 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: Shows notes related to Call Barrings operations.
-*
-*/
-
-
-#ifndef CPSUIBARRINGOBS_H
-#define CPSUIBARRINGOBS_H
-
-// INCLUDES
-#include <mpsetbarringobs.h>
-#include "psuiconstants.h"
-
-// FORWARD DECLARATION
-class MPsetCallBarring;
-class CPsuiResourceLoader;
-class CPsuiContainer;
-
-// CLASS DECLARATION
-
-/**
-* CPsuiBarringObs class implements MPsetBarringObserver.
-* @lib psui.lib
-* @since 1.0
-*/
-class CPsuiBarringObs : public CBase,
- public MPsetBarringObserver
- {
- public: // Constructor
-
- /**
- * Symbian OS two phased constructor.
- *
- * @param aContainer Reference to container object
- * @return Returns CPsuiBarringObs-pointer
- */
- IMPORT_C static CPsuiBarringObs* NewL( CPsuiContainer& aContainer );
-
- public: // Functions from base classes
-
- /**
- * From MPsetBarringObserver, handles barring mode changed notes.
- *
- * @param aType Type of barring program
- * @param aStatus Status of the barring program
- * @param aPlural Several barrings affected or not
- */
- void HandleBarringModeChangedL(
- TBarringProgram aType,
- TBarringStatus aStatus,
- TBool aPlural );
-
- /**
- * From MPsetBarringObserver, handles barring mode status notes.
- *
- * @param aBsc List of basic service groups
- * @param aStatus Status of the barring program
- */
- void HandleBarringModeStatusL( TUint8 aBsc[KPSUIMaxBscNumber],
- TBarringStatus aStatus );
-
- /**
- * From MPsetBarringObserver, handles errors for call barring requests.
- *
- * @param aReason Reason for error
- */
- void HandleBarringErrorL( TInt aReason );
-
- /**
- * From MPsetBarringObserver, handles requesting notes.
- *
- * @param aOngoing If ETrue, there is an active request
- * @param aInterrupted If ETrue, means that notemaster should be
- * immediately deleted.
- */
- void HandleCBRequestingL( TBool aOngoing,
- TBool aInterrupted = EFalse );
-
- /**
- * From MPsetBarringObserver, defines reference to requesting object.
- *
- * @param aBarringEngine Reference to the Phone Settings
- */
- void SetEngineContact( MPsetCallBarring* aBarringEngine );
-
- /**
- * From MPsetBarringObserver, handles notes relating to call barring
- * password change requests.
- *
- * @param aSuccess If ETrue, password change request was successful
- */
- void CbPasswordChangedL( TBool aSuccess );
-
- private: // new
-
- void SetContainer( CPsuiContainer& aContainer );
-
- private: // member variables
-
- // Container object
- CPsuiContainer* iContainer;
- };
-#endif //CPSUIBARRINGOBS_H
--- a/phonesrv_plat/phone_settings_notes_ui_api/inc/psuicliobserver.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/*
-* Copyright (c) 2002,2003 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: CPsuiCliObserver class is responsible for handling notes
-* related to CLIR, CLIP, COLR, COLP and CNAP.
-*
-*/
-
-
-#ifndef CPSUICLIOBSERVER_H
-#define CPSUICLIOBSERVER_H
-
-// INCLUDES
-#include <mpsetcliobserver.h>
-#include "psuiconstants.h"
-
-// FORWARD DECLARATION
-class CPsuiResourceLoader;
-class CPsuiContainer;
-
-// CLASS DECLARATION
-
-/**
-* CPsuiCliObserver class is responsible for handling notes related
-* to CLIR, CLIP, COLR, COLP and CNAP.
-* @lib psui.lib
-* @since 1.0
-*/
-class CPsuiCliObserver : public CBase,
- public MPsetCliObserver
- {
- public: // Constructor
-
- /**
- * Symbian OS two-phased constructor.
- *
- * @param aContainer Reference to container
- * @return Returns CPsuiCliObserver pointer
- */
- IMPORT_C static CPsuiCliObserver* NewL( CPsuiContainer& aContainer );
-
- public:
-
- /**
- * From MPsetCliObserver, handles calling identity notes.
- *
- * @param aType Type of call identity information
- */
- void CliInformationL( TPsuiCli aType );
-
- /**
- * From MPsetCliObserver, handles requesting notes.
- *
- * @param aOngoing If ETrue, there is an active request
- * @param aInterrupted If ETrue, means that notemaster should be
- * immediately deleted.
- */
- void HandleCliRequestingL( TBool aOngoing,
- TBool aInterrupted = EFalse );
-
- /**
- * From MPsetCliObserver, defines reference to requesting object.
- *
- * @param aEngine Reference to the Phone Settings
- */
- void SetEngineContact( MPsetCli* aEngine );
-
- /**
- * From MPsetCliObserver.
- * DEPRECATED.
- */
- void HandleCliStatusL(
- TUint8[] /*aBsc[KPSUIMaxBscNumber]*/,
- TPsuiCli /*aMode*/ ) {}
-
- /**
- * This method shows CNAP status.
- * @since 1.2
- *
- * @param aStatus Status of CNAP
- *
- */
- void HandleCnapStatusL( TInt aStatus );
-
- /**
- * Handles errors.
- * @since 2.0
- *
- * @param aError error code.
- *
- */
- void HandleCliErrorL( TInt aError );
-
- /**
- * Destructor
- * @since 2.0
- */
- ~CPsuiCliObserver();
-
- private: // new
-
- void SetContainer( CPsuiContainer& aContainer );
-
- private: // member variables
-
- //container object
- CPsuiContainer* iContainer;
- };
-
-
-#endif //CPSUICLIOBSERVER_H
-
-
-
--- a/phonesrv_plat/phone_settings_notes_ui_api/inc/psuiconstants.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2002-2007 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: Constant values for the Phone Setting UI Notes
-*
-*/
-
-#ifndef CPSUICONSTANTS_H
-#define CPSUICONSTANTS_H
-
-const TInt KPSUIMaxBscNumber = 13; //max. number of basic service groups
-const TInt KPSUIMaxPSUIItemLength = 32;//max. length of text in PSUI note
-// Status of Calling Identity.
-enum TPsuiCli
- {
- EPsuiClirOn = 1,
- EPsuiClirOff,
- EPsuiClipOn,
- EPsuiClipOff,
- EPsuiColrOn,
- EPsuiColrOff,
- EPsuiColpOn,
- EPsuiColpOff,
- EPsuiCliUnknown
- };
-
-#endif //CPSUICONSTANTS_H
-
-
--- a/phonesrv_plat/phone_settings_notes_ui_api/inc/psuicontainer.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) 2002-2007 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:
-* CPsuiContainer class is responsible for loading/unloading
-* the resources to be used by this dll. It is also
-* the correct way to construct observers, since
-* it gives the pointer to the resources in the
-* construction process.
-*
-*/
-
-
-#ifndef CPSUICONTAINER_H
-#define CPSUICONTAINER_H
-
-// INCLUDES
-#include <psuiwaitingobs.h>
-#include <psuidivertobs.h>
-#include <psuibarringobs.h>
-#include <psuicliobserver.h>
-
-// FORWARD DECLARATIONS
-class CPsuiResourceLoader;
-
-// CLASS DECLARATION
-
-/**
-* CPsuiContainer class is responsible for loading/unloading the resources to
-* be used by this dll. It is also the correct way to construct observers,
-* ince it gives the pointer to the resources in the construction process.
-* @lib psui.lib
-* @since 1.0
-*/
-class CPsuiContainer : public CBase
- {
- public: // Constructors and destructor
-
- /**
- * Symbian OS two-phased constructor.
- *
- * @return Returns CPsuiContainer-pointer.
- */
- IMPORT_C static CPsuiContainer* NewL();
-
- /**
- * Destructor
- */
- ~CPsuiContainer();
-
- public:
-
- /**
- * Creates Call Waiting observer.
- *
- * @return Returns CreateCWObsL pointer.
- */
- IMPORT_C CPsuiWaitingObs* CreateCWObsL();
-
- /**
- * Creates Call Forwarding observer.
- *
- * @return Returns CreateCFObsL pointer.
- */
- IMPORT_C CPsuiDivertObs* CreateCFObsL();
-
- /**
- * Creates Call Barring observer.
- *
- * @return Returns CreateCBObsL pointer.
- */
- IMPORT_C CPsuiBarringObs* CreateCBObsL();
-
- /**
- * Creates Calling Identity observer.
- *
- * @return Returns CreateCliObsL pointer.
- */
- IMPORT_C CPsuiCliObserver* CreateCliObsL();
-
-
- private: // private constructor
-
- void ConstructL();
-
- private: // member variables
-
- //reference to class' resource loader
- CPsuiResourceLoader* iAppEngineResourceLoader;
-
- };
-
-
-#endif //CPSUICONTAINER_H
--- a/phonesrv_plat/phone_settings_notes_ui_api/inc/psuidivertobs.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
-* Copyright (c) 2002,2003 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: Shows notes and lists for Divert supplementary service
-*
-*/
-
-
-#ifndef CPSUIDIVERTOBS_H
-#define CPSUIDIVERTOBS_H
-
-// INCLUDES
-#include <mpsetdivertobs.h>
-#include "psuiconstants.h"
-
-// FORWARD DECLARATION
-class MPsetCallDiverting;
-class CPsuiResourceLoader;
-class CPsuiContainer;
-class CMobilePhoneCFList;
-
-// CLASS DECLARATION
-
-/**
-* CPsuiDivertObs class implements the MPsetDivertObserver observer.
-* @lib psui.lib
-* @since 1.0
-*/
-class CPsuiDivertObs : public CBase,
-public MPsetDivertObserver
- {
- public: // Constructor
-
- /**
- * Symbian OS two-phased constructor.
- *
- * @param aContainer Reference to container
- * @return Returns pointer to this-object.
- */
- IMPORT_C static CPsuiDivertObs* NewL( CPsuiContainer& aContainer );
-
- public: // Functions from base classes
-
- /**
- * From MPsetDivertObserver, handles diverting changed.
- *
- * @param aSetting Call forwarding settings
- * @param aPlural Indicates that operation affected several basic
- * service groups
- */
- void HandleDivertingChangedL(
- const TCallDivertSetting& aSetting, TBool aPlural );
-
- /**
- * From MPsetDivertObserver, handles diverting status.
- *
- * @param aSetting Call forwarding settings
- * @param aPlural - DEPRECATED
- */
- /*****************************************************
- * Series 60 Customer / ETel
- * Series 60 ETel API
- *****************************************************/
- void HandleDivertingStatusL(
- CMobilePhoneCFList& aSetting,
- TBool aPlural );
-
- /**
- * From MPsetDivertObserver, handles diverting error.
- *
- * @param aReason Reason for error
- */
- void HandleDivertingErrorL( TInt aReason );
-
- /**
- * From MPsetDivertObserver, handles requesting notes.
- *
- * @param aTrue If ETrue, there is an active request
- * @param aInterrupted If ETrue, means that notemaster should be
- * immediately deleted
- */
- void HandleCFRequestingL( TBool aTrue, TBool aInterrupted = EFalse );
-
- /**
- * From MPsetDivertObserver, defines reference to requesting object.
- *
- * @param aDivertEngine Reference to the Phone Settings
- */
- void SetEngineContact( MPsetCallDiverting* aDivertEngine );
-
- private: // new
-
- void SetContainer( CPsuiContainer& aContainer );
-
-
- private: // member variables
-
- // Container object
- CPsuiContainer* iContainer;
- };
-#endif //CPSUIDIVERTOBS_H
--- a/phonesrv_plat/phone_settings_notes_ui_api/inc/psuiwaitingobs.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
-* Copyright (c) 2002,2003 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:
-* CPsuiWaitingObs class implements the virtual methods of
-* MPsetCallWaitingObserver. Commands are redirected to CPsuiNoteMaster,
-* which is responsible for actually showing the notes.
-*
-*/
-
-
-#ifndef CPSUIWAITINGOBS_H
-#define CPSUIWAITINGOBS_H
-
-// INCLUDES
-#include <mpsetcallwaitingobs.h>
-#include "psuiconstants.h"
-
-// FORWARD DECLARATION
-class CPsuiResourceLoader;
-class CPsuiContainer;
-class PSetCallWaiting;
-class AknStaticNoteDialog;
-
-// CLASS DECLARATION
-
-/**
-* CPsuiWaitingObs class implements the virtual methods of
-* MPsetCallWaitingObserver. Commands are redirected to CPsuiNoteMaster,
-* which is responsible for actually showing the notes.
-* @lib psui.lib
-* @since 1.0
-*/
-class CPsuiWaitingObs : public CBase,
- public MPsetCallWaitingObserver
- {
- public: // Constructor
-
- /**
- * Symbian OS two-phased constructor.
- *
- * @param aContainer Container object
- * @return CPsuiWaitingObs pointer
- */
- IMPORT_C static CPsuiWaitingObs* NewL( CPsuiContainer& aContainer );
-
- public: // Functions from base classes
-
- /**
- * From MPsetCallWaitingObserver, handles status notes
- *
- * @param aStatus Status of call waiting
- * @param aBsc List of basic service groups
- */
- void HandleCallWaitingGetStatusL(
- const MPsetCallWaiting::TGetCallWaitingStatus aStatus,
- TUint8 aBsc[KPSUIMaxBscNumber] );
-
- /**
- * From MPsetCallWaitingObserver, handles call waiting change notes
- *
- * @param aSetting Call waiting request type (activation/cancellation)
- * @param aResult DEPRECATED
- */
- void HandleCallWaitingChangedL(
- const MPsetCallWaiting::TSetCallWaiting aSetting,
- const TInt aResult );
-
- /**
- * From MPsetCallWaitingObserver, handles requesting notes.
- *
- * @param aOngoing If ETrue, there is an active request
- * @param aInterrupted If ETrue, means that notemaster should be
- * immediately deleted.
- */
- void HandleCWRequestingL(
- TBool aOngoing,
- TBool aInterrupted = EFalse );
-
- /**
- * From MPsetCallWaitingObserver, handles call waiting errors.
- *
- * @param aReason Reason for error
- */
- void HandleCWErrorL( TInt aReason );
-
- /**
- * From MPsetCallWaitingObserver, defines reference to requesting object.
- *
- * @param aEngineContact Reference to the Phone Settings
- */
- void SetEngineContact( MPsetCallWaiting& aEngineContact );
-
- private: //private constructor
-
- void ConstructL( CPsuiContainer& aContainer );
-
- private: // member variables
-
- // Container object
- CPsuiContainer* iContainer;
- TBool iCallWaitingDistinguishEnabled;
- };
-#endif // CPSUIWAITINGOBS_H
--- a/phonesrv_plat/phone_settings_notes_ui_api/phone_settings_notes_ui_api.metaxml Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="4634e2177b35a8ecf34a3f8cf20f20bb" dataversion="1.0">
- <name>Phone Settings Notes UI API</name>
- <description>Handles supplementary service specific notes.</description>
- <type>c++</type>
- <subsystem>phonesettings</subsystem>
- <libs>
- <lib name="psui.lib" />
- </libs>
- <release category="domain"/>
- <attributes>
- <!-- This indicates wether the api provedes separate html documentation -->
- <!-- or is the additional documentation generated from headers. -->
- <!-- If you are unsuere then the value is "no" -->
- <htmldocprovided>yes</htmldocprovided>
- <adaptation>no</adaptation>
- </attributes>
-</api>
--- a/phonesrv_plat/phone_settings_ui_notes_api/group/bld.inf Fri Sep 17 17:09:13 2010 +0300
+++ b/phonesrv_plat/phone_settings_ui_notes_api/group/bld.inf Mon Oct 04 15:57:13 2010 +0300
@@ -28,3 +28,4 @@
../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/psuiconstants.h MW_LAYER_PLATFORM_EXPORT_PATH(psuiconstants.h)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonesrv_plat/phone_settings_ui_notes_api/inc/psuiconstants.h Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2002-2007 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: Constant values for the Phone Setting UI Notes
+*
+*/
+
+#ifndef CPSUICONSTANTS_H
+#define CPSUICONSTANTS_H
+
+const TInt KPSUIMaxBscNumber = 13; //max. number of basic service groups
+const TInt KPSUIMaxPSUIItemLength = 32;//max. length of text in PSUI note
+
+// Status of Calling Identity.
+enum TPsuiCli
+ {
+ EPsuiClirOn = 1,
+ EPsuiClirOff,
+ EPsuiClipOn,
+ EPsuiClipOff,
+ EPsuiColrOn,
+ EPsuiColrOff,
+ EPsuiColpOn,
+ EPsuiColpOff,
+ EPsuiCliUnknown
+ };
+
+#endif //CPSUICONSTANTS_H
+
+
--- a/satengine/satserver/Commands/LaunchBrowserCmd/src/CLaunchBrowserHandler.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/Commands/LaunchBrowserCmd/src/CLaunchBrowserHandler.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -800,18 +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 = iUtils->SatUiHandler().ShellController().LaunchBrowserL(
+// aParam, aAccessPointUid );
TInt err = KErrNone;
if ( KErrNone == err )
@@ -966,8 +966,11 @@
// We use trap to continue following operations even if leaving from
// FulfillConnnectionMethodL.
TRAPD( errCode, FulfillConnnectionMethodL( cmManager, cm ) );
- LOG3( SIMPLE, "SATENGINE: CLaunchBrowserHandler::CreateAccessPointL \
- errCode=%d ad line %d", errCode, __LINE__ )
+ if ( errCode != KErrNone )
+ {
+ LOG3( SIMPLE, "SATENGINE: CLaunchBrowserHandler::CreateAccessPointL"
+ " error %d at line %d", errCode, __LINE__ )
+ }
// Set attributes of the connection method.
cm.SetStringAttributeL( CMManager::ECmName, aApName );
cm.SetIntAttributeL( CMManager::EPacketDataPDPType, aIPvType );
--- a/satengine/satserver/Commands/OpenChannelCmd/src/COpenChannelHandler.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/Commands/OpenChannelCmd/src/COpenChannelHandler.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -690,10 +690,8 @@
LOG( NORMAL, "OPENCHANNEL: SetConnectionSettingsL \
No APN, using defaults" )
// No APN, use default settings
- TRAPD( err, defaultId =
- iUtils->BipUtils().ApnHandler().FindDefaultApL( pdpType ) );
- LOG2( NORMAL, "OPENCHANNEL: SetConnectionSettingsL \
- No APN, using defaults err = %i", err )
+ TRAP_IGNORE( defaultId =
+ iUtils->BipUtils().ApnHandler().FindDefaultApL( pdpType ) );
SetOverrideSettingsL( defaultId );
}
break;
--- a/satengine/satserver/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -572,9 +572,7 @@
{
LOG( SIMPLE,
"SENDUSSD: CSendUssdHandler::CSendUssdHandler calling" )
- TRAPD( result, iIsSatDisplayUssdResult = SatDisplayUssdResultL(); )
- LOG2( NORMAL, "SENDUSSD: CSendUssdHandler::CSendUssdHandler \
- get CRepository key failed result: %d", result )
+ TRAP_IGNORE( iIsSatDisplayUssdResult = SatDisplayUssdResultL(); )
LOG( SIMPLE,
"SENDUSSD: CSendUssdHandler::CSendUssdHandler exiting" )
@@ -986,13 +984,12 @@
CRepository* repository = NULL;
repository = CRepository::NewL( KCRUidSatServer );
- if ( repository )
+ result = repository->Get( KSatDisplayUssdResult, ussdDisplayResult );
+ if ( result != KErrNone )
{
- result = repository->Get( KSatDisplayUssdResult, ussdDisplayResult );
- LOG3( NORMAL,
- "SENDUSSD: CSendUssdHandler::CSendUssdHandler \
- get CRepository key DisplayResult: %d, result: %d ",
- ussdDisplayResult, result )
+ LOG2( NORMAL,
+ "SENDUSSD: CSendUssdHandler::CSendUssdHandler "
+ "get CRepository key failed. err=%d", result )
}
delete repository;
--- a/satengine/satserver/Engine/inc/CSatEventMonitorContainer.h Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/Engine/inc/CSatEventMonitorContainer.h Mon Oct 04 15:57:13 2010 +0300
@@ -40,10 +40,10 @@
* @lib SatServer
* @since Series 60 3.0
*/
-class CSatEventMonitorContainer : public MSatEventMonitorContainer,
+class CSatEventMonitorContainer : public CActive,
+ public MSatEventMonitorContainer,
public MSatEventMonitorUtils,
- public MSatEventObserver,
- public CActive
+ public MSatEventObserver
{
public: // Constructors and destructor
--- a/satengine/satserver/Engine/inc/CSatSIconSubSession.h Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/Engine/inc/CSatSIconSubSession.h Mon Oct 04 15:57:13 2010 +0300
@@ -35,8 +35,8 @@
* @lib SatEngine.lib
* @since 3.0
*/
-class CSatSIconSubSession : public MSatIconObserver,
- public CSatSSubSession
+class CSatSIconSubSession : public CSatSSubSession,
+ public MSatIconObserver
{
public: // Constructors and destructor
--- a/satengine/satserver/Engine/src/CSatCommandContainer.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/Engine/src/CSatCommandContainer.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -58,7 +58,6 @@
_LIT( KSatCmccTitle, "txt_simatk_titlw_cmcc_sim_services");
const TUid KSatInterfaceDefinitionUid = { 0x1000f001 };
-const TInt KSizeOfBuf = 50;
// Important plugins UIDs. These are started on startup
--- a/satengine/satserver/EventMonitors/inc/CSatBrowserTerminationMonitor.h Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/EventMonitors/inc/CSatBrowserTerminationMonitor.h Mon Oct 04 15:57:13 2010 +0300
@@ -35,8 +35,8 @@
* @lib EventMonitors.lib
* @since Series 60 3.0
*/
-class CSatBrowserTerminationMonitor : public MSatBrowserWSObserver,
- public CSatEventMonitorHandler
+class CSatBrowserTerminationMonitor : public CSatEventMonitorHandler,
+ public MSatBrowserWSObserver
{
public: // Constructor and destructor
--- a/satengine/satserver/EventMonitors/inc/csatbrowserwsmonitor.h Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/EventMonitors/inc/csatbrowserwsmonitor.h Mon Oct 04 15:57:13 2010 +0300
@@ -37,8 +37,8 @@
* @lib EventMonitors.lib
* @since Series 60 3.1
*/
-class CSatBrowserWSMonitor : public MSatBrowserThreadObserver,
- public CActive
+class CSatBrowserWSMonitor : public CActive,
+ public MSatBrowserThreadObserver
{
public:
--- a/satengine/satserver/SystemState/src/CSatSystemState.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/SystemState/src/CSatSystemState.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -43,6 +43,21 @@
#include "msatmultimodeapi.h"
#include "SatLog.h"
+
+// -----------------------------------------------------------------------------
+// Helper function to define a property and log result
+// -----------------------------------------------------------------------------
+//
+TInt DefineProperty(TUid aCategory, TUint aKey, TInt aAttr,
+ const TSecurityPolicy & aReadPolicy, const TSecurityPolicy& aWritePolicy)
+ {
+ TInt err = RProperty::Define( aCategory, aKey, aAttr, aReadPolicy, aWritePolicy );
+ LOG3( SIMPLE,
+ "SATSYSTEMSTATE: CSatSystemState::ConstructL: property %d defined, err=%d",
+ aKey, err);
+ return err;
+ }
+
// ============================ MEMBER FUNCTIONS ===============================
// -----------------------------------------------------------------------------
@@ -56,6 +71,7 @@
"SATSYSTEMSTATE: CSatSystemState::CSatSystemState calling-exiting" )
}
+
// -----------------------------------------------------------------------------
// Symbian 2nd phase constructor can leave.
// -----------------------------------------------------------------------------
@@ -68,47 +84,33 @@
TSecurityPolicy readPolicy( ECapabilityReadUserData );
TSecurityPolicy writePolicy( ECapabilityWriteUserData );
- TInt err( KErrNone );
- // Define properties in P&S for SetUpIdleModeTex command
- err = RProperty::Define( KPSUidSatServerInternal,
- KSatIdleModeText,
- RProperty::ELargeText,
- readPolicy,
- writePolicy );
- LOG2( SIMPLE,
- "SATSYSTEMSTATE: CSatSystemState::ConstructL \
- Define KSatIdleModeText err: %i", err )
+ DefineProperty( KPSUidSatServerInternal,
+ KSatIdleModeText,
+ RProperty::ELargeText,
+ readPolicy,
+ writePolicy );
- err = RProperty::Define( KPSUidSatServerInternal,
- KSatIdleModeTextIconId,
- RProperty::EInt,
- readPolicy,
- writePolicy );
- LOG2( SIMPLE,
- "SATSYSTEMSTATE: CSatSystemState::ConstructL \
- Define KSatIdleModeTextIconId err: %i", err )
+ DefineProperty( KPSUidSatServerInternal,
+ KSatIdleModeTextIconId,
+ RProperty::EInt,
+ readPolicy,
+ writePolicy );
- err = RProperty::Define( KPSUidSatServerInternal,
- KSatIdleModeTextIconQualifier,
- RProperty::EInt,
- readPolicy,
- writePolicy );
- LOG2( SIMPLE,
- "SATSYSTEMSTATE: CSatSystemState::ConstructL \
- Define KSatIdleModeTextIconQualifier err: %i", err )
+ DefineProperty( KPSUidSatServerInternal,
+ KSatIdleModeTextIconQualifier,
+ RProperty::EInt,
+ readPolicy,
+ writePolicy );
// Set default (empty) values
WriteSetIdleModeText( KNullDesC, KErrNotFound, RSat::ENoIconId );
- err = RProperty::Define( KPSUidSatServer,
- KSatLanguageSelectionTimeBeforeReboot,
- RProperty::EInt,
- readPolicy,
- writePolicy );
- LOG2( SIMPLE,
- "SATSYSTEMSTATE: CSatSystemState::ConstructL \
- Define KSatLanguageSelectionTimeBeforeReboot err: %i", err )
-
+ DefineProperty( KPSUidSatServer,
+ KSatLanguageSelectionTimeBeforeReboot,
+ RProperty::EInt,
+ readPolicy,
+ writePolicy );
+
// Create Network Registration Status Monitor.
iNetworkRegStatusMonitor = CSatNetworkRegStatusMonitor::NewL( aPhone );
@@ -276,7 +278,7 @@
TBool CSatSystemState::IsPhoneInIdleStateL()
{
LOG( SIMPLE, "SATSYSTEMSTATE: CSatSystemState::IsPhoneInIdleState calling" )
- TInt idleStatus(EHomeScreenIdleState) ;
+ TInt idleStatus( EHomeScreenWidgetViewForeground );
// Get the idle status from P&S
User::LeaveIfError( RProperty::Get(
@@ -284,7 +286,7 @@
KHsCategoryStateKey,
idleStatus));
// Returns true if phone in idle state.
- const TBool result( EHomeScreenIdleState == idleStatus );
+ const TBool result( EHomeScreenWidgetViewForeground == idleStatus );
LOG2( SIMPLE, "SATSYSTEMSTATE: CSatSystemState::IsPhoneInIdleState exiting \
with value: %d", result )
--- a/satengine/satserver/SystemState/src/TSatSystemStateFactory.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/satengine/satserver/SystemState/src/TSatSystemStateFactory.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -63,7 +63,7 @@
KHsCategoryUid,
KHsCategoryStateKey,
aObserver,
- EHomeScreenIdleState );
+ EHomeScreenWidgetViewForeground );
LOG( SIMPLE, "SATSYSTEMSTATE: TSatSystemStateFactory::\
CreateIdleModeChangeNotifierL exiting" )
--- a/satui/satapp/resource/qtg_large_sat.svg Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.53" y2="50.71">
-<stop offset="0" stop-color="#A0A3A6"/>
-<stop offset="0.82" stop-color="#474B4D"/>
-<stop offset="1" stop-color="#7B7E80"/>
-</linearGradient>
-<path d="M14.126,50.774c-1.029,0-1.865-0.835-1.865-1.865V10.397c0-1.028,0.836-1.864,1.865-1.864 h23.233c0.842,0,1.967,0.467,2.563,1.061l6.752,6.751c0.595,0.596,1.061,1.721,1.061,2.563v30.001c0,1.03-0.836,1.865-1.865,1.865 L14.126,50.774L14.126,50.774z" fill="url(#SVGID_1)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="30" x2="30" y1="9.15" y2="50.09">
-<stop offset="0" stop-color="#E6E9E8"/>
-<stop offset="1" stop-color="#ADB2B5"/>
-</linearGradient>
-<path d="M39.482,10.035c-0.483-0.483-1.439-0.88-2.123-0.88H14.126c-0.684,0-1.244,0.561-1.244,1.243 v38.511c0,0.684,0.56,1.244,1.244,1.244h31.743c0.685,0,1.244-0.561,1.244-1.244v-30c0-0.684-0.396-1.639-0.879-2.123L39.482,10.035 z" fill="url(#SVGID_2)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="9.26" y2="50.26">
-<stop offset="0" stop-color="#F5F5F5"/>
-<stop offset="0.78" stop-color="#CCCCCC"/>
-<stop offset="1" stop-color="#D1D1D1"/>
-</linearGradient>
-<path d="M37.359,9.776c0.516,0,1.317,0.332,1.684,0.697l6.751,6.75 c0.365,0.366,0.697,1.167,0.697,1.684v30.001c0,0.344-0.278,0.622-0.622,0.622H14.126c-0.344,0-0.622-0.278-0.622-0.622V10.397 c0-0.342,0.278-0.622,0.622-0.622L37.359,9.776 M37.359,9.154H14.126c-0.684,0-1.244,0.561-1.244,1.243v38.511 c0,0.684,0.56,1.244,1.244,1.244h31.743c0.685,0,1.244-0.561,1.244-1.244v-30c0-0.684-0.396-1.639-0.879-2.123l-6.752-6.75 C38.999,9.552,38.043,9.154,37.359,9.154L37.359,9.154z" fill="url(#SVGID_3)"/>
-<rect fill="#E6E7E8" height="0.612" width="22.941" x="16.24" y="45.59"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="28.02" x2="28.02" y1="45.58" y2="25.53">
-<stop offset="0" stop-color="#666666"/>
-<stop offset="1" stop-color="#282828"/>
-</linearGradient>
-<rect fill="url(#SVGID_4)" height="20.202" width="23.553" x="16.24" y="25.45"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="19.61" x2="19.61" y1="26.43" y2="44.18">
-<stop offset="0" stop-color="#FFF173"/>
-<stop offset="0.33" stop-color="#F1BC35"/>
-<stop offset="0.66" stop-color="#E5B029"/>
-<stop offset="1" stop-color="#FFA102"/>
-</linearGradient>
-<rect fill="url(#SVGID_5)" height="5.51" width="4.285" x="17.464" y="38.855"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="30.14" x2="30.14" y1="26.62" y2="43.94">
-<stop offset="0" stop-color="#FFF173"/>
-<stop offset="0.33" stop-color="#F1BC35"/>
-<stop offset="0.66" stop-color="#E5B029"/>
-<stop offset="1" stop-color="#FFA102"/>
-</linearGradient>
-<rect fill="url(#SVGID_6)" height="5.509" width="3.963" x="28.161" y="26.612"/>
-<rect fill="url(#SVGID_6)" height="5.509" width="3.963" x="22.974" y="26.612"/>
-<rect fill="url(#SVGID_6)" height="5.509" width="5.188" x="33.348" y="26.612"/>
-<rect fill="url(#SVGID_5)" height="5.51" width="3.963" x="28.161" y="38.855"/>
-<rect fill="url(#SVGID_5)" height="5.51" width="3.963" x="22.974" y="38.855"/>
-<polygon fill="url(#SVGID_6)" points="21.683,33.346 21.683,26.612 17.464,26.612 17.464,37.631 38.535,37.631 38.535,33.346 "/>
-<rect fill="url(#SVGID_5)" height="5.51" width="5.188" x="33.348" y="38.855"/>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="59.996" width="59.996"/>
-<path d="M30.295,21.957c0.98,0,1.767-0.243,2.359-0.727 c0.592-0.485,0.888-1.15,0.888-2c0-0.825-0.306-1.487-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744 c-0.993,0-1.778,0.245-2.358,0.735c-0.581,0.491-0.87,1.154-0.87,1.991c0,0.849,0.296,1.515,0.888,2 C28.547,21.714,29.327,21.957,30.295,21.957z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M30.295,21.344c0.98,0,1.767-0.242,2.359-0.727s0.888-1.15,0.888-2 c0-0.825-0.306-1.486-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744c-0.993,0-1.778,0.245-2.358,0.735 c-0.581,0.49-0.87,1.154-0.87,1.991c0,0.849,0.296,1.515,0.888,2C28.547,21.102,29.327,21.344,30.295,21.344z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.77" y2="51.63">
-<stop offset="0" stop-color="#E5FFB2"/>
-<stop offset="0.39" stop-color="#6AAB18"/>
-<stop offset="0.68" stop-color="#247307"/>
-<stop offset="1" stop-color="#C2FF4A"/>
-</linearGradient>
-<circle cx="29.998" cy="29.998" fill="url(#SVGID_1_)" r="21.427"/>
-<radialGradient cx="30.2" cy="11.02" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="39.38">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="0.81" stop-color="#358C0C"/>
-<stop offset="1" stop-color="#67AD1A"/>
-</radialGradient>
-<path d="M29.998,50.813c-11.478,0-20.815-9.337-20.815-20.814S18.521,9.183,29.998,9.183 c11.479,0,20.814,9.337,20.814,20.815S41.475,50.813,29.998,50.813L29.998,50.813z" fill="url(#SVGID_2_)"/>
-<polygon fill-opacity="0.1" points="25.252,27.84 27.297,27.84 27.297,45.543 33.251,45.543 33.251,24.451 25.252,24.451 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="25.252,27.228 27.297,27.228 27.297,44.932 33.251,44.932 33.251,23.838 25.252,23.838 " stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.25" x2="29.25" y1="15.88" y2="44.66">
-<stop offset="0" stop-color="#F6FDFF"/>
-<stop offset="1" stop-color="#ADB3B5"/>
-</linearGradient>
-<polygon fill="url(#SVGID_3_)" points="25.252,26.616 27.297,26.616 27.297,44.318 33.251,44.318 33.251,23.226 25.252,23.226 "/>
-<path d="M30.274,21.038c0.981,0,1.767-0.242,2.359-0.727s0.888-1.15,0.888-2 c0-0.825-0.306-1.486-0.915-1.982c-0.609-0.495-1.387-0.744-2.332-0.744c-0.992,0-1.778,0.245-2.357,0.735 c-0.581,0.49-0.871,1.154-0.871,1.991c0,0.849,0.296,1.515,0.888,2C28.525,20.796,29.305,21.038,30.274,21.038z" fill="url(#SVGID_3_)"/>
-</g>
-</svg>
--- a/satui/satapp/resource/satapp.qrc Fri Sep 17 17:09:13 2010 +0300
+++ b/satui/satapp/resource/satapp.qrc Mon Oct 04 15:57:13 2010 +0300
@@ -6,7 +6,4 @@
<qresource prefix="/translations" >
<file alias="satapp">satapp.qm</file>
</qresource>
- <qresource prefix="/icons" >
- <file>qtg_large_sat.svg</file>
- </qresource>
</RCC>
--- a/satui/satapp/satapp.pro Fri Sep 17 17:09:13 2010 +0300
+++ b/satui/satapp/satapp.pro Mon Oct 04 15:57:13 2010 +0300
@@ -24,10 +24,10 @@
CONFIG += hb
-ICON = resource/qtg_large_sat.svg
symbian: {
TARGET.CAPABILITY = CAP_APPLICATION NetworkControl
TARGET.UID3=0x101f4ce0
+ SKINICON = qtg_large_sat
}
# enable this for tracing into a file (log/sat/satui.txt)
--- a/telutils/dialpad/src/dialpad.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/src/dialpad.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -44,7 +44,7 @@
static const int DialpadCloseAnimDuration = 200; // ms
static const int DialpadOpenAnimDuration = 200; // ms
static const qreal DialpadComponentMargin = 0.75; // units
-static const qreal DialpadCloseHandleHeight = 2.23; // units
+static const qreal DialpadCloseHandleHeight = 3.0; // units
static const qreal DialpadCloseHandleWidth = 18.8; // units
static const QLatin1String handsetIcon("qtg_mono_call");
--- a/telutils/dialpad/src/dialpadbluetootheventfilter.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/src/dialpadbluetootheventfilter.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -17,12 +17,13 @@
#include <QTimer>
#include <QKeyEvent>
#include <hblineedit.h>
+#include <btxqserviceapi.h>
#include "dialpadbluetootheventfilter.h"
#include "dialpad.h"
#include "qtphonesrvlog.h"
#ifdef Q_OS_SYMBIAN
-#include <xqservicerequest.h>
+#include <xqappmgr.h>
#endif //Q_OS_SYMBIAN
const int DialpadLongKeyPressTimeOut(1000);
@@ -67,8 +68,12 @@
PHONE_TRACE;
mDialpad->editor().setText(QString(""));
#ifdef Q_OS_SYMBIAN
- XQServiceRequest snd("com.nokia.services.btservices.ToggleBluetooth","toggleBluetooth()", false);
- QVariant retValue;
- snd.send(retValue);
+ XQApplicationManager appManager;
+ QScopedPointer<XQAiwRequest> request(appManager.create(BluetoothServiceName, BluetoothInterfaceTogglePower,
+ BluetoothTogglePower, false));
+ if (request == NULL) {
+ return;
+ }
+ request->send();
#endif // Q_OS_SYMBIAN
}
--- a/telutils/dialpad/src/dialpadnumericbuttongrid.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/src/dialpadnumericbuttongrid.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -36,12 +36,14 @@
static const qreal DialpadPrimaryTextSizeH = 4.5;
static const qreal DialpadSecondaryTextSizeV = 3.8;
static const qreal DialpadSecondaryTextSizeH = 3.3;
-static const qreal DialpadSecondaryTextSize2RowsV = 3.0;
+static const qreal DialpadSecondaryTextSize2RowsV = 2.8;
static const qreal DialpadSecondaryTextSize2RowsH = 2.6;
static const qreal DialpadIconSizeV = 5.0;
static const qreal DialpadIconSizeH = 4.25;
static const qreal DialpadPrimaryTextLeftMargin = 1.5;
static const qreal DialpadPrimarySecondaryMargin = 1.0;
+static const qreal DialpadButtonBorderSize = 0.5;
+static const qreal DialpadSecondaryTextOpacity = 0.4;
static const QLatin1String vmbxIcon("qtg_mono_voice_mailbox");
@@ -66,7 +68,7 @@
// create buttons
setGridSize(QSize(DialpadColumnCount, DialpadRowCount));
- setButtonBorderSize(0);
+ setButtonBorderSize(DialpadButtonBorderSize);
QList<HbInputButton*> buttons;
@@ -271,7 +273,7 @@
// this is used for alphabets shown dimmed, use alpha until exact color
// is specified
QColor disabledColor = HbColorScheme::color("qtc_input_button_normal");
- disabledColor.setAlpha(128);
+ disabledColor.setAlpha(DialpadSecondaryTextOpacity*256);
mColors.insert(Pressed+1, disabledColor);
}
--- a/telutils/dialpad/tsrc/unit/mt_keyhandler/mt_keyhandler.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/mt_keyhandler/mt_keyhandler.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -31,18 +31,6 @@
#include "dialpadkeyhandler.h"
#include "dialpadvoicemailboxeventfilter.h"
-bool mVmbxFilterConstructed;
-Dialpad* mParameter1;
-QObject* mParameter2;
-
-#ifdef Q_OS_SYMBIAN
-/*DialpadVoiceMailboxEventFilter::DialpadVoiceMailboxEventFilter(Dialpad* dialPad, QObject* parent)
-{
- mVmbxFilterConstructed = true;
- mParameter1 = dialPad;
- mParameter2 = parent;
-}*/
-#endif
// test cases
class mt_KeyHandler : public QObject
@@ -50,28 +38,33 @@
Q_OBJECT
private slots:
- void init();
- void cleanup();
+ void initTestCase();
+ void cleanupTestCase();
private:
- HbMainWindow* mMainWindow;
- Dialpad* mDialpad;
+ HbMainWindow *mMainWindow;
+ Dialpad *mDialpad;
DialpadKeyHandler *mKeyhandler;
};
-void mt_KeyHandler::init()
+void mt_KeyHandler::initTestCase()
{
- mVmbxFilterConstructed = false;
+ mMainWindow = new HbMainWindow();
mDialpad = new Dialpad(*mMainWindow);
- mKeyhandler = new DialpadKeyHandler(mDialpad, *hbInstance->allMainWindows().at(0), this);
+ DialpadKeyHandler::DialpadKeyEventFilters filter =
+ DialpadKeyHandler::VoiceMailbox
+ | DialpadKeyHandler::VideoMailBox
+ | DialpadKeyHandler::Bluetooth
+ | DialpadKeyHandler::KeySequence
+ | DialpadKeyHandler::EmergencyCall
+ | DialpadKeyHandler::Hash;
+ mKeyhandler = new DialpadKeyHandler(mDialpad, filter);
QVERIFY(mKeyhandler != NULL);
- //QVERIFY(mVmbxFilterConstructed == true);
- //QVERIFY(mParameter1 == mDialpad);
- //QVERIFY(mParameter2 == this);
}
-void mt_KeyHandler::cleanup()
+void mt_KeyHandler::cleanupTestCase()
{
+ delete mKeyhandler;
delete mDialpad;
delete mMainWindow;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/shared/mock_dialpadsymbianwrapper.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,98 @@
+/** 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 <smcmockclassincludes.h>
+#include "dialpadsymbianwrapper.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// DialpadSymbianWrapper::DialpadSymbianWrapper
+// -----------------------------------------------------------------------------
+//
+DialpadSymbianWrapper::DialpadSymbianWrapper(
+ QObject * parent ) : d_ptr(0)
+ //:
+ //QObject( /*parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// DialpadSymbianWrapper::~DialpadSymbianWrapper
+// -----------------------------------------------------------------------------
+//
+DialpadSymbianWrapper::~DialpadSymbianWrapper( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// DialpadSymbianWrapper::getMailboxNumber
+// -----------------------------------------------------------------------------
+//
+int DialpadSymbianWrapper::getMailboxNumber(
+ QString & vmbxNumber )
+ {
+ SMC_MOCK_METHOD1( int, QString &, vmbxNumber )
+ }
+
+
+// -----------------------------------------------------------------------------
+// DialpadSymbianWrapper::getVideoMailboxNumber
+// -----------------------------------------------------------------------------
+//
+int DialpadSymbianWrapper::getVideoMailboxNumber(
+ QString & vmbxNumber )
+ {
+ SMC_MOCK_METHOD1( int, QString &, vmbxNumber )
+ }
+
+
+// -----------------------------------------------------------------------------
+// DialpadSymbianWrapper::defineMailboxNumber
+// -----------------------------------------------------------------------------
+//
+int DialpadSymbianWrapper::defineMailboxNumber(
+ QString & vmbxNumber )
+ {
+ SMC_MOCK_METHOD1( int, QString &, vmbxNumber )
+ }
+
+
+// -----------------------------------------------------------------------------
+// DialpadSymbianWrapper::defineVideoMailboxNumber
+// -----------------------------------------------------------------------------
+//
+int DialpadSymbianWrapper::defineVideoMailboxNumber(
+ QString & vmbxNumber )
+ {
+ SMC_MOCK_METHOD1( int, QString &, vmbxNumber )
+ }
+
+
+// -----------------------------------------------------------------------------
+// DialpadSymbianWrapper::changeSilentModeState
+// -----------------------------------------------------------------------------
+//
+bool DialpadSymbianWrapper::changeSilentModeState( )
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
--- a/telutils/dialpad/tsrc/unit/shared/mock_hblineedit.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/shared/mock_hblineedit.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -1,8 +1,7 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+/** 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"
+* 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".
*
@@ -11,7 +10,7 @@
*
* Contributors:
*
-* Description:
+* Description:
*
*/
#include <QDebug>
@@ -207,15 +206,6 @@
// -----------------------------------------------------------------------------
-// HbLineEdit::cursorPosition
-// -----------------------------------------------------------------------------
-//
-int HbLineEdit::cursorPosition() const
- {
- SMC_MOCK_METHOD0( int )
- }
-
-// -----------------------------------------------------------------------------
// HbLineEdit::setCursorPosition
// -----------------------------------------------------------------------------
//
@@ -268,6 +258,49 @@
// -----------------------------------------------------------------------------
+// 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
// -----------------------------------------------------------------------------
//
@@ -279,6 +312,37 @@
// -----------------------------------------------------------------------------
+// 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
// -----------------------------------------------------------------------------
//
@@ -303,6 +367,17 @@
// -----------------------------------------------------------------------------
+// HbLineEdit::inputMethodQuery
+// -----------------------------------------------------------------------------
+//
+QVariant HbLineEdit::inputMethodQuery(
+ Qt::InputMethodQuery input) const
+ {
+ SMC_MOCK_METHOD1( QVariant, Qt::InputMethodQuery, input )
+ }
+
+
+// -----------------------------------------------------------------------------
// HbLineEdit::keyPressEvent
// -----------------------------------------------------------------------------
//
@@ -325,17 +400,6 @@
// -----------------------------------------------------------------------------
-// HbLineEdit::resizeEvent
-// -----------------------------------------------------------------------------
-//
-void HbLineEdit::resizeEvent(
- QGraphicsSceneResizeEvent * event )
- {
- SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event )
- }
-
-
-// -----------------------------------------------------------------------------
// HbLineEdit::canInsertFromMimeData
// -----------------------------------------------------------------------------
//
@@ -379,3 +443,16 @@
}
+// -----------------------------------------------------------------------------
+// HbLineEdit::eventFilter
+// -----------------------------------------------------------------------------
+//
+bool HbLineEdit::eventFilter(
+ QObject *obj,
+ QEvent *ev )
+ {
+ SMC_MOCK_METHOD2( bool, QObject *, obj,
+ QEvent *, ev )
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/shared/mock_hbstringutil.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,150 @@
+/** 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 <smcmockclassincludes.h>
+#include "hbstringutil.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbStringUtil::matchC
+// -----------------------------------------------------------------------------
+//
+int HbStringUtil::matchC(
+ const QString & strFrom,
+ const QString & strToMatch,
+ int maxLevel,
+ Options flags,
+ int wildChar,
+ int wildSequenceChar,
+ int escapeChar )
+ {
+ /*SMC_MOCK_METHOD7( int, const QString &, strFrom,
+ const QString &, strToMatch,
+ int, maxLevel,
+ Options, flags,
+ int, wildChar,
+ int, wildSequenceChar,
+ int, escapeChar )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbStringUtil::compareC
+// -----------------------------------------------------------------------------
+//
+int HbStringUtil::compareC(
+ const QString & string1,
+ const QString & string2,
+ int maxLevel,
+ Options flags )
+ {
+ /*SMC_MOCK_METHOD4( int, const QString &, string1,
+ const QString &, string2,
+ int, maxLevel,
+ Options, flags )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbStringUtil::findC
+// -----------------------------------------------------------------------------
+//
+int HbStringUtil::findC(
+ const QString & strFrom,
+ const QString & strToFind,
+ int maxLevel )
+ {
+ SMC_MOCK_METHOD3( int, const QString &, strFrom,
+ const QString &, strToFind,
+ int, maxLevel )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbStringUtil::matchF
+// -----------------------------------------------------------------------------
+//
+int HbStringUtil::matchF(
+ const QString & strFrom,
+ const QString & strToMatch )
+ {
+ SMC_MOCK_METHOD2( int, const QString &, strFrom,
+ const QString &, strToMatch )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbStringUtil::compareF
+// -----------------------------------------------------------------------------
+//
+int HbStringUtil::compareF(
+ const QString & string1,
+ const QString & string2 )
+ {
+ SMC_MOCK_METHOD2( int, const QString &, string1,
+ const QString &, string2 )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbStringUtil::findF
+// -----------------------------------------------------------------------------
+//
+int HbStringUtil::findF(
+ const QString & strFrom,
+ const QString & strToFind )
+ {
+ SMC_MOCK_METHOD2( int, const QString &, strFrom,
+ const QString &, strToFind )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbStringUtil::convertDigits
+// -----------------------------------------------------------------------------
+//
+QString HbStringUtil::convertDigits(
+ const QString str )
+ {
+ SMC_MOCK_METHOD1( QString, const QString, str )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbStringUtil::convertDigitsTo
+// -----------------------------------------------------------------------------
+//
+QString HbStringUtil::convertDigitsTo(
+ const QString str,
+ const DigitType digitType )
+ {
+ SMC_MOCK_METHOD2( QString, const QString, str,
+ const DigitType, digitType )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbStringUtil::sort
+// -----------------------------------------------------------------------------
+//
+void HbStringUtil::sort(
+ QStringList & strList )
+ {
+ SMC_MOCK_METHOD1( void, QStringList &, strList )
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/shared/mock_qevent.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,1335 @@
+/** 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 <smcmockclassincludes.h>
+#include <qevent.h>
+
+#include <QUrl>
+#include <QWidget>
+#include <QGesture>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// QWheelEvent::QWheelEvent
+// -----------------------------------------------------------------------------
+//
+QWheelEvent::QWheelEvent(
+ const QPoint & pos,
+ int delta,
+ Qt::MouseButtons buttons,
+ Qt::KeyboardModifiers modifiers,
+ Qt::Orientation orient )
+ :QInputEvent(Wheel, modifiers)
+ //QInputEvent( /*pos, delta, buttons, modifiers, orient*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QWheelEvent::QWheelEvent
+// -----------------------------------------------------------------------------
+//
+QWheelEvent::QWheelEvent(
+ const QPoint & pos,
+ const QPoint & globalPos,
+ int delta,
+ Qt::MouseButtons buttons,
+ Qt::KeyboardModifiers modifiers,
+ Qt::Orientation orient )
+ : QInputEvent(Wheel)
+ //QInputEvent( /*pos, globalPos, delta, buttons, modifiers, orient*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QWheelEvent::~QWheelEvent
+// -----------------------------------------------------------------------------
+//
+QWheelEvent::~QWheelEvent( )
+ {
+
+ }
+
+// -----------------------------------------------------------------------------
+// QUpdateLaterEvent::QUpdateLaterEvent
+// -----------------------------------------------------------------------------
+//
+QUpdateLaterEvent::QUpdateLaterEvent(
+ const QRegion & paintRegion )
+ :QEvent(UpdateLater)
+ //QEvent( /*paintRegion*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QUpdateLaterEvent::~QUpdateLaterEvent
+// -----------------------------------------------------------------------------
+//
+QUpdateLaterEvent::~QUpdateLaterEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::QGestureEvent
+// -----------------------------------------------------------------------------
+//
+QGestureEvent::QGestureEvent(
+ const QList<QGesture *> & gestures )
+ :QEvent(QEvent::Gesture)
+ //QEvent( /*gestures*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::~QGestureEvent
+// -----------------------------------------------------------------------------
+//
+QGestureEvent::~QGestureEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::gestures
+// -----------------------------------------------------------------------------
+//
+QList <QGesture * > QGestureEvent::gestures( ) const
+ {
+ SMC_MOCK_METHOD0( QList <QGesture * > )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::gesture
+// -----------------------------------------------------------------------------
+//
+QGesture * QGestureEvent::gesture(
+ Qt::GestureType type ) const
+ {
+ SMC_MOCK_METHOD1( QGesture *, Qt::GestureType, type )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::activeGestures
+// -----------------------------------------------------------------------------
+//
+QList <QGesture * > QGestureEvent::activeGestures( ) const
+ {
+ SMC_MOCK_METHOD0( QList <QGesture * > )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::canceledGestures
+// -----------------------------------------------------------------------------
+//
+QList <QGesture * > QGestureEvent::canceledGestures( ) const
+ {
+ SMC_MOCK_METHOD0( QList <QGesture * > )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::setAccepted
+// -----------------------------------------------------------------------------
+//
+void QGestureEvent::setAccepted(
+ QGesture *gesture, bool value)
+ {
+ SMC_MOCK_METHOD2( void, QGesture *, gesture, bool, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::accept
+// -----------------------------------------------------------------------------
+//
+void QGestureEvent::accept(
+ QGesture *gesture)
+ {
+ SMC_MOCK_METHOD1( void, QGesture *, gesture )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::ignore
+// -----------------------------------------------------------------------------
+//
+void QGestureEvent::ignore(
+ QGesture *gesture )
+ {
+ SMC_MOCK_METHOD1( void, QGesture *, gesture )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::isAccepted
+// -----------------------------------------------------------------------------
+//
+bool QGestureEvent::isAccepted(
+ QGesture *gesture ) const
+ {
+ SMC_MOCK_METHOD1( bool, QGesture *, gesture )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::setAccepted
+// -----------------------------------------------------------------------------
+//
+void QGestureEvent::setAccepted(
+ Qt::GestureType type, bool value)
+ {
+ SMC_MOCK_METHOD2( void, Qt::GestureType, type, bool, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::accept
+// -----------------------------------------------------------------------------
+//
+void QGestureEvent::accept(
+ Qt::GestureType type )
+ {
+ SMC_MOCK_METHOD1( void, Qt::GestureType, type )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::ignore
+// -----------------------------------------------------------------------------
+//
+void QGestureEvent::ignore(
+ Qt::GestureType type )
+ {
+ SMC_MOCK_METHOD1( void, Qt::GestureType, type )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::isAccepted
+// -----------------------------------------------------------------------------
+//
+bool QGestureEvent::isAccepted(
+ Qt::GestureType type ) const
+ {
+ SMC_MOCK_METHOD1( bool, Qt::GestureType, type )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::setWidget
+// -----------------------------------------------------------------------------
+//
+void QGestureEvent::setWidget(
+ QWidget * widget )
+ {
+ SMC_MOCK_METHOD1( void, QWidget *, widget )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::widget
+// -----------------------------------------------------------------------------
+//
+QWidget * QGestureEvent::widget( ) const
+ {
+ SMC_MOCK_METHOD0( QWidget * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGestureEvent::mapToGraphicsScene
+// -----------------------------------------------------------------------------
+//
+QPointF QGestureEvent::mapToGraphicsScene(
+ const QPointF & gesturePoint ) const
+ {
+ SMC_MOCK_METHOD1( QPointF, const QPointF &, gesturePoint )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QContextMenuEvent::QContextMenuEvent
+// -----------------------------------------------------------------------------
+//
+QContextMenuEvent::QContextMenuEvent(
+ Reason reason,
+ const QPoint & pos,
+ const QPoint & globalPos,
+ Qt::KeyboardModifiers modifiers )
+ :QInputEvent(ContextMenu, modifiers)
+ //QInputEvent( /*reason, pos, globalPos, modifiers*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QContextMenuEvent::QContextMenuEvent
+// -----------------------------------------------------------------------------
+//
+QContextMenuEvent::QContextMenuEvent(
+ Reason reason,
+ const QPoint & pos,
+ const QPoint & globalPos )
+ :QInputEvent(ContextMenu)
+ //QInputEvent( /*reason, pos, globalPos*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QContextMenuEvent::QContextMenuEvent
+// -----------------------------------------------------------------------------
+//
+QContextMenuEvent::QContextMenuEvent(
+ Reason reason,
+ const QPoint & pos )
+ :QInputEvent(ContextMenu)
+ //QInputEvent( /*reason, pos*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QContextMenuEvent::~QContextMenuEvent
+// -----------------------------------------------------------------------------
+//
+QContextMenuEvent::~QContextMenuEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QStatusTipEvent::QStatusTipEvent
+// -----------------------------------------------------------------------------
+//
+QStatusTipEvent::QStatusTipEvent(
+ const QString & tip )
+ :QEvent(StatusTip)
+ //QEvent( /*tip*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QStatusTipEvent::~QStatusTipEvent
+// -----------------------------------------------------------------------------
+//
+QStatusTipEvent::~QStatusTipEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QMoveEvent::QMoveEvent
+// -----------------------------------------------------------------------------
+//
+QMoveEvent::QMoveEvent(
+ const QPoint & pos,
+ const QPoint & oldPos )
+ :QEvent(Move)
+ //QEvent( /*pos, oldPos*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QMoveEvent::~QMoveEvent
+// -----------------------------------------------------------------------------
+//
+QMoveEvent::~QMoveEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDragEnterEvent::QDragEnterEvent
+// -----------------------------------------------------------------------------
+//
+QDragEnterEvent::QDragEnterEvent(
+ const QPoint & pos,
+ Qt::DropActions actions,
+ const QMimeData * data,
+ Qt::MouseButtons buttons,
+ Qt::KeyboardModifiers modifiers )
+ :QDragMoveEvent(pos, actions, data, buttons, modifiers, DragEnter)
+ //QDragMoveEvent( /*pos, actions, data, buttons, modifiers*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDragEnterEvent::~QDragEnterEvent
+// -----------------------------------------------------------------------------
+//
+QDragEnterEvent::~QDragEnterEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QIconDragEvent::QIconDragEvent
+// -----------------------------------------------------------------------------
+//
+QIconDragEvent::QIconDragEvent( )
+ :QEvent(IconDrag)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QIconDragEvent::~QIconDragEvent
+// -----------------------------------------------------------------------------
+//
+QIconDragEvent::~QIconDragEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QFileOpenEvent::QFileOpenEvent
+// -----------------------------------------------------------------------------
+//
+QFileOpenEvent::QFileOpenEvent(
+ const QString & file )
+ :QEvent(FileOpen)
+ //QEvent( /*file*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QFileOpenEvent::QFileOpenEvent
+// -----------------------------------------------------------------------------
+//
+QFileOpenEvent::QFileOpenEvent(
+ const QUrl & url )
+ :QEvent(FileOpen)
+ //QEvent( /*url*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QFileOpenEvent::~QFileOpenEvent
+// -----------------------------------------------------------------------------
+//
+QFileOpenEvent::~QFileOpenEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QFileOpenEvent::url
+// -----------------------------------------------------------------------------
+//
+QUrl QFileOpenEvent::url( ) const
+ {
+ SMC_MOCK_METHOD0( QUrl )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QHelpEvent::QHelpEvent
+// -----------------------------------------------------------------------------
+//
+QHelpEvent::QHelpEvent(
+ Type type,
+ const QPoint & pos,
+ const QPoint & globalPos )
+ :QEvent(type)
+ //QEvent( /*type, pos, globalPos*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QHelpEvent::~QHelpEvent
+// -----------------------------------------------------------------------------
+//
+QHelpEvent::~QHelpEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QToolBarChangeEvent::QToolBarChangeEvent
+// -----------------------------------------------------------------------------
+//
+QToolBarChangeEvent::QToolBarChangeEvent(
+ bool t )
+ :QEvent(ToolBarChange)
+ //QEvent( /*t*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QToolBarChangeEvent::~QToolBarChangeEvent
+// -----------------------------------------------------------------------------
+//
+QToolBarChangeEvent::~QToolBarChangeEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDragMoveEvent::QDragMoveEvent
+// -----------------------------------------------------------------------------
+//
+QDragMoveEvent::QDragMoveEvent(
+ const QPoint & pos,
+ Qt::DropActions actions,
+ const QMimeData * data,
+ Qt::MouseButtons buttons,
+ Qt::KeyboardModifiers modifiers,
+ Type type )
+ :QDropEvent(pos, actions, data, buttons, modifiers, type)
+ //QDropEvent( /*pos, actions, data, buttons, modifiers, type*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDragMoveEvent::~QDragMoveEvent
+// -----------------------------------------------------------------------------
+//
+QDragMoveEvent::~QDragMoveEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPaintEvent::QPaintEvent
+// -----------------------------------------------------------------------------
+//
+QPaintEvent::QPaintEvent(
+ const QRegion & paintRegion )
+ :QEvent(Paint)
+ //QEvent( /*paintRegion*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPaintEvent::QPaintEvent
+// -----------------------------------------------------------------------------
+//
+QPaintEvent::QPaintEvent(
+ const QRect & paintRect )
+ :QEvent(Paint)
+ //QEvent( /*paintRect*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPaintEvent::~QPaintEvent
+// -----------------------------------------------------------------------------
+//
+QPaintEvent::~QPaintEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QKeyEvent::QKeyEvent
+// -----------------------------------------------------------------------------
+//
+QKeyEvent::QKeyEvent(
+ Type type,
+ int key,
+ Qt::KeyboardModifiers modifiers,
+ const QString & text,
+ bool autorep,
+ ushort count )
+ :QInputEvent(type, modifiers)
+ //QInputEvent( /*type, key, modifiers, text, autorep, count*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QKeyEvent::~QKeyEvent
+// -----------------------------------------------------------------------------
+//
+QKeyEvent::~QKeyEvent( )
+ {
+
+ }
+
+// -----------------------------------------------------------------------------
+// QKeyEvent::matches
+// -----------------------------------------------------------------------------
+//
+bool QKeyEvent::matches(
+ QKeySequence::StandardKey key ) const
+ {
+ SMC_MOCK_METHOD1( bool, QKeySequence::StandardKey, key )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QKeyEvent::modifiers
+// -----------------------------------------------------------------------------
+//
+Qt::KeyboardModifiers QKeyEvent::modifiers( ) const
+ {
+ SMC_MOCK_METHOD0( Qt::KeyboardModifiers )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QKeyEvent::createExtendedKeyEvent
+// -----------------------------------------------------------------------------
+//
+QKeyEvent * QKeyEvent::createExtendedKeyEvent(
+ Type type,
+ int key,
+ Qt::KeyboardModifiers modifiers,
+ quint32 nativeScanCode,
+ quint32 nativeVirtualKey,
+ quint32 nativeModifiers,
+ const QString & text,
+ bool autorep,
+ ushort count )
+ {
+ /*SMC_MOCK_METHOD9( QKeyEvent *, Type, type,
+ int, key,
+ Qt::KeyboardModifiers, modifiers,
+ quint32, nativeScanCode,
+ quint32, nativeVirtualKey,
+ quint32, nativeModifiers,
+ const QString &, text,
+ bool, autorep,
+ ushort, count )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// QKeyEvent::nativeScanCode
+// -----------------------------------------------------------------------------
+//
+quint32 QKeyEvent::nativeScanCode( ) const
+ {
+ SMC_MOCK_METHOD0( quint32 )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QKeyEvent::nativeVirtualKey
+// -----------------------------------------------------------------------------
+//
+quint32 QKeyEvent::nativeVirtualKey( ) const
+ {
+ SMC_MOCK_METHOD0( quint32 )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QKeyEvent::nativeModifiers
+// -----------------------------------------------------------------------------
+//
+quint32 QKeyEvent::nativeModifiers( ) const
+ {
+ SMC_MOCK_METHOD0( quint32 )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QClipboardEvent::QClipboardEvent
+// -----------------------------------------------------------------------------
+//
+QClipboardEvent::QClipboardEvent(
+ QEventPrivate * data )
+ :QEvent(QEvent::Clipboard)
+ //QEvent( /*data*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QClipboardEvent::~QClipboardEvent
+// -----------------------------------------------------------------------------
+//
+QClipboardEvent::~QClipboardEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QHideEvent::QHideEvent
+// -----------------------------------------------------------------------------
+//
+QHideEvent::QHideEvent( )
+ :QEvent(Hide)
+ //QEvent( /**/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QHideEvent::~QHideEvent
+// -----------------------------------------------------------------------------
+//
+QHideEvent::~QHideEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QInputMethodEvent::QInputMethodEvent
+// -----------------------------------------------------------------------------
+//
+QInputMethodEvent::QInputMethodEvent( )
+ :QEvent(QEvent::InputMethod)
+ //QEvent( /**/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QInputMethodEvent::QInputMethodEvent
+// -----------------------------------------------------------------------------
+//
+QInputMethodEvent::QInputMethodEvent(
+ const QString & preeditText,
+ const QList<Attribute> & attributes )
+ :QEvent(QEvent::InputMethod)
+ //QEvent( /*preeditText, attributes*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QInputMethodEvent::setCommitString
+// -----------------------------------------------------------------------------
+//
+void QInputMethodEvent::setCommitString(
+ const QString & commitString,
+ int replaceFrom,
+ int replaceLength )
+ {
+ SMC_MOCK_METHOD3( void, const QString &, commitString,
+ int, replaceFrom,
+ int, replaceLength )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QInputMethodEvent::QInputMethodEvent
+// -----------------------------------------------------------------------------
+//
+QInputMethodEvent::QInputMethodEvent(
+ const QInputMethodEvent & other )
+ :QEvent(QEvent::InputMethod)
+ //QEvent( /*other*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTabletEvent::QTabletEvent
+// -----------------------------------------------------------------------------
+//
+QTabletEvent::QTabletEvent(
+ Type t,
+ const QPoint & pos,
+ const QPoint & globalPos,
+ const QPointF & hiResGlobalPos,
+ int device,
+ int pointerType,
+ qreal pressure,
+ int xTilt,
+ int yTilt,
+ qreal tangentialPressure,
+ qreal rotation,
+ int z,
+ Qt::KeyboardModifiers keyState,
+ qint64 uniqueID )
+ :QInputEvent(t, keyState)
+ //QInputEvent( /*t, pos, globalPos, hiResGlobalPos, device, pointerType, pressure, xTilt, yTilt, tangentialPressure, rotation, z, keyState, uniqueID*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTabletEvent::~QTabletEvent
+// -----------------------------------------------------------------------------
+//
+QTabletEvent::~QTabletEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDropEvent::QDropEvent
+// -----------------------------------------------------------------------------
+//
+QDropEvent::QDropEvent(
+ const QPoint & pos,
+ Qt::DropActions actions,
+ const QMimeData * data,
+ Qt::MouseButtons buttons,
+ Qt::KeyboardModifiers modifiers,
+ Type type )
+ :QEvent(type)
+ //QEvent( /*pos, actions, data, buttons, modifiers, type*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDropEvent::~QDropEvent
+// -----------------------------------------------------------------------------
+//
+QDropEvent::~QDropEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDropEvent::setDropAction
+// -----------------------------------------------------------------------------
+//
+void QDropEvent::setDropAction(
+ Qt::DropAction act )
+ {
+ SMC_MOCK_METHOD1( void, Qt::DropAction, act )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDropEvent::source
+// -----------------------------------------------------------------------------
+//
+QWidget * QDropEvent::source( ) const
+ {
+ SMC_MOCK_METHOD0( QWidget * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDropEvent::format
+// -----------------------------------------------------------------------------
+//
+const char * QDropEvent::format(
+ int n ) const
+ {
+ SMC_MOCK_METHOD1( const char *, int, n )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDropEvent::encodedData
+// -----------------------------------------------------------------------------
+//
+QByteArray QDropEvent::encodedData(
+ const char * ch) const
+ {
+ SMC_MOCK_METHOD1( QByteArray, const char *, ch )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDropEvent::provides
+// -----------------------------------------------------------------------------
+//
+bool QDropEvent::provides(
+ const char * ch) const
+ {
+ SMC_MOCK_METHOD1( bool, const char *, ch )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QHoverEvent::QHoverEvent
+// -----------------------------------------------------------------------------
+//
+QHoverEvent::QHoverEvent(
+ Type type,
+ const QPoint & pos,
+ const QPoint & oldPos )
+ :QEvent(type)
+ //QEvent( /*type, pos, oldPos*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QHoverEvent::~QHoverEvent
+// -----------------------------------------------------------------------------
+//
+QHoverEvent::~QHoverEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QActionEvent::QActionEvent
+// -----------------------------------------------------------------------------
+//
+QActionEvent::QActionEvent(
+ int type,
+ QAction * action,
+ QAction * before )
+ :QEvent(static_cast<QEvent::Type>(type))
+ //QEvent( /*type, action, before*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QActionEvent::~QActionEvent
+// -----------------------------------------------------------------------------
+//
+QActionEvent::~QActionEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDragLeaveEvent::QDragLeaveEvent
+// -----------------------------------------------------------------------------
+//
+QDragLeaveEvent::QDragLeaveEvent( )
+ :QEvent(DragLeave)
+ //QEvent( /**/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDragLeaveEvent::~QDragLeaveEvent
+// -----------------------------------------------------------------------------
+//
+QDragLeaveEvent::~QDragLeaveEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QResizeEvent::QResizeEvent
+// -----------------------------------------------------------------------------
+//
+QResizeEvent::QResizeEvent(
+ const QSize & size,
+ const QSize & oldSize )
+ :QEvent(Resize)
+ //QEvent( /*size, oldSize*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QResizeEvent::~QResizeEvent
+// -----------------------------------------------------------------------------
+//
+QResizeEvent::~QResizeEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDragResponseEvent::QDragResponseEvent
+// -----------------------------------------------------------------------------
+//
+QDragResponseEvent::QDragResponseEvent(
+ bool accepted )
+ :QEvent(DragResponse)
+ //QEvent( /*accepted*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QDragResponseEvent::~QDragResponseEvent
+// -----------------------------------------------------------------------------
+//
+QDragResponseEvent::~QDragResponseEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QInputEvent::QInputEvent
+// -----------------------------------------------------------------------------
+//
+QInputEvent::QInputEvent(
+ Type type,
+ Qt::KeyboardModifiers modifiers )
+ :QEvent(type)
+ //QEvent( /*type, modifiers*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QInputEvent::~QInputEvent
+// -----------------------------------------------------------------------------
+//
+QInputEvent::~QInputEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QWhatsThisClickedEvent::QWhatsThisClickedEvent
+// -----------------------------------------------------------------------------
+//
+QWhatsThisClickedEvent::QWhatsThisClickedEvent(
+ const QString & href )
+ :QEvent(WhatsThisClicked)
+ //QEvent( /*href*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QWhatsThisClickedEvent::~QWhatsThisClickedEvent
+// -----------------------------------------------------------------------------
+//
+QWhatsThisClickedEvent::~QWhatsThisClickedEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QShortcutEvent::QShortcutEvent
+// -----------------------------------------------------------------------------
+//
+QShortcutEvent::QShortcutEvent(
+ const QKeySequence & key,
+ int id,
+ bool ambiguous )
+ :QEvent(Shortcut)
+ //QEvent( /*key, id, ambiguous*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QShortcutEvent::~QShortcutEvent
+// -----------------------------------------------------------------------------
+//
+QShortcutEvent::~QShortcutEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QMouseEvent::QMouseEvent
+// -----------------------------------------------------------------------------
+//
+QMouseEvent::QMouseEvent(
+ Type type,
+ const QPoint & pos,
+ Qt::MouseButton button,
+ Qt::MouseButtons buttons,
+ Qt::KeyboardModifiers modifiers )
+ :QInputEvent(type, modifiers)
+ //QInputEvent( /*type, pos, button, buttons, modifiers*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QMouseEvent::QMouseEvent
+// -----------------------------------------------------------------------------
+//
+QMouseEvent::QMouseEvent(
+ Type type,
+ const QPoint & pos,
+ const QPoint & globalPos,
+ Qt::MouseButton button,
+ Qt::MouseButtons buttons,
+ Qt::KeyboardModifiers modifiers )
+ :QInputEvent(type, modifiers)
+ //QInputEvent( /*type, pos, globalPos, button, buttons, modifiers*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QMouseEvent::~QMouseEvent
+// -----------------------------------------------------------------------------
+//
+QMouseEvent::~QMouseEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QMouseEvent::createExtendedMouseEvent
+// -----------------------------------------------------------------------------
+//
+QMouseEvent * QMouseEvent::createExtendedMouseEvent(
+ Type type,
+ const QPointF & pos,
+ const QPoint & globalPos,
+ Qt::MouseButton button,
+ Qt::MouseButtons buttons,
+ Qt::KeyboardModifiers modifiers )
+ {
+ /*SMC_MOCK_METHOD6( QMouseEvent *, Type, type,
+ const QPointF &, pos,
+ const QPoint &, globalPos,
+ Qt::MouseButton, button,
+ Qt::MouseButtons, buttons,
+ Qt::KeyboardModifiers, modifiers )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// QMouseEvent::posF
+// -----------------------------------------------------------------------------
+//
+QPointF QMouseEvent::posF( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QFocusEvent::QFocusEvent
+// -----------------------------------------------------------------------------
+//
+QFocusEvent::QFocusEvent(
+ Type type,
+ Qt::FocusReason reason )
+ :QEvent(type)
+ //QEvent( /*type, reason*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QFocusEvent::~QFocusEvent
+// -----------------------------------------------------------------------------
+//
+QFocusEvent::~QFocusEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QFocusEvent::reason
+// -----------------------------------------------------------------------------
+//
+Qt::FocusReason QFocusEvent::reason( )
+ {
+ SMC_MOCK_METHOD0( Qt::FocusReason )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QFocusEvent::reason
+// -----------------------------------------------------------------------------
+//
+Qt::FocusReason QFocusEvent::reason( ) const
+ {
+ SMC_MOCK_METHOD0( Qt::FocusReason )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTouchEvent::QTouchEvent
+// -----------------------------------------------------------------------------
+//
+QTouchEvent::QTouchEvent(
+ QEvent::Type eventType,
+ QTouchEvent::DeviceType deviceType,
+ Qt::KeyboardModifiers modifiers,
+ Qt::TouchPointStates touchPointStates,
+ const QList<QTouchEvent::TouchPoint> & touchPoints )
+ :QInputEvent(eventType, modifiers)
+ //QInputEvent( /*eventType, deviceType, modifiers, touchPointStates, touchPoints*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTouchEvent::~QTouchEvent
+// -----------------------------------------------------------------------------
+//
+QTouchEvent::~QTouchEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QCloseEvent::QCloseEvent
+// -----------------------------------------------------------------------------
+//
+QCloseEvent::QCloseEvent( )
+ :QEvent(Close)
+ //QEvent( /**/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QCloseEvent::~QCloseEvent
+// -----------------------------------------------------------------------------
+//
+QCloseEvent::~QCloseEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QWindowStateChangeEvent::QWindowStateChangeEvent
+// -----------------------------------------------------------------------------
+//
+QWindowStateChangeEvent::QWindowStateChangeEvent(
+ Qt::WindowStates aOldState )
+ :QEvent(WindowStateChange)
+ //QEvent( /*aOldState*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QWindowStateChangeEvent::QWindowStateChangeEvent
+// -----------------------------------------------------------------------------
+//
+QWindowStateChangeEvent::QWindowStateChangeEvent(
+ Qt::WindowStates aOldState,
+ bool isOverride )
+ :QEvent(WindowStateChange)
+ //QEvent( /*aOldState, isOverride*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QWindowStateChangeEvent::~QWindowStateChangeEvent
+// -----------------------------------------------------------------------------
+//
+QWindowStateChangeEvent::~QWindowStateChangeEvent( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QWindowStateChangeEvent::isOverride
+// -----------------------------------------------------------------------------
+//
+bool QWindowStateChangeEvent::isOverride( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QShowEvent::QShowEvent
+// -----------------------------------------------------------------------------
+//
+QShowEvent::QShowEvent( )
+ :QEvent(Show)
+ //QEvent( /**/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QShowEvent::~QShowEvent
+// -----------------------------------------------------------------------------
+//
+QShowEvent::~QShowEvent( )
+ {
+
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/shared/mock_qtimer.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,114 @@
+/** 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 <smcmockclassincludes.h>
+#include <qtimer.h>
+
+#include <QTimerEvent>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// QTimer::QTimer
+// -----------------------------------------------------------------------------
+//
+QTimer::QTimer(
+ QObject * parent )
+ //:
+ //QObject( /*parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTimer::~QTimer
+// -----------------------------------------------------------------------------
+//
+QTimer::~QTimer( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTimer::setInterval
+// -----------------------------------------------------------------------------
+//
+void QTimer::setInterval(
+ int msec )
+ {
+ SMC_MOCK_METHOD1( void, int, msec )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTimer::singleShot
+// -----------------------------------------------------------------------------
+//
+void QTimer::singleShot(
+ int msec,
+ QObject * receiver,
+ const char * member )
+ {
+ SMC_MOCK_METHOD3( void, int, msec,
+ QObject *, receiver,
+ const char *, member )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTimer::start
+// -----------------------------------------------------------------------------
+//
+void QTimer::start(
+ int msec )
+ {
+ SMC_MOCK_METHOD1( void, int, msec )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTimer::start
+// -----------------------------------------------------------------------------
+//
+void QTimer::start( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTimer::stop
+// -----------------------------------------------------------------------------
+//
+void QTimer::stop( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTimer::timerEvent
+// -----------------------------------------------------------------------------
+//
+void QTimer::timerEvent(
+ QTimerEvent * ev)
+ {
+ SMC_MOCK_METHOD1( void, QTimerEvent *, ev )
+ }
+
+
--- a/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -25,9 +25,10 @@
#include <hbview.h>
#include <hblineedit.h>
#include <hbinstance.h>
+#include <btxqserviceapi.h>
#ifdef Q_OS_SYMBIAN
-#include "xqservicerequest.h"
+#include "xqappmgr.h"
#endif
#include "dialpadtest.h"
@@ -37,15 +38,21 @@
const int WAIT_TIME = 300;
QString mService;
-QString mMessage;
-bool mXQServiceConstructed;
+QString mInterface;
+QString mOperation;
+bool mEmbedded;
bool mSendCalled;
#ifdef Q_OS_SYMBIAN
-XQServiceRequest::XQServiceRequest(const QString& service, const QString& message, const bool& synchronous) { mService=service; mMessage=message; mXQServiceConstructed=true; }
-XQServiceRequest::~XQServiceRequest() {}
-bool XQServiceRequest::send(QVariant& retValue) { mSendCalled=true; return true; }
-void XQServiceRequest::addArg(const QVariant& v) {}
+XQAiwRequest* XQApplicationManager::create(const QString& service, const QString& interface, const QString& operation, bool embedded)
+{
+ mService = service;
+ mInterface = interface;
+ mOperation = operation;
+ mEmbedded = embedded;
+ return new XQAiwRequest();
+}
+void XQAiwRequest::send() { mSendCalled = true; }
#endif
// helper class
@@ -122,8 +129,9 @@
void ut_DialpadBluetoothEventFilter::init()
{
mService = QString("");
- mMessage = QString("");
- mXQServiceConstructed = false;
+ mInterface = QString("");
+ mOperation = QString("");
+ mEmbedded = false;
mSendCalled = false;
}
@@ -156,9 +164,10 @@
QCOMPARE(mDialpad->editor().text(), QString(""));
mDialpad->closeDialpad();
- QVERIFY(mXQServiceConstructed == true);
- QCOMPARE(mService, QString("com.nokia.services.btservices.ToggleBluetooth"));
- QCOMPARE(mMessage, QString("toggleBluetooth()"));
+ QCOMPARE(mService, BluetoothServiceName);
+ QCOMPARE(mInterface, BluetoothInterfaceTogglePower);
+ QCOMPARE(mOperation, BluetoothTogglePower);
+ QVERIFY(mEmbedded == false);
QVERIFY(mSendCalled == true);
}
--- a/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.pro Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/ut_dialpadbluetootheventfilter.pro Mon Oct 04 15:57:13 2010 +0300
@@ -30,7 +30,7 @@
#
HEADERS += ../../../inc/dialpadbluetootheventfilter.h \
- xqservicerequest.h \
+ xqappmgr.h \
dialpadtestutil.h
SOURCES += ut_dialpadbluetootheventfilter.cpp \
../../../src/dialpadbluetootheventfilter.cpp \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/xqappmgr.h Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,12 @@
+class XQAiwRequest
+{
+public:
+ void send();
+};
+
+class XQApplicationManager
+{
+public:
+ XQAiwRequest* create(const QString& service, const QString& interface, const QString& operation, bool embedded = true);
+};
+
--- a/telutils/dialpad/tsrc/unit/ut_dialpadbluetootheventfilter/xqservicerequest.h Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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:
-*
-*/
-
-class XQServiceRequest : public QObject
-{
-public:
- XQServiceRequest(const QString& service, const QString& message, const bool& synchronous);
- ~XQServiceRequest();
- bool send(QVariant& retValue);
- void addArg(const QVariant& v);
- template<typename T>
- inline XQServiceRequest &operator<< (const T &var)
- {
- QVariant v = qVariantFromValue(var);
- addArg(v);
- return *this;
- }
-};
--- a/telutils/dialpad/tsrc/unit/ut_dialpadhasheventfilter/hblineedit.h Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadhasheventfilter/hblineedit.h Mon Oct 04 15:57:13 2010 +0300
@@ -90,11 +90,19 @@
void setCapitalization ( QFont::Capitalization caps );
QFont::Capitalization capitalization () const;
+
+ bool adjustFontSizeToFitHeight() const;
+ void setAdjustFontSizeToFitHeight(bool active);
+
+ bool event(QEvent* event);
+
+ void setAutoCompleteContent(QGraphicsLayoutItem *content);
+
public slots:
void setText(const QString &text);
-signals:
+//signals:
void editingFinished();
void textChanged(const QString &text);
void selectionChanged();
@@ -103,6 +111,7 @@
HbLineEdit(HbLineEditPrivate &dd, QGraphicsItem *parent);
void inputMethodEvent(QInputMethodEvent *event);
+ QVariant inputMethodQuery(Qt::InputMethodQuery) const;
void keyPressEvent(QKeyEvent *event);
void keyReleaseEvent(QKeyEvent *event);
@@ -113,6 +122,10 @@
void focusOutEvent ( QFocusEvent * event );
void focusInEvent ( QFocusEvent * event );
+
+ bool eventFilter(QObject *, QEvent *);
+
+
private:
Q_DISABLE_COPY(HbLineEdit)
// Q_DECLARE_PRIVATE_D(d_ptr, HbLineEdit)
--- a/telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/hblineedit.h Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadkeysequenceeventfilter/hblineedit.h Mon Oct 04 15:57:13 2010 +0300
@@ -90,11 +90,19 @@
void setCapitalization ( QFont::Capitalization caps );
QFont::Capitalization capitalization () const;
+
+ bool adjustFontSizeToFitHeight() const;
+ void setAdjustFontSizeToFitHeight(bool active);
+
+ bool event(QEvent* event);
+
+ void setAutoCompleteContent(QGraphicsLayoutItem *content);
+
public slots:
void setText(const QString &text);
-signals:
+//signals:
void editingFinished();
void textChanged(const QString &text);
void selectionChanged();
@@ -103,6 +111,7 @@
HbLineEdit(HbLineEditPrivate &dd, QGraphicsItem *parent);
void inputMethodEvent(QInputMethodEvent *event);
+ QVariant inputMethodQuery(Qt::InputMethodQuery) const;
void keyPressEvent(QKeyEvent *event);
void keyReleaseEvent(QKeyEvent *event);
@@ -113,10 +122,14 @@
void focusOutEvent ( QFocusEvent * event );
void focusInEvent ( QFocusEvent * event );
+
+ bool eventFilter(QObject *, QEvent *);
+
+
private:
Q_DISABLE_COPY(HbLineEdit)
- //Q_DECLARE_PRIVATE_D(d_ptr, HbLineEdit)
- //Q_PRIVATE_SLOT(d_func(), void _q_textChanged())
+// Q_DECLARE_PRIVATE_D(d_ptr, HbLineEdit)
+// Q_PRIVATE_SLOT(d_func(), void _q_textChanged())
};
#endif // HBLINEEDIT_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadmailboxeventfilterbase/ut_dialpadmailboxeventfilterbase.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,165 @@
+/*!
+* 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 <mockservice.h>
+
+#include <hbapplication.h>
+#include <hblineedit.h>
+
+#include "dialpadtest.h"
+#include "dialpad.h"
+#include "dialpadmailboxeventfilterbase.h"
+
+
+// Dummy helper class
+class DummyFilter : public DialpadMailboxEventFilterBase
+{
+ Q_OBJECT
+ friend class ut_DialpadMailboxEventFilterBase;
+public:
+ DummyFilter(Dialpad* dialpad, QObject* parent = 0);
+ virtual ~DummyFilter(){};
+
+public:
+ bool eventFilter(QObject *, QEvent *){return true;};
+ bool handleCallButtonPress(){return true;};
+ void handleMailboxOperation(){};
+
+public slots:
+ void handleLongKeyPress(){};
+
+};
+
+DummyFilter::DummyFilter(Dialpad *dialpad, QObject *parent)
+:DialpadMailboxEventFilterBase(dialpad, parent)
+{
+}
+
+
+// test class
+class ut_DialpadMailboxEventFilterBase : public QObject, MockService
+{
+ Q_OBJECT
+
+public:
+ ut_DialpadMailboxEventFilterBase();
+ virtual ~ut_DialpadMailboxEventFilterBase();
+
+private slots:
+ void init();
+ void cleanup();
+
+ // Mailbox event filter base unit tests
+ void testCheckIfSendEventAndConsumeEvent();
+ void testIsLongKeyPressSupported();
+ void testClearEditor();
+ void testCreateCall();
+
+private:
+ DummyFilter *mEventFilter;
+ Dialpad *mDialpad;
+};
+
+
+ut_DialpadMailboxEventFilterBase::ut_DialpadMailboxEventFilterBase()
+{
+}
+
+ut_DialpadMailboxEventFilterBase::~ut_DialpadMailboxEventFilterBase()
+{
+}
+
+void ut_DialpadMailboxEventFilterBase::init()
+{
+ initialize();
+ HbMainWindow *window = 0;
+ mDialpad = new Dialpad(*window);
+ mEventFilter = new DummyFilter(mDialpad);
+}
+
+void ut_DialpadMailboxEventFilterBase::cleanup()
+{
+ delete mEventFilter;
+ delete mDialpad;
+ reset();
+}
+
+void ut_DialpadMailboxEventFilterBase::testCheckIfSendEventAndConsumeEvent()
+{
+ int key = Qt::Key_Yes;
+ int type = QEvent::KeyPress;
+ bool handled = mEventFilter->checkIfSendEventAndConsumeEvent(key, type);
+ QVERIFY(handled);
+
+ key = Qt::Key_Enter;
+ type = QEvent::KeyRelease;
+ HbLineEdit line;
+ EXPECT(Dialpad, editor).returns(&line);
+ EXPECT(HbLineEdit, text).returns(QString("blah"));
+ handled = mEventFilter->checkIfSendEventAndConsumeEvent(key, type);
+ QVERIFY(verify() && handled);
+
+ key = Qt::Key_Enter;
+ type = QEvent::KeyRelease;
+ EXPECT(Dialpad, editor).returns(&line);
+ EXPECT(HbLineEdit, text).returns(QString(""));
+ handled = mEventFilter->checkIfSendEventAndConsumeEvent(key, type);
+ QVERIFY(verify() && !handled);
+
+ key = Qt::Key_Enter;
+ type = QEvent::MouseButtonPress;
+ handled = mEventFilter->checkIfSendEventAndConsumeEvent(key, type);
+ QVERIFY(!handled);
+
+ key = Qt::Key_Apostrophe;
+ handled = mEventFilter->checkIfSendEventAndConsumeEvent(key, type);
+ QVERIFY(!handled);
+}
+
+void ut_DialpadMailboxEventFilterBase::testIsLongKeyPressSupported()
+{
+ int key = Qt::Key_Apostrophe;
+ bool supported = mEventFilter->isLongKeyPressSupported(key);
+ QVERIFY(!supported);
+
+ key = Qt::Key_1;
+ supported = mEventFilter->isLongKeyPressSupported(key);
+ QVERIFY(supported);
+}
+
+void ut_DialpadMailboxEventFilterBase::testClearEditor()
+{
+ HbLineEdit line;
+ EXPECT(Dialpad, editor).returns(&line);
+ EXPECT(HbLineEdit, setText).with(QString(""));
+ mEventFilter->clearEditor();
+ QVERIFY(verify());
+}
+
+void ut_DialpadMailboxEventFilterBase::testCreateCall()
+{
+ QString number("313");
+ mEventFilter->createCall(number, true);
+ mEventFilter->createCall(number, false);
+}
+
+
+DIALPAD_TEST_MAIN(ut_DialpadMailboxEventFilterBase)
+#include "ut_dialpadmailboxeventfilterbase.moc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadmailboxeventfilterbase/ut_dialpadmailboxeventfilterbase.pro Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,57 @@
+#
+# 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 =
+INCLUDEPATH += . ../../../inc ../../../../../inc ../shared
+
+CONFIG += hb qtestlib
+
+DEFINES += BUILD_DIALPAD \
+ XQ_BUILD_XQSERVICE_LIB
+
+symbian {
+ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
+} else:win32 {
+ DESTDIR = ./
+ INCLUDEPATH += ../../../../../phonesrv_plat/dialpad_api/inc
+ INCLUDEPATH += ../../../../xqtelephonyservice/inc
+}
+
+HEADERS += ../../../inc/dialpadmailboxeventfilterbase.h \
+ ../../../../../phonesrv_plat/dialpad_api/inc/dialpad.h \
+ ../../../inc/dialpadsymbianwrapper.h \
+ /epoc32/include/mw/xqservicerequest.h
+
+# test code
+SOURCES += ut_dialpadmailboxeventfilterbase.cpp
+
+# mock files
+SOURCES += ../shared/mock_qtimer.cpp \
+ ../shared/mock_dialpad.cpp \
+ ../shared/mock_dialpadsymbianwrapper.cpp \
+ ../shared/mock_hblineedit.cpp \
+ ../shared/mock_xqservicerequest.cpp
+
+# code to be tested
+SOURCES += ../../../src/dialpadmailboxeventfilterbase.cpp
+
+LIBS += -lmocklib \
+ -lsymbianmock \
+ -lxqserviceutil
+
--- a/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -17,73 +17,35 @@
#include <QtGui>
#include <QtTest/QtTest>
+#include <mockservice.h>
#include <hbapplication.h>
-#include <hbmainwindow.h>
-#include <hbaction.h>
-#include <hbtoolbar.h>
-#include <hbview.h>
#include <hblineedit.h>
-#include <hbinstance.h>
-
-#ifdef Q_OS_SYMBIAN
-#include "xqservicerequest.h"
-#endif
+#include <hbstringutil.h>
#include "dialpadtest.h"
-#include "dialpadtestutil.h"
-#include "dialpadvoicemailboxeventfilter.h"
#include "dialpad.h"
#include "dialpadsymbianwrapper.h"
-
-const int WAIT_TIME = 300;
-QString mService;
-QString mMessage;
-bool mXQServiceConstructed;
-bool mSendCalled;
+#define protected public
+#include "dialpadvoicemailboxeventfilter.h"
+#include "dialpadmailboxeventfilterbase.h"
-DialpadSymbianWrapper::DialpadSymbianWrapper(QObject *parent) : d_ptr(NULL) {}
-DialpadSymbianWrapper::~DialpadSymbianWrapper() {}
-int DialpadSymbianWrapper::getMailboxNumber(QString &vmbxNumber) { vmbxNumber=QString("12345678"); return 0; }
-int DialpadSymbianWrapper::defineMailboxNumber(QString &vmbxNumber) { return 0; }
-#ifdef Q_OS_SYMBIAN
-XQServiceRequest::XQServiceRequest(const QString& service, const QString& message, const bool& synchronous) { mService=service; mMessage=message; mXQServiceConstructed=true; }
-XQServiceRequest::~XQServiceRequest() {}
-bool XQServiceRequest::send(QVariant& retValue) { mSendCalled=true; return true; }
-void XQServiceRequest::addArg(const QVariant& v) {}
-#endif
-
-// helper class
-class KeyEventCatcher : public QObject
+void editText(QString &text)
{
-public:
- bool eventFilter(QObject* watched, QEvent * event)
- {
- Q_UNUSED(watched);
+ text = QString("blah");
+}
- if (event->type() == QEvent::KeyPress) {
- QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
- mKeyPresses.append(keyEvent->key());
- return false;
- } else if (event->type() == QEvent::KeyRelease) {
- QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
- mKeyReleases.append(keyEvent->key());
- return false;
- }
- return false;
- }
-
-public:
- QList<int> mKeyPresses;
- QList<int> mKeyReleases;
-};
// test cases
-class ut_DialpadVoiceMailboxEventFilter : public QObject
+class ut_DialpadVoiceMailboxEventFilter : public QObject, MockService
{
Q_OBJECT
+public:
+ ut_DialpadVoiceMailboxEventFilter();
+ virtual ~ut_DialpadVoiceMailboxEventFilter();
+
private slots:
void initTestCase();
void init();
@@ -91,113 +53,193 @@
void cleanup();
// These are actual voice mailbox event filter unit tests
- void testNumericKeyOneLongPress();
- void testNumericKeyOneShortPress();
- void testNumericKeyOneShortThenLongPress();
+ void testEventFilter();
+ void testHandleCallButtonPress();
+ void testHandleMailboxOperation();
+ void testHandleLongKeyPress();
private:
- HbMainWindow* mMainWindow;
- Dialpad* mDialpad;
DialpadVoiceMailboxEventFilter *mEventFilter;
- KeyEventCatcher* mKeyCatcher;
- DialpadTestUtil* mUtil;
+ Dialpad *mDialpad;
};
+ut_DialpadVoiceMailboxEventFilter::ut_DialpadVoiceMailboxEventFilter()
+{
+}
+
+ut_DialpadVoiceMailboxEventFilter::~ut_DialpadVoiceMailboxEventFilter()
+{
+}
+
void ut_DialpadVoiceMailboxEventFilter::initTestCase()
{
- mMainWindow = new HbMainWindow;
-
- mKeyCatcher = new KeyEventCatcher;
- mMainWindow->installEventFilter(mKeyCatcher);
-
- mUtil = new DialpadTestUtil(*mMainWindow);
-
- mDialpad = new Dialpad();
- mEventFilter = new DialpadVoiceMailboxEventFilter(mDialpad, this);
- hbInstance->allMainWindows().at(0)->installEventFilter(mEventFilter);
-
- QRectF rect(mMainWindow->contentsRect());
- rect.setHeight(rect.height()*0.7);
- rect.moveTop((mMainWindow->contentsRect().height()-rect.height())/2);
-
- mDialpad->setPreferredSize(360,400);
- mDialpad->setPos(0,100);
-
- mMainWindow->show();
- mDialpad->show();
- mDialpad->hide();
}
void ut_DialpadVoiceMailboxEventFilter::init()
{
- mService = QString("");
- mMessage = QString("");
- mXQServiceConstructed = false;
- mSendCalled = false;
+ initialize();
+ HbMainWindow *window = 0;
+ mDialpad = new Dialpad(*window);
+ mEventFilter = new DialpadVoiceMailboxEventFilter(mDialpad);
}
void ut_DialpadVoiceMailboxEventFilter::cleanupTestCase()
{
- delete mDialpad;
- delete mMainWindow;
- delete mKeyCatcher;
- delete mUtil;
}
void ut_DialpadVoiceMailboxEventFilter::cleanup()
{
- mKeyCatcher->mKeyPresses.clear();
- mKeyCatcher->mKeyReleases.clear();
- mDialpad->editor().setText(QString());
- QTest::qWait( WAIT_TIME ); // delay between tests
+ delete mEventFilter;
+ delete mDialpad;
+ reset();
}
-void ut_DialpadVoiceMailboxEventFilter::testNumericKeyOneLongPress()
+void ut_DialpadVoiceMailboxEventFilter::testEventFilter()
{
- mDialpad->openDialpad();
- QTest::qWait(WAIT_TIME);
- mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Press);
- QTest::qWait(2000);
- mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Release);
- QTest::qWait(1000);
- QCOMPARE(mDialpad->editor().text(), QString(""));
- mDialpad->closeDialpad();
+ QObject *obj = 0;
+
+ // First test key press functionality (all code branches).
+ QKeyEvent event1(QEvent::KeyPress, 0, Qt::NoModifier);
+ EXPECT(DialpadMailboxEventFilterBase, checkIfSendEventAndConsumeEvent).returns(true);
+
+ bool eaten = mEventFilter->eventFilter(obj, &event1);
+ QVERIFY(verify() && eaten);
+
+ HbLineEdit line;// = new HbLineEdit();
+ EXPECT(DialpadMailboxEventFilterBase, checkIfSendEventAndConsumeEvent).returns(false);
+ EXPECT(DialpadMailboxEventFilterBase, isLongKeyPressSupported).returns(true);
+ EXPECT(Dialpad, editor).returns(&line);
+ EXPECT(HbLineEdit, text).returns(QString(""));
+ EXPECT(QTimer, stop);
+ EXPECT(QTimer ,start);
+ eaten = mEventFilter->eventFilter(obj, &event1);
+ QVERIFY(verify() && !eaten);
+
+ EXPECT(DialpadMailboxEventFilterBase, checkIfSendEventAndConsumeEvent).returns(false);
+ EXPECT(DialpadMailboxEventFilterBase, isLongKeyPressSupported).returns(true);
+ EXPECT(Dialpad, editor).returns(&line);
+ EXPECT(HbLineEdit, text).returns(QString("blaa"));
+ eaten = mEventFilter->eventFilter(obj, &event1);
+ QVERIFY(verify() && !eaten);
-#ifdef Q_OS_SYMBIAN
- QVERIFY(mXQServiceConstructed == true);
- QVERIFY(mSendCalled == true);
- QCOMPARE(mService, QString("com.nokia.symbian.ICallDial"));
- QCOMPARE(mMessage, QString("dial(QString)"));
-#endif
+ EXPECT(DialpadMailboxEventFilterBase, checkIfSendEventAndConsumeEvent).returns(false);
+ EXPECT(DialpadMailboxEventFilterBase, isLongKeyPressSupported).returns(false);
+ eaten = mEventFilter->eventFilter(obj, &event1);
+ QVERIFY(verify() && !eaten);
+
+ //delete event1;
+
+ // Test key release functionality (all code branches).
+ QKeyEvent event2(QEvent::KeyRelease, 0, Qt::NoModifier);// = new QKeyEvent(QEvent::KeyRelease, 0, Qt::NoModifier);
+ EXPECT(DialpadMailboxEventFilterBase, checkIfSendEventAndConsumeEvent).returns(true);
+ eaten = mEventFilter->eventFilter(obj, &event2);
+ QVERIFY(verify() && eaten);
+
+ EXPECT(DialpadMailboxEventFilterBase, checkIfSendEventAndConsumeEvent).returns(false);
+ EXPECT(DialpadMailboxEventFilterBase, isLongKeyPressSupported).returns(true);
+ EXPECT(QTimer, stop);
+ eaten = mEventFilter->eventFilter(obj, &event2);
+ QVERIFY(verify() && !eaten);
+
+ EXPECT(DialpadMailboxEventFilterBase, checkIfSendEventAndConsumeEvent).returns(false);
+ EXPECT(DialpadMailboxEventFilterBase, isLongKeyPressSupported).returns(false);
+ eaten = mEventFilter->eventFilter(obj, &event2);
+ QVERIFY(verify() && !eaten);
+
+ //delete event2;
+
+ // Test non-supported key type functionality.
+ QKeyEvent event3(QEvent::None, 0, Qt::NoModifier);// = new QKeyEvent(QEvent::None, 0, Qt::NoModifier);
+ eaten = mEventFilter->eventFilter(obj, &event3);
+ QVERIFY(verify() && !eaten);
+ //delete event3;
+
+ //delete line;
}
-void ut_DialpadVoiceMailboxEventFilter::testNumericKeyOneShortPress()
+void ut_DialpadVoiceMailboxEventFilter::testHandleCallButtonPress()
{
- mDialpad->openDialpad();
- QTest::qWait(WAIT_TIME);
- mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Press);
- QTest::qWait(200);
- mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Release);
- QTest::qWait(1000);
- // Check that character '1' is in editor.
- QCOMPARE(mDialpad->editor().text(), QString("1"));
+ HbLineEdit line;// = new HbLineEdit();
+
+ EXPECT(Dialpad, editor).returns(&line);
+ EXPECT(HbLineEdit, text).returns(QString("1"));
+ EXPECT(Dialpad, editor).returns(&line);
+ EXPECT(HbLineEdit, text).returns(QString("1"));
+ EXPECT(HbStringUtil, convertDigitsTo).returns(QString("1"));
+ EXPECT(DialpadSymbianWrapper, getMailboxNumber).returns(97);
+ bool handled = mEventFilter->handleCallButtonPress();
+ QVERIFY(verify() && handled);
+
+ EXPECT(Dialpad, editor).returns(&line);
+ EXPECT(HbLineEdit, text).returns(QString("a"));
+ EXPECT(Dialpad, editor).returns(&line);
+ EXPECT(HbLineEdit, text).returns(QString("a"));
+ EXPECT(HbStringUtil, convertDigitsTo).returns(QString("a"));
+ handled = mEventFilter->handleCallButtonPress();
+ QVERIFY(verify() && !handled);
+
+ EXPECT(Dialpad, editor).returns(&line);
+ EXPECT(HbLineEdit, text).returns(QString(""));
+ handled = mEventFilter->handleCallButtonPress();
+ QVERIFY(verify() && !handled);
+
+ //delete line;
}
-void ut_DialpadVoiceMailboxEventFilter::testNumericKeyOneShortThenLongPress()
+void ut_DialpadVoiceMailboxEventFilter::testHandleMailboxOperation()
{
- // Then one short and one long press
- mDialpad->openDialpad();
- QTest::qWait( WAIT_TIME );
- mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Press);
- mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Release);
- mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Press);
- QTest::qWait(2000);
- mUtil->mouseClickDialpad(Qt::Key_1, DialpadTestUtil::Release);
- QTest::qWait(1000);
- QVERIFY(mDialpad->editor().text()=="11");
- mDialpad->closeDialpad();
+ EXPECT(DialpadSymbianWrapper, getMailboxNumber).returns(DialpadErrorCancel);
+ EXPECT(Dialpad, closeDialpad);
+ EXPECT(DialpadSymbianWrapper, defineMailboxNumber).returns(DialpadErrorCancel);
+ EXPECT(Dialpad, openDialpad);
+ mEventFilter->handleMailboxOperation();
+ QVERIFY(verify());
+
+ EXPECT(DialpadSymbianWrapper, getMailboxNumber).returns(DialpadErrorNone);
+ EXPECT(Dialpad, closeDialpad);
+ EXPECT(DialpadSymbianWrapper, defineMailboxNumber).returns(DialpadErrorCancel);
+ EXPECT(Dialpad, openDialpad);
+ mEventFilter->handleMailboxOperation();
+ QVERIFY(verify());
+
+ EXPECT(DialpadSymbianWrapper, getMailboxNumber).returns(DialpadErrorCancel);
+ EXPECT(Dialpad, closeDialpad);
+ EXPECT(DialpadSymbianWrapper, defineMailboxNumber).returns(DialpadErrorNone);
+ mEventFilter->handleMailboxOperation();
+ QVERIFY(verify());
+
+ QString text;
+ EXPECT(DialpadSymbianWrapper, getMailboxNumber).with<QString &>(text).
+ willOnce(invoke(editText)).times(1).returns(DialpadErrorCancel);
+ EXPECT(Dialpad, closeDialpad);
+ EXPECT(DialpadSymbianWrapper, defineMailboxNumber).returns(DialpadErrorCancel);
+ EXPECT(Dialpad, openDialpad);
+ mEventFilter->handleMailboxOperation();
+ QVERIFY(verify());
+
+ EXPECT(DialpadSymbianWrapper, getMailboxNumber).with<QString &>(text).
+ willOnce(invoke(editText)).times(1).returns(DialpadErrorNone);
+ EXPECT(DialpadMailboxEventFilterBase, createCall);
+ EXPECT(DialpadMailboxEventFilterBase, clearEditor);
+ EXPECT(Dialpad, openDialpad);
+ mEventFilter->handleMailboxOperation();
+ QVERIFY(verify());
}
+void ut_DialpadVoiceMailboxEventFilter::testHandleLongKeyPress()
+{
+ QString text;
+ mEventFilter->mKeyEvent = Qt::Key_1;
+ EXPECT(DialpadSymbianWrapper, getMailboxNumber).with<QString &>(text).
+ willOnce(invoke(editText)).times(1).returns(DialpadErrorNone);
+ mEventFilter->handleLongKeyPress();
+ QVERIFY(verify());
+
+ mEventFilter->mKeyEvent = Qt::Key_Apostrophe;
+ mEventFilter->handleLongKeyPress();
+}
+
+
DIALPAD_TEST_MAIN(ut_DialpadVoiceMailboxEventFilter)
#include "ut_dialpadvoicemailboxeventfilter.moc"
--- a/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.pro Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/dialpad/tsrc/unit/ut_dialpadvoicemailboxeventfilter/ut_dialpadvoicemailboxeventfilter.pro Mon Oct 04 15:57:13 2010 +0300
@@ -21,24 +21,36 @@
CONFIG += hb qtestlib
+DEFINES += BUILD_DIALPAD
+
symbian {
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
} else:win32 {
DESTDIR = ./
INCLUDEPATH += ../../../../../phonesrv_plat/dialpad_api/inc
INCLUDEPATH += ../../../../xqtelephonyservice/inc
}
-#
HEADERS += ../../../inc/dialpadvoicemailboxeventfilter.h \
- ../../../inc/dialpadmailboxeventfilterbase.h \
- ../../../inc/dialpadsymbianwrapper.h \
- xqservicerequest.h \
- dialpadtestutil.h
-SOURCES += ut_dialpadvoicemailboxeventfilter.cpp \
- ../../../src/dialpadvoicemailboxeventfilter.cpp \
- ../../../src/dialpadmailboxeventfilterbase.cpp \
- ../shared/dialpadtestutil.cpp
+ ../../../../../phonesrv_plat/dialpad_api/inc/dialpad.h \
+ ../../../inc/dialpadmailboxeventfilterbase.h \
+ ../../../inc/dialpadsymbianwrapper.h
+# test code
+SOURCES += ut_dialpadvoicemailboxeventfilter.cpp
-#
-LIBS += -ldialpad
+# mock files
+SOURCES += ../shared/mock_qevent.cpp \
+ ../shared/mock_qtimer.cpp \
+ ../shared/mock_dialpad.cpp \
+ ../shared/mock_dialpadsymbianwrapper.cpp \
+ ../shared/mock_dialpadmailboxeventfilterbase.cpp \
+ ../shared/mock_hblineedit.cpp \
+ ../shared/mock_hbstringutil.cpp
+
+# code to be tested
+SOURCES += ../../../src/dialpadvoicemailboxeventfilter.cpp
+
+LIBS += -lmocklib \
+ -lsymbianmock
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/keysequencerecognitionservice/inc/bluetoothkeysequencehandler.h Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,39 @@
+/*!
+* 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: Implements bluetooth key sequence handling.
+*
+*/
+
+#ifndef BLUETOOTHKEYSEQUENCEHANDLER_H
+#define BLUETOOTHKEYSEQUENCEHANDLER_H
+
+#include "keysequencehandler.h"
+
+class BluetoothKeySequenceHandler : public KeySequenceHandler
+{
+ Q_OBJECT
+
+public:
+ BluetoothKeySequenceHandler(QObject *parent = 0);
+ ~BluetoothKeySequenceHandler();
+
+ bool executeKeySequence(const QString &keySequence);
+
+private:
+ void showBluetoothLocalAddress();
+ void activateBluetoothTestMode();
+ void toggleBluetoothDebugMode();
+};
+
+#endif // BLUETOOTHKEYSEQUENCEHANDLER_H
--- a/telutils/keysequencerecognitionservice/inc/keysequencerecognitionservicedefs.h Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/keysequencerecognitionservice/inc/keysequencerecognitionservicedefs.h Mon Oct 04 15:57:13 2010 +0300
@@ -22,26 +22,44 @@
/*! code for showing software version number */
const QString KCodeSwVersion("*#0000#");
+
/*! code for launching reset ui */
const QString KCodeActivateRfsNormal("*#7780#");
+
/*! code for launching reset ui */
const QString KCodeActivateRfsDeep("*#7370#");
+
/*! code for showing bluetooth device address */
const QString KCodeBtAddress("*#2820#");
+
/*! code for enabling bluetooth test mode */
const QString KCodeRFLoopback("*#9990#");
+
/*! code for showing serial number */
const QString KCodeImei("*#06#");
+
/*! code for showing life timer data */
const QString KCodeLifeTimer("*#92702689#");
+
/*! code for changing pin code 1 */
const QString KCodeChangePin1("\\*\\*04\\*\\d{4,15}\\*\\d{4,15}\\*\\d{4,15}\\#");
+
/*! code for changing pin code 2 */
const QString KCodeChangePin2("\\*\\*042\\*\\d{4,15}\\*\\d{4,15}\\*\\d{4,15}#");
+
/*! code for unblocking pin code 1 */
const QString KCodeUnblockPin1("\\*\\*05\\**\\d{8,20}\\*\\d{4,15}\\*\\d{4,15}#");
+
/*! code for unblocking pin code 2 */
const QString KCodeUnblockPin2("\\*\\*052\\**\\d{8,20}\\*\\d{4,15}\\*\\d{4,15}#");
+/* code for showing the local bluetooth device address in a dialog */
+const QString KShowBTAddress("*#2820#");
+
+/* code for activating the bluetooth device test mode (DUT mode) */
+const QString KActivateBTTestMode("*#9990#");
+
+/* code for toggling the bluetooth SSP debug mode */
+const QString KToggleBTSSPDebugMode("*#2873#");
#endif // KEYSEQUENCERECOGNITIONSERVICEDEFS_H
--- a/telutils/keysequencerecognitionservice/keysequencerecognitionservice.pri Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/keysequencerecognitionservice/keysequencerecognitionservice.pri Mon Oct 04 15:57:13 2010 +0300
@@ -13,8 +13,9 @@
./inc/keysequencehandler.h \
./inc/manufacturerkeysequencehandler.h \
./inc/imeikeysequencehandler.h \
- ./inc/simcontrolkeysequencehandler.h \
- ./inc/lifetimerkeysequencehandler.h
+ ./inc/simcontrolkeysequencehandler.h \
+ ./inc/lifetimerkeysequencehandler.h \
+ ./inc/bluetoothkeysequencehandler.h
SOURCES = ./src/main.cpp \
./src/keysequencerecognitionprovider.cpp \
@@ -22,4 +23,5 @@
./src/manufacturerkeysequencehandler.cpp \
./src/imeikeysequencehandler.cpp \
./src/simcontrolkeysequencehandler.cpp \
- ./src/lifetimerkeysequencehandler.cpp
+ ./src/lifetimerkeysequencehandler.cpp \
+ ./src/bluetoothkeysequencehandler.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/keysequencerecognitionservice/src/bluetoothkeysequencehandler.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,113 @@
+/*!
+* 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: Implements bluetooth key sequence handling.
+*
+*/
+
+#include <qmobilityglobal.h>
+#include <btxqserviceapi.h>
+#include <QRegExp>
+#ifdef Q_OS_SYMBIAN
+#include <xqappmgr.h>
+#endif //Q_OS_SYMBIAN
+
+#include "keysequencerecognitionservicedefs.h"
+#include "keysequencerecognitionservicelog.h"
+#include "bluetoothkeysequencehandler.h"
+
+/*!
+ BluetoothKeySequenceHandler::BluetoothKeySequenceHandler.
+ */
+BluetoothKeySequenceHandler::BluetoothKeySequenceHandler(QObject* parent) :
+ KeySequenceHandler(parent)
+{
+ DPRINT_METHODENTRYEXIT;
+
+ setKeySequenceValidator(QRegExp::escape(KShowBTAddress) + "|" +
+ QRegExp::escape(KActivateBTTestMode) + "|" +
+ QRegExp::escape(KToggleBTSSPDebugMode));
+}
+
+/*!
+ BluetoothKeySequenceHandler::~BluetoothKeySequenceHandler.
+ */
+BluetoothKeySequenceHandler::~BluetoothKeySequenceHandler()
+{
+ DPRINT_METHODENTRYEXIT;
+}
+
+
+/*!
+ BluetoothKeySequenceHandler::executeKeySequence.
+ */
+bool BluetoothKeySequenceHandler::executeKeySequence(
+ const QString &keySequence)
+{
+ DPRINT_METHODENTRYEXIT;
+ bool handled = true;
+
+ if(keySequence == KShowBTAddress) {
+ showBluetoothLocalAddress();
+ } else if(keySequence == KActivateBTTestMode) {
+ activateBluetoothTestMode();
+ } else if(keySequence == KToggleBTSSPDebugMode) {
+ toggleBluetoothDebugMode();
+ } else {
+ handled = false;
+ }
+
+ return handled;
+}
+
+void BluetoothKeySequenceHandler::showBluetoothLocalAddress()
+{
+ DPRINT_METHODENTRYEXIT;
+#ifdef Q_OS_SYMBIAN
+ XQApplicationManager appManager;
+ QScopedPointer<XQAiwRequest> request(appManager.create(BluetoothServiceName, BluetoothInterfaceShowLocalAddress,
+ BluetoothShowLocalAddress, false));
+ if (request == NULL) {
+ return;
+ }
+ request->send();
+#endif // Q_OS_SYMBIAN
+}
+
+void BluetoothKeySequenceHandler::activateBluetoothTestMode()
+{
+ DPRINT_METHODENTRYEXIT;
+#ifdef Q_OS_SYMBIAN
+ XQApplicationManager appManager;
+ QScopedPointer<XQAiwRequest> request(appManager.create(BluetoothServiceName, BluetoothInterfaceActivateDutMode,
+ BluetoothActivateDutMode, false));
+ if (request == NULL) {
+ return;
+ }
+ request->send();
+#endif // Q_OS_SYMBIAN
+}
+
+void BluetoothKeySequenceHandler::toggleBluetoothDebugMode()
+{
+ DPRINT_METHODENTRYEXIT;
+#ifdef Q_OS_SYMBIAN
+ XQApplicationManager appManager;
+ QScopedPointer<XQAiwRequest> request(appManager.create(BluetoothServiceName, BluetoothInterfaceToggleSspDebugMode,
+ BluetoothToggleSspDebugMode, false));
+ if (request == NULL) {
+ return;
+ }
+ request->send();
+#endif // Q_OS_SYMBIAN
+}
--- a/telutils/keysequencerecognitionservice/src/keysequencerecognitionprovider.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/keysequencerecognitionservice/src/keysequencerecognitionprovider.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -25,6 +25,7 @@
#include "imeikeysequencehandler.h"
#include "lifetimerkeysequencehandler.h"
#include "simcontrolkeysequencehandler.h"
+#include "bluetoothkeysequencehandler.h"
#include "keysequencerecognitionservicelog.h"
/*!
@@ -54,7 +55,6 @@
taskSettings.setVisibility(false);
}
-
/*!
KeySequenceRecognitionProvider::~KeySequenceRecognitionProvider.
*/
@@ -63,7 +63,6 @@
DPRINT_METHODENTRYEXIT;
}
-
/*!
KeySequenceRecognitionProvider::keySequenceValidator.
*/
@@ -78,7 +77,6 @@
return m_keySequenceValidator;
}
-
/*!
KeySequenceRecognitionProvider::executeKeySequence.
*/
@@ -97,7 +95,6 @@
return handled;
}
-
/*!
KeySequenceRecognitionProvider::setupLocalization.
*/
@@ -118,7 +115,6 @@
}
}
-
/*!
KeySequenceRecognitionProvider::constructKeySequenceHandlers.
*/
@@ -145,9 +141,13 @@
new SimControlKeySequenceHandler(this));
m_handlers.append(simControlHandler.data());
simControlHandler.take();
+
+ QScopedPointer<KeySequenceHandler> bluetoothHandler(
+ new BluetoothKeySequenceHandler(this));
+ m_handlers.append(bluetoothHandler.data());
+ bluetoothHandler.take();
}
-
/*!
KeySequenceRecognitionProvider::constructKeySequenceValidator.
*/
--- a/telutils/keysequencerecognitionservice/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/keysequencerecognitionservice/tsrc/run_auto_tests_qt.bat Mon Oct 04 15:57:13 2010 +0300
@@ -139,7 +139,7 @@
call qmake
call sbs --config winscw_udeb --keepgoing CLEAN
if [%INSTRUMENT%] EQU [TRUE] (
-call ctcwrap -2comp -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
+call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
) else (
call %SBS_CALL%
)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/keysequencerecognitionservice/tsrc/shared/mock_bluetoothkeysequencehandler.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,54 @@
+/*
+* 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 "bluetoothkeysequencehandler.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// BluetoothKeySequenceHandler::BluetoothKeySequenceHandler
+// -----------------------------------------------------------------------------
+//
+BluetoothKeySequenceHandler::BluetoothKeySequenceHandler(
+ QObject * parent )
+ :
+ KeySequenceHandler(parent)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// BluetoothKeySequenceHandler::~BluetoothKeySequenceHandler
+// -----------------------------------------------------------------------------
+//
+BluetoothKeySequenceHandler::~BluetoothKeySequenceHandler( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// BluetoothKeySequenceHandler::executeKeySequence
+// -----------------------------------------------------------------------------
+//
+bool BluetoothKeySequenceHandler::executeKeySequence(
+ const QString & keySequence )
+ {
+ SMC_MOCK_METHOD1( bool, const QString &, keySequence )
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/keysequencerecognitionservice/tsrc/ut_bluetoothkeysequencehandler/runtest.cmd Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,22 @@
+@echo off
+rem
+rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:
+rem
+
+call del \epoc32\winscw\c\data\ut_bluetoothsequencehandler.log
+@echo on
+:FINAL
+call \epoc32\release\winscw\udeb\ut_bluetoothsequencehandler.exe -o c:\data\ut_bluetoothsequencehandler.log
+call type \epoc32\winscw\c\data\ut_bluetoothsequencehandler.log
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/keysequencerecognitionservice/tsrc/ut_bluetoothkeysequencehandler/ut_bluetoothkeysequencehandler.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,124 @@
+/*!
+* 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 <QtTest/QtTest>
+#ifdef Q_OS_SYMBIAN
+#include <btxqserviceapi.h>
+#endif
+#include "ut_bluetoothkeysequencehandler.h"
+#include "bluetoothkeysequencehandler.h"
+#include "keysequencerecognitionservicedefs.h"
+#include "qtestmains60.h"
+#include "xqappmgr.h"
+
+QString mService;
+QString mInterface;
+QString mOperation;
+bool mEmbedded;
+bool mSendCalled;
+
+#ifdef Q_OS_SYMBIAN
+XQAiwRequest* XQApplicationManager::create(const QString& service, const QString& interface, const QString& operation, bool embedded)
+{
+ mService = service;
+ mInterface = interface;
+ mOperation = operation;
+ mEmbedded = embedded;
+ return new XQAiwRequest();
+}
+void XQAiwRequest::send() { mSendCalled = true; }
+#endif
+
+UT_BluetoothKeySequenceHandler::UT_BluetoothKeySequenceHandler() : m_handler(0)
+{
+
+}
+
+UT_BluetoothKeySequenceHandler::~UT_BluetoothKeySequenceHandler()
+{
+ delete m_handler;
+}
+
+void UT_BluetoothKeySequenceHandler::init()
+{
+ mService = QString("");
+ mInterface = QString("");
+ mOperation = QString("");
+ mEmbedded = false;
+ mSendCalled = false;
+ m_handler = new BluetoothKeySequenceHandler();
+}
+
+void UT_BluetoothKeySequenceHandler::cleanup()
+{
+ delete m_handler;
+ m_handler = 0;
+}
+
+void UT_BluetoothKeySequenceHandler::testShowBTLocalAddressKeySequence()
+{
+#ifdef Q_OS_SYMBIAN
+ bool handled = m_handler->executeKeySequence(KShowBTAddress);
+ QVERIFY(handled == true);
+ QCOMPARE(mService, BluetoothServiceName);
+ QCOMPARE(mInterface, BluetoothInterfaceShowLocalAddress);
+ QCOMPARE(mOperation, BluetoothShowLocalAddress);
+ QVERIFY(mEmbedded == false);
+ QVERIFY(mSendCalled == true);
+#endif
+}
+
+void UT_BluetoothKeySequenceHandler::testActivateBTDutModeKeySequence()
+{
+#ifdef Q_OS_SYMBIAN
+ bool handled = m_handler->executeKeySequence(KActivateBTTestMode);
+ QVERIFY(handled == true);
+ QCOMPARE(mService, BluetoothServiceName);
+ QCOMPARE(mInterface, BluetoothInterfaceActivateDutMode);
+ QCOMPARE(mOperation, BluetoothActivateDutMode);
+ QVERIFY(mEmbedded == false);
+ QVERIFY(mSendCalled == true);
+#endif
+}
+
+void UT_BluetoothKeySequenceHandler::testToggleBTSSPDebugModeKeySequence()
+{
+#ifdef Q_OS_SYMBIAN
+ bool handled = m_handler->executeKeySequence(KToggleBTSSPDebugMode);
+ QVERIFY(handled == true);
+ QCOMPARE(mService, BluetoothServiceName);
+ QCOMPARE(mInterface, BluetoothInterfaceToggleSspDebugMode);
+ QCOMPARE(mOperation, BluetoothToggleSspDebugMode);
+ QVERIFY(mEmbedded == false);
+ QVERIFY(mSendCalled == true);
+#endif
+}
+
+void UT_BluetoothKeySequenceHandler::testInvalidKeySequence()
+{
+#ifdef Q_OS_SYMBIAN
+ bool handled = m_handler->executeKeySequence("*#1234#");
+ QVERIFY(handled == false);
+ QCOMPARE(mService, QString(""));
+ QCOMPARE(mInterface, QString(""));
+ QCOMPARE(mOperation, QString(""));
+ QVERIFY(mEmbedded == false);
+ QVERIFY(mSendCalled == false);
+#endif
+}
+
+QTEST_MAIN_S60(UT_BluetoothKeySequenceHandler)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/keysequencerecognitionservice/tsrc/ut_bluetoothkeysequencehandler/ut_bluetoothkeysequencehandler.h Mon Oct 04 15:57:13 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_BLUETOOTHKEYSEQUENCEHANDLER_H
+#define UT_BLUETOOTHKEYSEQUENCEHANDLER_H
+
+#include <QtTest/QtTest>
+
+class BluetoothKeySequenceHandler;
+
+class UT_BluetoothKeySequenceHandler : public QObject
+{
+ Q_OBJECT
+
+public:
+
+ UT_BluetoothKeySequenceHandler();
+ ~UT_BluetoothKeySequenceHandler();
+
+private slots:
+
+ void init();
+ void cleanup();
+ void testShowBTLocalAddressKeySequence();
+ void testActivateBTDutModeKeySequence();
+ void testToggleBTSSPDebugModeKeySequence();
+ void testInvalidKeySequence();
+
+private:
+ BluetoothKeySequenceHandler *m_handler;
+};
+
+#endif // UT_BLUETOOTHKEYSEQUENCEHANDLER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/keysequencerecognitionservice/tsrc/ut_bluetoothkeysequencehandler/ut_bluetoothsequencehandler.pro Mon Oct 04 15:57:13 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:
+#
+#
+
+TEMPLATE = app
+TARGET =
+MOC_DIR = moc
+CONFIG += hb qtestlib
+DEFINES += QT_NO_DEBUG_STREAM
+DEFINES += QT_BUILD_SYSINFO_LIB QT_MAKEDLL
+
+QT -= gui
+
+symbian {
+ INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+ INCLUDEPATH += . ../shared ../../inc
+
+ HEADERS += ../../inc/keysequencehandler.h
+ HEADERS += ../../inc/bluetoothkeysequencehandler.h
+ SOURCES += ../../src/keysequencehandler.cpp
+ SOURCES += ../../src/bluetoothkeysequencehandler.cpp
+
+ HEADERS += xqappmgr.h
+ HEADERS += ut_bluetoothkeysequencehandler.h
+ SOURCES += ut_bluetoothkeysequencehandler.cpp
+
+ LIBS += -lxqserviceutil
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telutils/keysequencerecognitionservice/tsrc/ut_bluetoothkeysequencehandler/xqappmgr.h Mon Oct 04 15:57:13 2010 +0300
@@ -0,0 +1,12 @@
+class XQAiwRequest
+{
+public:
+ void send();
+};
+
+class XQApplicationManager
+{
+public:
+ XQAiwRequest* create(const QString& service, const QString& interface, const QString& operation, bool embedded = true);
+};
+
--- a/telutils/keysequencerecognitionservice/tsrc/ut_keysequencerecognitionprovider/ut_keysequencerecognitionprov.pro Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/keysequencerecognitionservice/tsrc/ut_keysequencerecognitionprovider/ut_keysequencerecognitionprov.pro Mon Oct 04 15:57:13 2010 +0300
@@ -39,7 +39,8 @@
../../inc/imeikeysequencehandler.h \
../../inc/lifetimerkeysequencehandler.h \
../../inc/manufacturerkeysequencehandler.h \
- ../../inc/simcontrolkeysequencehandler.h
+ ../../inc/simcontrolkeysequencehandler.h \
+ ../../inc/bluetoothkeysequencehandler.h
SOURCES += \
../shared/mock_qtranslator.cpp \
@@ -49,7 +50,8 @@
../shared/mock_manufacturerkeysequencehandler.cpp \
../shared/mock_simcontrolkeysequencehandler.cpp \
../shared/mock_centralrepository.cpp \
- ../shared/mock_tstasksettings.cpp
+ ../shared/mock_tstasksettings.cpp \
+ ../shared/mock_bluetoothkeysequencehandler.cpp
LIBS += -lmocklib -lsymbianmock -lxqservice -lxqserviceutil
}
--- a/telutils/keysequencerecognitionservice/tsrc/ut_keysequencerecognitionprovider/ut_keysequencerecognitionprovider.cpp Fri Sep 17 17:09:13 2010 +0300
+++ b/telutils/keysequencerecognitionservice/tsrc/ut_keysequencerecognitionprovider/ut_keysequencerecognitionprovider.cpp Mon Oct 04 15:57:13 2010 +0300
@@ -87,7 +87,7 @@
void UT_KeySequenceRecognitionProvider::t_keySequenceValidator()
{
- QString KExpectedValidator = "1|2|3";
+ QString KExpectedValidator = "1|2|3||";
EXPECT(KeySequenceHandler, keySequenceValidator)
.returns(QString("1"));
EXPECT(KeySequenceHandler, keySequenceValidator)
--- a/vmbx/vmbxcpplugin_version_history.txt Fri Sep 17 17:09:13 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-
-22-Oct-2009 Tommi Kenakkala
-
-HOW TO INTEGRATE:
-- This version uses MCLwk32+QtOrbitDeltawk37+QtControlPanelwk38
-- To get this working you have use the refactored vmbxengine.
-Copy cvoicemailbox.h, cvoicemailboxentry.h, voicemailboxdefs.h to the phonesrv_plat api folder (Same as old)
-(I'll also remove vmbxengine app layer api dependencies from mercurial)
-- Copy Qt control panel to root
-- Edit \qtcontrolpanel\qtcontrolpanel\controlpanelplugins\communicationplugin\data\cpcommunicationplugin.cpcfg
-by adding:
- <plugin displayname = "displayname" id = "0X20029F5D" dll = "vmbxcpplugin.dll">
- <desc>I'm a description</desc>
- </plugin>
-(remember to check that uid matches to implementation)
-- To get signals from ui control in QtControlPanelwk38 package you have to fix the mistyped connect
-in qtcontrolpanel\qtcontrolpanel\cpframework\src\cpsettingformitemdata.cpp:
-"lineEditTextChanged" is mistyped as "lineEditTextChangge"
-Signal is emitted on every character change so we or control panel have to fix that.
-- After above is done compile qtcontrolpanel:
- qmake -spec symbian-abld
- bldmake bldfiles
- abld build winscw udeb
-- Copy vmbxcpplugin to root and compile similarly
-
-- If you want to avoid carbide:
- - Install DebugView (debug traces are printed there)
- - launch epoc.exe from shell, launch DebugView PC app
- - In emulator open eshell and launch the application there by typing the exe name
-
-- If vmbxcpplugin is not loaded enable QtControlPanel tracing and check the control
-panel fw traces, there should be a trace for every plugin load attemp.
-After "desc" tag there's a "loading failed" string if e.g. vmbxcpplugin.dll
-loading failed because linking to vmbxengine.dll had problems.
-Here is an ok trace from qtcontrolpanel:
- "[1876] diplayname = "displayname"
- [1876] dll = "vmbxcpplugin.dll"
- [1876] desc = "I'm a description" "
-
-HOW TO USE QT CONTROL PANEL ON UI:
-- launch by selecting applications > qtcontrolpanel
-or applications > eshell and type qtcontrolpanel
-- Click the "+" to open communications group
-- Click the "+" to open vmbx group
-- when you start editing the number, it will be save every time you change even a single character
-
-ABOUT DESIGN & FEATURES:
-
-- TODO: update VmbxCpGroup to class VmbxCpGroup : public CpSettingFormItemData
-when DataForm bug is fixed (QTControlPanel wk39-41?), now append/addchild() panics.
-After the base class switch API will change but it should be just a few minutes of work to do that.
-
-- Ps Services to be implemented later when we know if they will be in vmbx control panel group or in service settings group.
-- UI editing permit checking must be implemented
-- Video ALS support not to be implemented on UI, do it later if there really is someone using it.
-- Default mailbox setting to be implemented later to CVoiceMailbox API and to UI, if future UI concepts still specify it.
-- Use QT_TRAP_THROWING when qt 4.6 available, but do test then that qt throws and symbian leaves work ok together.
-- Triple-check cleanup everywhere
-- .pro file include paths are hard-coded, fix those for phonesrv_plat api folders.
-
-test
-
