--- a/package_definition.xml Fri Sep 17 17:09:12 2010 +0300
+++ b/package_definition.xml Mon Oct 04 16:06:10 2010 +0300
@@ -35,6 +35,9 @@
<component id="phoneui2" filter="s60" name="Phone UI">
<unit bldFile="phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
</component>
+ <component id="phoneuivoipextension" filter="s60" name="Phone UI">
+ <unit bldFile="phoneapp/phoneuivoipextension/group"/>
+ </component>
</collection>
<collection id="phoneengine" name="Phone Engine" level="engine">
<component id="phonecntfinder2" filter="s60" name="Phone Contact Finder">
--- a/phone_plat/telephony_information_api/inc/telinformationpskeys.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phone_plat/telephony_information_api/inc/telinformationpskeys.h Mon Oct 04 16:06:10 2010 +0300
@@ -47,7 +47,7 @@
* This can be used for setting and requesting
* Car Mode status.
*****************************************************************************/
-const TUid KPSUidTelCarMode = {0x102029A8};
+const TUid KPSUidTelCarMode = {0x102078EC};
/**
* Indicates the car mode setting
--- a/phoneapp/phonemediatorcenter/src/cphonemediatormessagefactory.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phonemediatorcenter/src/cphonemediatormessagefactory.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -70,11 +70,9 @@
// ---------------------------------------------------------
//
MPhoneMediatorMessage* CPhoneMediatorMessageFactory::CreateMessageL(
- const TInt aMessage, TInt aCallId )
+ const TInt aMessage, TInt /*aCallId*/ )
{
__LOGMETHODSTARTEND( EPhoneMediatorCenter, "CPhoneMediatorMessageFactory::CreateMessageL( ) ");
- __PHONELOG2( EBasic, EPhoneMediatorCenter,
- "CPhoneMediatorMessageFactory::CreateMessageL - aMessage=%d, aCallId=%d", aMessage, aCallId );
MPhoneMediatorMessage* message = NULL;
--- a/phoneapp/phonemediatorcenter/src/cphonemediatorsender.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phonemediatorcenter/src/cphonemediatorsender.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -69,9 +69,12 @@
// Destructor
CPhoneMediatorSender::~CPhoneMediatorSender()
{
- iEventSender->UnregisterEvent( KMediatorTelephonyDomain,
- KCatEventsFromTelephony,
- iGenericEvents );
+ if ( iEventSender != NULL )
+ {
+ iEventSender->UnregisterEvent( KMediatorTelephonyDomain,
+ KCatEventsFromTelephony,
+ iGenericEvents );
+ }
delete iCommandInitiator;
iEvents.Close();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/rom/phoneapp_package.pkg Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,43 @@
+;
+; 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: For packing phoneuicontrol component.
+;
+; Languages
+&EN
+
+; Standard SIS file header
+;
+; TODO: UID must ne fixed once SW Update bug is fixed. Estimate wk40 2010
+;
+#{"phone_package"},(0x100058B5),1,0,0,TYPE=SA,RU
+
+
+; Localized Vendor Name
+%{"Nokia"}
+
+
+; Unique Vendor name
+:"Nokia"
+
+
+; Platform Dependency
+;
+; TODO: Fix correct platform
+;
+[0x102752ae], 0, 0, 0, {"Series60ProductID"}
+
+; Files to copy
+"\Epoc32\release\armv5\udeb\phoneuicontrol.dll" -"C:\sys\bin\phoneuicontrol.dll"
+
+
--- a/phoneapp/phoneui2/rom/phoneui_stub.pkg Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneui2/rom/phoneui_stub.pkg Mon Oct 04 16:06:10 2010 +0300
@@ -27,6 +27,6 @@
:"Nokia"
"" - "z:\sys\bin\phoneui.exe"
-"" - "z:\resource\apps\phoneui.rsc"
+"" - "z:\resource\apps\phoneui.r*"
"" - "z:\private\10003a3f\import\apps\phoneui_reg.rsc"
Binary file phoneapp/phoneui2/rom/phoneui_stub.sis has changed
--- a/phoneapp/phoneui2/src/phoneapplication.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneui2/src/phoneapplication.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -35,15 +35,13 @@
{
if (event->type() == QSymbianEvent::WindowServerEvent){
const TWsEvent *wsevent = event->windowServerEvent();
- switch( wsevent->Type()){
- case EEventFocusGained:
+ if ( wsevent->Type() == EEventWindowVisibilityChanged ){
+ TUint visible = wsevent->VisibilityChanged()->iFlags;
+ if ( visible & TWsVisibilityChangedEvent::EFullyVisible ){
emit focusGained();
- break;
- case EEventFocusLost:
+ }else if (visible & TWsVisibilityChangedEvent::ENotVisible){
emit focusLost();
- break;
- default:
- break;
+ }
}
}
return HbApplication::symbianEventFilter(event);
--- a/phoneapp/phoneui2/src/phoneuikeyeventadapter.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneui2/src/phoneuikeyeventadapter.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -20,6 +20,7 @@
#include <QKeyEvent>
#include "phoneuikeyeventadapter.h"
#include "phoneconstants.h"
+#include "qtphonelog.h"
PhoneUIKeyEventAdapter::PhoneUIKeyEventAdapter (MPhoneKeyEventHandler &keyEventHandler, QObject *parent) :
QObject (parent), mHandler (keyEventHandler)
@@ -43,7 +44,9 @@
void PhoneUIKeyEventAdapter::forwardKeyEvent(
TEventCode symbianEventCode, QKeyEvent *event)
-{
+{
+
+ PHONE_TRACE
TKeyEvent symbianKeyEvent;
symbianKeyEvent.iCode = convertKeyCode(event);
symbianKeyEvent.iRepeats = 0;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneui2/tsrc/ut_phonemainwindow/hbmainwindow_stub.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,376 @@
+/*
+* 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 <QDebug>
+#include <hbmainwindow.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::HbMainWindow
+// -----------------------------------------------------------------------------
+//
+HbMainWindow::HbMainWindow(
+ QWidget * parent,
+ Hb::WindowFlags windowFlags )
+ : d_ptr(NULL)
+ //QGraphicsView( /*parent, windowFlags*/ )
+ {
+ Q_UNUSED(parent)
+ Q_UNUSED(windowFlags)
+ }
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::~HbMainWindow
+// -----------------------------------------------------------------------------
+//
+HbMainWindow::~HbMainWindow( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::addView
+// -----------------------------------------------------------------------------
+//
+HbView * HbMainWindow::addView(
+ QGraphicsWidget * widget )
+ {
+ Q_UNUSED(widget)
+ }
+// -----------------------------------------------------------------------------
+// HbMainWindow::insertView
+// -----------------------------------------------------------------------------
+//
+HbView * HbMainWindow::insertView(
+ int index,
+ QGraphicsWidget * widget )
+ {
+ Q_UNUSED(index)
+ Q_UNUSED(widget)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::removeView
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::removeView(
+ QGraphicsWidget * widget )
+ {
+ Q_UNUSED(widget)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::views
+// -----------------------------------------------------------------------------
+//
+QList <HbView * > HbMainWindow::views( ) const
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::currentView
+// -----------------------------------------------------------------------------
+//
+HbView * HbMainWindow::currentView( ) const
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::setCurrentView
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::setCurrentView(
+ HbView * view,
+ bool animate,
+ Hb::ViewSwitchFlags flags )
+ {
+ Q_UNUSED(view)
+ Q_UNUSED(animate)
+ Q_UNUSED(flags)
+ }
+
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::orientation
+// -----------------------------------------------------------------------------
+//
+Qt::Orientation HbMainWindow::orientation( ) const
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::setOrientation
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::setOrientation(
+ Qt::Orientation orientation,
+ bool animate )
+ {
+ Q_UNUSED(orientation)
+ Q_UNUSED(animate)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::unsetOrientation
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::unsetOrientation(
+ bool animate )
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::nativeBackgroundWindow
+// -----------------------------------------------------------------------------
+//
+WId HbMainWindow::nativeBackgroundWindow( )
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::resetNativeBackgroundWindow
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::resetNativeBackgroundWindow( )
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::layoutRect
+// -----------------------------------------------------------------------------
+//
+QRectF HbMainWindow::layoutRect( ) const
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::setBackgroundImageName
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::setBackgroundImageName(
+ Qt::Orientation orientation,
+ const QString & name )
+ {
+ Q_UNUSED(orientation)
+ Q_UNUSED(name)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::backgroundImageName
+// -----------------------------------------------------------------------------
+//
+QString HbMainWindow::backgroundImageName(
+ Qt::Orientation orientation ) const
+ {
+ Q_UNUSED(orientation)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::setAutomaticOrientationEffectEnabled
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::setAutomaticOrientationEffectEnabled(
+ bool enabled )
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::automaticOrientationEffectEnabled
+// -----------------------------------------------------------------------------
+//
+bool HbMainWindow::automaticOrientationEffectEnabled( ) const
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::broadcastEvent
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::broadcastEvent(
+ int eventType )
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::viewReady
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::viewReady( )
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::aboutToChangeView
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::aboutToChangeView(
+ HbView * oldView,
+ HbView * newView )
+ {
+ Q_UNUSED(oldView)
+ Q_UNUSED(newView)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::currentViewChanged
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::currentViewChanged(
+ HbView * view )
+ {
+ Q_UNUSED(view)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::aboutToChangeOrientation
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::aboutToChangeOrientation( )
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::aboutToChangeOrientation
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::aboutToChangeOrientation(
+ Qt::Orientation newOrientation,
+ bool animated )
+ {
+ Q_UNUSED(newOrientation)
+ Q_UNUSED(animated)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::orientationChanged
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::orientationChanged(
+ Qt::Orientation orientation )
+ {
+ Q_UNUSED(orientation)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::changeEvent
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::changeEvent(
+ QEvent * event )
+ {
+ Q_UNUSED(event)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::closeEvent
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::closeEvent(
+ QCloseEvent * event )
+ {
+ Q_UNUSED(event)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::keyPressEvent
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::keyPressEvent(
+ QKeyEvent * event )
+ {
+ Q_UNUSED(event)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::keyReleaseEvent
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::keyReleaseEvent(
+ QKeyEvent * event )
+ {
+ Q_UNUSED(event)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::resizeEvent
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::resizeEvent(
+ QResizeEvent * event )
+ {
+ Q_UNUSED(event)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::customEvent
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::customEvent(
+ QEvent * event )
+ {
+ Q_UNUSED(event)
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::scrollContentsBy
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::scrollContentsBy(
+ int dx,
+ int dy )
+ {
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMainWindow::paintEvent
+// -----------------------------------------------------------------------------
+//
+void HbMainWindow::paintEvent(
+ QPaintEvent * event )
+ {
+ Q_UNUSED(event)
+ }
--- a/phoneapp/phoneui2/tsrc/ut_phonemainwindow/ut_phonemainwindow.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneui2/tsrc/ut_phonemainwindow/ut_phonemainwindow.pro Mon Oct 04 16:06:10 2010 +0300
@@ -29,6 +29,7 @@
HEADERS += ..\..\inc\hbphonemainwindow.h
SOURCES += phoneuihousehold_stub.cpp
+SOURCES += hbmainwindow_stub.cpp
SOURCES += ut_phonemainwindow.cpp
SOURCES += ..\..\src\hbphonemainwindow.cpp
--- a/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/bwins/phoneuicontrolu.def Mon Oct 04 16:06:10 2010 +0300
@@ -36,118 +36,116 @@
?NumberEntryClearL@CPhoneNumberEntryManager@@QBEXXZ @ 35 NONAME ; void CPhoneNumberEntryManager::NumberEntryClearL(void) const
?DisconnectCallL@CPhoneState@@IAEHXZ @ 36 NONAME ; int CPhoneState::DisconnectCallL(void)
?HandleNumberEntryClearedL@CPhoneStateCallSetup@@MAEXXZ @ 37 NONAME ; void CPhoneStateCallSetup::HandleNumberEntryClearedL(void)
- ?HandleIdleForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 38 NONAME ; void CPhoneStateIdle::HandleIdleForegroundEventL(void)
- ?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 39 NONAME ; void CPhoneState::HandleDisconnectingL(int)
- ?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 40 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void)
- ?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 41 NONAME ; int CPhoneStateIncoming::HandleCommandL(int)
- ?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 42 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int)
- ?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 43 NONAME ; enum TPESimState CPhoneState::SimState(void) const
- ?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 44 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 45 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?IsSimOk@CPhoneState@@QAEHXZ @ 46 NONAME ; int CPhoneState::IsSimOk(void)
- ?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 47 NONAME ; int CPhoneStateIdle::HandleCommandL(int)
- ?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 48 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void)
- ?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 49 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void)
- ?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 50 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void)
- ??1CPhoneStateInCall@@UAE@XZ @ 51 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void)
- ?ConstructL@CPhoneStateInCall@@MAEXXZ @ 52 NONAME ; void CPhoneStateInCall::ConstructL(void)
- ?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 53 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &)
- ?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 54 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void)
- ?HandlePhoneForegroundEventL@CPhoneStateIdle@@UAEXXZ @ 55 NONAME ; void CPhoneStateIdle::HandlePhoneForegroundEventL(void)
- ?ClearNumberEntryContentCache@CPhoneNumberEntryManager@@QAEXXZ @ 56 NONAME ; void CPhoneNumberEntryManager::ClearNumberEntryContentCache(void)
- ?IsCustomizedDialerVisibleL@CPhoneNumberEntryManager@@QBEHXZ @ 57 NONAME ; int CPhoneNumberEntryManager::IsCustomizedDialerVisibleL(void) const
- ?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 58 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
- ?EikonEnv@CPhoneStateMachine@@QBEPAVCEikonEnv@@XZ @ 59 NONAME ; class CEikonEnv * CPhoneStateMachine::EikonEnv(void) const
- ?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 60 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int)
- ?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 61 NONAME ; void CPhoneState::DialMultimediaCallL(void)
- ?NewL@CPhoneUIController@@SAPAV1@PAVMPhoneViewCommandHandle@@@Z @ 62 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class MPhoneViewCommandHandle *)
- ?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 63 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int)
- ?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 64 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &)
- ??1CPhoneUIController@@UAE@XZ @ 65 NONAME ; CPhoneUIController::~CPhoneUIController(void)
- ?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 66 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void)
- ?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 67 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?RemoveDialogsAndSendPhoneToBackgroundL@CPhoneState@@IAEXXZ @ 68 NONAME ; void CPhoneState::RemoveDialogsAndSendPhoneToBackgroundL(void)
- ?StoreNumberEntryContentL@CPhoneNumberEntryManager@@QAEXXZ @ 69 NONAME ; void CPhoneNumberEntryManager::StoreNumberEntryContentL(void)
- ?SendGlobalErrorNoteL@CPhoneState@@QAEXHH@Z @ 70 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int, int)
- ?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 71 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &)
- ?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 72 NONAME ; void CPhoneStateIncoming::ConstructL(void)
- ?HandleIdleForegroundEventL@CPhoneStateStartup@@UAEXXZ @ 73 NONAME ; void CPhoneStateStartup::HandleIdleForegroundEventL(void)
- ?IsVideoCall@CPhoneState@@IAEHH@Z @ 74 NONAME ; int CPhoneState::IsVideoCall(int)
- ?IsAutoLockOn@CPhoneState@@UBEHXZ @ 75 NONAME ; int CPhoneState::IsAutoLockOn(void) const
- ?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 76 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?SendGlobalWarningNoteL@CPhoneState@@IAEXHH@Z @ 77 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int, int)
- ?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 78 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void)
- ?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 79 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void)
- ?StateMachine@CPhoneStateHandle@@QAEPAVMPhoneStateMachine@@XZ @ 80 NONAME ; class MPhoneStateMachine * CPhoneStateHandle::StateMachine(void)
- ?EndUiUpdate@CPhoneState@@IAEXXZ @ 81 NONAME ; void CPhoneState::EndUiUpdate(void)
- ?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 82 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
- ?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 83 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int)
- ?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 84 NONAME ; void CPhoneState::BeginUiUpdateLC(void)
- ?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 85 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void)
- ?ProcessCommandL@CPhoneState@@UAEHH@Z @ 86 NONAME ; int CPhoneState::ProcessCommandL(int)
- ?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 87 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void)
- ??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 88 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 89 NONAME ; void CPhoneStateMachine::SetCallId(int)
- ?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 90 NONAME ; int CPhoneUIController::ProcessCommandL(int)
- ?DisplayCallHeaderL@CPhoneState@@QAEXHW4TNumberEntrySetRule@1@@Z @ 91 NONAME ; void CPhoneState::DisplayCallHeaderL(int, enum CPhoneState::TNumberEntrySetRule)
- ??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 92 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 93 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int)
- ?IsNumberEntryVisibleL@CPhoneNumberEntryManager@@QBEHXZ @ 94 NONAME ; int CPhoneNumberEntryManager::IsNumberEntryVisibleL(void) const
- ??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 95 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 96 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 97 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
- ?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 98 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
- ?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 99 NONAME ; int CPhoneUIController::HandleCommandL(int)
- ?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 100 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void)
- ?SetNumberEntryVisibilityL@CPhoneNumberEntryManager@@QAEXH@Z @ 101 NONAME ; void CPhoneNumberEntryManager::SetNumberEntryVisibilityL(int)
- ?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 102 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int)
- ?PhoneStorage@CPhoneStateMachine@@UAEPAVMPhoneStorage@@XZ @ 103 NONAME ; class MPhoneStorage * CPhoneStateMachine::PhoneStorage(void)
- ??1CPhoneState@@UAE@XZ @ 104 NONAME ; CPhoneState::~CPhoneState(void)
- ?DialVoiceCallL@CPhoneState@@QAEXXZ @ 105 NONAME ; void CPhoneState::DialVoiceCallL(void)
- ?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 106 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int)
- ??1CPhoneStateMachine@@UAE@XZ @ 107 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void)
- ?SetVisibilityIfNumberEntryUsedL@CPhoneNumberEntryManager@@QAEHH@Z @ 108 NONAME ; int CPhoneNumberEntryManager::SetVisibilityIfNumberEntryUsedL(int)
- ?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 109 NONAME ; void CPhoneStateCallSetup::ConstructL(void)
- ?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 110 NONAME ; void CPhoneUIController::HandleMessage(int, int)
- ?ConstructL@CPhoneStateStartup@@MAEXXZ @ 111 NONAME ; void CPhoneStateStartup::ConstructL(void)
- ?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 112 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
- ?ShowNoteL@CPhoneState@@IAEXH@Z @ 113 NONAME ; void CPhoneState::ShowNoteL(int)
- ?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 114 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int)
- ?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 115 NONAME ; class MPhoneState * CPhoneStateMachine::State(void)
- ?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 116 NONAME ; void CPhoneState::SetHandsfreeModeL(int)
- ?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 117 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const
- ?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 118 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void)
- ?PhoneNumberFromEntryLC@CPhoneNumberEntryManager@@QBEPAVHBufC16@@XZ @ 119 NONAME ; class HBufC16 * CPhoneNumberEntryManager::PhoneNumberFromEntryLC(void) const
- ??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 120 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
- ??1CPhoneStateIncoming@@UAE@XZ @ 121 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void)
- ?SendGlobalInfoNoteL@CPhoneState@@QAEXHH@Z @ 122 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int, int)
- ?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 123 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void)
- ?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 124 NONAME ; int CPhoneStateIdle::ProcessCommandL(int)
- ?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 125 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int)
- ?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 126 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 127 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 128 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void)
- ?ConstructL@CPhoneStateIdle@@MAEXXZ @ 129 NONAME ; void CPhoneStateIdle::ConstructL(void)
- ?SetEikonEnv@CPhoneState@@UAEXPAVCEikonEnv@@@Z @ 130 NONAME ; void CPhoneState::SetEikonEnv(class CEikonEnv *)
- ?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 131 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void)
- ?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 132 NONAME ; void CPhoneState::StartShowSecurityNoteL(void)
- ?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 133 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int)
- ?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 134 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int)
- ?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 135 NONAME ; void CPhoneState::SetDefaultFlagsL(void)
- ?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 136 NONAME ; int CPhoneStateInCall::HandleCommandL(int)
- ?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 137 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void)
- ?UpdateRemoteInfoDataL@CPhoneState@@IAEXH@Z @ 138 NONAME ; void CPhoneState::UpdateRemoteInfoDataL(int)
- ?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 139 NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
- ?EikonEnv@CPhoneState@@QBEPAVCEikonEnv@@XZ @ 140 NONAME ; class CEikonEnv * CPhoneState::EikonEnv(void) const
- ?SetBackButtonActive@CPhoneState@@IAEXH@Z @ 141 NONAME ; void CPhoneState::SetBackButtonActive(int)
- ?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 142 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
- ??1CPhoneStateIdle@@UAE@XZ @ 143 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
- ?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 144 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
- ?BaseConstructL@CPhoneState@@QAEXXZ @ 145 NONAME ; void CPhoneState::BaseConstructL(void)
- ?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 146 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
- ?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 147 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
- ??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 148 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
- ??1CPhoneStateStartup@@UAE@XZ @ 149 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
- ?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 150 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
- ?OpenSoftRejectMessageEditorL@CPhoneState@@MAEXXZ @ 151 NONAME ; void CPhoneState::OpenSoftRejectMessageEditorL(void)
+ ?HandleDisconnectingL@CPhoneState@@IAEXH@Z @ 38 NONAME ; void CPhoneState::HandleDisconnectingL(int)
+ ?HandleAudioMuteChangedL@CPhoneState@@IAEXXZ @ 39 NONAME ; void CPhoneState::HandleAudioMuteChangedL(void)
+ ?HandleCommandL@CPhoneStateIncoming@@UAEHH@Z @ 40 NONAME ; int CPhoneStateIncoming::HandleCommandL(int)
+ ?UpdateSingleActiveCallL@CPhoneState@@IAEXH@Z @ 41 NONAME ; void CPhoneState::UpdateSingleActiveCallL(int)
+ ?SimState@CPhoneState@@IBE?AW4TPESimState@@XZ @ 42 NONAME ; enum TPESimState CPhoneState::SimState(void) const
+ ?HandleKeyEventL@CPhoneStateCallSetup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 43 NONAME ; void CPhoneStateCallSetup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?NewL@CPhoneStateStartup@@SAPAV1@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 44 NONAME ; class CPhoneStateStartup * CPhoneStateStartup::NewL(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?IsSimOk@CPhoneState@@QAEHXZ @ 45 NONAME ; int CPhoneState::IsSimOk(void)
+ ?HandleCommandL@CPhoneStateIdle@@UAEHH@Z @ 46 NONAME ; int CPhoneStateIdle::HandleCommandL(int)
+ ?ViewCommandHandle@CPhoneStateHandle@@QAEPAVMPhoneViewCommandHandle@@XZ @ 47 NONAME ; class MPhoneViewCommandHandle * CPhoneStateHandle::ViewCommandHandle(void)
+ ?DialMultimediaCallL@CPhoneStateIdle@@IAEXXZ @ 48 NONAME ; void CPhoneStateIdle::DialMultimediaCallL(void)
+ ?DisconnectOutgoingCallL@CPhoneStateInCall@@IAEXXZ @ 49 NONAME ; void CPhoneStateInCall::DisconnectOutgoingCallL(void)
+ ??1CPhoneStateInCall@@UAE@XZ @ 50 NONAME ; CPhoneStateInCall::~CPhoneStateInCall(void)
+ ?ConstructL@CPhoneStateInCall@@MAEXXZ @ 51 NONAME ; void CPhoneStateInCall::ConstructL(void)
+ ?HandleError@CPhoneUIController@@UAEXABUTPEErrorInfo@@@Z @ 52 NONAME ; void CPhoneUIController::HandleError(struct TPEErrorInfo const &)
+ ?IsVideoCallRingingL@CPhoneStateInCall@@MAEHXZ @ 53 NONAME ; int CPhoneStateInCall::IsVideoCallRingingL(void)
+ ?ClearNumberEntryContentCache@CPhoneNumberEntryManager@@QAEXXZ @ 54 NONAME ; void CPhoneNumberEntryManager::ClearNumberEntryContentCache(void)
+ ?IsCustomizedDialerVisibleL@CPhoneNumberEntryManager@@QBEHXZ @ 55 NONAME ; int CPhoneNumberEntryManager::IsCustomizedDialerVisibleL(void) const
+ ?HandleDtmfKeyToneL@CPhoneStateStartup@@EAEXABUTKeyEvent@@W4TEventCode@@@Z @ 56 NONAME ; void CPhoneStateStartup::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
+ ?EikonEnv@CPhoneStateMachine@@QBEPAVCEikonEnv@@XZ @ 57 NONAME ; class CEikonEnv * CPhoneStateMachine::EikonEnv(void) const
+ ?ShowTextQueryL@CPhoneState@@IAEXHHHPAVTDes16@@H@Z @ 58 NONAME ; void CPhoneState::ShowTextQueryL(int, int, int, class TDes16 *, int)
+ ?DialMultimediaCallL@CPhoneState@@IAEXXZ @ 59 NONAME ; void CPhoneState::DialMultimediaCallL(void)
+ ?NewL@CPhoneUIController@@SAPAV1@PAVMPhoneViewCommandHandle@@@Z @ 60 NONAME ; class CPhoneUIController * CPhoneUIController::NewL(class MPhoneViewCommandHandle *)
+ ?HandleCommandL@CPhoneStateCallSetup@@UAEHH@Z @ 61 NONAME ; int CPhoneStateCallSetup::HandleCommandL(int)
+ ?HandleErrorL@CPhoneState@@UAEXABUTPEErrorInfo@@@Z @ 62 NONAME ; void CPhoneState::HandleErrorL(struct TPEErrorInfo const &)
+ ??1CPhoneUIController@@UAE@XZ @ 63 NONAME ; CPhoneUIController::~CPhoneUIController(void)
+ ?HandleAudioOutputChangedL@CPhoneState@@IAEXXZ @ 64 NONAME ; void CPhoneState::HandleAudioOutputChangedL(void)
+ ?HandleKeyEventL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 65 NONAME ; void CPhoneState::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?RemoveDialogsAndSendPhoneToBackgroundL@CPhoneState@@IAEXXZ @ 66 NONAME ; void CPhoneState::RemoveDialogsAndSendPhoneToBackgroundL(void)
+ ?StoreNumberEntryContentL@CPhoneNumberEntryManager@@QAEXXZ @ 67 NONAME ; void CPhoneNumberEntryManager::StoreNumberEntryContentL(void)
+ ?SendGlobalErrorNoteL@CPhoneState@@QAEXHH@Z @ 68 NONAME ; void CPhoneState::SendGlobalErrorNoteL(int, int)
+ ?CreatePhoneEngineL@CPhoneStateMachine@@UAEPAVMPEPhoneModel@@AAVMEngineMonitor@@@Z @ 69 NONAME ; class MPEPhoneModel * CPhoneStateMachine::CreatePhoneEngineL(class MEngineMonitor &)
+ ?ConstructL@CPhoneStateIncoming@@MAEXXZ @ 70 NONAME ; void CPhoneStateIncoming::ConstructL(void)
+ ?UpdateCallHeaderAndUiCommandsL@CPhoneState@@IAEXH@Z @ 71 NONAME ; void CPhoneState::UpdateCallHeaderAndUiCommandsL(int)
+ ?IsVideoCall@CPhoneState@@IAEHH@Z @ 72 NONAME ; int CPhoneState::IsVideoCall(int)
+ ?IsAutoLockOn@CPhoneState@@UBEHXZ @ 73 NONAME ; int CPhoneState::IsAutoLockOn(void) const
+ ?HandleKeyEventL@CPhoneStateIdle@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 74 NONAME ; void CPhoneStateIdle::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?SendGlobalWarningNoteL@CPhoneState@@IAEXHH@Z @ 75 NONAME ; void CPhoneState::SendGlobalWarningNoteL(int, int)
+ ?HandlePhoneStartupL@CPhoneStateStartup@@UAEXXZ @ 76 NONAME ; void CPhoneStateStartup::HandlePhoneStartupL(void)
+ ?IsVideoCallActiveL@CPhoneStateInCall@@MAEHXZ @ 77 NONAME ; int CPhoneStateInCall::IsVideoCallActiveL(void)
+ ?StateMachine@CPhoneStateHandle@@QAEPAVMPhoneStateMachine@@XZ @ 78 NONAME ; class MPhoneStateMachine * CPhoneStateHandle::StateMachine(void)
+ ?EndUiUpdate@CPhoneState@@IAEXXZ @ 79 NONAME ; void CPhoneState::EndUiUpdate(void)
+ ?HandleKeyMessageL@CPhoneStateInCall@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 80 NONAME ; void CPhoneStateInCall::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+ ?SetRingingTonePlaybackL@CPhoneState@@IAEXH@Z @ 81 NONAME ; void CPhoneState::SetRingingTonePlaybackL(int)
+ ?BeginUiUpdateLC@CPhoneState@@IAEXXZ @ 82 NONAME ; void CPhoneState::BeginUiUpdateLC(void)
+ ?DecreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 83 NONAME ; void CPhoneState::DecreaseAudioVolumeL(void)
+ ?ProcessCommandL@CPhoneState@@UAEHH@Z @ 84 NONAME ; int CPhoneState::ProcessCommandL(int)
+ ?PhoneEngineInfo@CPhoneStateMachine@@UAEPAVMPEEngineInfo@@XZ @ 85 NONAME ; class MPEEngineInfo * CPhoneStateMachine::PhoneEngineInfo(void)
+ ??0CPhoneStateStartup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 86 NONAME ; CPhoneStateStartup::CPhoneStateStartup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?SetCallId@CPhoneStateMachine@@UAEXH@Z @ 87 NONAME ; void CPhoneStateMachine::SetCallId(int)
+ ?ProcessCommandL@CPhoneUIController@@UAEHH@Z @ 88 NONAME ; int CPhoneUIController::ProcessCommandL(int)
+ ?DisplayCallHeaderL@CPhoneState@@QAEXHW4TNumberEntrySetRule@1@@Z @ 89 NONAME ; void CPhoneState::DisplayCallHeaderL(int, enum CPhoneState::TNumberEntrySetRule)
+ ??0CPhoneStateIdle@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 90 NONAME ; CPhoneStateIdle::CPhoneStateIdle(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?SendPhoneEngineMessage@CPhoneStateMachine@@UAEXH@Z @ 91 NONAME ; void CPhoneStateMachine::SendPhoneEngineMessage(int)
+ ?IsNumberEntryVisibleL@CPhoneNumberEntryManager@@QBEHXZ @ 92 NONAME ; int CPhoneNumberEntryManager::IsNumberEntryVisibleL(void) const
+ ??0CPhoneStateCallSetup@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 93 NONAME ; CPhoneStateCallSetup::CPhoneStateCallSetup(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ??0CPhoneState@@QAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 94 NONAME ; CPhoneState::CPhoneState(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ?HandleDtmfKeyToneL@CPhoneState@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 95 NONAME ; void CPhoneState::HandleDtmfKeyToneL(struct TKeyEvent const &, enum TEventCode)
+ ?HandleKeyMessageL@CPhoneStateIdle@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 96 NONAME ; void CPhoneStateIdle::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+ ?HandleCommandL@CPhoneUIController@@UAEHH@Z @ 97 NONAME ; int CPhoneUIController::HandleCommandL(int)
+ ?HandleSendCommandL@CPhoneStateIdle@@MAEXXZ @ 98 NONAME ; void CPhoneStateIdle::HandleSendCommandL(void)
+ ?SetNumberEntryVisibilityL@CPhoneNumberEntryManager@@QAEXH@Z @ 99 NONAME ; void CPhoneNumberEntryManager::SetNumberEntryVisibilityL(int)
+ ?HandlePhoneEngineMessageL@CPhoneStateInCall@@UAEXHH@Z @ 100 NONAME ; void CPhoneStateInCall::HandlePhoneEngineMessageL(int, int)
+ ?PhoneStorage@CPhoneStateMachine@@UAEPAVMPhoneStorage@@XZ @ 101 NONAME ; class MPhoneStorage * CPhoneStateMachine::PhoneStorage(void)
+ ??1CPhoneState@@UAE@XZ @ 102 NONAME ; CPhoneState::~CPhoneState(void)
+ ?DialVoiceCallL@CPhoneState@@QAEXXZ @ 103 NONAME ; void CPhoneState::DialVoiceCallL(void)
+ ?HandlePhoneEngineMessageL@CPhoneStateCallSetup@@UAEXHH@Z @ 104 NONAME ; void CPhoneStateCallSetup::HandlePhoneEngineMessageL(int, int)
+ ??1CPhoneStateMachine@@UAE@XZ @ 105 NONAME ; CPhoneStateMachine::~CPhoneStateMachine(void)
+ ?SetVisibilityIfNumberEntryUsedL@CPhoneNumberEntryManager@@QAEHH@Z @ 106 NONAME ; int CPhoneNumberEntryManager::SetVisibilityIfNumberEntryUsedL(int)
+ ?ConstructL@CPhoneStateCallSetup@@MAEXXZ @ 107 NONAME ; void CPhoneStateCallSetup::ConstructL(void)
+ ?HandleMessage@CPhoneUIController@@UAEXHH@Z @ 108 NONAME ; void CPhoneUIController::HandleMessage(int, int)
+ ?ConstructL@CPhoneStateStartup@@MAEXXZ @ 109 NONAME ; void CPhoneStateStartup::ConstructL(void)
+ ?HandleKeyMessageL@CPhoneStateStartup@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 110 NONAME ; void CPhoneStateStartup::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+ ?ShowNoteL@CPhoneState@@IAEXH@Z @ 111 NONAME ; void CPhoneState::ShowNoteL(int)
+ ?HandlePropertyChangedL@CPhoneState@@UAEXABVTUid@@IH@Z @ 112 NONAME ; void CPhoneState::HandlePropertyChangedL(class TUid const &, unsigned int, int)
+ ?State@CPhoneStateMachine@@UAEPAVMPhoneState@@XZ @ 113 NONAME ; class MPhoneState * CPhoneStateMachine::State(void)
+ ?SetHandsfreeModeL@CPhoneState@@IAEXH@Z @ 114 NONAME ; void CPhoneState::SetHandsfreeModeL(int)
+ ?IsCustomizedDialerVisibleL@CPhoneState@@QBEHXZ @ 115 NONAME ; int CPhoneState::IsCustomizedDialerVisibleL(void) const
+ ?HandleNumberEntryClearedL@CPhoneStateInCall@@MAEXXZ @ 116 NONAME ; void CPhoneStateInCall::HandleNumberEntryClearedL(void)
+ ?PhoneNumberFromEntryLC@CPhoneNumberEntryManager@@QBEPAVHBufC16@@XZ @ 117 NONAME ; class HBufC16 * CPhoneNumberEntryManager::PhoneNumberFromEntryLC(void) const
+ ??0CPhoneStateIncoming@@IAE@PAVMPhoneStateMachine@@PAVMPhoneViewCommandHandle@@PAVMPhoneCustomization@@@Z @ 118 NONAME ; CPhoneStateIncoming::CPhoneStateIncoming(class MPhoneStateMachine *, class MPhoneViewCommandHandle *, class MPhoneCustomization *)
+ ??1CPhoneStateIncoming@@UAE@XZ @ 119 NONAME ; CPhoneStateIncoming::~CPhoneStateIncoming(void)
+ ?SendGlobalInfoNoteL@CPhoneState@@QAEXHH@Z @ 120 NONAME ; void CPhoneState::SendGlobalInfoNoteL(int, int)
+ ?DeleteTouchPaneButtons@CPhoneState@@IAEXXZ @ 121 NONAME ; void CPhoneState::DeleteTouchPaneButtons(void)
+ ?ProcessCommandL@CPhoneStateIdle@@UAEHH@Z @ 122 NONAME ; int CPhoneStateIdle::ProcessCommandL(int)
+ ?HandlePhoneEngineMessageL@CPhoneStateStartup@@UAEXHH@Z @ 123 NONAME ; void CPhoneStateStartup::HandlePhoneEngineMessageL(int, int)
+ ?HandleKeyEventL@CPhoneStateIncoming@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 124 NONAME ; void CPhoneStateIncoming::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?HandleKeyEventL@CPhoneStateStartup@@UAEXABUTKeyEvent@@W4TEventCode@@@Z @ 125 NONAME ; void CPhoneStateStartup::HandleKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ?IncreaseAudioVolumeL@CPhoneState@@IAEXXZ @ 126 NONAME ; void CPhoneState::IncreaseAudioVolumeL(void)
+ ?ConstructL@CPhoneStateIdle@@MAEXXZ @ 127 NONAME ; void CPhoneStateIdle::ConstructL(void)
+ ?CheckIfShowCallTerminationNote@CPhoneState@@MAEHXZ @ 128 NONAME ; int CPhoneState::CheckIfShowCallTerminationNote(void)
+ ?SetEikonEnv@CPhoneState@@UAEXPAVCEikonEnv@@@Z @ 129 NONAME ; void CPhoneState::SetEikonEnv(class CEikonEnv *)
+ ?StartShowSecurityNoteL@CPhoneState@@IAEXXZ @ 130 NONAME ; void CPhoneState::StartShowSecurityNoteL(void)
+ ?SetBTHandsfreeModeL@CPhoneState@@IAEXH@Z @ 131 NONAME ; void CPhoneState::SetBTHandsfreeModeL(int)
+ ?HandlePhoneEngineMessageL@CPhoneStateIncoming@@UAEXHH@Z @ 132 NONAME ; void CPhoneStateIncoming::HandlePhoneEngineMessageL(int, int)
+ ?HandleCommandL@CPhoneStateInCall@@UAEHH@Z @ 133 NONAME ; int CPhoneStateInCall::HandleCommandL(int)
+ ?SetDefaultFlagsL@CPhoneState@@IAEXXZ @ 134 NONAME ; void CPhoneState::SetDefaultFlagsL(void)
+ ?DialVoiceCallL@CPhoneStateIdle@@IAEXXZ @ 135 NONAME ; void CPhoneStateIdle::DialVoiceCallL(void)
+ ?GetRingingCallL@CPhoneStateInCall@@MAEHXZ @ 136 NONAME ; int CPhoneStateInCall::GetRingingCallL(void)
+ ?EikonEnv@CPhoneState@@QBEPAVCEikonEnv@@XZ @ 137 NONAME ; class CEikonEnv * CPhoneState::EikonEnv(void) const
+ ?UpdateCallHeader@CPhoneState@@IAEXH@Z @ 138 NONAME ; void CPhoneState::UpdateCallHeader(int)
+ ?SetBackButtonActive@CPhoneState@@IAEXH@Z @ 139 NONAME ; void CPhoneState::SetBackButtonActive(int)
+ ?DisplayIncomingCallL@CPhoneStateIdle@@IAEXH@Z @ 140 NONAME ; void CPhoneStateIdle::DisplayIncomingCallL(int)
+ ??1CPhoneStateIdle@@UAE@XZ @ 141 NONAME ; CPhoneStateIdle::~CPhoneStateIdle(void)
+ ?HandleRemConCommandL@CPhoneState@@UAEHW4TRemConCoreApiOperationId@@W4TRemConCoreApiButtonAction@@@Z @ 142 NONAME ; int CPhoneState::HandleRemConCommandL(enum TRemConCoreApiOperationId, enum TRemConCoreApiButtonAction)
+ ?BaseConstructL@CPhoneState@@QAEXXZ @ 143 NONAME ; void CPhoneState::BaseConstructL(void)
+ ?HandlePhoneStartupL@CPhoneUIController@@UAEXXZ @ 144 NONAME ; void CPhoneUIController::HandlePhoneStartupL(void)
+ ?SetPhoneEngine@CPhoneStateMachine@@UAEXPAVMPEPhoneModel@@@Z @ 145 NONAME ; void CPhoneStateMachine::SetPhoneEngine(class MPEPhoneModel *)
+ ??0CPhoneStateMachine@@IAE@PAVMPhoneViewCommandHandle@@@Z @ 146 NONAME ; CPhoneStateMachine::CPhoneStateMachine(class MPhoneViewCommandHandle *)
+ ??1CPhoneStateStartup@@UAE@XZ @ 147 NONAME ; CPhoneStateStartup::~CPhoneStateStartup(void)
+ ?HandleKeyMessageL@CPhoneState@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 148 NONAME ; void CPhoneState::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode)
+ ?OpenSoftRejectMessageEditorL@CPhoneState@@MAEXXZ @ 149 NONAME ; void CPhoneState::OpenSoftRejectMessageEditorL(void)
--- a/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/eabi/phoneuicontrolu.def Mon Oct 04 16:06:10 2010 +0300
@@ -13,23 +13,23 @@
_ZN11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 12 NONAME
_ZN11CPhoneState15ProcessCommandLEi @ 13 NONAME
_ZN11CPhoneState16SetDefaultFlagsLEv @ 14 NONAME
- _ZN11CPhoneState16UpdateUiCommandsEv @ 15 NONAME
- _ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 16 NONAME
- _ZN11CPhoneState17SetHandsfreeModeLEi @ 17 NONAME
- _ZN11CPhoneState18DisplayCallHeaderLEiNS_19TNumberEntrySetRuleE @ 18 NONAME
- _ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 19 NONAME
- _ZN11CPhoneState19DialMultimediaCallLEv @ 20 NONAME
- _ZN11CPhoneState19HandlePhoneStartupLEv @ 21 NONAME
- _ZN11CPhoneState19SendGlobalInfoNoteLEii @ 22 NONAME
- _ZN11CPhoneState19SetBTHandsfreeModeLEi @ 23 NONAME
- _ZN11CPhoneState19SetBackButtonActiveEi @ 24 NONAME
- _ZN11CPhoneState19ShowNumberBusyNoteLEv @ 25 NONAME
- _ZN11CPhoneState20DecreaseAudioVolumeLEv @ 26 NONAME
- _ZN11CPhoneState20HandleDisconnectingLEi @ 27 NONAME
- _ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 28 NONAME
- _ZN11CPhoneState20IncreaseAudioVolumeLEv @ 29 NONAME
- _ZN11CPhoneState20SendGlobalErrorNoteLEii @ 30 NONAME
- _ZN11CPhoneState21UpdateRemoteInfoDataLEi @ 31 NONAME
+ _ZN11CPhoneState16UpdateCallHeaderEi @ 15 NONAME
+ _ZN11CPhoneState16UpdateUiCommandsEv @ 16 NONAME
+ _ZN11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 17 NONAME
+ _ZN11CPhoneState17SetHandsfreeModeLEi @ 18 NONAME
+ _ZN11CPhoneState18DisplayCallHeaderLEiNS_19TNumberEntrySetRuleE @ 19 NONAME
+ _ZN11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 20 NONAME
+ _ZN11CPhoneState19DialMultimediaCallLEv @ 21 NONAME
+ _ZN11CPhoneState19HandlePhoneStartupLEv @ 22 NONAME
+ _ZN11CPhoneState19SendGlobalInfoNoteLEii @ 23 NONAME
+ _ZN11CPhoneState19SetBTHandsfreeModeLEi @ 24 NONAME
+ _ZN11CPhoneState19SetBackButtonActiveEi @ 25 NONAME
+ _ZN11CPhoneState19ShowNumberBusyNoteLEv @ 26 NONAME
+ _ZN11CPhoneState20DecreaseAudioVolumeLEv @ 27 NONAME
+ _ZN11CPhoneState20HandleDisconnectingLEi @ 28 NONAME
+ _ZN11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 29 NONAME
+ _ZN11CPhoneState20IncreaseAudioVolumeLEv @ 30 NONAME
+ _ZN11CPhoneState20SendGlobalErrorNoteLEii @ 31 NONAME
_ZN11CPhoneState22DeleteTouchPaneButtonsEv @ 32 NONAME
_ZN11CPhoneState22HandlePropertyChangedLERK4TUidji @ 33 NONAME
_ZN11CPhoneState22SendGlobalWarningNoteLEii @ 34 NONAME
@@ -43,282 +43,280 @@
_ZN11CPhoneState27DisplayCallTerminationNoteLEv @ 42 NONAME
_ZN11CPhoneState28OpenSoftRejectMessageEditorLEv @ 43 NONAME
_ZN11CPhoneState30CheckIfShowCallTerminationNoteEv @ 44 NONAME
- _ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 45 NONAME
- _ZN11CPhoneState38RemoveDialogsAndSendPhoneToBackgroundLEv @ 46 NONAME
- _ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 47 NONAME
- _ZN11CPhoneState7IsSimOkEv @ 48 NONAME
- _ZN11CPhoneState9ShowNoteLEi @ 49 NONAME
- _ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 50 NONAME
- _ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 51 NONAME
- _ZN11CPhoneStateD0Ev @ 52 NONAME
- _ZN11CPhoneStateD1Ev @ 53 NONAME
- _ZN11CPhoneStateD2Ev @ 54 NONAME
- _ZN15CPhoneStateIdle10ConstructLEv @ 55 NONAME
- _ZN15CPhoneStateIdle14DialVoiceCallLEv @ 56 NONAME
- _ZN15CPhoneStateIdle14HandleCommandLEi @ 57 NONAME
- _ZN15CPhoneStateIdle14HandleDialingLEi @ 58 NONAME
- _ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 59 NONAME
- _ZN15CPhoneStateIdle15ProcessCommandLEi @ 60 NONAME
- _ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 61 NONAME
- _ZN15CPhoneStateIdle18HandleSendCommandLEv @ 62 NONAME
- _ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 63 NONAME
- _ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 64 NONAME
- _ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 65 NONAME
- _ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 66 NONAME
- _ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 67 NONAME
- _ZN15CPhoneStateIdle26HandleIdleForegroundEventLEv @ 68 NONAME
+ _ZN11CPhoneState30UpdateCallHeaderAndUiCommandsLEi @ 45 NONAME
+ _ZN11CPhoneState34SetToolbarButtonLoudspeakerEnabledEv @ 46 NONAME
+ _ZN11CPhoneState38RemoveDialogsAndSendPhoneToBackgroundLEv @ 47 NONAME
+ _ZN11CPhoneState43IsSimStateNotPresentWithSecurityModeEnabledEv @ 48 NONAME
+ _ZN11CPhoneState7IsSimOkEv @ 49 NONAME
+ _ZN11CPhoneState9ShowNoteLEi @ 50 NONAME
+ _ZN11CPhoneStateC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 51 NONAME
+ _ZN11CPhoneStateC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 52 NONAME
+ _ZN11CPhoneStateD0Ev @ 53 NONAME
+ _ZN11CPhoneStateD1Ev @ 54 NONAME
+ _ZN11CPhoneStateD2Ev @ 55 NONAME
+ _ZN15CPhoneStateIdle10ConstructLEv @ 56 NONAME
+ _ZN15CPhoneStateIdle14DialVoiceCallLEv @ 57 NONAME
+ _ZN15CPhoneStateIdle14HandleCommandLEi @ 58 NONAME
+ _ZN15CPhoneStateIdle14HandleDialingLEi @ 59 NONAME
+ _ZN15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 60 NONAME
+ _ZN15CPhoneStateIdle15ProcessCommandLEi @ 61 NONAME
+ _ZN15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 62 NONAME
+ _ZN15CPhoneStateIdle18HandleSendCommandLEv @ 63 NONAME
+ _ZN15CPhoneStateIdle19DialMultimediaCallLEv @ 64 NONAME
+ _ZN15CPhoneStateIdle20DisplayIncomingCallLEi @ 65 NONAME
+ _ZN15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 66 NONAME
+ _ZN15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 67 NONAME
+ _ZN15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 68 NONAME
_ZN15CPhoneStateIdle26HandlePhoneFocusLostEventLEv @ 69 NONAME
- _ZN15CPhoneStateIdle27HandlePhoneForegroundEventLEv @ 70 NONAME
- _ZN15CPhoneStateIdle5DialLERK7TDesC16NS_16TPhoneNumberTypeENS_21TDialInitiationMethodE @ 71 NONAME
- _ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 72 NONAME
- _ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 73 NONAME
- _ZN15CPhoneStateIdleD0Ev @ 74 NONAME
- _ZN15CPhoneStateIdleD1Ev @ 75 NONAME
- _ZN15CPhoneStateIdleD2Ev @ 76 NONAME
- _ZN17CPhoneStateHandle12StateMachineEv @ 77 NONAME
- _ZN17CPhoneStateHandle17ViewCommandHandleEv @ 78 NONAME
- _ZN17CPhoneStateHandle8InstanceEv @ 79 NONAME
- _ZN17CPhoneStateInCall10ConstructLEv @ 80 NONAME
- _ZN17CPhoneStateInCall11HandleIdleLEi @ 81 NONAME
- _ZN17CPhoneStateInCall14HandleCommandLEi @ 82 NONAME
- _ZN17CPhoneStateInCall15GetRingingCallLEv @ 83 NONAME
- _ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 84 NONAME
- _ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 85 NONAME
- _ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 86 NONAME
- _ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 87 NONAME
- _ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 88 NONAME
- _ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 89 NONAME
- _ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 90 NONAME
- _ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 91 NONAME
- _ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 92 NONAME
- _ZN17CPhoneStateInCallD0Ev @ 93 NONAME
- _ZN17CPhoneStateInCallD1Ev @ 94 NONAME
- _ZN17CPhoneStateInCallD2Ev @ 95 NONAME
- _ZN18CPhoneStateMachine11ChangeStateEi @ 96 NONAME
- _ZN18CPhoneStateMachine11PhoneEngineEv @ 97 NONAME
- _ZN18CPhoneStateMachine12PhoneStorageEv @ 98 NONAME
- _ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 99 NONAME
- _ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 100 NONAME
- _ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 101 NONAME
- _ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 102 NONAME
- _ZN18CPhoneStateMachine5StateEv @ 103 NONAME
- _ZN18CPhoneStateMachine9SetCallIdEi @ 104 NONAME
- _ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 105 NONAME
- _ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 106 NONAME
- _ZN18CPhoneStateMachineD0Ev @ 107 NONAME
- _ZN18CPhoneStateMachineD1Ev @ 108 NONAME
- _ZN18CPhoneStateMachineD2Ev @ 109 NONAME
- _ZN18CPhoneStateStartup10ConstructLEv @ 110 NONAME
- _ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 111 NONAME
- _ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 112 NONAME
- _ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 113 NONAME
- _ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 114 NONAME
- _ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 115 NONAME
- _ZN18CPhoneStateStartup26HandleIdleForegroundEventLEv @ 116 NONAME
- _ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 117 NONAME
- _ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 118 NONAME
- _ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 119 NONAME
- _ZN18CPhoneStateStartupD0Ev @ 120 NONAME
- _ZN18CPhoneStateStartupD1Ev @ 121 NONAME
- _ZN18CPhoneStateStartupD2Ev @ 122 NONAME
- _ZN18CPhoneUIController10EngineInfoEv @ 123 NONAME
- _ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 124 NONAME
- _ZN18CPhoneUIController13HandleMessageEii @ 125 NONAME
- _ZN18CPhoneUIController14HandleCommandLEi @ 126 NONAME
- _ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 127 NONAME
- _ZN18CPhoneUIController15ProcessCommandLEi @ 128 NONAME
- _ZN18CPhoneUIController19HandlePhoneStartupLEv @ 129 NONAME
- _ZN18CPhoneUIController4NewLEP23MPhoneViewCommandHandle @ 130 NONAME
- _ZN18CPhoneUIControllerD0Ev @ 131 NONAME
- _ZN18CPhoneUIControllerD1Ev @ 132 NONAME
- _ZN18CPhoneUIControllerD2Ev @ 133 NONAME
- _ZN19CPhoneStateIncoming10ConstructLEv @ 134 NONAME
- _ZN19CPhoneStateIncoming14HandleCommandLEi @ 135 NONAME
- _ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 136 NONAME
- _ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 137 NONAME
- _ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 138 NONAME
- _ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 139 NONAME
- _ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 140 NONAME
- _ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 141 NONAME
- _ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 142 NONAME
- _ZN19CPhoneStateIncomingD0Ev @ 143 NONAME
- _ZN19CPhoneStateIncomingD1Ev @ 144 NONAME
- _ZN19CPhoneStateIncomingD2Ev @ 145 NONAME
- _ZN20CPhoneStateCallSetup10ConstructLEv @ 146 NONAME
- _ZN20CPhoneStateCallSetup14HandleCommandLEi @ 147 NONAME
- _ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 148 NONAME
- _ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 149 NONAME
- _ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 150 NONAME
- _ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 151 NONAME
- _ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 152 NONAME
- _ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 153 NONAME
- _ZN20CPhoneStateCallSetupD0Ev @ 154 NONAME
- _ZN20CPhoneStateCallSetupD1Ev @ 155 NONAME
- _ZN20CPhoneStateCallSetupD2Ev @ 156 NONAME
- _ZN24CPhoneNumberEntryManager20CallFromNumberEntryLEv @ 157 NONAME
- _ZN24CPhoneNumberEntryManager24StoreNumberEntryContentLEv @ 158 NONAME
- _ZN24CPhoneNumberEntryManager25SetNumberEntryVisibilityLEi @ 159 NONAME
- _ZN24CPhoneNumberEntryManager26IsNumberEntryContentStoredEv @ 160 NONAME
- _ZN24CPhoneNumberEntryManager28ClearNumberEntryContentCacheEv @ 161 NONAME
- _ZN24CPhoneNumberEntryManager31SetVisibilityIfNumberEntryUsedLEi @ 162 NONAME
- _ZN24CPhoneNumberEntryManager37RemoveNumberEntryIfVisibilityIsFalseLEv @ 163 NONAME
- _ZN24CPhoneNumberEntryManager43ClearNumberEntryContentCacheIfContentStoredEv @ 164 NONAME
- _ZNK11CPhoneState12IsAutoLockOnEv @ 165 NONAME
- _ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 166 NONAME
- _ZNK11CPhoneState8EikonEnvEv @ 167 NONAME
- _ZNK11CPhoneState8SimStateEv @ 168 NONAME
- _ZNK18CPhoneStateMachine8EikonEnvEv @ 169 NONAME
- _ZNK24CPhoneNumberEntryManager17NumberEntryClearLEv @ 170 NONAME
- _ZNK24CPhoneNumberEntryManager18IsNumberEntryUsedLEv @ 171 NONAME
- _ZNK24CPhoneNumberEntryManager21IsNumberEntryVisibleLEv @ 172 NONAME
- _ZNK24CPhoneNumberEntryManager22PhoneNumberFromEntryLCEv @ 173 NONAME
- _ZNK24CPhoneNumberEntryManager26IsCustomizedDialerVisibleLEv @ 174 NONAME
- _ZTI11CPhoneState @ 175 NONAME
- _ZTI15CPhoneStateIdle @ 176 NONAME
- _ZTI17CPhoneStateHandle @ 177 NONAME
- _ZTI17CPhoneStateInCall @ 178 NONAME
- _ZTI18CPhoneStateMachine @ 179 NONAME
- _ZTI18CPhoneStateStartup @ 180 NONAME
- _ZTI18CPhoneUIController @ 181 NONAME
- _ZTI19CPhoneStateIncoming @ 182 NONAME
- _ZTI20CPhoneStateCallSetup @ 183 NONAME
- _ZTI23CPhoneDtmfWaitCharTimer @ 184 NONAME
- _ZTI24CPhoneSystemEventHandler @ 185 NONAME
- _ZTI26CPhoneRemoteControlHandler @ 186 NONAME
- _ZTI27CPhoneBtaaDisconnectHandler @ 187 NONAME
- _ZTV11CPhoneState @ 188 NONAME
- _ZTV15CPhoneStateIdle @ 189 NONAME
- _ZTV17CPhoneStateHandle @ 190 NONAME
- _ZTV17CPhoneStateInCall @ 191 NONAME
- _ZTV18CPhoneStateMachine @ 192 NONAME
- _ZTV18CPhoneStateStartup @ 193 NONAME
- _ZTV18CPhoneUIController @ 194 NONAME
- _ZTV19CPhoneStateIncoming @ 195 NONAME
- _ZTV20CPhoneStateCallSetup @ 196 NONAME
- _ZTV23CPhoneDtmfWaitCharTimer @ 197 NONAME
- _ZTV24CPhoneSystemEventHandler @ 198 NONAME
- _ZTV26CPhoneRemoteControlHandler @ 199 NONAME
- _ZTV27CPhoneBtaaDisconnectHandler @ 200 NONAME
- _ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 201 NONAME
- _ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 202 NONAME
- _ZThn12_N11CPhoneStateD0Ev @ 203 NONAME
- _ZThn12_N11CPhoneStateD1Ev @ 204 NONAME
- _ZThn12_N15CPhoneStateIdleD0Ev @ 205 NONAME
- _ZThn12_N15CPhoneStateIdleD1Ev @ 206 NONAME
- _ZThn12_N17CPhoneStateInCallD0Ev @ 207 NONAME
- _ZThn12_N17CPhoneStateInCallD1Ev @ 208 NONAME
- _ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 209 NONAME
- _ZThn12_N18CPhoneStateStartupD0Ev @ 210 NONAME
- _ZThn12_N18CPhoneStateStartupD1Ev @ 211 NONAME
- _ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 212 NONAME
- _ZThn12_N18CPhoneUIControllerD0Ev @ 213 NONAME
- _ZThn12_N18CPhoneUIControllerD1Ev @ 214 NONAME
- _ZThn12_N19CPhoneStateIncomingD0Ev @ 215 NONAME
- _ZThn12_N19CPhoneStateIncomingD1Ev @ 216 NONAME
- _ZThn12_N20CPhoneStateCallSetupD0Ev @ 217 NONAME
- _ZThn12_N20CPhoneStateCallSetupD1Ev @ 218 NONAME
- _ZThn16_N11CPhoneState14HandleCommandLEi @ 219 NONAME
- _ZThn16_N11CPhoneState15ProcessCommandLEi @ 220 NONAME
- _ZThn16_N11CPhoneStateD0Ev @ 221 NONAME
- _ZThn16_N11CPhoneStateD1Ev @ 222 NONAME
- _ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 223 NONAME
- _ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 224 NONAME
- _ZThn16_N15CPhoneStateIdleD0Ev @ 225 NONAME
- _ZThn16_N15CPhoneStateIdleD1Ev @ 226 NONAME
- _ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 227 NONAME
- _ZThn16_N17CPhoneStateInCallD0Ev @ 228 NONAME
- _ZThn16_N17CPhoneStateInCallD1Ev @ 229 NONAME
- _ZThn16_N18CPhoneStateStartupD0Ev @ 230 NONAME
- _ZThn16_N18CPhoneStateStartupD1Ev @ 231 NONAME
- _ZThn16_N18CPhoneUIController14HandleCommandLEi @ 232 NONAME
- _ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 233 NONAME
- _ZThn16_N18CPhoneUIControllerD0Ev @ 234 NONAME
- _ZThn16_N18CPhoneUIControllerD1Ev @ 235 NONAME
- _ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 236 NONAME
- _ZThn16_N19CPhoneStateIncomingD0Ev @ 237 NONAME
- _ZThn16_N19CPhoneStateIncomingD1Ev @ 238 NONAME
- _ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 239 NONAME
- _ZThn16_N20CPhoneStateCallSetupD0Ev @ 240 NONAME
- _ZThn16_N20CPhoneStateCallSetupD1Ev @ 241 NONAME
- _ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 242 NONAME
- _ZThn20_N11CPhoneStateD0Ev @ 243 NONAME
- _ZThn20_N11CPhoneStateD1Ev @ 244 NONAME
- _ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 245 NONAME
- _ZThn20_N15CPhoneStateIdleD0Ev @ 246 NONAME
- _ZThn20_N15CPhoneStateIdleD1Ev @ 247 NONAME
- _ZThn20_N17CPhoneStateInCallD0Ev @ 248 NONAME
- _ZThn20_N17CPhoneStateInCallD1Ev @ 249 NONAME
- _ZThn20_N18CPhoneStateStartupD0Ev @ 250 NONAME
- _ZThn20_N18CPhoneStateStartupD1Ev @ 251 NONAME
- _ZThn20_N19CPhoneStateIncomingD0Ev @ 252 NONAME
- _ZThn20_N19CPhoneStateIncomingD1Ev @ 253 NONAME
- _ZThn20_N20CPhoneStateCallSetupD0Ev @ 254 NONAME
- _ZThn20_N20CPhoneStateCallSetupD1Ev @ 255 NONAME
- _ZThn24_N11CPhoneState25HandleNumberEntryClearedLEv @ 256 NONAME
- _ZThn24_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 257 NONAME
- _ZThn24_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 258 NONAME
- _ZThn24_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 259 NONAME
- _ZThn24_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 260 NONAME
- _ZThn28_NK11CPhoneState12IsAutoLockOnEv @ 261 NONAME
- _ZThn32_N11CPhoneState11SetEikonEnvEP9CEikonEnv @ 262 NONAME
- _ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 263 NONAME
- _ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 264 NONAME
- _ZThn4_N11CPhoneStateD0Ev @ 265 NONAME
- _ZThn4_N11CPhoneStateD1Ev @ 266 NONAME
- _ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 267 NONAME
- _ZThn4_N15CPhoneStateIdleD0Ev @ 268 NONAME
- _ZThn4_N15CPhoneStateIdleD1Ev @ 269 NONAME
- _ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 270 NONAME
- _ZThn4_N17CPhoneStateInCallD0Ev @ 271 NONAME
- _ZThn4_N17CPhoneStateInCallD1Ev @ 272 NONAME
- _ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 273 NONAME
- _ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 274 NONAME
- _ZThn4_N18CPhoneStateMachine12PhoneStorageEv @ 275 NONAME
- _ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 276 NONAME
- _ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 277 NONAME
- _ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 278 NONAME
- _ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 279 NONAME
- _ZThn4_N18CPhoneStateMachine5StateEv @ 280 NONAME
- _ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 281 NONAME
- _ZThn4_N18CPhoneStateMachineD0Ev @ 282 NONAME
- _ZThn4_N18CPhoneStateMachineD1Ev @ 283 NONAME
- _ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 284 NONAME
- _ZThn4_N18CPhoneStateStartupD0Ev @ 285 NONAME
- _ZThn4_N18CPhoneStateStartupD1Ev @ 286 NONAME
- _ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 287 NONAME
- _ZThn4_N18CPhoneUIController13HandleMessageEii @ 288 NONAME
- _ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 289 NONAME
- _ZThn4_N19CPhoneStateIncomingD0Ev @ 290 NONAME
- _ZThn4_N19CPhoneStateIncomingD1Ev @ 291 NONAME
- _ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 292 NONAME
- _ZThn4_N20CPhoneStateCallSetupD0Ev @ 293 NONAME
- _ZThn4_N20CPhoneStateCallSetupD1Ev @ 294 NONAME
- _ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 295 NONAME
- _ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 296 NONAME
- _ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 297 NONAME
- _ZThn8_N11CPhoneStateD0Ev @ 298 NONAME
- _ZThn8_N11CPhoneStateD1Ev @ 299 NONAME
- _ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 300 NONAME
- _ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 301 NONAME
- _ZThn8_N15CPhoneStateIdleD0Ev @ 302 NONAME
- _ZThn8_N15CPhoneStateIdleD1Ev @ 303 NONAME
- _ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 304 NONAME
- _ZThn8_N17CPhoneStateInCallD0Ev @ 305 NONAME
- _ZThn8_N17CPhoneStateInCallD1Ev @ 306 NONAME
- _ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 307 NONAME
- _ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 308 NONAME
- _ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 309 NONAME
- _ZThn8_N18CPhoneStateStartupD0Ev @ 310 NONAME
- _ZThn8_N18CPhoneStateStartupD1Ev @ 311 NONAME
- _ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 312 NONAME
- _ZThn8_N18CPhoneUIControllerD0Ev @ 313 NONAME
- _ZThn8_N18CPhoneUIControllerD1Ev @ 314 NONAME
- _ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 315 NONAME
- _ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 316 NONAME
- _ZThn8_N19CPhoneStateIncomingD0Ev @ 317 NONAME
- _ZThn8_N19CPhoneStateIncomingD1Ev @ 318 NONAME
- _ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 319 NONAME
- _ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 320 NONAME
- _ZThn8_N20CPhoneStateCallSetupD0Ev @ 321 NONAME
- _ZThn8_N20CPhoneStateCallSetupD1Ev @ 322 NONAME
+ _ZN15CPhoneStateIdle5DialLERK7TDesC16NS_16TPhoneNumberTypeENS_21TDialInitiationMethodE @ 70 NONAME
+ _ZN15CPhoneStateIdleC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 71 NONAME
+ _ZN15CPhoneStateIdleC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 72 NONAME
+ _ZN15CPhoneStateIdleD0Ev @ 73 NONAME
+ _ZN15CPhoneStateIdleD1Ev @ 74 NONAME
+ _ZN15CPhoneStateIdleD2Ev @ 75 NONAME
+ _ZN17CPhoneStateHandle12StateMachineEv @ 76 NONAME
+ _ZN17CPhoneStateHandle17ViewCommandHandleEv @ 77 NONAME
+ _ZN17CPhoneStateHandle8InstanceEv @ 78 NONAME
+ _ZN17CPhoneStateInCall10ConstructLEv @ 79 NONAME
+ _ZN17CPhoneStateInCall11HandleIdleLEi @ 80 NONAME
+ _ZN17CPhoneStateInCall14HandleCommandLEi @ 81 NONAME
+ _ZN17CPhoneStateInCall15GetRingingCallLEv @ 82 NONAME
+ _ZN17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 83 NONAME
+ _ZN17CPhoneStateInCall18CallFetchedNumberLERK7TDesC16 @ 84 NONAME
+ _ZN17CPhoneStateInCall18IsVideoCallActiveLEv @ 85 NONAME
+ _ZN17CPhoneStateInCall19IsVideoCallRingingLEv @ 86 NONAME
+ _ZN17CPhoneStateInCall23DisconnectOutgoingCallLEv @ 87 NONAME
+ _ZN17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 88 NONAME
+ _ZN17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 89 NONAME
+ _ZN17CPhoneStateInCallC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 90 NONAME
+ _ZN17CPhoneStateInCallC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 91 NONAME
+ _ZN17CPhoneStateInCallD0Ev @ 92 NONAME
+ _ZN17CPhoneStateInCallD1Ev @ 93 NONAME
+ _ZN17CPhoneStateInCallD2Ev @ 94 NONAME
+ _ZN18CPhoneStateMachine11ChangeStateEi @ 95 NONAME
+ _ZN18CPhoneStateMachine11PhoneEngineEv @ 96 NONAME
+ _ZN18CPhoneStateMachine12PhoneStorageEv @ 97 NONAME
+ _ZN18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 98 NONAME
+ _ZN18CPhoneStateMachine15PhoneEngineInfoEv @ 99 NONAME
+ _ZN18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 100 NONAME
+ _ZN18CPhoneStateMachine22SendPhoneEngineMessageEi @ 101 NONAME
+ _ZN18CPhoneStateMachine5StateEv @ 102 NONAME
+ _ZN18CPhoneStateMachine9SetCallIdEi @ 103 NONAME
+ _ZN18CPhoneStateMachineC1EP23MPhoneViewCommandHandle @ 104 NONAME
+ _ZN18CPhoneStateMachineC2EP23MPhoneViewCommandHandle @ 105 NONAME
+ _ZN18CPhoneStateMachineD0Ev @ 106 NONAME
+ _ZN18CPhoneStateMachineD1Ev @ 107 NONAME
+ _ZN18CPhoneStateMachineD2Ev @ 108 NONAME
+ _ZN18CPhoneStateStartup10ConstructLEv @ 109 NONAME
+ _ZN18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 110 NONAME
+ _ZN18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 111 NONAME
+ _ZN18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 112 NONAME
+ _ZN18CPhoneStateStartup19HandlePhoneStartupLEv @ 113 NONAME
+ _ZN18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 114 NONAME
+ _ZN18CPhoneStateStartup4NewLEP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 115 NONAME
+ _ZN18CPhoneStateStartupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 116 NONAME
+ _ZN18CPhoneStateStartupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 117 NONAME
+ _ZN18CPhoneStateStartupD0Ev @ 118 NONAME
+ _ZN18CPhoneStateStartupD1Ev @ 119 NONAME
+ _ZN18CPhoneStateStartupD2Ev @ 120 NONAME
+ _ZN18CPhoneUIController10EngineInfoEv @ 121 NONAME
+ _ZN18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 122 NONAME
+ _ZN18CPhoneUIController13HandleMessageEii @ 123 NONAME
+ _ZN18CPhoneUIController14HandleCommandLEi @ 124 NONAME
+ _ZN18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 125 NONAME
+ _ZN18CPhoneUIController15ProcessCommandLEi @ 126 NONAME
+ _ZN18CPhoneUIController19HandlePhoneStartupLEv @ 127 NONAME
+ _ZN18CPhoneUIController4NewLEP23MPhoneViewCommandHandle @ 128 NONAME
+ _ZN18CPhoneUIControllerD0Ev @ 129 NONAME
+ _ZN18CPhoneUIControllerD1Ev @ 130 NONAME
+ _ZN18CPhoneUIControllerD2Ev @ 131 NONAME
+ _ZN19CPhoneStateIncoming10ConstructLEv @ 132 NONAME
+ _ZN19CPhoneStateIncoming14HandleCommandLEi @ 133 NONAME
+ _ZN19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 134 NONAME
+ _ZN19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 135 NONAME
+ _ZN19CPhoneStateIncoming23HandleAudioPlayStoppedLEv @ 136 NONAME
+ _ZN19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 137 NONAME
+ _ZN19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 138 NONAME
+ _ZN19CPhoneStateIncomingC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 139 NONAME
+ _ZN19CPhoneStateIncomingC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 140 NONAME
+ _ZN19CPhoneStateIncomingD0Ev @ 141 NONAME
+ _ZN19CPhoneStateIncomingD1Ev @ 142 NONAME
+ _ZN19CPhoneStateIncomingD2Ev @ 143 NONAME
+ _ZN20CPhoneStateCallSetup10ConstructLEv @ 144 NONAME
+ _ZN20CPhoneStateCallSetup14HandleCommandLEi @ 145 NONAME
+ _ZN20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 146 NONAME
+ _ZN20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 147 NONAME
+ _ZN20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 148 NONAME
+ _ZN20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 149 NONAME
+ _ZN20CPhoneStateCallSetupC1EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 150 NONAME
+ _ZN20CPhoneStateCallSetupC2EP18MPhoneStateMachineP23MPhoneViewCommandHandleP19MPhoneCustomization @ 151 NONAME
+ _ZN20CPhoneStateCallSetupD0Ev @ 152 NONAME
+ _ZN20CPhoneStateCallSetupD1Ev @ 153 NONAME
+ _ZN20CPhoneStateCallSetupD2Ev @ 154 NONAME
+ _ZN24CPhoneNumberEntryManager20CallFromNumberEntryLEv @ 155 NONAME
+ _ZN24CPhoneNumberEntryManager24StoreNumberEntryContentLEv @ 156 NONAME
+ _ZN24CPhoneNumberEntryManager25SetNumberEntryVisibilityLEi @ 157 NONAME
+ _ZN24CPhoneNumberEntryManager26IsNumberEntryContentStoredEv @ 158 NONAME
+ _ZN24CPhoneNumberEntryManager28ClearNumberEntryContentCacheEv @ 159 NONAME
+ _ZN24CPhoneNumberEntryManager31SetVisibilityIfNumberEntryUsedLEi @ 160 NONAME
+ _ZN24CPhoneNumberEntryManager37RemoveNumberEntryIfVisibilityIsFalseLEv @ 161 NONAME
+ _ZN24CPhoneNumberEntryManager43ClearNumberEntryContentCacheIfContentStoredEv @ 162 NONAME
+ _ZNK11CPhoneState12IsAutoLockOnEv @ 163 NONAME
+ _ZNK11CPhoneState26IsCustomizedDialerVisibleLEv @ 164 NONAME
+ _ZNK11CPhoneState8EikonEnvEv @ 165 NONAME
+ _ZNK11CPhoneState8SimStateEv @ 166 NONAME
+ _ZNK18CPhoneStateMachine8EikonEnvEv @ 167 NONAME
+ _ZNK24CPhoneNumberEntryManager17NumberEntryClearLEv @ 168 NONAME
+ _ZNK24CPhoneNumberEntryManager18IsNumberEntryUsedLEv @ 169 NONAME
+ _ZNK24CPhoneNumberEntryManager21IsNumberEntryVisibleLEv @ 170 NONAME
+ _ZNK24CPhoneNumberEntryManager22PhoneNumberFromEntryLCEv @ 171 NONAME
+ _ZNK24CPhoneNumberEntryManager26IsCustomizedDialerVisibleLEv @ 172 NONAME
+ _ZTI11CPhoneState @ 173 NONAME
+ _ZTI15CPhoneStateIdle @ 174 NONAME
+ _ZTI17CPhoneStateHandle @ 175 NONAME
+ _ZTI17CPhoneStateInCall @ 176 NONAME
+ _ZTI18CPhoneStateMachine @ 177 NONAME
+ _ZTI18CPhoneStateStartup @ 178 NONAME
+ _ZTI18CPhoneUIController @ 179 NONAME
+ _ZTI19CPhoneStateIncoming @ 180 NONAME
+ _ZTI20CPhoneStateCallSetup @ 181 NONAME
+ _ZTI23CPhoneDtmfWaitCharTimer @ 182 NONAME
+ _ZTI24CPhoneSystemEventHandler @ 183 NONAME
+ _ZTI26CPhoneRemoteControlHandler @ 184 NONAME
+ _ZTI27CPhoneBtaaDisconnectHandler @ 185 NONAME
+ _ZTV11CPhoneState @ 186 NONAME
+ _ZTV15CPhoneStateIdle @ 187 NONAME
+ _ZTV17CPhoneStateHandle @ 188 NONAME
+ _ZTV17CPhoneStateInCall @ 189 NONAME
+ _ZTV18CPhoneStateMachine @ 190 NONAME
+ _ZTV18CPhoneStateStartup @ 191 NONAME
+ _ZTV18CPhoneUIController @ 192 NONAME
+ _ZTV19CPhoneStateIncoming @ 193 NONAME
+ _ZTV20CPhoneStateCallSetup @ 194 NONAME
+ _ZTV23CPhoneDtmfWaitCharTimer @ 195 NONAME
+ _ZTV24CPhoneSystemEventHandler @ 196 NONAME
+ _ZTV26CPhoneRemoteControlHandler @ 197 NONAME
+ _ZTV27CPhoneBtaaDisconnectHandler @ 198 NONAME
+ _ZThn12_N11CPhoneState19HandlePhoneStartupLEv @ 199 NONAME
+ _ZThn12_N11CPhoneState22HandlePropertyChangedLERK4TUidji @ 200 NONAME
+ _ZThn12_N11CPhoneStateD0Ev @ 201 NONAME
+ _ZThn12_N11CPhoneStateD1Ev @ 202 NONAME
+ _ZThn12_N15CPhoneStateIdleD0Ev @ 203 NONAME
+ _ZThn12_N15CPhoneStateIdleD1Ev @ 204 NONAME
+ _ZThn12_N17CPhoneStateInCallD0Ev @ 205 NONAME
+ _ZThn12_N17CPhoneStateInCallD1Ev @ 206 NONAME
+ _ZThn12_N18CPhoneStateStartup19HandlePhoneStartupLEv @ 207 NONAME
+ _ZThn12_N18CPhoneStateStartupD0Ev @ 208 NONAME
+ _ZThn12_N18CPhoneStateStartupD1Ev @ 209 NONAME
+ _ZThn12_N18CPhoneUIController19HandlePhoneStartupLEv @ 210 NONAME
+ _ZThn12_N18CPhoneUIControllerD0Ev @ 211 NONAME
+ _ZThn12_N18CPhoneUIControllerD1Ev @ 212 NONAME
+ _ZThn12_N19CPhoneStateIncomingD0Ev @ 213 NONAME
+ _ZThn12_N19CPhoneStateIncomingD1Ev @ 214 NONAME
+ _ZThn12_N20CPhoneStateCallSetupD0Ev @ 215 NONAME
+ _ZThn12_N20CPhoneStateCallSetupD1Ev @ 216 NONAME
+ _ZThn16_N11CPhoneState14HandleCommandLEi @ 217 NONAME
+ _ZThn16_N11CPhoneState15ProcessCommandLEi @ 218 NONAME
+ _ZThn16_N11CPhoneStateD0Ev @ 219 NONAME
+ _ZThn16_N11CPhoneStateD1Ev @ 220 NONAME
+ _ZThn16_N15CPhoneStateIdle14HandleCommandLEi @ 221 NONAME
+ _ZThn16_N15CPhoneStateIdle15ProcessCommandLEi @ 222 NONAME
+ _ZThn16_N15CPhoneStateIdleD0Ev @ 223 NONAME
+ _ZThn16_N15CPhoneStateIdleD1Ev @ 224 NONAME
+ _ZThn16_N17CPhoneStateInCall14HandleCommandLEi @ 225 NONAME
+ _ZThn16_N17CPhoneStateInCallD0Ev @ 226 NONAME
+ _ZThn16_N17CPhoneStateInCallD1Ev @ 227 NONAME
+ _ZThn16_N18CPhoneStateStartupD0Ev @ 228 NONAME
+ _ZThn16_N18CPhoneStateStartupD1Ev @ 229 NONAME
+ _ZThn16_N18CPhoneUIController14HandleCommandLEi @ 230 NONAME
+ _ZThn16_N18CPhoneUIController15ProcessCommandLEi @ 231 NONAME
+ _ZThn16_N18CPhoneUIControllerD0Ev @ 232 NONAME
+ _ZThn16_N18CPhoneUIControllerD1Ev @ 233 NONAME
+ _ZThn16_N19CPhoneStateIncoming14HandleCommandLEi @ 234 NONAME
+ _ZThn16_N19CPhoneStateIncomingD0Ev @ 235 NONAME
+ _ZThn16_N19CPhoneStateIncomingD1Ev @ 236 NONAME
+ _ZThn16_N20CPhoneStateCallSetup14HandleCommandLEi @ 237 NONAME
+ _ZThn16_N20CPhoneStateCallSetupD0Ev @ 238 NONAME
+ _ZThn16_N20CPhoneStateCallSetupD1Ev @ 239 NONAME
+ _ZThn20_N11CPhoneState20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 240 NONAME
+ _ZThn20_N11CPhoneStateD0Ev @ 241 NONAME
+ _ZThn20_N11CPhoneStateD1Ev @ 242 NONAME
+ _ZThn20_N15CPhoneStateIdle20HandleRemConCommandLE25TRemConCoreApiOperationId26TRemConCoreApiButtonAction @ 243 NONAME
+ _ZThn20_N15CPhoneStateIdleD0Ev @ 244 NONAME
+ _ZThn20_N15CPhoneStateIdleD1Ev @ 245 NONAME
+ _ZThn20_N17CPhoneStateInCallD0Ev @ 246 NONAME
+ _ZThn20_N17CPhoneStateInCallD1Ev @ 247 NONAME
+ _ZThn20_N18CPhoneStateStartupD0Ev @ 248 NONAME
+ _ZThn20_N18CPhoneStateStartupD1Ev @ 249 NONAME
+ _ZThn20_N19CPhoneStateIncomingD0Ev @ 250 NONAME
+ _ZThn20_N19CPhoneStateIncomingD1Ev @ 251 NONAME
+ _ZThn20_N20CPhoneStateCallSetupD0Ev @ 252 NONAME
+ _ZThn20_N20CPhoneStateCallSetupD1Ev @ 253 NONAME
+ _ZThn24_N11CPhoneState25HandleNumberEntryClearedLEv @ 254 NONAME
+ _ZThn24_N15CPhoneStateIdle25HandleNumberEntryClearedLEv @ 255 NONAME
+ _ZThn24_N17CPhoneStateInCall25HandleNumberEntryClearedLEv @ 256 NONAME
+ _ZThn24_N19CPhoneStateIncoming25HandleNumberEntryClearedLEv @ 257 NONAME
+ _ZThn24_N20CPhoneStateCallSetup25HandleNumberEntryClearedLEv @ 258 NONAME
+ _ZThn28_NK11CPhoneState12IsAutoLockOnEv @ 259 NONAME
+ _ZThn32_N11CPhoneState11SetEikonEnvEP9CEikonEnv @ 260 NONAME
+ _ZThn4_N11CPhoneState12HandleErrorLERK12TPEErrorInfo @ 261 NONAME
+ _ZThn4_N11CPhoneState25HandlePhoneEngineMessageLEii @ 262 NONAME
+ _ZThn4_N11CPhoneStateD0Ev @ 263 NONAME
+ _ZThn4_N11CPhoneStateD1Ev @ 264 NONAME
+ _ZThn4_N15CPhoneStateIdle25HandlePhoneEngineMessageLEii @ 265 NONAME
+ _ZThn4_N15CPhoneStateIdleD0Ev @ 266 NONAME
+ _ZThn4_N15CPhoneStateIdleD1Ev @ 267 NONAME
+ _ZThn4_N17CPhoneStateInCall25HandlePhoneEngineMessageLEii @ 268 NONAME
+ _ZThn4_N17CPhoneStateInCallD0Ev @ 269 NONAME
+ _ZThn4_N17CPhoneStateInCallD1Ev @ 270 NONAME
+ _ZThn4_N18CPhoneStateMachine11ChangeStateEi @ 271 NONAME
+ _ZThn4_N18CPhoneStateMachine11PhoneEngineEv @ 272 NONAME
+ _ZThn4_N18CPhoneStateMachine12PhoneStorageEv @ 273 NONAME
+ _ZThn4_N18CPhoneStateMachine14SetPhoneEngineEP13MPEPhoneModel @ 274 NONAME
+ _ZThn4_N18CPhoneStateMachine15PhoneEngineInfoEv @ 275 NONAME
+ _ZThn4_N18CPhoneStateMachine18CreatePhoneEngineLER14MEngineMonitor @ 276 NONAME
+ _ZThn4_N18CPhoneStateMachine22SendPhoneEngineMessageEi @ 277 NONAME
+ _ZThn4_N18CPhoneStateMachine5StateEv @ 278 NONAME
+ _ZThn4_N18CPhoneStateMachine9SetCallIdEi @ 279 NONAME
+ _ZThn4_N18CPhoneStateMachineD0Ev @ 280 NONAME
+ _ZThn4_N18CPhoneStateMachineD1Ev @ 281 NONAME
+ _ZThn4_N18CPhoneStateStartup25HandlePhoneEngineMessageLEii @ 282 NONAME
+ _ZThn4_N18CPhoneStateStartupD0Ev @ 283 NONAME
+ _ZThn4_N18CPhoneStateStartupD1Ev @ 284 NONAME
+ _ZThn4_N18CPhoneUIController11HandleErrorERK12TPEErrorInfo @ 285 NONAME
+ _ZThn4_N18CPhoneUIController13HandleMessageEii @ 286 NONAME
+ _ZThn4_N19CPhoneStateIncoming25HandlePhoneEngineMessageLEii @ 287 NONAME
+ _ZThn4_N19CPhoneStateIncomingD0Ev @ 288 NONAME
+ _ZThn4_N19CPhoneStateIncomingD1Ev @ 289 NONAME
+ _ZThn4_N20CPhoneStateCallSetup25HandlePhoneEngineMessageLEii @ 290 NONAME
+ _ZThn4_N20CPhoneStateCallSetupD0Ev @ 291 NONAME
+ _ZThn4_N20CPhoneStateCallSetupD1Ev @ 292 NONAME
+ _ZThn8_N11CPhoneState15HandleKeyEventLERK9TKeyEvent10TEventCode @ 293 NONAME
+ _ZThn8_N11CPhoneState17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 294 NONAME
+ _ZThn8_N11CPhoneState18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 295 NONAME
+ _ZThn8_N11CPhoneStateD0Ev @ 296 NONAME
+ _ZThn8_N11CPhoneStateD1Ev @ 297 NONAME
+ _ZThn8_N15CPhoneStateIdle15HandleKeyEventLERK9TKeyEvent10TEventCode @ 298 NONAME
+ _ZThn8_N15CPhoneStateIdle17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 299 NONAME
+ _ZThn8_N15CPhoneStateIdleD0Ev @ 300 NONAME
+ _ZThn8_N15CPhoneStateIdleD1Ev @ 301 NONAME
+ _ZThn8_N17CPhoneStateInCall17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 302 NONAME
+ _ZThn8_N17CPhoneStateInCallD0Ev @ 303 NONAME
+ _ZThn8_N17CPhoneStateInCallD1Ev @ 304 NONAME
+ _ZThn8_N18CPhoneStateStartup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 305 NONAME
+ _ZThn8_N18CPhoneStateStartup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 306 NONAME
+ _ZThn8_N18CPhoneStateStartup18HandleDtmfKeyToneLERK9TKeyEvent10TEventCode @ 307 NONAME
+ _ZThn8_N18CPhoneStateStartupD0Ev @ 308 NONAME
+ _ZThn8_N18CPhoneStateStartupD1Ev @ 309 NONAME
+ _ZThn8_N18CPhoneUIController15HandleKeyEventLERK9TKeyEvent10TEventCode @ 310 NONAME
+ _ZThn8_N18CPhoneUIControllerD0Ev @ 311 NONAME
+ _ZThn8_N18CPhoneUIControllerD1Ev @ 312 NONAME
+ _ZThn8_N19CPhoneStateIncoming15HandleKeyEventLERK9TKeyEvent10TEventCode @ 313 NONAME
+ _ZThn8_N19CPhoneStateIncoming17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 314 NONAME
+ _ZThn8_N19CPhoneStateIncomingD0Ev @ 315 NONAME
+ _ZThn8_N19CPhoneStateIncomingD1Ev @ 316 NONAME
+ _ZThn8_N20CPhoneStateCallSetup15HandleKeyEventLERK9TKeyEvent10TEventCode @ 317 NONAME
+ _ZThn8_N20CPhoneStateCallSetup17HandleKeyMessageLEN15MPhoneKeyEvents22TPhoneKeyEventMessagesE8TKeyCode @ 318 NONAME
+ _ZThn8_N20CPhoneStateCallSetupD0Ev @ 319 NONAME
+ _ZThn8_N20CPhoneStateCallSetupD1Ev @ 320 NONAME
--- a/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/group/phoneuicontrol.mmp Mon Oct 04 16:06:10 2010 +0300
@@ -47,7 +47,9 @@
SOURCE cphoneuicontroller.cpp
SOURCE cphoneaccessorybthandler.cpp
SOURCE cphonenumberentrymanager.cpp
-SOURCE cphoneuicommandmanager.cpp
+SOURCE cphoneuicommandmanager.cpp
+SOURCE phonenoteutil.cpp
+SOURCE phoneaudioutil.cpp
/* Languages */
LANG SC
--- a/phoneapp/phoneuicontrol/inc/cphoneaccessorybthandler.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphoneaccessorybthandler.h Mon Oct 04 16:06:10 2010 +0300
@@ -44,7 +44,7 @@
* @return an instance of class CPhoneAccessoryBTHandler
*/
static CPhoneAccessoryBTHandler* NewLC( MPhoneViewCommandHandle* aViewCommandHandle,
- MPhoneStateMachine* aStateMachine, MPhoneNEClearedHandler* aNEClearedHandler );
+ MPhoneStateMachine* aStateMachine );
/**
* Destructor.
@@ -87,7 +87,7 @@
* C++ constructor.
*/
CPhoneAccessoryBTHandler( MPhoneViewCommandHandle* aViewCommandHandle,
- MPhoneStateMachine* aStateMachine, MPhoneNEClearedHandler* aNEClearedHandler );
+ MPhoneStateMachine* aStateMachine );
/**
* Set the handsfree mode
@@ -109,11 +109,6 @@
*/
MPhoneStateMachine* iStateMachine;
- /**
- * Reference to handler for Number Entry cleared event
- */
- MPhoneNEClearedHandler* iNEClearedHandler;
-
};
--- a/phoneapp/phoneuicontrol/inc/cphonestate.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestate.h Mon Oct 04 16:06:10 2010 +0300
@@ -273,9 +273,15 @@
* Update remote information data in the call header
* @param aCallid call id
*/
- IMPORT_C void UpdateRemoteInfoDataL( TInt aCallId );
+ IMPORT_C void UpdateCallHeader( TInt aCallId );
/**
+ * Updates call header and ui commands.
+ * @param aCallid call id
+ */
+ IMPORT_C void UpdateCallHeaderAndUiCommandsL( TInt aCallId );
+
+ /**
* Show note
* @param aResourceId resource id to be resolved
*/
@@ -480,15 +486,6 @@
TEventCode aEventCode );
/**
- * Change Audio volume level
- * @param aLevel New volume level.
- * @param aUpdateControl Set ETrue if volume ui control
- * needs to be updated.
- */
- void ChangeAudioVolumeL( TInt aLevel,
- TBool aUpdateControl = ETrue );
-
- /**
* Handles EPEMessageInitiatedEmergency call message from Phone Engine.
* @param aCallId - Caller id.
*/
@@ -506,20 +503,9 @@
void HandleCallSecureStatusChangeL( TInt aCallId );
/**
- * Active call id
- */
- TInt GetActiveCallIdL();
-
- /**
* Shows WLAN MAC address note
*/
void ShowWlanMacAddressL();
-
- /**
- * A message handling function for message EPEMessageRemoteBusy
- * @param aCallId a call id
- */
- void HandleRemoteBusyL( const TInt aCallId );
/**
* TCleanupOperation to call EndUiUpdate(), if leave occurs
@@ -528,11 +514,6 @@
static void UiUpdateCleanup(TAny* aThis );
/**
- * Gets volume level from ui control.
- */
- TInt GetVolumeLevel();
-
- /**
* Shows video call specific out of memory note.
*/
void ShowVideoCallOutOfMemoryNoteL();
--- a/phoneapp/phoneuicontrol/inc/cphonestateidle.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestateidle.h Mon Oct 04 16:06:10 2010 +0300
@@ -101,16 +101,6 @@
IMPORT_C virtual TBool ProcessCommandL( TInt aCommand );
/**
- * Indicates when the Idle app is in the foreground.
- */
- IMPORT_C virtual void HandleIdleForegroundEventL();
-
- /**
- * Indicates when the Phone app is in the foreground.
- */
- IMPORT_C virtual void HandlePhoneForegroundEventL();
-
- /**
* Indicates when the Phone app has lost focus.
*/
IMPORT_C virtual void HandlePhoneFocusLostEventL();
--- a/phoneapp/phoneuicontrol/inc/cphonestateincall.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestateincall.h Mon Oct 04 16:06:10 2010 +0300
@@ -114,6 +114,7 @@
* @return call id otherwise KErrNotFound
*/
IMPORT_C virtual TBool GetRingingCallL();
+
/**
* Search and release outgoingcall
*/
@@ -163,14 +164,6 @@
void LaunchDtmfListQueryL();
/**
- * Update remote data and label to the call header.
- * @param aCallId - Call Id.
- * @param aCallHeaderData - Call header parameters where modifications
- * are made.
- */
- void UpdateRemoteInfoDataAndLabelL( TInt aCallId );
-
- /**
* Show dtmf text query
* @param aDialogResourceId dialog's resource id
* @param aDefaultCbaResourceId default CBA's resource id
--- a/phoneapp/phoneuicontrol/inc/cphonestateincoming.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestateincoming.h Mon Oct 04 16:06:10 2010 +0300
@@ -145,21 +145,11 @@
* Show disconnected note
*/
void ShowDisconnectingL( TInt aCallId );
-
- /**
- * Update remote data and label to the call header.
- * @param aCallId - Call Id.
- */
- void UpdateRemoteInfoDataAndLabelL(
- TInt aCallId );
protected:
// call id of ringing call
TInt iRingingCallId;
- // True if call is disconnected otherwise false
- TBool iCallDisconnected;
-
};
#endif // CPHONESTATEINCOMING
--- a/phoneapp/phoneuicontrol/inc/cphonestatestartup.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphonestatestartup.h Mon Oct 04 16:06:10 2010 +0300
@@ -71,12 +71,7 @@
*/
IMPORT_C virtual void HandlePhoneStartupL();
- /**
- * Indicates when the Idle app is in the foreground.
- */
- IMPORT_C virtual void HandleIdleForegroundEventL();
-
- protected:
+ protected:
/**
* ConstructL()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuicontrol/inc/phoneaudioutil.h Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,104 @@
+/*
+* 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: Audio util class.
+*
+*/
+
+
+#ifndef PHONEAUDIOUTIL_H
+#define PHONEAUDIOUTIL_H
+
+// INCLUDES
+#include <e32base.h>
+#include <pevirtualengine.h>
+#include "mphoneviewcommandhandle.h"
+#include "mphonestatemachine.h"
+
+// CLASS DECLARATION
+
+/**
+* Note util class.
+*
+*/
+class PhoneAudioUtil
+ {
+ public:
+
+ /**
+ * Handles audio mute changes.
+ */
+ static void HandleAudioMuteChangedL();
+
+ /**
+ * Handles audio output changes.
+ */
+ static void HandleAudioOutputChangedL();
+
+ /**
+ * Decreases audio volume.
+ */
+ static void DecreaseAudioVolumeL();
+
+ /**
+ * Increases audio volume.
+ */
+ static void IncreaseAudioVolumeL();
+
+ /**
+ * Changes audio volume.
+ */
+ static void ChangeAudioVolumeL( TInt aLevel,
+ TBool aUpdateControl );
+
+ /**
+ * Gets current volume level.
+ */
+ static TInt GetVolumeLevel();
+
+ /**
+ * Handles audio output changes.
+ */
+ static void HandleAudioAvailableOutputChangedL();
+
+ /**
+ * Toggles mute.
+ */
+ static void ToggleMute();
+
+ /**
+ * Sets handsfree mode.
+ */
+ static void SetHandsfreeModeL( TBool aHandsfreeMode );
+
+ /**
+ * Sets bt handsfree mode.
+ */
+ static void SetBtHandsfreeModeL( TBool aHandsfreeMode );
+
+ private:
+
+ /**
+ * Returns view command handler.
+ */
+ inline static MPhoneViewCommandHandle* ViewCommandHandle();
+
+ /**
+ * Returns phone state handler.
+ */
+ inline static MPhoneStateMachine* StateMachine();
+ };
+
+#endif // PHONEAUDIOUTIL_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuicontrol/inc/phonenoteutil.h Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,123 @@
+/*
+* 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: Note util class.
+*
+*/
+
+
+#ifndef PHONENOTEUTIL_H
+#define PHONENOTEUTIL_H
+
+// INCLUDES
+#include <e32base.h>
+#include <pevirtualengine.h>
+#include "mphoneviewcommandhandle.h"
+#include "tphonecmdparamglobalnote.h"
+
+// CLASS DECLARATION
+
+/**
+* Note util class.
+*
+*/
+class PhoneNoteUtil
+ {
+ public:
+
+ /**
+ * Shows global info note.
+ */
+ static void SendGlobalInfoNoteL(
+ TInt aResourceId, TBool aNotificationDialog );
+
+ /**
+ * Shows global warning note.
+ */
+ static void SendGlobalWarningNoteL(
+ TInt aResourceId, TBool aNotificationDialog );
+
+ /**
+ * Shows global error note.
+ */
+ static void SendGlobalErrorNoteL(
+ TInt aResourceId, TBool aNotificationDialog );
+
+ /**
+ * Shows global note.
+ */
+ static void SendGlobalNoteL(
+ TInt aResourceId, TBool aNotificationDialog );
+
+ /**
+ * Shows global note.
+ */
+ static void SendGlobalNoteL(
+ TPhoneNotificationType aType, const TDesC& aText );
+
+ /**
+ * Shows note.
+ */
+ static void ShowNoteL( TInt aResourceId );
+
+ /**
+ * Shows query.
+ */
+ static void ShowQueryL( TInt aResourceId );
+
+ /**
+ * Shows text query.
+ */
+ static void ShowTextQueryL(
+ TInt aDialogResourceId,
+ TInt aDefaultCbaResourceId,
+ TInt aContentCbaResourceId,
+ TDes* aDataText,
+ TBool aSendKeyEnabled );
+
+ /**
+ * Default error handling.
+ */
+ static void HandleErrorL( const TPEErrorInfo& aErrorInfo );
+
+ /**
+ * handles remote busy note.
+ */
+ static void HandleRemoteBusyNoteL( TInt aCallId );
+
+ private:
+
+ /**
+ * Sets global notifier disabled.
+ */
+ static void SetGlobalNotifierDisabledL(
+ MPhoneViewCommandHandle* aViewCommandHandle );
+
+ /**
+ * Sets common global note params.
+ */
+ static void SetCommonGlobalNoteParamsL(
+ TPhoneCmdParamGlobalNote& aGlobalNoteParam,
+ TInt aResourceId, TBool aNotificationDialog,
+ TPhoneNotificationType aNoteType,
+ TPhoneNotificationToneType aTone = EPhoneNoTone );
+
+ /**
+ * Returns view command handler.
+ */
+ inline static MPhoneViewCommandHandle* ViewCommandHandle();
+ };
+
+#endif // PHONENOTEUTIL_H
+
+// End of File
--- a/phoneapp/phoneuicontrol/src/cphoneaccessorybthandler.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphoneaccessorybthandler.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -43,11 +43,9 @@
CPhoneAccessoryBTHandler::CPhoneAccessoryBTHandler(
MPhoneViewCommandHandle* aViewCommandHandle,
- MPhoneStateMachine* aStateMachine,
- MPhoneNEClearedHandler* aNEClearedHandler ) :
+ MPhoneStateMachine* aStateMachine ) :
iViewCommandHandle( aViewCommandHandle ),
- iStateMachine( aStateMachine ),
- iNEClearedHandler( aNEClearedHandler )
+ iStateMachine( aStateMachine )
{
}
@@ -59,11 +57,10 @@
//
CPhoneAccessoryBTHandler* CPhoneAccessoryBTHandler::NewLC(
MPhoneViewCommandHandle* aViewCommandHandle,
- MPhoneStateMachine* aStateMachine,
- MPhoneNEClearedHandler* aNEClearedHandler )
+ MPhoneStateMachine* aStateMachine )
{
CPhoneAccessoryBTHandler* self = new (ELeave) CPhoneAccessoryBTHandler(
- aViewCommandHandle, aStateMachine, aNEClearedHandler );
+ aViewCommandHandle, aStateMachine );
CleanupStack::PushL( self );
return self;
}
--- a/phoneapp/phoneuicontrol/src/cphonestate.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestate.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -69,8 +69,6 @@
#include "tphonecmdparamstring.h"
#include "tphonecmdparamcallstatedata.h"
#include "tphonecmdparambitmap.h"
-#include "tphonecmdparamaudiooutput.h"
-#include "tphonecmdparamaudioavailability.h"
#include "tphonecmdparamappinfo.h"
#include "tphonecmdparamtranseffect.h"
#include "tphonecmdparamringtone.h"
@@ -100,6 +98,8 @@
#include "mphonestorage.h"
#include "phoneconstants.h"
#include "cphoneclearblacklist.h"
+#include "phonenoteutil.h"
+#include "phoneaudioutil.h"
// ================= MEMBER FUNCTIONS =======================
@@ -212,7 +212,7 @@
break;
case MEngineMonitor::EPEMessageRemoteBusy:
- HandleRemoteBusyL( aCallId );
+ PhoneNoteUtil::HandleRemoteBusyNoteL( aCallId );
break;
case MEngineMonitor::EPEMessageCallWaiting:
@@ -265,7 +265,7 @@
case MEngineMonitor::EPEMessageShowBTLoopback:
iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageEndDTMF );
accessoryBtHandler = CPhoneAccessoryBTHandler::NewLC(
- iViewCommandHandle, iStateMachine, this );
+ iViewCommandHandle, iStateMachine );
accessoryBtHandler->ShowBTLoopbackL();
CleanupStack::PopAndDestroy( accessoryBtHandler );
break;
@@ -274,7 +274,7 @@
case MEngineMonitor::EPEMessageShowBTDeviceAddress:
iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageEndDTMF );
accessoryBtHandler = CPhoneAccessoryBTHandler::NewLC(
- iViewCommandHandle, iStateMachine, this );
+ iViewCommandHandle, iStateMachine );
accessoryBtHandler->ShowBTAddressL();
CleanupStack::PopAndDestroy( accessoryBtHandler );
break;
@@ -298,11 +298,8 @@
break;
case MEngineMonitor::EPEMessageThumbnailLoadingCompleted:
- UpdateRemoteInfoDataL( aCallId );
- break;
-
case MEngineMonitor::EPEMessageRemotePartyInfoChanged:
- UpdateRemoteInfoDataL ( aCallId );
+ UpdateCallHeader( aCallId );
break;
case MEngineMonitor::EPEMessageSIMStateChanged:
@@ -347,11 +344,7 @@
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandleAudioMuteChangedL() ");
__ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(),
Panic( EPhoneCtrlInvariant ) );
- TPhoneCmdParamBoolean booleanParam;
- const TBool audioMute = iStateMachine->PhoneEngineInfo()->AudioMute();
- booleanParam.SetBoolean( audioMute );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewActivateMuteUIChanges,
- &booleanParam );
+ PhoneAudioUtil::HandleAudioMuteChangedL();
UpdateUiCommands();
}
@@ -365,47 +358,7 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandleAudioOutputChangedL() ");
__ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) );
- TPhoneCmdParamAudioOutput outputParam;
- const TPEAudioOutput audioOutput =
- iStateMachine->PhoneEngineInfo()->AudioOutput();
- outputParam.SetAudioOutput( audioOutput );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewActivateAudioPathUIChanges,
- &outputParam );
-
- // Previous Output
- TPEPhoneAudioRouteParameters RouteParameters = iStateMachine->
- PhoneEngineInfo()->RouteParameters();
- const TPEAudioOutput previousOutput =
- RouteParameters.iPreviousOutput;
-
- TBool btAvailable = iStateMachine->PhoneEngineInfo()->AudioOutputAvailable(
- EPEBTAudioAccessory );
- // Show note or BT disconnect handler
- if ( audioOutput != EPENotActive &&
- previousOutput == EPEBTAudioAccessory &&
- !btAvailable )
- {
- CPhoneBtaaDisconnectHandler::InstanceL()->HandleConnectionLostL();
- }
- else if ( audioOutput == EPEBTAudioAccessory &&
- previousOutput != EPEBTAudioAccessory &&
- btAvailable )
- {
- CPhoneAccessoryBTHandler* bt = CPhoneAccessoryBTHandler::NewLC(
- iViewCommandHandle, iStateMachine, this );
- bt->ShowBTActivatedL();
- CleanupStack::PopAndDestroy( bt );
- }
- else if ( audioOutput == EPENotActive &&
- CPhoneBtaaDisconnectHandler::InstanceL()->IsQuery() )
- {
- CPhoneBtaaDisconnectHandler::InstanceL()->Cancel();
- }
- else if ( RouteParameters.iShowNote && audioOutput == EPELoudspeaker )
- {
- // Avkon removal
- }
+ PhoneAudioUtil::HandleAudioOutputChangedL();
}
// -----------------------------------------------------------
@@ -503,24 +456,7 @@
"PhoneUIControl: CPhoneState::HandleErrorL - aErrorInfo.iCallId =%d ",
aErrorInfo.iCallId );
// Do the common error handling (display proper notes etc)
- CPhoneMainErrorMessagesHandler::Instance()->ShowErrorSpecificNoteL( aErrorInfo );
- switch( aErrorInfo.iErrorCode )
- {
-
- case ECCPErrorNoService:
- // No network -> hide volume popup
- iViewCommandHandle->ExecuteCommandL( EPhoneViewHideNaviPaneAudioVolume );
- break;
-
- case ECCPErrorSatControl:
- iNumberEntryManager->NumberEntryClearL();
- break;
-
- default:
- break;
- }
- // clear call blacklist if call failure occurs
- CPhoneClearBlacklist::Instance()->ClearBlackListOnNextKey();
+ PhoneNoteUtil::HandleErrorL( aErrorInfo );
}
// -----------------------------------------------------------
@@ -547,20 +483,6 @@
}
}
-// -----------------------------------------------------------------------------
-// CPhoneState::HandleRemoteBusyL
-// -----------------------------------------------------------------------------
-//
-void CPhoneState::HandleRemoteBusyL( TInt aCallId )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandleRemoteBusyL( ) ");
- TPEErrorInfo info;
- info.iCallId = aCallId;
- info.iErrorCode = ECCPErrorBusy;
- info.iErrorType = EPECcp;
- CPhoneMainErrorMessagesHandler::Instance()->ShowErrorSpecificNoteL( info );
- }
-
// -----------------------------------------------------------
// CPhoneState::HandleDisconnectingL
// -----------------------------------------------------------
@@ -570,9 +492,7 @@
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandleDisconnectingL( ) ");
iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateBubble,
- aCallId);
+ UpdateCallHeader( aCallId );
CPhoneClearBlacklist::Instance()->ClearBlackListOnNextKey();
}
@@ -786,7 +706,7 @@
case EPhoneInCallCmdDeactivateIhf: // fall through
case EPhoneInCallCmdActivateIhf:
- SetHandsfreeModeL( aCommand == EPhoneInCallCmdActivateIhf );
+ SetHandsfreeModeL( aCommand == EPhoneInCallCmdActivateIhf );
break;
case EPhoneInCallCmdHandset: // fall through
@@ -806,7 +726,8 @@
{
// This command comes from ui control, no need to update
// value to control (second parameter set false).
- ChangeAudioVolumeL( GetVolumeLevel(), EFalse );
+ PhoneAudioUtil::ChangeAudioVolumeL(
+ PhoneAudioUtil::GetVolumeLevel(), EFalse );
}
break;
@@ -876,11 +797,7 @@
case ERemConCoreApiMute:
{
__PHONELOG( EBasic, EPhoneControl, "CPhoneState::MrccatoCommand ERemConCoreApiMute" );
- iStateMachine->PhoneEngineInfo()->AudioMute() ?
- iStateMachine->PhoneEngineInfo()->SetAudioMuteCommand( EFalse ):
- iStateMachine->PhoneEngineInfo()->SetAudioMuteCommand( ETrue );
- iStateMachine->SendPhoneEngineMessage(
- MPEPhoneModel::EPEMessageSetAudioMute );
+ PhoneAudioUtil::ToggleMute();
handled = ETrue;
break;
}
@@ -900,19 +817,7 @@
EXPORT_C void CPhoneState::DecreaseAudioVolumeL()
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::DecreaceAudioVolumeL( ) ");
- __ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) );
- TPEAudioOutput output( iStateMachine->PhoneEngineInfo()->AudioOutput() );
- __PHONELOG1( EBasic, EPhoneControl, "CPhoneState::DecreaseAudioVolumeL - audio output =%d", output );
- if( output == EPETTY )
- {
- SendGlobalInfoNoteL( EPhoneNoteTTYNoAudioControl, ETrue );
- }
- else
- {
- TInt audioVolume( iStateMachine->PhoneEngineInfo()->AudioVolume() );
- audioVolume--;
- ChangeAudioVolumeL( audioVolume, ETrue );
- }
+ PhoneAudioUtil::DecreaseAudioVolumeL();
}
// -----------------------------------------------------------
@@ -922,51 +827,7 @@
EXPORT_C void CPhoneState::IncreaseAudioVolumeL()
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::IncreaceAudioVolumeL( ) ");
- __ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) );
- TPEAudioOutput output( iStateMachine->PhoneEngineInfo()->AudioOutput() );
- __PHONELOG1( EBasic, EPhoneControl, "CPhoneState::IncreaseAudioVolumeL - audio output =%d", output );
- if( output == EPETTY )
- {
- SendGlobalInfoNoteL( EPhoneNoteTTYNoAudioControl, ETrue );
- }
- else
- {
- TInt audioVolume( iStateMachine->PhoneEngineInfo()->AudioVolume() );
- audioVolume++;
- ChangeAudioVolumeL( audioVolume, ETrue );
- }
- }
-
-// -----------------------------------------------------------
-// CPhoneState::ChangeAudioVolumeL()
-// -----------------------------------------------------------
-//
-void CPhoneState::ChangeAudioVolumeL( TInt aLevel, TBool aUpdateControl )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::ChangeAudioVolumeL( ) ");
- __PHONELOG1( EBasic, EPhoneControl, "CPhoneState::ChangeAudioVolumeL - set volume =%d", aLevel );
- TInt valueToControl = aLevel;
- // sets value between 1 -10
- if ( aLevel>=KPhoneVolumeMinValue && aLevel<=KPhoneVolumeMaxValue )
- {
- iStateMachine->PhoneEngineInfo()->SetAudioVolumeCommand( aLevel );
- // Syncronizes audio volume level between engine and ui
- // causes EPEMessageAudioVolumeChanged message to phoneUI
- iStateMachine->SendPhoneEngineMessage(
- MPEPhoneModel::EPEMessageSetAudioVolume );
- }
-
- if ( aUpdateControl )
- {
- // Update the volume display.
- // Upper max (11) and under min (-1)
- // values are also updated to volume popup.
- TPhoneCmdParamInteger volumeParam;
- volumeParam.SetInteger( valueToControl );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetNaviPaneAudioVolume,
- &volumeParam );
- }
+ PhoneAudioUtil::IncreaseAudioVolumeL();
}
// <-------------------------- COMMON STATE FUNCTIONS ------------------------>
@@ -995,7 +856,7 @@
globalNotifierParam.SetBoolean( ETrue );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- iStateMachine->PhoneEngineInfo()->SetCallTypeCommand( EPECallTypeCSVoice );
+ iStateMachine->PhoneEngineInfo()->SetCallTypeCommand( EPECallTypeCSVoice );
iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageDial );
}
@@ -1062,9 +923,7 @@
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::UpdateSingleActiveCallL( ) ");
BeginUiUpdateLC();
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId);
-
- UpdateRemoteInfoDataL( aCallId );
+ UpdateCallHeaderAndUiCommandsL( aCallId );
// Create call duration label if enabled
// This key will be moved to some other area, but since key
@@ -1077,7 +936,7 @@
{
HandleChangedCallDurationL( aCallId );
}
- UpdateUiCommands();
+
EndUiUpdate();
// If there is no need to send back ground and number entry is used then
@@ -1113,29 +972,32 @@
}
// -----------------------------------------------------------
-// CPhoneState::UpdateRemoteInfoDataL
+// CPhoneState::UpdateCallHeader
// -----------------------------------------------------------
//
-EXPORT_C void CPhoneState::UpdateRemoteInfoDataL( TInt aCallId )
+EXPORT_C void CPhoneState::UpdateCallHeader( TInt aCallId )
{
- __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::UpdateRemoteInfoDataL() ");
- /*TPhoneCmdParamCallHeaderData callHeaderParam = UpdateCallHeaderInfoL( aCallId );
- if( iCustomization )
- {
- TBuf<KCntMaxTextFieldLength> inCallNumberText( KNullDesC );
- // to check if we have VoIP call in question and fix
- // parameters if needed
- iCustomization->ModifyCallHeaderTexts( aCallId, &callHeaderParam,
- inCallNumberText );
- }*/
- //TODO
- // Update the remote info data in the call header
+ __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::UpdateCallHeader() ");
iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateCallHeaderRemoteInfoData,
+ EPhoneViewUpdateBubble,
aCallId );
}
+// -----------------------------------------------------------
+// CPhoneState::UpdateCallHeaderAndUiCommandsL
+// -----------------------------------------------------------
+//
+EXPORT_C void CPhoneState::UpdateCallHeaderAndUiCommandsL( TInt aCallId )
+ {
+ __LOGMETHODSTARTEND( EPhoneControl,
+ "CPhoneState::UpdateCallHeaderAndUiCommandsL() ");
+ BeginUiUpdateLC();
+ UpdateCallHeader( aCallId );
+ UpdateUiCommands();
+ EndUiUpdate();
+ }
+
// <-------------------------- CONTEXT MENU ------------------------->
// -----------------------------------------------------------
@@ -1146,11 +1008,7 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::ShowNoteL( ) ");
__ASSERT_DEBUG( aResourceId, Panic( EPhoneCtrlParameterNotInitialized ) );
- TPhoneCmdParamNote noteParam;
- noteParam.SetType( EPhoneNotePermanent );
- noteParam.SetResourceId( CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( aResourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNote, ¬eParam );
+ PhoneNoteUtil::ShowNoteL( aResourceId );
}
// -----------------------------------------------------------
@@ -1161,11 +1019,7 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::ShowQueryL( ) ");
__ASSERT_DEBUG( aResourceId, Panic( EPhoneCtrlParameterNotInitialized ) );
- TPhoneCmdParamQuery queryParam;
- queryParam.SetQueryType( EPhoneQueryDialog );
- queryParam.SetQueryResourceId( CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( aResourceId ) );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewShowQuery, &queryParam );
+ PhoneNoteUtil::ShowQueryL( aResourceId );
}
// -----------------------------------------------------------
@@ -1184,15 +1038,14 @@
aContentCbaResourceId &&
aDataText,
Panic( EPhoneCtrlParameterNotInitialized ) );
- TPhoneCmdParamQuery queryDialogParam;
- queryDialogParam.SetQueryType( EPhoneTextQueryDialog );
- queryDialogParam.SetQueryResourceId( aDialogResourceId );
- queryDialogParam.SetDefaultCba( aDefaultCbaResourceId );
- queryDialogParam.SetContentCba( aContentCbaResourceId );
- queryDialogParam.SetDataText( aDataText );
- queryDialogParam.SetSendKeyEnabled( aSendKeyEnabled );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewShowQuery,
- &queryDialogParam );
+
+ PhoneNoteUtil::ShowTextQueryL(
+ aDialogResourceId,
+ aDefaultCbaResourceId,
+ aContentCbaResourceId,
+ aDataText,
+ aSendKeyEnabled );
+
}
// -----------------------------------------------------------
@@ -1235,12 +1088,8 @@
noteText.Append( timeString );
- TPhoneCmdParamGlobalNote globalNoteParam;
- globalNoteParam.SetType( EPhoneMessageBoxInformation );
- globalNoteParam.SetText( noteText );
-
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewShowGlobalNote, &globalNoteParam );
+ PhoneNoteUtil::SendGlobalNoteL(
+ EPhoneMessageBoxInformation, noteText);
}
}
@@ -1253,25 +1102,7 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::SendGlobalInfoNoteL( ) ");
__ASSERT_DEBUG( aResourceId, Panic( EPhoneCtrlParameterNotInitialized ) );
-
- // Avkon removal
- TPhoneCmdParamBoolean globalNotifierParam;
- globalNotifierParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
- &globalNotifierParam );
-
- TPhoneCmdParamGlobalNote globalNoteParam;
- PhoneNotificationType type = aNotificationDialog ?
- EPhoneNotificationDialog : EPhoneMessageBoxInformation;
- globalNoteParam.SetType( type );
- globalNoteParam.SetTextResourceId(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( aResourceId ) );
- globalNoteParam.SetNotificationDialog( aNotificationDialog );
-
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewShowGlobalNote, &globalNoteParam );
-
+ PhoneNoteUtil::SendGlobalInfoNoteL( aResourceId, aNotificationDialog );
}
// ---------------------------------------------------------
@@ -1283,25 +1114,7 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::SendGlobalWarningNoteL( ) ");
__ASSERT_DEBUG( aResourceId, Panic( EPhoneCtrlParameterNotInitialized ) );
- if ( SimState() == EPESimReadable )
- {
- TPhoneCmdParamBoolean globalNotifierParam;
- globalNotifierParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
- &globalNotifierParam );
-
- TPhoneCmdParamGlobalNote globalNoteParam;
- PhoneNotificationType type = aNotificationDialog ?
- EPhoneNotificationDialog : EPhoneMessageBoxWarning;
- globalNoteParam.SetType( type );
- globalNoteParam.SetTextResourceId(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( aResourceId ) );
- globalNoteParam.SetNotificationDialog( aNotificationDialog );
-
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewShowGlobalNote, &globalNoteParam );
- }
+ PhoneNoteUtil::SendGlobalWarningNoteL( aResourceId, aNotificationDialog );
}
// ---------------------------------------------------------
@@ -1313,25 +1126,7 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::SendGlobalErrorNoteL( ) ");
__ASSERT_DEBUG( aResourceId, Panic( EPhoneCtrlParameterNotInitialized ) );
-
- TPhoneCmdParamBoolean globalNotifierParam;
- globalNotifierParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
- &globalNotifierParam );
-
- TPhoneCmdParamGlobalNote globalNoteParam;
- PhoneNotificationType type = aNotificationDialog ?
- EPhoneNotificationDialog : EPhoneMessageBoxInformation;
- globalNoteParam.SetType( type );
-
- globalNoteParam.SetTextResourceId(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( aResourceId ) );
- globalNoteParam.SetNotificationDialog( aNotificationDialog );
-
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewShowGlobalNote, &globalNoteParam );
-
+ PhoneNoteUtil::SendGlobalErrorNoteL( aResourceId, aNotificationDialog );
}
// ---------------------------------------------------------
@@ -1341,13 +1136,7 @@
EXPORT_C void CPhoneState::SetHandsfreeModeL( TBool aHandsfreeMode )
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::SetHandsfreeModeL( ) ");
- CPhoneAccessoryBTHandler* bt = CPhoneAccessoryBTHandler::NewLC(
- iViewCommandHandle, iStateMachine, this );
- if ( !bt->SetHandsfreeModeL( aHandsfreeMode ))
- {
- SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue );
- }
- CleanupStack::PopAndDestroy( bt );
+ PhoneAudioUtil::SetHandsfreeModeL( aHandsfreeMode );
}
// ---------------------------------------------------------
@@ -1357,13 +1146,7 @@
EXPORT_C void CPhoneState::SetBTHandsfreeModeL( TBool aHandsfreeMode )
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::SetBTHandsfreeModeL( ) ");
- CPhoneAccessoryBTHandler* bt = CPhoneAccessoryBTHandler::NewLC(
- iViewCommandHandle, iStateMachine, this );
- if ( !bt->SetBTHandsfreeModeL( aHandsfreeMode ))
- {
- SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue );
- }
- CleanupStack::PopAndDestroy( bt );
+ PhoneAudioUtil::SetBtHandsfreeModeL( aHandsfreeMode );
}
// <-------------------------- INTERNAL FUNCTIONS ------------------------>
@@ -1430,31 +1213,6 @@
}
// ---------------------------------------------------------
-// CPhoneState::GetActiveCallIdL()
-// ---------------------------------------------------------
-//
-TInt CPhoneState::GetActiveCallIdL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::GetActiveCallId()( ) ");
- // Fetch active call's id from view
- TPhoneViewResponseId response;
- TPhoneCmdParamCallStateData callStateData;
- callStateData.SetCallState( EPEStateConnected );
- response = iViewCommandHandle->HandleCommandL(
- EPhoneViewGetCallIdByState, &callStateData );
-
- if ( response == EPhoneViewResponseSuccess &&
- callStateData.CallId() < 0 ) // no connected calls
- {
- // check for held call
- callStateData.SetCallState( EPEStateHeld );
- response = iViewCommandHandle->HandleCommandL(
- EPhoneViewGetCallIdByState, &callStateData );
- }
- return callStateData.CallId();
- }
-
-// ---------------------------------------------------------
// CPhoneState::SimState()
// ---------------------------------------------------------
//
@@ -1650,26 +1408,7 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::HandleAudioAvailableOutputChangedL() ");
__ASSERT_DEBUG( iStateMachine->PhoneEngineInfo(), Panic( EPhoneCtrlInvariant ) );
- TPhoneCmdParamAudioAvailability outputParam;
- // Output
- const TPEAudioOutput audioOutput =
- iStateMachine->PhoneEngineInfo()->AudioOutput();
- // BT availability
- TBool btAvailable = iStateMachine->PhoneEngineInfo()->AudioOutputAvailable(
- EPEBTAudioAccessory );
- outputParam.SetBTAccAvailable( btAvailable );
- // Wired availability
- TBool wiredAvailable = iStateMachine->PhoneEngineInfo()->AudioOutputAvailable(
- EPEWiredAudioAccessory );
- outputParam.SetWiredAccAvailable( wiredAvailable );
- // BTA disconnect handler check
- if( btAvailable )
- {
- CPhoneBtaaDisconnectHandler::InstanceL()->Cancel();
- }
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewActivateAudioAvailabilityUIChanges,
- &outputParam );
+ PhoneAudioUtil::HandleAudioAvailableOutputChangedL();
}
// ---------------------------------------------------------
@@ -1679,10 +1418,6 @@
EXPORT_C void CPhoneState::ShowNumberBusyNoteL()
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::ShowNumberBusyNoteL( ) ");
- TPhoneCmdParamBoolean globalNotifierParam;
- globalNotifierParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
- &globalNotifierParam );
TInt resource( EPhoneNumberBusy );
if( iCustomization )
@@ -1690,17 +1425,8 @@
// Get customized text resource for busy note
resource = iCustomization->CustomizeBusyNoteText();
}
-
- // Show number busy notification
- TPhoneCmdParamGlobalNote globalNoteParam;
- globalNoteParam.SetType( EPhoneNotificationDialog );
- globalNoteParam.SetTextResourceId(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( resource ) );
- globalNoteParam.SetNotificationDialog( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewShowGlobalNote,
- &globalNoteParam );
+ PhoneNoteUtil::SendGlobalNoteL( resource, ETrue );
}
// ---------------------------------------------------------
@@ -1810,8 +1536,6 @@
globalNotifierParam.SetBoolean( EFalse );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
- &globalNotifierParam );
// Restore keylock if phone has been locked before call.
if ( iStateMachine->PhoneStorage()->NeedToEnableKeylock() )
@@ -1822,18 +1546,6 @@
}
// -----------------------------------------------------------
-// CPhoneState::GetVolumeLevel
-// -----------------------------------------------------------
-//
-TInt CPhoneState::GetVolumeLevel()
- {
- TPhoneCmdParamInteger integerParam;
- iViewCommandHandle->ExecuteCommand( EPhoneViewGetAudioVolumeLevel,
- &integerParam );
- return integerParam.Integer();
- }
-
-// -----------------------------------------------------------
// CPhoneState::ShowVideoCallOutOfMemoryNoteL
// -----------------------------------------------------------
//
@@ -1849,12 +1561,13 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewBringPhoneAppToForeground );
// Display error note
- SExtendedError ext;
+ /*SExtendedError ext;
ext.iComponent = KUidPhoneApplication;
ext.iErrorNumber = KErrNoMemory;
ext.iInformation = EFalse;
TBuf<1> ignore;
- iAvkonAppUi->HandleError( KErrNoMemory, ext, ignore, ignore );
+ iAvkonAppUi->HandleError( KErrNoMemory, ext, ignore, ignore );*/
+ //TODO show note
}
// -----------------------------------------------------------------------------
@@ -1989,11 +1702,10 @@
CPhoneMainResourceResolver::Instance()->
ResolveResourceID(
EPhoneInfoCugInUse ), cugIndex );
- TPhoneCmdParamGlobalNote globalNoteParam;
- globalNoteParam.SetText( *buf );
- globalNoteParam.SetType( EPhoneMessageBoxInformation );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewShowGlobalNote, &globalNoteParam );
+
+ PhoneNoteUtil::SendGlobalNoteL(
+ EPhoneMessageBoxInformation, *buf );
+
CleanupStack::PopAndDestroy( buf );
}
}
--- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -480,30 +480,10 @@
globalNotifierParam.SetBoolean( ETrue );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
- &globalNotifierParam );
iViewCommandHandle->ExecuteCommandL(EPhoneViewCreateCallHeader, aCallId);
}
// -----------------------------------------------------------
-// CPhoneStateIdle::HandleIdleForegroundEventL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateIdle::HandleIdleForegroundEventL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIdleForegroundEventL( ) ");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
- }
-
-// -----------------------------------------------------------
-// CPhoneStateIdle::HandlePhoneForegroundEventL
-// -----------------------------------------------------------
-
-EXPORT_C void CPhoneStateIdle::HandlePhoneForegroundEventL()
- {
- }
-
-// -----------------------------------------------------------
// CPhoneStateIdle::HandlePhoneFocusLostEventL
// -----------------------------------------------------------
//
--- a/phoneapp/phoneuicontrol/src/cphonestateincall.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestateincall.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -214,17 +214,7 @@
break;
case MEngineMonitor::EPEMessageRemotePartyInfoChanged:
- // If there is a waiting call then update header and label
- // else forward message to CPhoneState.
- if ( IsWaitingCallL( aCallId ) )
- {
- // Update remote info data and label.
- UpdateRemoteInfoDataAndLabelL( aCallId );
- }
- else
- {
- CPhoneState::HandlePhoneEngineMessageL( aMessage, aCallId );
- }
+ UpdateCallHeader( aCallId );
break;
default:
@@ -234,20 +224,6 @@
}
// -----------------------------------------------------------
-// CPhoneStateInCall::UpdateRemoteInfoDataAndLabelL
-// -----------------------------------------------------------
-//
-void CPhoneStateInCall::UpdateRemoteInfoDataAndLabelL(
- TInt aCallId )
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateInCall::UpdateRemoteInfoDataAndLabelL ()" );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel,
- aCallId );
- }
-
-// -----------------------------------------------------------
// CPhoneStateInCall::HandleIdleL
// -----------------------------------------------------------
//
--- a/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -258,7 +258,6 @@
break;
case MEngineMonitor::EPEMessageDisconnecting:
- iCallDisconnected = ETrue;
CPhoneState::HandlePhoneEngineMessageL( aMessage, aCallId );
break;
@@ -292,10 +291,7 @@
break;
case MEngineMonitor::EPEMessageRemotePartyInfoChanged:
- if(!iCallDisconnected)
- {
- UpdateRemoteInfoDataAndLabelL( aCallId );
- }
+ UpdateCallHeader( aCallId );
break;
default:
@@ -305,20 +301,6 @@
}
// -----------------------------------------------------------
-// CPhoneStateIncoming::UpdateRemoteInfoDataAndLabelL
-// -----------------------------------------------------------
-//
-void CPhoneStateIncoming::UpdateRemoteInfoDataAndLabelL(
- TInt aCallId )
- {
- __LOGMETHODSTARTEND(EPhoneControl,
- "CPhoneStateIncoming::UpdateRemoteInfoDataAndLabelL ()" );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel,
- aCallId );
- }
-
-// -----------------------------------------------------------
// CPhoneStateIncoming::HandleConnectedL
// -----------------------------------------------------------
//
@@ -330,8 +312,6 @@
globalNotifierParam.SetBoolean( EFalse );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
- &globalNotifierParam );
iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
@@ -369,11 +349,6 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
- TPhoneCmdParamBoolean globalNotifierParam;
- globalNotifierParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetEikonNotifiersDisabled,
- &globalNotifierParam );
SetDefaultFlagsL();
if ( !iNumberEntryManager->SetVisibilityIfNumberEntryUsedL( ETrue ) )
@@ -499,8 +474,6 @@
iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageRelease );
}
ShowDisconnectingL( iRingingCallId );
-
- iCallDisconnected = ETrue;
}
// -----------------------------------------------------------
@@ -517,12 +490,6 @@
iUiCommandManager->SetSoftRejectStatus( EFalse );
- // Re-enable global notes. Otherwise message editor is not opened.
- TPhoneCmdParamBoolean globalNotifierParam;
- globalNotifierParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
- &globalNotifierParam );
-
UpdateUiCommands();
TPhoneCmdParamSfiData sfiDataParam;
--- a/phoneapp/phoneuicontrol/src/cphonestatestartup.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonestatestartup.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -199,28 +199,6 @@
}
}
-// ---------------------------------------------------------
-// CPhoneStateStartup::HandleIdleForegroundEventL
-// Phone should show security note asap.
-// Active idle might be in front quite early if f.e. rejected SIM
-// ---------------------------------------------------------
-//
-EXPORT_C void CPhoneStateStartup::HandleIdleForegroundEventL()
- {
- __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateStartup::HandleIdleForegroundEventL( ) ");
- TPhoneCmdParamBoolean isSecurityMode;
- iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
- if ( !isSecurityMode.Boolean() && !IsSimOk() )
- {
- TPhoneCmdParamBoolean securityMode;
- securityMode.SetBoolean( ETrue );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetSecurityMode, &securityMode );
- iCreateNote = CIdle::NewL( CActive::EPriorityHigh );
-
- CreateAndShowNoteAfterIdle();
- }
- }
-
// -----------------------------------------------------------------------------
// CPhoneStateStartup::CreateAndShowNoteAfterIdle
//
--- a/phoneapp/phoneuicontrol/src/cphoneuicommandmanager.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphoneuicommandmanager.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -255,7 +255,7 @@
}
else if ( 2 == activeCallCount )
{
- ret = ret = EPhoneCallHandlingIncomingRejectCBA;
+ ret = EPhoneCallHandlingIncomingRejectCBA;
}
else
{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuicontrol/src/phoneaudioutil.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,297 @@
+/*
+* 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: Acessory and Bluetooth handler.
+*
+*/
+
+
+// INCLUDE FILES
+#include "phoneaudioutil.h"
+#include "phonenoteutil.h"
+#include "cphoneaccessorybthandler.h"
+#include "cphonecenrepproxy.h"
+#include "cphonemainresourceresolver.h"
+#include "mphoneneclearedhandler.h"
+#include "mphonestatemachine.h"
+#include "mphoneviewcommandhandle.h"
+#include "cphonestatehandle.h"
+#include "tphonecmdparamboolean.h"
+#include "tphonecmdparamaudiooutput.h"
+#include "cphonebtaadisconnecthandler.h"
+#include "phonerssbase.h"
+#include "tphonecmdparaminteger.h"
+#include "tphonecmdparamaudioavailability.h"
+
+#include <mpeengineinfo.h>
+
+// CONSTANTS
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------
+// PhoneAudioUtil::HandleAudioMuteChangedL
+// Default handling for EPEMessageAudioMuteChanged message
+// (other items were commented in a header).
+// -----------------------------------------------------------
+//
+void PhoneAudioUtil::HandleAudioMuteChangedL()
+ {
+ TPhoneCmdParamBoolean booleanParam;
+ const TBool audioMute = StateMachine()->PhoneEngineInfo()->AudioMute();
+ booleanParam.SetBoolean( audioMute );
+ ViewCommandHandle()->ExecuteCommandL( EPhoneViewActivateMuteUIChanges,
+ &booleanParam );
+ }
+
+// ---------------------------------------------------------
+// PhoneAudioUtil::HandleAudioOutputChangedL
+// ---------------------------------------------------------
+//
+void PhoneAudioUtil::HandleAudioOutputChangedL()
+ {
+ MPhoneViewCommandHandle* viewCommandHandle =
+ ViewCommandHandle();
+
+ MPhoneStateMachine* stateMachine = StateMachine();
+
+ TPhoneCmdParamAudioOutput outputParam;
+ const TPEAudioOutput audioOutput =
+ stateMachine->PhoneEngineInfo()->AudioOutput();
+ outputParam.SetAudioOutput( audioOutput );
+
+ viewCommandHandle->ExecuteCommandL( EPhoneViewActivateAudioPathUIChanges,
+ &outputParam );
+
+ // Previous Output
+ TPEPhoneAudioRouteParameters RouteParameters = stateMachine->
+ PhoneEngineInfo()->RouteParameters();
+ const TPEAudioOutput previousOutput =
+ RouteParameters.iPreviousOutput;
+
+ TBool btAvailable = stateMachine->PhoneEngineInfo()->AudioOutputAvailable(
+ EPEBTAudioAccessory );
+ // Show note or BT disconnect handler
+ if ( audioOutput != EPENotActive &&
+ previousOutput == EPEBTAudioAccessory &&
+ !btAvailable )
+ {
+ CPhoneBtaaDisconnectHandler::InstanceL()->HandleConnectionLostL();
+ }
+ else if ( audioOutput == EPEBTAudioAccessory &&
+ previousOutput != EPEBTAudioAccessory &&
+ btAvailable )
+ {
+ CPhoneAccessoryBTHandler* bt = CPhoneAccessoryBTHandler::NewLC(
+ viewCommandHandle, stateMachine );
+ bt->ShowBTActivatedL();
+ CleanupStack::PopAndDestroy( bt );
+ }
+ else if ( audioOutput == EPENotActive &&
+ CPhoneBtaaDisconnectHandler::InstanceL()->IsQuery() )
+ {
+ CPhoneBtaaDisconnectHandler::InstanceL()->Cancel();
+ }
+ else if ( RouteParameters.iShowNote && audioOutput == EPELoudspeaker )
+ {
+ // Avkon removal
+ // TODO Play tone
+ }
+ }
+
+// -----------------------------------------------------------
+// PhoneAudioUtil::DecreaseAudioVolume()
+// -----------------------------------------------------------
+//
+void PhoneAudioUtil::DecreaseAudioVolumeL()
+ {
+ MPhoneStateMachine* stateMachine = StateMachine();
+ TPEAudioOutput output( stateMachine->PhoneEngineInfo()->AudioOutput() );
+
+ if( output == EPETTY )
+ {
+ PhoneNoteUtil::SendGlobalInfoNoteL(
+ EPhoneNoteTTYNoAudioControl, ETrue );
+ }
+ else
+ {
+ TInt audioVolume( stateMachine->PhoneEngineInfo()->AudioVolume() );
+ audioVolume--;
+ ChangeAudioVolumeL( audioVolume, ETrue );
+ }
+ }
+
+// -----------------------------------------------------------
+// PhoneAudioUtil::IncreaceAudioVolume()
+// -----------------------------------------------------------
+//
+void PhoneAudioUtil::IncreaseAudioVolumeL()
+ {
+ MPhoneStateMachine* stateMachine = StateMachine();
+ TPEAudioOutput output( stateMachine->PhoneEngineInfo()->AudioOutput() );
+
+ if( output == EPETTY )
+ {
+ PhoneNoteUtil::SendGlobalInfoNoteL(
+ EPhoneNoteTTYNoAudioControl, ETrue );
+ }
+ else
+ {
+ TInt audioVolume( stateMachine->PhoneEngineInfo()->AudioVolume() );
+ audioVolume++;
+ ChangeAudioVolumeL( audioVolume, ETrue );
+ }
+ }
+
+// -----------------------------------------------------------
+// PhoneAudioUtil::ChangeAudioVolumeL()
+// -----------------------------------------------------------
+//
+void PhoneAudioUtil::ChangeAudioVolumeL( TInt aLevel, TBool aUpdateControl )
+ {
+ TInt valueToControl = aLevel;
+ // sets value between 1 -10
+ if ( aLevel>=KPhoneVolumeMinValue && aLevel<=KPhoneVolumeMaxValue )
+ {
+ MPhoneStateMachine* stateMachine = StateMachine();
+
+ stateMachine->PhoneEngineInfo()->SetAudioVolumeCommand( aLevel );
+ // Syncronizes audio volume level between engine and ui
+ // causes EPEMessageAudioVolumeChanged message to phoneUI
+ stateMachine->SendPhoneEngineMessage(
+ MPEPhoneModel::EPEMessageSetAudioVolume );
+ }
+
+ if ( aUpdateControl )
+ {
+ // Update the volume display.
+ // Upper max (11) and under min (-1)
+ // values are also updated to volume popup.
+ TPhoneCmdParamInteger volumeParam;
+ volumeParam.SetInteger( valueToControl );
+ ViewCommandHandle()->ExecuteCommandL(
+ EPhoneViewSetNaviPaneAudioVolume,
+ &volumeParam );
+ }
+ }
+
+// -----------------------------------------------------------
+// PhoneAudioUtil::GetVolumeLevel
+// -----------------------------------------------------------
+//
+TInt PhoneAudioUtil::GetVolumeLevel()
+ {
+ TPhoneCmdParamInteger integerParam;
+ ViewCommandHandle()->ExecuteCommand( EPhoneViewGetAudioVolumeLevel,
+ &integerParam );
+ return integerParam.Integer();
+ }
+
+// -----------------------------------------------------------
+// PhoneAudioUtil::HandleAudioAvailableOutputChangedL
+// Default handling for EPEMessageAvailableAudioOutputsChanged message
+// (other items were commented in a header).
+// -----------------------------------------------------------
+//
+void PhoneAudioUtil::HandleAudioAvailableOutputChangedL()
+ {
+ MPhoneStateMachine* stateMachine = StateMachine();
+ TPhoneCmdParamAudioAvailability outputParam;
+ // Output
+ const TPEAudioOutput audioOutput =
+ stateMachine->PhoneEngineInfo()->AudioOutput();
+ // BT availability
+ TBool btAvailable = stateMachine->PhoneEngineInfo()->
+ AudioOutputAvailable( EPEBTAudioAccessory );
+ outputParam.SetBTAccAvailable( btAvailable );
+ // Wired availability
+ TBool wiredAvailable = stateMachine->PhoneEngineInfo()->
+ AudioOutputAvailable( EPEWiredAudioAccessory );
+ outputParam.SetWiredAccAvailable( wiredAvailable );
+ // BTA disconnect handler check
+ if( btAvailable )
+ {
+ CPhoneBtaaDisconnectHandler::InstanceL()->Cancel();
+ }
+
+ ViewCommandHandle()->ExecuteCommandL(
+ EPhoneViewActivateAudioAvailabilityUIChanges,
+ &outputParam );
+ }
+
+// -----------------------------------------------------------
+// PhoneAudioUtil::ToggleMute
+// -----------------------------------------------------------
+//
+void PhoneAudioUtil::ToggleMute()
+ {
+ MPhoneStateMachine* stateMachine = StateMachine();
+ stateMachine->PhoneEngineInfo()->AudioMute() ?
+ stateMachine->PhoneEngineInfo()->SetAudioMuteCommand( EFalse ):
+ stateMachine->PhoneEngineInfo()->SetAudioMuteCommand( ETrue );
+
+ stateMachine->SendPhoneEngineMessage(
+ MPEPhoneModel::EPEMessageSetAudioMute );
+ }
+
+// ---------------------------------------------------------
+// PhoneAudioUtil::SetHandsfreeModeL
+// ---------------------------------------------------------
+//
+void PhoneAudioUtil::SetHandsfreeModeL( TBool aHandsfreeMode )
+ {
+ CPhoneAccessoryBTHandler* bt = CPhoneAccessoryBTHandler::NewLC(
+ ViewCommandHandle(), StateMachine() );
+ if ( !bt->SetHandsfreeModeL( aHandsfreeMode ))
+ {
+ PhoneNoteUtil::SendGlobalErrorNoteL(
+ EPhoneNoteTextNotAllowed, ETrue );
+ }
+ CleanupStack::PopAndDestroy( bt );
+ }
+
+// ---------------------------------------------------------
+// PhoneAudioUtil::SetBTHandsfreeModeL
+// ---------------------------------------------------------
+//
+void PhoneAudioUtil::SetBtHandsfreeModeL( TBool aHandsfreeMode )
+ {
+ CPhoneAccessoryBTHandler* bt = CPhoneAccessoryBTHandler::NewLC(
+ ViewCommandHandle(), StateMachine() );
+ if ( !bt->SetBTHandsfreeModeL( aHandsfreeMode ))
+ {
+ PhoneNoteUtil::SendGlobalErrorNoteL(
+ EPhoneNoteTextNotAllowed, ETrue );
+ }
+ CleanupStack::PopAndDestroy( bt );
+ }
+
+// ---------------------------------------------------------
+// PhoneAudioUtil::ViewCommandHandle
+// ---------------------------------------------------------
+//
+MPhoneViewCommandHandle* PhoneAudioUtil::ViewCommandHandle()
+ {
+ return CPhoneStateHandle::Instance()->ViewCommandHandle();
+ }
+
+// ---------------------------------------------------------
+// PhoneAudioUtil::StateMachine
+// ---------------------------------------------------------
+//
+MPhoneStateMachine* PhoneAudioUtil::StateMachine()
+ {
+ return CPhoneStateHandle::Instance()->StateMachine();
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuicontrol/src/phonenoteutil.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,289 @@
+/*
+* 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: Acessory and Bluetooth handler.
+*
+*/
+
+
+// INCLUDE FILES
+#include "phonenoteutil.h"
+#include "cphonecenrepproxy.h"
+#include "cphonemainresourceresolver.h"
+#include "mphoneneclearedhandler.h"
+#include "mphonestatemachine.h"
+#include "mphoneviewcommandhandle.h"
+#include "cphonestatehandle.h"
+#include "tphonecmdparamboolean.h"
+#include "tphonecmdparamnote.h"
+#include "tphonecmdparamquery.h"
+#include "cphoneclearblacklist.h"
+#include "cphonemainerrormessageshandler.h"
+
+// CONSTANTS
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// ---------------------------------------------------------
+// PhoneNoteUtil::SendGlobalInfoNoteL
+// ---------------------------------------------------------
+//
+void PhoneNoteUtil::SendGlobalInfoNoteL( TInt aResourceId,
+ TBool aNotificationDialog )
+ {
+ MPhoneViewCommandHandle* viewCommandHandle =
+ ViewCommandHandle();
+
+ SetGlobalNotifierDisabledL( viewCommandHandle );
+
+ TPhoneCmdParamGlobalNote globalNoteParam;
+ TPhoneNotificationType type = aNotificationDialog ?
+ EPhoneNotificationDialog : EPhoneMessageBoxInformation;
+
+ SetCommonGlobalNoteParamsL(
+ globalNoteParam, aResourceId,
+ aNotificationDialog, type,
+ EPhoneInformationTone );
+
+ viewCommandHandle->ExecuteCommandL(
+ EPhoneViewShowGlobalNote, &globalNoteParam );
+ }
+
+// ---------------------------------------------------------
+// PhoneNoteUtil::SendGlobalWarningNoteL
+// ---------------------------------------------------------
+//
+void PhoneNoteUtil::SendGlobalWarningNoteL(
+ TInt aResourceId, TBool aNotificationDialog )
+ {
+ MPhoneViewCommandHandle* viewCommandHandle =
+ ViewCommandHandle();
+
+ SetGlobalNotifierDisabledL( viewCommandHandle );
+
+ TPhoneCmdParamGlobalNote globalNoteParam;
+ TPhoneNotificationType type = aNotificationDialog ?
+ EPhoneNotificationDialog : EPhoneMessageBoxWarning;
+
+ SetCommonGlobalNoteParamsL(
+ globalNoteParam, aResourceId,
+ aNotificationDialog, type,
+ EPhoneWarningTone );
+
+ viewCommandHandle->ExecuteCommandL(
+ EPhoneViewShowGlobalNote, &globalNoteParam );
+ }
+
+// ---------------------------------------------------------
+// PhoneNoteUtil::SendGlobalErrorNoteL
+// ---------------------------------------------------------
+//
+void PhoneNoteUtil::SendGlobalErrorNoteL(
+ TInt aResourceId, TBool aNotificationDialog )
+ {
+ MPhoneViewCommandHandle* viewCommandHandle =
+ ViewCommandHandle();
+
+ SetGlobalNotifierDisabledL( viewCommandHandle );
+
+ TPhoneCmdParamGlobalNote globalNoteParam;
+ TPhoneNotificationType type = aNotificationDialog ?
+ EPhoneNotificationDialog : EPhoneMessageBoxInformation;
+
+ SetCommonGlobalNoteParamsL(
+ globalNoteParam, aResourceId,
+ aNotificationDialog, type,
+ EPhoneErrorTone );
+
+ viewCommandHandle->ExecuteCommandL(
+ EPhoneViewShowGlobalNote, &globalNoteParam );
+
+ }
+
+// ---------------------------------------------------------
+// PhoneNoteUtil::SendGlobalNoteL
+// ---------------------------------------------------------
+//
+void PhoneNoteUtil::SendGlobalNoteL(
+ TInt aResourceId, TBool aNotificationDialog )
+ {
+ MPhoneViewCommandHandle* viewCommandHandle =
+ ViewCommandHandle();
+
+ SetGlobalNotifierDisabledL( viewCommandHandle );
+
+ TPhoneCmdParamGlobalNote globalNoteParam;
+ TPhoneNotificationType type = aNotificationDialog ?
+ EPhoneNotificationDialog : EPhoneMessageBoxInformation;
+
+ SetCommonGlobalNoteParamsL(
+ globalNoteParam, aResourceId,
+ aNotificationDialog,
+ type );
+
+ viewCommandHandle->ExecuteCommandL(
+ EPhoneViewShowGlobalNote, &globalNoteParam );
+
+ }
+
+// ---------------------------------------------------------
+// PhoneNoteUtil::SendGlobalNoteL
+// ---------------------------------------------------------
+//
+void PhoneNoteUtil::SendGlobalNoteL(
+ TPhoneNotificationType aType, const TDesC& aText )
+ {
+ TPhoneCmdParamGlobalNote globalNoteParam;
+ globalNoteParam.SetType( aType );
+ globalNoteParam.SetText( aText );
+
+ ViewCommandHandle()->ExecuteCommandL(
+ EPhoneViewShowGlobalNote, &globalNoteParam );
+ }
+
+// -----------------------------------------------------------
+// PhoneNoteUtil::ShowNoteL
+// -----------------------------------------------------------
+//
+void PhoneNoteUtil::ShowNoteL( TInt aResourceId )
+ {
+ TPhoneCmdParamNote noteParam;
+ noteParam.SetType( EPhoneNotePermanent );
+ noteParam.SetResourceId( CPhoneMainResourceResolver::Instance()->
+ ResolveResourceID( aResourceId ) );
+ ViewCommandHandle()->ExecuteCommandL( EPhoneViewShowNote, ¬eParam );
+ }
+
+// -----------------------------------------------------------
+// PhoneNoteUtil::ShowQueryL
+// -----------------------------------------------------------
+//
+void PhoneNoteUtil::ShowQueryL( TInt aResourceId )
+ {
+ TPhoneCmdParamQuery queryParam;
+ queryParam.SetQueryType( EPhoneQueryDialog );
+ queryParam.SetQueryResourceId( CPhoneMainResourceResolver::Instance()->
+ ResolveResourceID( aResourceId ) );
+ ViewCommandHandle()->ExecuteCommandL( EPhoneViewShowQuery, &queryParam );
+ }
+
+// -----------------------------------------------------------
+// PhoneNoteUtil::ShowTextQueryL
+// -----------------------------------------------------------
+//
+void PhoneNoteUtil::ShowTextQueryL(
+ TInt aDialogResourceId,
+ TInt aDefaultCbaResourceId,
+ TInt aContentCbaResourceId,
+ TDes* aDataText,
+ TBool aSendKeyEnabled )
+ {
+ TPhoneCmdParamQuery queryDialogParam;
+ queryDialogParam.SetQueryType( EPhoneTextQueryDialog );
+ queryDialogParam.SetQueryResourceId( aDialogResourceId );
+ queryDialogParam.SetDefaultCba( aDefaultCbaResourceId );
+ queryDialogParam.SetContentCba( aContentCbaResourceId );
+ queryDialogParam.SetDataText( aDataText );
+ queryDialogParam.SetSendKeyEnabled( aSendKeyEnabled );
+ ViewCommandHandle()->ExecuteCommandL( EPhoneViewShowQuery,
+ &queryDialogParam );
+ }
+
+// -----------------------------------------------------------
+// PhoneNoteUtil::HandleErrorL
+// Default handling for HandleError message
+// (other items were commented in a header).
+// -----------------------------------------------------------
+//
+void PhoneNoteUtil::HandleErrorL( const TPEErrorInfo& aErrorInfo )
+ {
+ // Do the common error handling (display proper notes etc)
+ CPhoneMainErrorMessagesHandler::Instance()->ShowErrorSpecificNoteL( aErrorInfo );
+ switch( aErrorInfo.iErrorCode )
+ {
+ case ECCPErrorNoService:
+ // No network -> hide volume popup
+ ViewCommandHandle()->
+ ExecuteCommandL( EPhoneViewHideNaviPaneAudioVolume );
+ break;
+
+ case ECCPErrorSatControl:
+ ViewCommandHandle()->
+ ExecuteCommandL( EPhoneViewClearNumberEntryContent );
+ break;
+
+ default:
+ break;
+ }
+ // clear call blacklist if call failure occurs
+ CPhoneClearBlacklist::Instance()->ClearBlackListOnNextKey();
+ }
+
+// -----------------------------------------------------------------------------
+// PhoneNoteUtil::HandleRemoteBusyNoteL
+// -----------------------------------------------------------------------------
+//
+void PhoneNoteUtil::HandleRemoteBusyNoteL( TInt aCallId )
+ {
+ TPEErrorInfo info;
+ info.iCallId = aCallId;
+ info.iErrorCode = ECCPErrorBusy;
+ info.iErrorType = EPECcp;
+ CPhoneMainErrorMessagesHandler::Instance()->
+ ShowErrorSpecificNoteL( info );
+ }
+
+// ---------------------------------------------------------
+// PhoneNoteUtil::SetGlobalNotifierDisabledL
+// ---------------------------------------------------------
+//
+void PhoneNoteUtil::SetGlobalNotifierDisabledL(
+ MPhoneViewCommandHandle* aViewCommandHandle )
+ {
+ TPhoneCmdParamBoolean globalNotifierParam;
+ globalNotifierParam.SetBoolean( EFalse );
+ aViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
+ &globalNotifierParam );
+ }
+
+// ---------------------------------------------------------
+// PhoneNoteUtil::SetCommonGlobalNoteParamsL
+// ---------------------------------------------------------
+//
+void PhoneNoteUtil::SetCommonGlobalNoteParamsL(
+ TPhoneCmdParamGlobalNote& aGlobalNoteParam,
+ TInt aResourceId,
+ TBool aNotificationDialog,
+ TPhoneNotificationType aNoteType,
+ TPhoneNotificationToneType aTone )
+ {
+ aGlobalNoteParam.SetType( aNoteType );
+ aGlobalNoteParam.SetToneType( aTone );
+
+ aGlobalNoteParam.SetTextResourceId(
+ CPhoneMainResourceResolver::Instance()->
+ ResolveResourceID( aResourceId ) );
+
+ aGlobalNoteParam.SetNotificationDialog( aNotificationDialog );
+ }
+
+// ---------------------------------------------------------
+// PhoneNoteUtil::ViewCommandHandle
+// ---------------------------------------------------------
+//
+MPhoneViewCommandHandle* PhoneNoteUtil::ViewCommandHandle()
+ {
+ return CPhoneStateHandle::Instance()->ViewCommandHandle();
+ }
+
+// End of File
--- a/phoneapp/phoneuicontrol/tsrc/ut_cphoneaccessorybthandler/Src/ut_cphoneaccessorybthandler.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/tsrc/ut_cphoneaccessorybthandler/Src/ut_cphoneaccessorybthandler.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -99,8 +99,7 @@
iCPhoneAccessoryBTHandler =
CPhoneAccessoryBTHandler::NewLC(
iViewCmdHandleMock,
- iStateMachineMock,
- this );
+ iStateMachineMock );
}
--- a/phoneapp/phoneuicontrol/tsrc/ut_cphonenumberentrymanager/run_auto_tests.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonenumberentrymanager/run_auto_tests.bat Mon Oct 04 16:06:10 2010 +0300
@@ -151,7 +151,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%
)
@@ -191,7 +191,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/phoneapp/phoneuicontrol/tsrc/ut_cphonestate/group/ut_cphonestate.mmp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestate/group/ut_cphonestate.mmp Mon Oct 04 16:06:10 2010 +0300
@@ -41,6 +41,8 @@
SOURCE mock_cphonestateincall.cpp
SOURCE mock_cphonestatemachine.cpp
SOURCE mock_cphoneaccessorybthandler.cpp
+SOURCE mock_phonenoteutil.cpp
+SOURCE mock_phoneaudioutil.cpp
SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol
SOURCE mock_cphoneuicommandmanager.cpp
--- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestate/inc/cphonestate_tester.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestate/inc/cphonestate_tester.h Mon Oct 04 16:06:10 2010 +0300
@@ -100,7 +100,7 @@
void cphonestate_tester::T_UpdateRemoteInfoDataL( TInt aCallId )
{
- UpdateRemoteInfoDataL( aCallId );
+ UpdateCallHeader( aCallId );
}
void cphonestate_tester::T_StartShowSecurityNoteL()
--- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestate/src/ut_cphonestate.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestate/src/ut_cphonestate.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -324,14 +324,8 @@
*/
void ut_cphonestate::T_DisplayCallTerminationNoteL( )
{
-
- TPhoneCmdParamGlobalNote globalNoteParam;
- globalNoteParam.SetType( EPhoneMessageBoxInformation );
- iMockContext->ExpectCallL( "CPhoneViewController::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TPhoneCommandParam&> (
- EPhoneViewShowGlobalNote,
- globalNoteParam );
+ iMockContext->ExpectCallL( "PhoneNoteUtil::SendGlobalNoteL" );
iPhoneState->T_DisplayCallTerminationNoteL();
@@ -352,12 +346,7 @@
keyEvent.iCode = EKeyUpArrow;
keyEvent.iRepeats = 0;
TEventCode eventCode(EEventKey);
- iMockContext->ExpectCallL( "CPEEngineInfoImpl::AudioVolume" ).
- ReturnsL( volume );
- TPhoneCmdParamInteger volumeParam;
- volumeParam.SetInteger( volume+1 );
- iMockContext->ExpectCallL( "CPhoneViewController::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TPhoneCommandParam&> ( EPhoneViewSetNaviPaneAudioVolume, volumeParam );
+ iMockContext->ExpectCallL( "PhoneAudioUtil::IncreaseAudioVolumeL" );
iPhoneState->HandleKeyEventL( keyEvent, eventCode );
@@ -378,12 +367,7 @@
keyEvent.iCode = EKeyDownArrow;
keyEvent.iRepeats = 0;
TEventCode eventCode(EEventKey);
- iMockContext->ExpectCallL( "CPEEngineInfoImpl::AudioVolume" ).
- ReturnsL( volume );
- TPhoneCmdParamInteger volumeParam;
- volumeParam.SetInteger( volume-1 );
- iMockContext->ExpectCallL( "CPhoneViewController::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TPhoneCommandParam&> ( EPhoneViewSetNaviPaneAudioVolume, volumeParam );
+ iMockContext->ExpectCallL( "PhoneAudioUtil::DecreaseAudioVolumeL" );
iPhoneState->HandleKeyEventL( keyEvent, eventCode );
@@ -561,23 +545,7 @@
void ut_cphonestate::T_HandleBTActivatedL()
{
- iMockContext->ExpectCallL( "CPEEngineInfoImpl::AudioOutput" ).
- ReturnsL( EPEBTAudioAccessory );
-
- const TPEAudioOutput audioOutput = EPEBTAudioAccessory;
- const TPEAudioOutput previousOutput = EPEHandset;
- TPEPhoneAudioRouteParameters routeParameters;
- routeParameters.iAudioOutput = audioOutput;
- routeParameters.iPreviousOutput = previousOutput;
-
- iMockContext->ExpectCallL( "CPEEngineInfoImpl::RouteParameters" ).
- ReturnsL( routeParameters );
-
- iMockContext->ExpectCallL( "CPEEngineInfoImpl::AudioOutputAvailable" ).
- WithL( EPEBTAudioAccessory ).
- ReturnsL( ETrue );
-
- iMockContext->ExpectCallL( "CPhoneAccessoryBTHandler::ShowBTActivatedL" );
+ iMockContext->ExpectCallL( "PhoneAudioUtil::HandleAudioOutputChangedL()" );
iPhoneState->HandlePhoneEngineMessageL(
MEngineMonitor::EPEMessageAudioOutputChanged,
@@ -824,13 +792,6 @@
WithL( KCallId, KNullDesC() );
iMockContext->ExpectCallL( "CPhoneCustomizationVoip::ModifyCallHeaderTexts" );
-
-
- TPhoneCmdParamCallHeaderData callHeaderParam;
-
- iMockContext->ExpectCallL( "CPhoneViewController::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TInt, TPhoneCommandParam&> ( EPhoneViewUpdateCallHeaderRemoteInfoData,
- KCallId, callHeaderParam );
iPhoneState->T_UpdateRemoteInfoDataL( KCallId );
EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
--- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -220,20 +220,6 @@
EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
}
-void ut_cphonestateidle::T_HandleIdleForegroundEventL( )
- {
- iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
- WithL( EPhoneViewBringIdleToForeground ).
- TimesL(1);
- iStateIdle->HandleIdleForegroundEventL();
- EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
- }
-
-void ut_cphonestateidle::T_HandlePhoneForegroundEventL( )
- {
- iStateIdle->HandlePhoneForegroundEventL();
- }
-
void ut_cphonestateidle::T_HandleKeyMessageL( )
{
_LIT( KPhoneNumber, "12345" );
@@ -505,21 +491,6 @@
SetupL, T_IdleEndKeyPressGeneratesCancelNotificationsL, Teardown)
EUNIT_TEST(
- "Test4 - T_HandleIdleForegroundEventL",
- "CPhoneIdleState",
- "Test4",
- "FUNCTIONALITY",
- SetupL, T_HandleIdleForegroundEventL, Teardown)
-
-
-EUNIT_TEST(
- "Test6 - HandlePhoneForegroundEventL",
- "CPhoneIdleState",
- "Test6",
- "FUNCTIONALITY",
- SetupL, T_HandlePhoneForegroundEventL, Teardown)
-
-EUNIT_TEST(
"Test7 - HandleKeyMessageL",
"CPhoneIdleState",
"Test7",
--- a/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuicontrol/tsrc/ut_cphonestateidle/Src/ut_cphonestateidle.h Mon Oct 04 16:06:10 2010 +0300
@@ -63,8 +63,6 @@
void T_IdlePhoneFocusLost_DiallerNotUsedL();
void T_IdlePhoneFocusLost_DiallerUsedL();
void T_IdleEndKeyPressGeneratesCancelNotificationsL();
- void T_HandleIdleForegroundEventL();
- void T_HandlePhoneForegroundEventL();
void T_HandleKeyMessageL();
void T_HandleKeyMessageL_AppKeyL();
void T_HandleKeyMessageL_AppKeyL_SecurityModeOff();
--- a/phoneapp/phoneuiqtviewadapter/bwins/phoneuiqtviewadapteru.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/bwins/phoneuiqtviewadapteru.def Mon Oct 04 16:06:10 2010 +0300
@@ -48,55 +48,53 @@
?convertKey@PhoneUIQtViewAdapter@@AAE_NW4TKeyCode@@AAW4Key@Qt@@@Z @ 47 NONAME ; bool PhoneUIQtViewAdapter::convertKey(enum TKeyCode, enum Qt::Key &)
?setExpandedConferenceCallHeader@PhoneUIQtViewAdapter@@AAEXXZ @ 48 NONAME ; void PhoneUIQtViewAdapter::setExpandedConferenceCallHeader(void)
?HandleCommandL@PhoneUIQtViewAdapter@@UAEHHPAVTPhoneCommandParam@@@Z @ 49 NONAME ; int PhoneUIQtViewAdapter::HandleCommandL(int, class TPhoneCommandParam *)
- ?updateCallHeaderRemoteInfo@PhoneUIQtViewAdapter@@AAEXH@Z @ 50 NONAME ; void PhoneUIQtViewAdapter::updateCallHeaderRemoteInfo(int)
- ?setHidden@PhoneUIQtViewAdapter@@AAEX_N@Z @ 51 NONAME ; void PhoneUIQtViewAdapter::setHidden(bool)
- ?setDialpadMenu@PhoneUIQtViewAdapter@@AAEXXZ @ 52 NONAME ; void PhoneUIQtViewAdapter::setDialpadMenu(void)
- ?createCallHeader@PhoneUIQtViewAdapter@@AAEXH@Z @ 53 NONAME ; void PhoneUIQtViewAdapter::createCallHeader(int)
- ?callIdByState@PhoneUIQtViewAdapter@@AAEHPAVTPhoneCommandParam@@@Z @ 54 NONAME ; int PhoneUIQtViewAdapter::callIdByState(class TPhoneCommandParam *)
- ?ExecuteCommandL@PhoneUIQtViewAdapter@@UAEXHPAVTPhoneCommandParam@@@Z @ 55 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommandL(int, class TPhoneCommandParam *)
- ?setDialpadVisibility@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 56 NONAME ; void PhoneUIQtViewAdapter::setDialpadVisibility(class TPhoneCommandParam *)
- ?updateCallHeaderState@PhoneUIQtViewAdapter@@AAEXH@Z @ 57 NONAME ; void PhoneUIQtViewAdapter::updateCallHeaderState(int)
- ?ExecuteCommandL@PhoneUIQtViewAdapter@@UAEXHHPAVTPhoneCommandParam@@@Z @ 58 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommandL(int, int, class TPhoneCommandParam *)
- ?removeConferenceBubble@PhoneUIQtViewAdapter@@AAEXXZ @ 59 NONAME ; void PhoneUIQtViewAdapter::removeConferenceBubble(void)
- ?showGlobalNote@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 60 NONAME ; void PhoneUIQtViewAdapter::showGlobalNote(class TPhoneCommandParam *)
- ?handleWindowDeactivated@PhoneUIQtViewAdapter@@AAEXXZ @ 61 NONAME ; void PhoneUIQtViewAdapter::handleWindowDeactivated(void)
- ?getSelectedConferenceMember@PhoneUIQtViewAdapter@@AAEHPAVTPhoneCommandParam@@@Z @ 62 NONAME ; int PhoneUIQtViewAdapter::getSelectedConferenceMember(class TPhoneCommandParam *)
- ?metaObject@PhoneUIQtViewAdapter@@UBEPBUQMetaObject@@XZ @ 63 NONAME ; struct QMetaObject const * PhoneUIQtViewAdapter::metaObject(void) const
- ?dialpadClosed@PhoneUIQtViewAdapter@@AAEXXZ @ 64 NONAME ; void PhoneUIQtViewAdapter::dialpadClosed(void)
- ?removeAllCallHeaders@PhoneUIQtViewAdapter@@AAEXXZ @ 65 NONAME ; void PhoneUIQtViewAdapter::removeAllCallHeaders(void)
- ?SetHiddenL@PhoneUIQtViewAdapter@@AAEX_N@Z @ 66 NONAME ; void PhoneUIQtViewAdapter::SetHiddenL(bool)
- ?hideDeviceDialogs@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 67 NONAME ; void PhoneUIQtViewAdapter::hideDeviceDialogs(class TPhoneCommandParam *)
- ?setPrivateFromConference@PhoneUIQtViewAdapter@@AAEXH@Z @ 68 NONAME ; void PhoneUIQtViewAdapter::setPrivateFromConference(int)
- ?setCallMenu@PhoneUIQtViewAdapter@@AAEXXZ @ 69 NONAME ; void PhoneUIQtViewAdapter::setCallMenu(void)
- ?setAudioVolumeSliderValue@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 70 NONAME ; void PhoneUIQtViewAdapter::setAudioVolumeSliderValue(class TPhoneCommandParam *)
- ?qt_metacall@PhoneUIQtViewAdapter@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 71 NONAME ; int PhoneUIQtViewAdapter::qt_metacall(enum QMetaObject::Call, int, void * *)
- ??1PhoneResourceAdapter@@UAE@XZ @ 72 NONAME ; PhoneResourceAdapter::~PhoneResourceAdapter(void)
- ?removeCallFromConference@PhoneUIQtViewAdapter@@AAEXH@Z @ 73 NONAME ; void PhoneUIQtViewAdapter::removeCallFromConference(int)
- ?tr@PhoneUIQtViewAdapter@@SA?AVQString@@PBD0H@Z @ 74 NONAME ; class QString PhoneUIQtViewAdapter::tr(char const *, char const *, int)
- ?staticMetaObject@PhoneResourceAdapter@@2UQMetaObject@@B @ 75 NONAME ; struct QMetaObject const PhoneResourceAdapter::staticMetaObject
- ?staticMetaObject@PhoneUIQtViewAdapter@@2UQMetaObject@@B @ 76 NONAME ; struct QMetaObject const PhoneUIQtViewAdapter::staticMetaObject
- ?ExecuteCommandL@PhoneUIQtViewAdapter@@UAEXH@Z @ 77 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommandL(int)
- ?trUtf8@PhoneUIQtViewAdapter@@SA?AVQString@@PBD0H@Z @ 78 NONAME ; class QString PhoneUIQtViewAdapter::trUtf8(char const *, char const *, int)
- ?setMuteIndication@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 79 NONAME ; void PhoneUIQtViewAdapter::setMuteIndication(class TPhoneCommandParam *)
- ?convertToToolBarCommandList@PhoneResourceAdapter@@QBE?AV?$QList@VToolBarItem@PhoneAction@@@@H@Z @ 80 NONAME ; class QList<class PhoneAction::ToolBarItem> PhoneResourceAdapter::convertToToolBarCommandList(int) const
- ?HandleCommandL@PhoneUIQtViewAdapter@@UAEHH@Z @ 81 NONAME ; int PhoneUIQtViewAdapter::HandleCommandL(int)
- ?showNote@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 82 NONAME ; void PhoneUIQtViewAdapter::showNote(class TPhoneCommandParam *)
- ?FetchContent@PhoneUIQtViewAdapter@@UAEABVTDesC16@@XZ @ 83 NONAME ; class TDesC16 const & PhoneUIQtViewAdapter::FetchContent(void)
- ?writeAudioVolumeLevel@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 84 NONAME ; void PhoneUIQtViewAdapter::writeAudioVolumeLevel(class TPhoneCommandParam *)
- ?conferenceCallId@PhoneUIQtViewAdapter@@AAEXHPAVTPhoneCommandParam@@@Z @ 85 NONAME ; void PhoneUIQtViewAdapter::conferenceCallId(int, class TPhoneCommandParam *)
- ?clearDialpad@PhoneUIQtViewAdapter@@AAEXXZ @ 86 NONAME ; void PhoneUIQtViewAdapter::clearDialpad(void)
- ?setMenu@PhoneUIQtViewAdapter@@AAEXXZ @ 87 NONAME ; void PhoneUIQtViewAdapter::setMenu(void)
- ?trUtf8@PhoneUIQtViewAdapter@@SA?AVQString@@PBD0@Z @ 88 NONAME ; class QString PhoneUIQtViewAdapter::trUtf8(char const *, char const *)
- ?tr@PhoneUIQtViewAdapter@@SA?AVQString@@PBD0@Z @ 89 NONAME ; class QString PhoneUIQtViewAdapter::tr(char const *, char const *)
- ?getStaticMetaObject@PhoneUIQtViewAdapter@@SAABUQMetaObject@@XZ @ 90 NONAME ; struct QMetaObject const & PhoneUIQtViewAdapter::getStaticMetaObject(void)
- ?qt_metacall@PhoneResourceAdapter@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 91 NONAME ; int PhoneResourceAdapter::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?setToolbarButtons@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 92 NONAME ; void PhoneUIQtViewAdapter::setToolbarButtons(class TPhoneCommandParam *)
- ?setAudioPath@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 93 NONAME ; void PhoneUIQtViewAdapter::setAudioPath(class TPhoneCommandParam *)
- ?expandedBubbleCallId@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 94 NONAME ; void PhoneUIQtViewAdapter::expandedBubbleCallId(class TPhoneCommandParam *)
- ?openDialpad@PhoneUIQtViewAdapter@@AAEXXZ @ 95 NONAME ; void PhoneUIQtViewAdapter::openDialpad(void)
- ?handleWindowActivated@PhoneUIQtViewAdapter@@AAEXXZ @ 96 NONAME ; void PhoneUIQtViewAdapter::handleWindowActivated(void)
- ?ExecuteCommand@PhoneUIQtViewAdapter@@UAEXH@Z @ 97 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommand(int)
- ?metaObject@PhoneResourceAdapter@@UBEPBUQMetaObject@@XZ @ 98 NONAME ; struct QMetaObject const * PhoneResourceAdapter::metaObject(void) const
- ?updateCallHeaderRemoteInfoAndLabel@PhoneUIQtViewAdapter@@AAEXH@Z @ 99 NONAME ; void PhoneUIQtViewAdapter::updateCallHeaderRemoteInfoAndLabel(int)
- ?setParticipantListActions@PhoneUIQtViewAdapter@@AAEXXZ @ 100 NONAME ; void PhoneUIQtViewAdapter::setParticipantListActions(void)
+ ?setHidden@PhoneUIQtViewAdapter@@AAEX_N@Z @ 50 NONAME ; void PhoneUIQtViewAdapter::setHidden(bool)
+ ?setDialpadMenu@PhoneUIQtViewAdapter@@AAEXXZ @ 51 NONAME ; void PhoneUIQtViewAdapter::setDialpadMenu(void)
+ ?createCallHeader@PhoneUIQtViewAdapter@@AAEXH@Z @ 52 NONAME ; void PhoneUIQtViewAdapter::createCallHeader(int)
+ ?callIdByState@PhoneUIQtViewAdapter@@AAEHPAVTPhoneCommandParam@@@Z @ 53 NONAME ; int PhoneUIQtViewAdapter::callIdByState(class TPhoneCommandParam *)
+ ?ExecuteCommandL@PhoneUIQtViewAdapter@@UAEXHPAVTPhoneCommandParam@@@Z @ 54 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommandL(int, class TPhoneCommandParam *)
+ ?setDialpadVisibility@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 55 NONAME ; void PhoneUIQtViewAdapter::setDialpadVisibility(class TPhoneCommandParam *)
+ ?ExecuteCommandL@PhoneUIQtViewAdapter@@UAEXHHPAVTPhoneCommandParam@@@Z @ 56 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommandL(int, int, class TPhoneCommandParam *)
+ ?removeConferenceBubble@PhoneUIQtViewAdapter@@AAEXXZ @ 57 NONAME ; void PhoneUIQtViewAdapter::removeConferenceBubble(void)
+ ?showGlobalNote@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 58 NONAME ; void PhoneUIQtViewAdapter::showGlobalNote(class TPhoneCommandParam *)
+ ?handleWindowDeactivated@PhoneUIQtViewAdapter@@AAEXXZ @ 59 NONAME ; void PhoneUIQtViewAdapter::handleWindowDeactivated(void)
+ ?getSelectedConferenceMember@PhoneUIQtViewAdapter@@AAEHPAVTPhoneCommandParam@@@Z @ 60 NONAME ; int PhoneUIQtViewAdapter::getSelectedConferenceMember(class TPhoneCommandParam *)
+ ?metaObject@PhoneUIQtViewAdapter@@UBEPBUQMetaObject@@XZ @ 61 NONAME ; struct QMetaObject const * PhoneUIQtViewAdapter::metaObject(void) const
+ ?dialpadClosed@PhoneUIQtViewAdapter@@AAEXXZ @ 62 NONAME ; void PhoneUIQtViewAdapter::dialpadClosed(void)
+ ?removeAllCallHeaders@PhoneUIQtViewAdapter@@AAEXXZ @ 63 NONAME ; void PhoneUIQtViewAdapter::removeAllCallHeaders(void)
+ ?SetHiddenL@PhoneUIQtViewAdapter@@AAEX_N@Z @ 64 NONAME ; void PhoneUIQtViewAdapter::SetHiddenL(bool)
+ ?hideDeviceDialogs@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 65 NONAME ; void PhoneUIQtViewAdapter::hideDeviceDialogs(class TPhoneCommandParam *)
+ ?setPrivateFromConference@PhoneUIQtViewAdapter@@AAEXH@Z @ 66 NONAME ; void PhoneUIQtViewAdapter::setPrivateFromConference(int)
+ ?setCallMenu@PhoneUIQtViewAdapter@@AAEXXZ @ 67 NONAME ; void PhoneUIQtViewAdapter::setCallMenu(void)
+ ?setAudioVolumeSliderValue@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 68 NONAME ; void PhoneUIQtViewAdapter::setAudioVolumeSliderValue(class TPhoneCommandParam *)
+ ?qt_metacall@PhoneUIQtViewAdapter@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 69 NONAME ; int PhoneUIQtViewAdapter::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ??1PhoneResourceAdapter@@UAE@XZ @ 70 NONAME ; PhoneResourceAdapter::~PhoneResourceAdapter(void)
+ ?removeCallFromConference@PhoneUIQtViewAdapter@@AAEXH@Z @ 71 NONAME ; void PhoneUIQtViewAdapter::removeCallFromConference(int)
+ ?tr@PhoneUIQtViewAdapter@@SA?AVQString@@PBD0H@Z @ 72 NONAME ; class QString PhoneUIQtViewAdapter::tr(char const *, char const *, int)
+ ?staticMetaObject@PhoneResourceAdapter@@2UQMetaObject@@B @ 73 NONAME ; struct QMetaObject const PhoneResourceAdapter::staticMetaObject
+ ?staticMetaObject@PhoneUIQtViewAdapter@@2UQMetaObject@@B @ 74 NONAME ; struct QMetaObject const PhoneUIQtViewAdapter::staticMetaObject
+ ?ExecuteCommandL@PhoneUIQtViewAdapter@@UAEXH@Z @ 75 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommandL(int)
+ ?trUtf8@PhoneUIQtViewAdapter@@SA?AVQString@@PBD0H@Z @ 76 NONAME ; class QString PhoneUIQtViewAdapter::trUtf8(char const *, char const *, int)
+ ?setMuteIndication@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 77 NONAME ; void PhoneUIQtViewAdapter::setMuteIndication(class TPhoneCommandParam *)
+ ?convertToToolBarCommandList@PhoneResourceAdapter@@QBE?AV?$QList@VToolBarItem@PhoneAction@@@@H@Z @ 78 NONAME ; class QList<class PhoneAction::ToolBarItem> PhoneResourceAdapter::convertToToolBarCommandList(int) const
+ ?HandleCommandL@PhoneUIQtViewAdapter@@UAEHH@Z @ 79 NONAME ; int PhoneUIQtViewAdapter::HandleCommandL(int)
+ ?showNote@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 80 NONAME ; void PhoneUIQtViewAdapter::showNote(class TPhoneCommandParam *)
+ ?FetchContent@PhoneUIQtViewAdapter@@UAEABVTDesC16@@XZ @ 81 NONAME ; class TDesC16 const & PhoneUIQtViewAdapter::FetchContent(void)
+ ?writeAudioVolumeLevel@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 82 NONAME ; void PhoneUIQtViewAdapter::writeAudioVolumeLevel(class TPhoneCommandParam *)
+ ?conferenceCallId@PhoneUIQtViewAdapter@@AAEXHPAVTPhoneCommandParam@@@Z @ 83 NONAME ; void PhoneUIQtViewAdapter::conferenceCallId(int, class TPhoneCommandParam *)
+ ?clearDialpad@PhoneUIQtViewAdapter@@AAEXXZ @ 84 NONAME ; void PhoneUIQtViewAdapter::clearDialpad(void)
+ ?setMenu@PhoneUIQtViewAdapter@@AAEXXZ @ 85 NONAME ; void PhoneUIQtViewAdapter::setMenu(void)
+ ?trUtf8@PhoneUIQtViewAdapter@@SA?AVQString@@PBD0@Z @ 86 NONAME ; class QString PhoneUIQtViewAdapter::trUtf8(char const *, char const *)
+ ?tr@PhoneUIQtViewAdapter@@SA?AVQString@@PBD0@Z @ 87 NONAME ; class QString PhoneUIQtViewAdapter::tr(char const *, char const *)
+ ?getStaticMetaObject@PhoneUIQtViewAdapter@@SAABUQMetaObject@@XZ @ 88 NONAME ; struct QMetaObject const & PhoneUIQtViewAdapter::getStaticMetaObject(void)
+ ?updateCallHeader@PhoneUIQtViewAdapter@@AAEXH@Z @ 89 NONAME ; void PhoneUIQtViewAdapter::updateCallHeader(int)
+ ?qt_metacall@PhoneResourceAdapter@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 90 NONAME ; int PhoneResourceAdapter::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?setToolbarButtons@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 91 NONAME ; void PhoneUIQtViewAdapter::setToolbarButtons(class TPhoneCommandParam *)
+ ?setAudioPath@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 92 NONAME ; void PhoneUIQtViewAdapter::setAudioPath(class TPhoneCommandParam *)
+ ?expandedBubbleCallId@PhoneUIQtViewAdapter@@AAEXPAVTPhoneCommandParam@@@Z @ 93 NONAME ; void PhoneUIQtViewAdapter::expandedBubbleCallId(class TPhoneCommandParam *)
+ ?openDialpad@PhoneUIQtViewAdapter@@AAEXXZ @ 94 NONAME ; void PhoneUIQtViewAdapter::openDialpad(void)
+ ?handleWindowActivated@PhoneUIQtViewAdapter@@AAEXXZ @ 95 NONAME ; void PhoneUIQtViewAdapter::handleWindowActivated(void)
+ ?ExecuteCommand@PhoneUIQtViewAdapter@@UAEXH@Z @ 96 NONAME ; void PhoneUIQtViewAdapter::ExecuteCommand(int)
+ ?metaObject@PhoneResourceAdapter@@UBEPBUQMetaObject@@XZ @ 97 NONAME ; struct QMetaObject const * PhoneResourceAdapter::metaObject(void) const
+ ?setParticipantListActions@PhoneUIQtViewAdapter@@AAEXXZ @ 98 NONAME ; void PhoneUIQtViewAdapter::setParticipantListActions(void)
--- a/phoneapp/phoneuiqtviewadapter/conf/carmode.qcrml Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/conf/carmode.qcrml Mon Oct 04 16:06:10 2010 +0300
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<repository target="RProperty" uidValue="0x102029A8">
+<repository target="RProperty" uidValue="0x102078EC">
<key int="0x1" ref="/phone/carmode">
</key>
</repository>
--- a/phoneapp/phoneuiqtviewadapter/eabi/phoneuiqtviewadapteru.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/eabi/phoneuiqtviewadapteru.def Mon Oct 04 16:06:10 2010 +0300
@@ -49,18 +49,18 @@
_ZN20PhoneUIQtViewAdapter16createCallHeaderEi @ 48 NONAME
_ZN20PhoneUIQtViewAdapter16setExpandActionsEv @ 49 NONAME
_ZN20PhoneUIQtViewAdapter16staticMetaObjectE @ 50 NONAME DATA 16
- _ZN20PhoneUIQtViewAdapter17bringToForegroundEv @ 51 NONAME
- _ZN20PhoneUIQtViewAdapter17hideDeviceDialogsEP18TPhoneCommandParam @ 52 NONAME
- _ZN20PhoneUIQtViewAdapter17setMuteIndicationEP18TPhoneCommandParam @ 53 NONAME
- _ZN20PhoneUIQtViewAdapter17setToolbarButtonsEP18TPhoneCommandParam @ 54 NONAME
- _ZN20PhoneUIQtViewAdapter19getStaticMetaObjectEv @ 55 NONAME
- _ZN20PhoneUIQtViewAdapter20expandedBubbleCallIdEP18TPhoneCommandParam @ 56 NONAME
- _ZN20PhoneUIQtViewAdapter20getNumberFromDialpadEP18TPhoneCommandParam @ 57 NONAME
- _ZN20PhoneUIQtViewAdapter20removeAllCallHeadersEv @ 58 NONAME
- _ZN20PhoneUIQtViewAdapter20setCommonButtonFlagsEv @ 59 NONAME
- _ZN20PhoneUIQtViewAdapter20setDialpadVisibilityEP18TPhoneCommandParam @ 60 NONAME
- _ZN20PhoneUIQtViewAdapter21handleWindowActivatedEv @ 61 NONAME
- _ZN20PhoneUIQtViewAdapter21updateCallHeaderStateEi @ 62 NONAME
+ _ZN20PhoneUIQtViewAdapter16updateCallHeaderEi @ 51 NONAME
+ _ZN20PhoneUIQtViewAdapter17bringToForegroundEv @ 52 NONAME
+ _ZN20PhoneUIQtViewAdapter17hideDeviceDialogsEP18TPhoneCommandParam @ 53 NONAME
+ _ZN20PhoneUIQtViewAdapter17setMuteIndicationEP18TPhoneCommandParam @ 54 NONAME
+ _ZN20PhoneUIQtViewAdapter17setToolbarButtonsEP18TPhoneCommandParam @ 55 NONAME
+ _ZN20PhoneUIQtViewAdapter19getStaticMetaObjectEv @ 56 NONAME
+ _ZN20PhoneUIQtViewAdapter20expandedBubbleCallIdEP18TPhoneCommandParam @ 57 NONAME
+ _ZN20PhoneUIQtViewAdapter20getNumberFromDialpadEP18TPhoneCommandParam @ 58 NONAME
+ _ZN20PhoneUIQtViewAdapter20removeAllCallHeadersEv @ 59 NONAME
+ _ZN20PhoneUIQtViewAdapter20setCommonButtonFlagsEv @ 60 NONAME
+ _ZN20PhoneUIQtViewAdapter20setDialpadVisibilityEP18TPhoneCommandParam @ 61 NONAME
+ _ZN20PhoneUIQtViewAdapter21handleWindowActivatedEv @ 62 NONAME
_ZN20PhoneUIQtViewAdapter21writeAudioVolumeLevelEP18TPhoneCommandParam @ 63 NONAME
_ZN20PhoneUIQtViewAdapter22createConferenceBubbleEi @ 64 NONAME
_ZN20PhoneUIQtViewAdapter22getDialpadStringLengthEP18TPhoneCommandParam @ 65 NONAME
@@ -73,42 +73,40 @@
_ZN20PhoneUIQtViewAdapter25handleCipheringInfoChangeEi @ 72 NONAME
_ZN20PhoneUIQtViewAdapter25setAudioVolumeSliderValueEP18TPhoneCommandParam @ 73 NONAME
_ZN20PhoneUIQtViewAdapter25setParticipantListActionsEv @ 74 NONAME
- _ZN20PhoneUIQtViewAdapter26updateCallHeaderRemoteInfoEi @ 75 NONAME
- _ZN20PhoneUIQtViewAdapter27getSelectedConferenceMemberEP18TPhoneCommandParam @ 76 NONAME
- _ZN20PhoneUIQtViewAdapter31setExpandedConferenceCallHeaderEv @ 77 NONAME
- _ZN20PhoneUIQtViewAdapter34updateCallHeaderRemoteInfoAndLabelEi @ 78 NONAME
- _ZN20PhoneUIQtViewAdapter7setMenuEv @ 79 NONAME
- _ZN20PhoneUIQtViewAdapter8openLogsEP18TPhoneCommandParam @ 80 NONAME
- _ZN20PhoneUIQtViewAdapter8showNoteEP18TPhoneCommandParam @ 81 NONAME
- _ZN20PhoneUIQtViewAdapter9setHiddenEb @ 82 NONAME
- _ZN20PhoneUIQtViewAdapterC1ER15PhoneUIQtViewIFP7QObject @ 83 NONAME
- _ZN20PhoneUIQtViewAdapterC2ER15PhoneUIQtViewIFP7QObject @ 84 NONAME
- _ZN20PhoneUIQtViewAdapterD0Ev @ 85 NONAME
- _ZN20PhoneUIQtViewAdapterD1Ev @ 86 NONAME
- _ZN20PhoneUIQtViewAdapterD2Ev @ 87 NONAME
- _ZNK20PhoneResourceAdapter10metaObjectEv @ 88 NONAME
- _ZNK20PhoneResourceAdapter15convertToStringEiRK7QString @ 89 NONAME
- _ZNK20PhoneResourceAdapter18convertToHbActionsEi @ 90 NONAME
- _ZNK20PhoneResourceAdapter22convertCommandToStringEi @ 91 NONAME
- _ZNK20PhoneResourceAdapter24convertToStringWithParamEiRK7QString @ 92 NONAME
- _ZNK20PhoneResourceAdapter24defaultToolbarResourceIdEv @ 93 NONAME
- _ZNK20PhoneResourceAdapter27convertToToolBarCommandListEi @ 94 NONAME
- _ZNK20PhoneUIQtViewAdapter10metaObjectEv @ 95 NONAME
- _ZNK20PhoneUIQtViewAdapter14noteControllerEv @ 96 NONAME
- _ZTI20PhoneResourceAdapter @ 97 NONAME
- _ZTI20PhoneUIQtViewAdapter @ 98 NONAME
- _ZTV20PhoneResourceAdapter @ 99 NONAME
- _ZTV20PhoneUIQtViewAdapter @ 100 NONAME
- _ZThn8_N20PhoneUIQtViewAdapter12FetchContentEv @ 101 NONAME
- _ZThn8_N20PhoneUIQtViewAdapter14ExecuteCommandEi @ 102 NONAME
- _ZThn8_N20PhoneUIQtViewAdapter14ExecuteCommandEiP18TPhoneCommandParam @ 103 NONAME
- _ZThn8_N20PhoneUIQtViewAdapter14HandleCommandLEi @ 104 NONAME
- _ZThn8_N20PhoneUIQtViewAdapter14HandleCommandLEiP18TPhoneCommandParam @ 105 NONAME
- _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEi @ 106 NONAME
- _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEiP18TPhoneCommandParam @ 107 NONAME
- _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEii @ 108 NONAME
- _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEiiP18TPhoneCommandParam @ 109 NONAME
- _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEiiR7TDesC16 @ 110 NONAME
- _ZThn8_N20PhoneUIQtViewAdapterD0Ev @ 111 NONAME
- _ZThn8_N20PhoneUIQtViewAdapterD1Ev @ 112 NONAME
+ _ZN20PhoneUIQtViewAdapter27getSelectedConferenceMemberEP18TPhoneCommandParam @ 75 NONAME
+ _ZN20PhoneUIQtViewAdapter31setExpandedConferenceCallHeaderEv @ 76 NONAME
+ _ZN20PhoneUIQtViewAdapter7setMenuEv @ 77 NONAME
+ _ZN20PhoneUIQtViewAdapter8openLogsEP18TPhoneCommandParam @ 78 NONAME
+ _ZN20PhoneUIQtViewAdapter8showNoteEP18TPhoneCommandParam @ 79 NONAME
+ _ZN20PhoneUIQtViewAdapter9setHiddenEb @ 80 NONAME
+ _ZN20PhoneUIQtViewAdapterC1ER15PhoneUIQtViewIFP7QObject @ 81 NONAME
+ _ZN20PhoneUIQtViewAdapterC2ER15PhoneUIQtViewIFP7QObject @ 82 NONAME
+ _ZN20PhoneUIQtViewAdapterD0Ev @ 83 NONAME
+ _ZN20PhoneUIQtViewAdapterD1Ev @ 84 NONAME
+ _ZN20PhoneUIQtViewAdapterD2Ev @ 85 NONAME
+ _ZNK20PhoneResourceAdapter10metaObjectEv @ 86 NONAME
+ _ZNK20PhoneResourceAdapter15convertToStringEiRK7QString @ 87 NONAME
+ _ZNK20PhoneResourceAdapter18convertToHbActionsEi @ 88 NONAME
+ _ZNK20PhoneResourceAdapter22convertCommandToStringEi @ 89 NONAME
+ _ZNK20PhoneResourceAdapter24convertToStringWithParamEiRK7QString @ 90 NONAME
+ _ZNK20PhoneResourceAdapter24defaultToolbarResourceIdEv @ 91 NONAME
+ _ZNK20PhoneResourceAdapter27convertToToolBarCommandListEi @ 92 NONAME
+ _ZNK20PhoneUIQtViewAdapter10metaObjectEv @ 93 NONAME
+ _ZNK20PhoneUIQtViewAdapter14noteControllerEv @ 94 NONAME
+ _ZTI20PhoneResourceAdapter @ 95 NONAME
+ _ZTI20PhoneUIQtViewAdapter @ 96 NONAME
+ _ZTV20PhoneResourceAdapter @ 97 NONAME
+ _ZTV20PhoneUIQtViewAdapter @ 98 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapter12FetchContentEv @ 99 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapter14ExecuteCommandEi @ 100 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapter14ExecuteCommandEiP18TPhoneCommandParam @ 101 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapter14HandleCommandLEi @ 102 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapter14HandleCommandLEiP18TPhoneCommandParam @ 103 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEi @ 104 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEiP18TPhoneCommandParam @ 105 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEii @ 106 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEiiP18TPhoneCommandParam @ 107 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapter15ExecuteCommandLEiiR7TDesC16 @ 108 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapterD0Ev @ 109 NONAME
+ _ZThn8_N20PhoneUIQtViewAdapterD1Ev @ 110 NONAME
--- a/phoneapp/phoneuiqtviewadapter/inc/phonecallheadermanager.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/inc/phonecallheadermanager.h Mon Oct 04 16:06:10 2010 +0300
@@ -76,23 +76,9 @@
/*!
\fn int PhoneUIQtViewAdapter::updateCallHeader()
- This method updates call state information in call header.
- */
- void updateCallHeaderState(int callId);
-
- /*!
- \fn int PhoneUIQtViewAdapter::updateCallHeaderRemoteInfo()
-
- This method updates remote information in call header.
+ This method updates call header.
*/
- void updateCallHeaderRemoteInfo (int callId);
-
- /*!
- \fn int PhoneUIQtViewAdapter::updateCallHeaderRemoteInfo()
-
- This method updates remote information in call header and label.
- */
- void updateCallHeaderRemoteInfoAndLabel (int callId);
+ void updateCallHeader(int callId);
/*!
\fn int PhoneUIQtViewAdapter::handleCipheringInfoChange()
@@ -149,20 +135,13 @@
This method checks is the call a voice call.
*/
- bool isVoiceCall(int callId) const;
-
- /*!
- \fn void PhoneUIQtViewAdapter::removeAllCallHeaders()
-
- This method checks is the call a video call.
- */
- bool isVideoCall( int callId ) const;
+ bool isVoiceCall(int callId);
private:
- bool isIncoming(int callId) const;
+ void setCommonCallHeaderData(int callId, int bubble);
- bool isWaitingCall(int callId) const;
+ void sendVideoCallData(int callId);
PhoneCallHeaderUtil *callHeaderUtil();
--- a/phoneapp/phoneuiqtviewadapter/inc/phonecallheaderutil.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/inc/phonecallheaderutil.h Mon Oct 04 16:06:10 2010 +0300
@@ -21,7 +21,6 @@
//INCLUDES
#include "mpeengineinfo.h"
-#include "tphonecmdparamcallheaderdata.h"
//FORWARD
class MPEEngineInfo;
@@ -34,7 +33,13 @@
class PhoneCallHeaderUtil
{
public: // Constructors & destructors.
-
+
+ enum ClippingDirection
+ {
+ ERight = 0,
+ ELeft
+ };
+
/**
* C++ constructor.
*/
@@ -45,209 +50,163 @@
public: // New functions.
/**
- * Sets info to outgoing call header.
- * @param aCallId - call id.
- * @param aWaitingCall - if call is waiting value is ETrue otherwise EFalse.
- * @param aVideoCall - if call is video value is ETrue otherwise EFalse.
- * @param aCallHeaderData - Call header parameter into which the text/picture
- * parameters will be set.
- */
- void SetIncomingCallHeaderParams(
- const TInt aCallId,
- const TBool aWaitingCall,
- const TBool aVideoCall,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
- /**
- * Sets info to outgoing call header.
- * @param aCallId - call id.
- * @param aCallHeaderData - Call header parameter into which the text/picture
- * parameters will be set.
- */
- void SetOutgoingCallHeaderParams(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
- /**
- * Updates call header info.
- * NOTE: This method is used when state receives
- * EPEMessageRemotePartyInfoChanged from PhoneEngine.
- *
- * @param aCallId - call id.
- * @param aWaitingCall - if call is waiting value is ETrue otherwise EFalse.
- * @param aVideoCall - if call is video value is ETrue otherwise EFalse.
- * @param aCallHeaderData - Call header parameter into which the text/picture
- * parameters will be set.
- */
- void UpdateCallHeaderInfo(
- const TInt aCallId,
- const TBool aWaitingCall,
- const TBool aVideoCall,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
-
- /**
- * Sets the call header type used in the call bubble.
- * @param aCallHeaderType, call header type.
- */
- void SetCallHeaderType(
- TInt aCallHeaderType );
- /**
- * Returns the set call header type. Used for constructing right type
- * of call bubble.
- */
- TInt CallHeaderType() const;
-
- /**
- * Setter for divert indication showing in bubble.
- * @param aDivertIndication ETrue to show divert indication,
- * EFalse to not. Usually setting EFalse isn't necessary
- * as it's a default value in bubble creation.
- */
- void SetDivertIndication( const TBool aDivertIndication );
-
- /**
- * Return remote info data
- * @return True if secondary CLI is used
- * @param aCallid call id
- * @param aData the returned remote info data
- */
- TBool GetRemoteInfoData(
- const TInt aCallId,
- TDes& aData ) const;
-
- /**
- * Sets texts for voice call header.
- * @param aCallId - Call Id.
- * @param aWaitingCall - Waiting call indication.
- * @param aCallHeaderData - Call header parameter into which the text
- * will be set.
- */
- void SetCallHeaderTexts(
- const TInt aCallId,
- const TBool aWaitingCall,
- const TBool aVideoCall,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
-
- /**
* Returns the call header label text
* @return Returns the label
*/
const TDesC& LabelText( TInt aCallId );
- const TDesC& EmergencyHeaderText();
+ /**
+ * Gets the call cli texts.
+ */
+ void GetCliTexts(
+ TInt aCallId,
+ TDes& aCliText,
+ ClippingDirection &aCliClip,
+ TDes& aSecondaryCliText,
+ ClippingDirection &aSecondaryCliClip );
- const TDesC& AttemptingEmergencyText();
+ /**
+ * Gets the cli text.
+ * @return Returns cli text.
+ */
+ void GetCli( TInt aCallId, TDes& aCliText,
+ ClippingDirection &aClipping );
+
+ /**
+ * Gets the secondary cli text.
+ */
+ void GetSecondaryCli( TInt aCallId,
+ TDes& aSecondaryCliText,
+ ClippingDirection &aClipping );
+
+ /**
+ * Remote phone number.
+ * @return Phone number for remote end.
+ */
+ const TDesC& RemotePhoneNumber( TInt aCallId ) const;
/**
- * Returns the call header call state.
+ * Returns the call type.
+ * @return Returns call type.
+ */
+ TInt CallType( const TInt aCallId );
+
+ /**
+ * Returns service id.
+ * @return Returns service id.
+ */
+ TInt ServiceId( const TInt aCallId );
+
+ /**
+ * Returns flag is the call forwarded.
+ * @return Returns is forwarded.
+ */
+ TBool IsCallForwarded( TInt aCallId );
+
+ /**
+ * Returns secure specified status.
+ * @return Returns secure specified status.
+ */
+ TBool SecureSpecified();
+
+ /**
+ * Returns ciphering status.
+ * @return Returns ciphering status.
+ */
+ TBool Ciphering( TInt aCallId );
+
+ /**
+ * Returns the call state.
* @return Returns the call state
*/
TInt CallState( TInt aCallId ) const;
- void LoadResource( TDes& aData, const TInt aResource ) const;
-
- HBufC* LoadResource( const TInt aResource ) const;
-
- private:
-
-
-
- /**
- * Set basic info to call header.
- * @param aCallId - call id.
- * @param aCallHeaderData - Call header parameter into which the text/picture
- * parameters will be set.
- */
- void SetBasicCallHeaderParams(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
-
/**
- * Sets divert indication to call header if necessary
- * @param aCallId - Call Id.
- * @param aCallHeaderData - Call header where indication will be set
- * if needed.
- */
- void SetDivertIndicatorToCallHeader(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
-
+ * Returns the caller image.
+ * @return Returns the caller image.
+ */
+ const TDesC& CallerImage( const TInt aCallId );
+
/**
- * Sets divert indication to call header if necessary
- * @param aFeatureKey - feature key id Id.
- * @param aCallId - Call Id.
- */
- TBool IsFeatureSupported(
- const TInt aFeatureKey,
- const TInt aCallId ) const;
-
- /**
- * Return CNAP (Calling Name Presentation) text
- * @param aCallid call id
- * @param aData the returned CNAP text
- * @param aDirection the returned CNAP clipping direction
- */
- void GetCNAPText(
- const TInt aCallId,
- TDes& aData,
- TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection& aDirection ) const;
+ * Returns emergency call header text.
+ * @return Returns emergency call header text.
+ */
+ const TDesC& EmergencyHeaderText();
/**
- * Check if contact is available(RemoteName or RemoteCompanyName),
- * if available ETrue is returned otherwise EFalse.
- * @param aCallid call id
- */
- TBool ContactInfoAvailable(
- const TInt aCallId ) const;
-
- /**
- * Returns call type and stores type to member variable.
- * @param aCallId - Call Id.
- * @param aCallHeaderData - Call header data.
- */
- TPECallType GetCallType(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
+ * Returns emergency call label text.
+ * @return Returns emergency call label text.
+ */
+ const TDesC& AttemptingEmergencyText();
/**
- * Sets caller image.
- * @param aCallId - Call Id.
- * @param aCallHeaderData - Call header parameter where modifications
- * are made.
- */
- void SetCallerImage(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
-
- /**
- * Updates cli and cnap parameters to call header.
- * @param aCallId - Call Id.
- * @param aCallHeaderData - Call header parameter where modifications
- * are made.
+ * Check if the call is video call.
+ * @param aCallid call id
*/
- void SetCliAndCnapParamaters(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
+ TBool IsVoiceCall(TInt aCallId) const;
+
/**
- * Updates cli parameter to call header.
- * @param aCallId - Call Id.
- * @param aCallHeaderData - Call header parameter where modifications
- * are made.
+ * Check if the call is video call.
+ * @param aCallid call id
*/
- void SetCliParamaters(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
-
- void LoadCallHeaderTexts(
- const TInt aLabelId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData );
-
TBool IsVideoCall(int aCallId ) const;
private:
+ /**
+ * Sets label text for incoming call.
+ * @param aCallId - Call Id.
+ */
+ void SetCallHeaderLabelTextForRingingCall( TInt aCallId );
+
+ /**
+ * Check if remote name info is available
+ * (RemoteName, RemotePartyName or RemoteCompanyName),
+ * if available ETrue is returned otherwise EFalse.
+ * @param aCallid call id
+ */
+ TBool RemoteNameAvailable( const TInt aCallId ) const;
+
+ /**
+ * Gets remote info data
+ * @param aCallid call id
+ * @param aData the returned remote info data
+ */
+ void GetRemoteInfoData(
+ const TInt aCallId,
+ TDes& aData ) const;
+
+ /**
+ * Checks is the secondary cli allowed for the call.
+ * @param aCallid call id
+ * @return ETrue if allowed to show the secondary cli.
+ */
+ TBool IsSecondaryCliAllowed( TInt aCallId );
+
+ /**
+ * Check if the call is waiting call.
+ * @param aCallid call id
+ */
+ TBool IsWaitingCall(int callId) const;
+
+ /**
+ * Loads resource text.
+ * @return Returns loaded text.
+ */
+ HBufC* LoadResource( const TInt aResource ) const;
+
+ /**
+ * Loads recource text.
+ */
+ void LoadResource( TDes& aData, const TInt aResource ) const;
+
+ private:
+
MPEEngineInfo& m_engineInfo;
- TInt iCallHeaderType;
- TBool iSetDivertIndication;
HBufC *iLabelText;
+ HBufC *iCliText;
+ HBufC *iSecondaryCliText;
+ HBufC *iCallerImage;
HBufC *iEmergencyHeaderText;
HBufC *iAttemptingEmergencyText;
--- a/phoneapp/phoneuiqtviewadapter/inc/phoneglobalnotes.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/inc/phoneglobalnotes.h Mon Oct 04 16:06:10 2010 +0300
@@ -1,5 +1,5 @@
/*!
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,6 +21,7 @@
#include <QObject>
#include <QString>
#include "tphonecmdparamnote.h"
+#include "tphonecmdparamglobalnote.h"
#include "phoneaction.h"
#include <hbdevicenotificationdialogsymbian.h>
#include <hbdevicemessageboxsymbian.h>
@@ -34,6 +35,7 @@
class HbDeviceNotificationDialog;
class HbDeviceProgressDialog;
class QTimer;
+class XQSystemToneService;
class PhoneGlobalNotes : public QObject,
public MHbDeviceNotificationDialogObserver,
@@ -101,6 +103,12 @@
*/
QString globalNoteText(TPhoneCommandParam *commandParam);
+ /*!
+ \fn QString playToneIfNeeded()
+
+ This method plays note tone if needed.
+ */
+ void playToneIfNeeded(TPhoneNotificationToneType aTone);
private: // Leaving symbian stuff
void ShowGlobalWaitNoteL(
@@ -109,10 +117,13 @@
void ShowDeviceMessageBoxL(
CHbDeviceMessageBoxSymbian::TType aType,
const TDesC16& aText,
- TInt aTimeout);
+ TInt aTimeout,
+ TPhoneNotificationToneType aTone);
void ShowDeviceNotificationDialogL(
- const TDesC16& aTitle, TInt aTimeout);
+ const TDesC16& aTitle,
+ TInt aTimeout,
+ TPhoneNotificationToneType aTone);
private slots:
@@ -137,14 +148,24 @@
void ProgressDialogClosed(
const CHbDeviceProgressDialogSymbian* aProgressDialog);
+ struct MessageBoxData{
+ CHbDeviceMessageBoxSymbian *m_messageBox;
+ int m_tone;
+ };
+
+ struct NotificationDialogData{
+ CHbDeviceNotificationDialogSymbian *m_notificationDialog;
+ int m_tone;
+ };
private:
QTimer *m_timer;
+ XQSystemToneService *m_toneService;
int m_queryCanceledCommand;
int m_timeoutCommand;
- QList<CHbDeviceNotificationDialogSymbian* > iNotificationList;
- QList<CHbDeviceMessageBoxSymbian *> iMessageBoxList;
+ QList<NotificationDialogData*> iNotificationList;
+ QList<MessageBoxData*> iMessageBoxList;
CHbDeviceProgressDialogSymbian *iProgressDialog;
};
--- a/phoneapp/phoneuiqtviewadapter/inc/phonenotecontroller.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/inc/phonenotecontroller.h Mon Oct 04 16:06:10 2010 +0300
@@ -142,8 +142,13 @@
*/
void showDefaultQuery(TPhoneCmdParamQuery* params);
-
- void replaceDialogActions(HbDialog *dialog, QList<HbAction *> &actions);
+ /*!
+ \fn void replaceDialogActions()
+
+ This method replaces dialog actions.
+ */
+ void replaceDialogActions(HbDialog *dialog,
+ QList<HbAction *> &actions, bool deleteOldActions = true);
private:
PhoneGlobalNotes *m_globalNotes;
--- a/phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/inc/phoneuiqtviewadapter.h Mon Oct 04 16:06:10 2010 +0300
@@ -222,24 +222,9 @@
/*!
\fn int PhoneUIQtViewAdapter::updateCallHeader()
- This method updates call state information in call header.
- */
- void updateCallHeaderState(int callId);
-
- /*!
- \fn int PhoneUIQtViewAdapter::updateCallHeaderRemoteInfo()
-
- This method updates remote information in call header.
+ This method updates call header.
*/
- void updateCallHeaderRemoteInfo(int callId);
-
-
- /*!
- \fn int PhoneUIQtViewAdapter::updateCallHeaderRemoteInfo()
-
- This method updates remote information in call header and label.
- */
- void updateCallHeaderRemoteInfoAndLabel(int callId);
+ void updateCallHeader(int callId);
/*!
\fn int PhoneUIQtViewAdapter::handleCipheringInfoChange()
--- a/phoneapp/phoneuiqtviewadapter/inc/phoneviewcommanddefinitions.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/inc/phoneviewcommanddefinitions.h Mon Oct 04 16:06:10 2010 +0300
@@ -39,7 +39,6 @@
EPhoneViewClearNumberEntryContent,
EPhoneViewCreateCallHeader,
EPhoneViewCreateEmergencyCallHeader,
- EPhoneViewUpdateCallHeaderRemoteInfoData,
EPhoneViewUpdateCallHeaderCallDuration,
EPhoneViewRemoveCallHeader,
EPhoneViewUpdateCba,
@@ -96,9 +95,7 @@
EPhoneViewSetTouchPaneButtons,
EPhoneViewOpenCallHandling,
EPhoneViewGetAudioVolumeLevel,
- EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel,
EPhoneViewRemoveDtmfNote,
- EPhoneViewSetEikonNotifiersDisabled,
EPhoneViewCancelAllNotications,
EPhoneViewDisableKeyLock,
EPhoneViewSendAiwCommand,
@@ -129,6 +126,7 @@
EPhoneViewSetBlueToothFlag,
EPhoneViewSetBluetoothAvailableFlag,
EPhoneViewSetSoftRejectDimmed,
+ EPhoneViewDisableDeviceLock,
EPhoneViewIsRingingTonePlaying,
EPhoneAmountOfCommands, // Don't remove this, this should always be the last in list.
};
--- a/phoneapp/phoneuiqtviewadapter/phoneuiqtviewadapter.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/phoneuiqtviewadapter.pro Mon Oct 04 16:06:10 2010 +0300
@@ -55,7 +55,9 @@
-lcone \
-lengineinfo \
-lphonestringloader \
- -lbafl
+ -lbafl \
+ -lxqsystemtoneservice
+
defFiles = "$${LITERAL_HASH}ifdef WINS" \
"DEFFILE bwins/phoneuiqtviewadapter.def" \
--- a/phoneapp/phoneuiqtviewadapter/src/phoneapplauncher.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneapplauncher.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -136,6 +136,7 @@
const QList<QVariant> &arguments,
const bool foreground)
{
+ PHONE_TRACE
int err = -1;
TRAP_IGNORE(
// Allow application launch only when device is unlocked
@@ -146,7 +147,7 @@
)
if ((err == KErrNone) || (err == KErrAlreadyExists)) {
- PHONE_TRACE3(service, operation, arguments);
+ PHONE_DEBUG3(service, operation, arguments);
XQApplicationManager appManager;
QScopedPointer<XQAiwRequest> request(
service.isEmpty() ?
--- a/phoneapp/phoneuiqtviewadapter/src/phonebubblewrapper.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phonebubblewrapper.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -50,6 +50,7 @@
int PhoneBubbleWrapper::createCallHeader (int callId)
{
+ PHONE_TRACE
int bubble;
if (!m_bubbles.contains (callId)) {
@@ -65,6 +66,7 @@
void PhoneBubbleWrapper::removeCallHeader (int callId)
{
+ PHONE_TRACE
if (m_bubbles.contains (callId)) {
m_bubbleManager.removeCallHeader (m_bubbles [callId]);
m_bubbles.remove (callId);
@@ -196,6 +198,7 @@
int PhoneBubbleWrapper::activeCallCount()
{
+ PHONE_TRACE
int count(0);
QMap<int, int> callStateList = callStates();
@@ -214,6 +217,7 @@
QMap<int, int> PhoneBubbleWrapper::callStates() const
{
+ PHONE_TRACE
QMap<int, int> ret;
for (int i=0; i<m_callStates.size(); ++i) {
@@ -229,6 +233,7 @@
QMap<int, int> PhoneBubbleWrapper::bubbles() const
{
+ PHONE_TRACE
QMap<int, int> ret;
for (int i=0; i<m_bubbles.size(); ++i) {
@@ -246,6 +251,7 @@
const TDesC &labelText,
const TDesC &cliText)
{
+ PHONE_TRACE
int callId1;
int callId2;
int bubble = -1;
@@ -295,6 +301,7 @@
void PhoneBubbleWrapper::removeCallFromConference(int callId)
{
+ PHONE_TRACE
if (m_conferenceList.contains(callId)) {
m_bubbleManager.startChanges();
if(1<m_conferenceList.size()) {
--- a/phoneapp/phoneuiqtviewadapter/src/phonecallheadermanager.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phonecallheadermanager.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -31,6 +31,7 @@
#include "cphonemediatorfactory.h"
#include "cphonemediatorsender.h"
#include "phoneviewcommanddefinitions.h"
+#include "qtphonelog.h"
#include <bubblemanagerif.h>
#include <pevirtualengine.h>
@@ -41,9 +42,9 @@
inline Qt::TextElideMode clipToElide(
- TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection clip)
+ PhoneCallHeaderUtil::ClippingDirection clip)
{
- return clip == TPhoneCmdParamCallHeaderData::ELeft ?
+ return clip == PhoneCallHeaderUtil::ELeft ?
Qt::ElideLeft : Qt::ElideRight;
}
@@ -73,20 +74,7 @@
void PhoneCallHeaderManager::createCallHeader(
int callId)
{
- TPhoneCmdParamCallHeaderData data;
-
- if (isIncoming(callId)) {
- callHeaderUtil()->SetIncomingCallHeaderParams(
- callId,
- isWaitingCall(callId),
- isVideoCall(callId),
- &data );
- } else {
- callHeaderUtil()->SetOutgoingCallHeaderParams(
- callId,
- &data);
- }
-
+ PHONE_TRACE
m_bubbleWrapper.bubbleManager().startChanges ();
if (m_bubbleWrapper.bubbleManager().isConferenceExpanded())
@@ -95,25 +83,20 @@
}
int bubble = m_bubbleWrapper.createCallHeader(callId);
- m_bubbleWrapper.setState(callId, bubble, data.CallState ());
- m_bubbleWrapper.setCli(bubble, data.CLIText(), clipToElide(data.CLITextClippingDirection()));
- m_bubbleWrapper.setServiceId(callId, data.ServiceId());
- m_bubbleWrapper.setSecondaryCli(bubble, data.CNAPText (), clipToElide(data.CNAPTextClippingDirection()));
- m_bubbleWrapper.setLabel(bubble, data.LabelText ());
- m_bubbleWrapper.setCallType(bubble, data.CallType ());
- m_bubbleWrapper.setDivert(bubble, data.Diverted ());
- m_bubbleWrapper.setCiphering(bubble, data.CipheringIndicatorAllowed(), data.Ciphering());
+
+ setCommonCallHeaderData(callId, bubble);
- if (data.Picture().Length()) {
+ const TDesC& callerImage(callHeaderUtil()->CallerImage(callId));
+ if (callerImage.Length()) {
QString imagePath =
- QString::fromUtf16(data.Picture().Ptr(),data.Picture().Length());
+ QString::fromUtf16(callerImage.Ptr(), callerImage.Length());
m_bubbleWrapper.bubbleManager().setCallObjectImage(bubble,imagePath);
} else {
m_bubbleWrapper.bubbleManager().setCallObjectFromTheme(bubble);
}
m_bubbleWrapper.bubbleManager().endChanges ();
- CPhoneMediatorFactory::Instance()->Sender()->SendEvent(EPhoneViewCreateCallHeader, callId, data);
+ sendVideoCallData(callId);
}
void PhoneCallHeaderManager::createEmergencyCallHeader(int callId)
@@ -123,7 +106,10 @@
m_bubbleWrapper.setLabel(bubble, callHeaderUtil()->AttemptingEmergencyText());
m_bubbleWrapper.setCli (bubble, callHeaderUtil()->EmergencyHeaderText(), Qt::ElideRight);
m_bubbleWrapper.setState(callId, bubble, EPEStateDialing);
- m_bubbleWrapper.setCiphering(bubble, m_engineInfo->SecureSpecified(), m_engineInfo->ServiceId(callId));
+ m_bubbleWrapper.setCallType(bubble, callHeaderUtil()->CallType(callId));
+ m_bubbleWrapper.setCiphering(bubble, callHeaderUtil()->SecureSpecified(), callHeaderUtil()->Ciphering(callId));
+ m_bubbleWrapper.bubbleManager().setCallFlag(bubble, BubbleManagerIF::EmergencyCall, true);
+ m_bubbleWrapper.bubbleManager().setCallObjectFromTheme(bubble);
m_bubbleWrapper.bubbleManager().endChanges ();
}
@@ -140,68 +126,19 @@
m_bubbleWrapper.bubbleManager().endChanges();
}
-void PhoneCallHeaderManager::updateCallHeaderState(int callId)
+void PhoneCallHeaderManager::updateCallHeader(int callId)
{
-
int bubble = m_bubbleWrapper.bubbleId(callId);
if ( -1 != bubble ) {
m_bubbleWrapper.bubbleManager ().startChanges ();
- m_bubbleWrapper.setState(callId, bubble, callHeaderUtil()->CallState(callId));
- m_bubbleWrapper.setLabel(bubble, callHeaderUtil()->LabelText(callId));
- m_bubbleWrapper.setDivert(bubble, m_engineInfo->IncomingCallForwarded(callId));
+ setCommonCallHeaderData(callId, bubble);
m_bubbleWrapper.bubbleManager().endChanges ();
}
}
-void PhoneCallHeaderManager::updateCallHeaderRemoteInfo(int callId)
-{
-
- TPhoneCmdParamCallHeaderData data;
-
- int bubble = m_bubbleWrapper.bubbleId(callId);
- if ( -1 != bubble ) {
- callHeaderUtil()->UpdateCallHeaderInfo(
- callId,
- isWaitingCall(callId),
- isVideoCall(callId),
- &data );
-
- m_bubbleWrapper.bubbleManager().startChanges();
- m_bubbleWrapper.setCli(bubble, data.CLIText(),
- clipToElide(data.CLITextClippingDirection()));
- m_bubbleWrapper.setSecondaryCli(bubble, data.CNAPText (),
- clipToElide(data.CNAPTextClippingDirection()));
- m_bubbleWrapper.setDivert(bubble, m_engineInfo->IncomingCallForwarded(callId));
- m_bubbleWrapper.bubbleManager().endChanges ();
- }
-
-}
-
-void PhoneCallHeaderManager::updateCallHeaderRemoteInfoAndLabel (int callId)
-{
- TPhoneCmdParamCallHeaderData data;
-
- int bubble = m_bubbleWrapper.bubbleId(callId);
- if ( -1 != bubble ) {
- callHeaderUtil()->UpdateCallHeaderInfo(
- callId,
- isWaitingCall(callId),
- isVideoCall(callId),
- &data );
-
- m_bubbleWrapper.bubbleManager().startChanges ();
- m_bubbleWrapper.setCli(bubble, data.CLIText (),
- clipToElide(data.CLITextClippingDirection()));
- m_bubbleWrapper.setSecondaryCli(bubble, data.CNAPText (),
- clipToElide(data.CNAPTextClippingDirection()));
- m_bubbleWrapper.setLabel(bubble, data.LabelText ());
- m_bubbleWrapper.setDivert(bubble, data.Diverted ());
- m_bubbleWrapper.bubbleManager().endChanges ();
- }
-}
-
void PhoneCallHeaderManager::handleCipheringInfoChange(int callId)
{
+ PHONE_TRACE
if (callId == KPEConferenceCallID) {
bool secure(true);
for (int i=0; i<m_bubbleWrapper.conferenceCallList().count(); i++) {
@@ -233,10 +170,15 @@
void PhoneCallHeaderManager::createConferenceBubble(int callId)
{
m_bubbleWrapper.bubbleManager().startChanges();
- TBuf<KPhoneCallHeaderLabelMaxLength> conferenceText( KNullDesC );
- callHeaderUtil()->LoadResource(conferenceText, EPhoneCLIConferenceCall);
+
+ PhoneCallHeaderUtil::ClippingDirection clipping;
+ TBuf<KCntMaxTextFieldLength> cliText;
+ callHeaderUtil()->GetCli(callId, cliText, clipping);
int bubble = m_bubbleWrapper.createConferenceBubble(
- callId, callHeaderUtil()->CallState(callId), callHeaderUtil()->LabelText(callId), conferenceText);
+ callId,
+ callHeaderUtil()->CallState(callId),
+ callHeaderUtil()->LabelText(callId),
+ cliText );
m_bubbleWrapper.setServiceId(callId, m_engineInfo->ServiceId(callId));
m_bubbleWrapper.setCiphering(bubble, m_engineInfo->SecureSpecified(), m_engineInfo->IsSecureCall(callId));
@@ -299,6 +241,7 @@
void PhoneCallHeaderManager::removeAllCallHeaders()
{
+ PHONE_TRACE
if (m_bubbleWrapper.conferenceCallList().size()) {
removeConferenceBubble();
}
@@ -322,56 +265,63 @@
// PhoneCallHeaderUtil::IsVoiceCall
// ---------------------------------------------------------------------------
//
-bool PhoneCallHeaderManager::isVoiceCall(int callId) const
+bool PhoneCallHeaderManager::isVoiceCall(int callId)
{
- if( callId < 0 )
- {
- return ( m_engineInfo->CallTypeCommand()
- == EPECallTypeCSVoice ||
- m_engineInfo->CallTypeCommand()
- == EPECallTypeVoIP );
- }
-
- return ( m_engineInfo->CallType( callId )
- == EPECallTypeCSVoice ||
- m_engineInfo->CallType( callId )
- == EPECallTypeVoIP );
+ return callHeaderUtil()->IsVoiceCall(callId);
}
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::IsVideoCall
-// ---------------------------------------------------------------------------
-//
-bool PhoneCallHeaderManager::isVideoCall(int callId) const
+
+void PhoneCallHeaderManager::setCommonCallHeaderData(int callId, int bubble)
{
- if( callId < 0 )
- {
- return ( m_engineInfo->CallTypeCommand()
- == EPECallTypeVideo );
- }
- return ( m_engineInfo->CallType( callId )
- == EPECallTypeVideo );
+ m_bubbleWrapper.setState(callId, bubble,
+ callHeaderUtil()->CallState(callId));
+
+ PhoneCallHeaderUtil::ClippingDirection cliClip;
+ PhoneCallHeaderUtil::ClippingDirection secondaryCliClip;
+ TBuf<KCntMaxTextFieldLength> cliText;
+ TBuf<KCntMaxTextFieldLength> secondaryCliText;
+
+ callHeaderUtil()->GetCliTexts(callId, cliText,
+ cliClip, secondaryCliText, secondaryCliClip );
+
+ m_bubbleWrapper.setCli(bubble, cliText, clipToElide(cliClip));
+ m_bubbleWrapper.setSecondaryCli(bubble,
+ secondaryCliText, clipToElide(secondaryCliClip));
+
+ m_bubbleWrapper.setServiceId(callId, callHeaderUtil()->ServiceId(callId));
+ m_bubbleWrapper.setLabel(bubble, callHeaderUtil()->LabelText(callId));
+ m_bubbleWrapper.setCallType(bubble, callHeaderUtil()->CallType(callId));
+
+ m_bubbleWrapper.bubbleManager().setCallFlag(
+ bubble, BubbleManagerIF::EmergencyCall, callId == KEmergencyCallId);
+
+ m_bubbleWrapper.setDivert(bubble,
+ callHeaderUtil()->IsCallForwarded(callId));
+ m_bubbleWrapper.setCiphering(bubble, callHeaderUtil()->SecureSpecified(),
+ callHeaderUtil()->Ciphering(callId));
}
-bool PhoneCallHeaderManager::isIncoming(int callId) const
- {
- return callId >= 0 &&
- m_engineInfo->CallState( callId ) == EPEStateRinging;
- }
-
-bool PhoneCallHeaderManager::isWaitingCall(int callId) const
+void PhoneCallHeaderManager::sendVideoCallData(int callId)
{
- bool waiting( EFalse );
- if ( callId >= 0 &&
- m_engineInfo->CallState( callId ) == EPEStateRinging )
- {
- if( m_bubbleWrapper.activeCallCount() > 0 )
- {
- waiting = ETrue;
- }
- }
- return waiting;
+ TPhoneCmdParamCallHeaderData callHeaderParam;
+
+ PhoneCallHeaderUtil::ClippingDirection clipping;
+ TBuf<KCntMaxTextFieldLength> cliText;
+ callHeaderUtil()->GetCli(callId, cliText, clipping);
+ TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection clip =
+ clipping == PhoneCallHeaderUtil::ERight ?
+ TPhoneCmdParamCallHeaderData::ERight :
+ TPhoneCmdParamCallHeaderData::ELeft;
+
+ callHeaderParam.SetCLIText(cliText, clip);
+ callHeaderParam.SetCallState(callHeaderUtil()->CallState(callId));
+ callHeaderParam.SetCallType(callHeaderUtil()->CallType(callId));
+ callHeaderParam.SetRemotePhoneNumber(
+ callHeaderUtil()->RemotePhoneNumber(callId));
+
+ CPhoneMediatorFactory::Instance()->Sender()->
+ SendEvent(EPhoneViewCreateCallHeader, callId, callHeaderParam);
}
PhoneCallHeaderUtil *PhoneCallHeaderManager::callHeaderUtil()
--- a/phoneapp/phoneuiqtviewadapter/src/phonecallheaderutil.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phonecallheaderutil.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -16,15 +16,12 @@
*/
-#include <mpeclientinformation.h>
#include <StringLoader.h>
#include <bautils.h>
#include "phonecallheaderutil.h"
-#include "tphonecmdparamboolean.h"
#include "cphonemainresourceresolver.h"
#include "phonerssbase.h"
-#include "phoneui.pan"
#include "cphonecenrepproxy.h"
#include "telephonyvariant.hrh"
#include "phoneviewcommanddefinitions.h"
@@ -39,9 +36,10 @@
PhoneCallHeaderUtil::PhoneCallHeaderUtil(
MPEEngineInfo& engineInfo )
: m_engineInfo( engineInfo),
- iCallHeaderType( EPECallTypeUninitialized ),
- iSetDivertIndication( EFalse ),
iLabelText( NULL ),
+ iCliText( NULL ),
+ iSecondaryCliText( NULL ),
+ iCallerImage( NULL ),
iEmergencyHeaderText( NULL ),
iAttemptingEmergencyText( NULL )
{
@@ -54,94 +52,14 @@
PhoneCallHeaderUtil::~PhoneCallHeaderUtil()
{
delete iLabelText;
-
+ delete iCliText;
+ delete iSecondaryCliText;
+ delete iCallerImage;
delete iEmergencyHeaderText;
-
delete iAttemptingEmergencyText;
}
// -----------------------------------------------------------
-// PhoneCallHeaderUtil::SetCallHeaderTexts
-// -----------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetCallHeaderTexts(
- const TInt aCallId,
- const TBool aWaitingCall,
- const TBool aVideoCall,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::SetCallHeaderTexts( ) ");
-
- TInt labelId(KPhoneRssCommonFirst);
-
- // Fetch engine info parameters.
- const TBool auxLine( m_engineInfo.CallALSLine( aCallId ) == CCCECallParameters::ECCELineTypeAux );
- const TBool cli( m_engineInfo.RemotePhoneNumber( aCallId ).Length());
- const TBool cnap( m_engineInfo.RemotePartyName( aCallId ).Length());
- const TInt numberType( m_engineInfo.RemotePhoneNumberType( aCallId ));
-
- __PHONELOG2( EBasic, EPhoneControl, "PhoneCallHeaderUtil::SetCallHeaderTexts - NumberType(%d), CLI(%d)", numberType, cli );
- __PHONELOG2( EBasic, EPhoneControl, "PhoneCallHeaderUtil::SetCallHeaderTexts - CNAP(%d), AuxLine(%d)", cnap, auxLine );
-
- if ( !cli && !cnap && numberType != EPEPrivateNumber && numberType != EPEUnknownNumber )
- {
- if ( auxLine )
- {
- if ( aWaitingCall )
- {
- labelId = EPhoneIncomingLine2WaitingText; // waiting, line 2
- }
- else
- {
- labelId = EPhoneIncomingLine2Text; // on line 2
- }
- }
- // If CLIR, but also network limitation(e.g. EPEUnknownNumber), then second line
- // should be empty in call bubble.
- else
- {
- labelId = KPhoneRssCommonFirst; // No second line in call bubble
- }
- }
- else // Voice or video call with CLI or with CNAP.
- {
- if ( aWaitingCall )
- {
- if ( auxLine )
- {
- labelId = EPhoneIncomingLine2WaitingText; // waiting, line 2
- }
- else
- {
- labelId = EPhoneCallWaitingLabel; // waiting
- }
- }
- else // Mo other calls
- {
- if ( auxLine )
- {
- labelId = EPhoneIncomingLine2CallingText; // calling, line 2
- }
- else
- {
- // If CLIR, but not network limitation, then second line
- // (calling or video call) should be shown in call bubble.
- if ( aVideoCall )
- {
- labelId = EPhoneVideoCallIncoming; // video call
- }
- else
- {
- labelId = EPhoneIncomingCallLabel; // calling
- }
- }
- }
- }
- __PHONELOG1( EBasic, EPhoneControl, "PhoneCallHeaderUtil::SetCallHeaderTexts - labelId(%d)", labelId );
- LoadCallHeaderTexts( labelId, aCallHeaderData );
- }
-
-// -----------------------------------------------------------
// PhoneCallHeaderUtil::LabelText
// -----------------------------------------------------------
//
@@ -174,16 +92,18 @@
}
case EPEStateRinging:
{
- TPhoneCmdParamCallHeaderData callHeaderData;
- SetCallHeaderTexts(
- aCallId,
- EFalse,
- IsVideoCall( aCallId ),
- &callHeaderData );
-
- if (callHeaderData.LabelText().Length())
+ SetCallHeaderLabelTextForRingingCall(aCallId);
+ break;
+ }
+ case EPEStateDialing:
+ {
+ if ( IsVideoCall(aCallId) )
{
- iLabelText = callHeaderData.LabelText().Alloc();
+ iLabelText = LoadResource(EPhoneOutgoingVideoCallLabel);
+ }
+ else
+ {
+ iLabelText = LoadResource(EPhoneOutgoingCallLabel);
}
break;
}
@@ -195,6 +115,199 @@
}
// -----------------------------------------------------------
+// PhoneCallHeaderUtil::GetCliTexts
+// -----------------------------------------------------------
+//
+void PhoneCallHeaderUtil::GetCliTexts(
+ TInt aCallId,
+ TDes& aCliText,
+ ClippingDirection &aCliClip,
+ TDes& aSecondaryCliText,
+ ClippingDirection &aSecondaryCliClip )
+ {
+ if ( aCallId == KEmergencyCallId )
+ {
+ // Set "Emergency call" as cli in emergency call.
+ aCliText = EmergencyHeaderText();
+ aCliClip = PhoneCallHeaderUtil::ERight;
+ }
+ else if ( aCallId == KConferenceCallId )
+ {
+ // No need for secondary cli in conference call.
+ GetCli( aCallId, aCliText, aCliClip );
+ }
+ else
+ {
+ GetCli( aCallId, aCliText, aCliClip );
+ GetSecondaryCli( aCallId, aSecondaryCliText, aSecondaryCliClip );
+ }
+
+ }
+
+// -----------------------------------------------------------
+// PhoneCallHeaderUtil::GetCli
+// -----------------------------------------------------------
+//
+void PhoneCallHeaderUtil::GetCli( TInt aCallId,
+ TDes& aCliText,
+ ClippingDirection &aClipping )
+ {
+ if (iCliText)
+ {
+ delete iCliText;
+ iCliText = NULL;
+ }
+
+ if ( aCallId == KEmergencyCallId )
+ {
+ aCliText = EmergencyHeaderText();
+ aClipping = PhoneCallHeaderUtil::ERight;
+ return;
+ }
+ else if ( aCallId == KConferenceCallId )
+ {
+ iCliText = LoadResource(EPhoneCLIConferenceCall);
+ }
+ else if ( ( m_engineInfo.RemotePhoneNumber( aCallId ).Length() ) &&
+ ( !RemoteNameAvailable( aCallId ) ) )
+ {
+ iCliText = m_engineInfo.RemotePhoneNumber( aCallId ).Alloc();
+ aClipping = PhoneCallHeaderUtil::ELeft;
+ }
+ else
+ {
+ TBuf<KCntMaxTextFieldLength> remoteInfoText( KNullDesC );
+ GetRemoteInfoData( aCallId, remoteInfoText );
+
+ iCliText = remoteInfoText.Alloc();
+ aClipping = PhoneCallHeaderUtil::ERight;
+ }
+
+ aCliText = iCliText ? *iCliText : KNullDesC();
+ }
+
+// -----------------------------------------------------------
+// PhoneCallHeaderUtil::GetSecondaryCli
+// -----------------------------------------------------------
+//
+void PhoneCallHeaderUtil::GetSecondaryCli( TInt aCallId,
+ TDes& aSecondaryCliText,
+ ClippingDirection &aClipping )
+ {
+ if (iSecondaryCliText)
+ {
+ delete iSecondaryCliText;
+ iSecondaryCliText = NULL;
+ }
+
+ if ( IsSecondaryCliAllowed( aCallId ) )
+ {
+ if (CPhoneCenRepProxy::Instance()->
+ IsTelephonyFeatureSupported( KTelephonyLVFlagUUS ) &&
+ m_engineInfo.RemotePartyName( aCallId ).Length() )
+ {
+ iSecondaryCliText = m_engineInfo.RemotePartyName( aCallId ).Alloc();
+ aClipping = PhoneCallHeaderUtil::ERight;
+ }
+ else
+ {
+ iSecondaryCliText = m_engineInfo.RemotePhoneNumber( aCallId ).Alloc();
+ aClipping = PhoneCallHeaderUtil::ELeft;
+ }
+ }
+
+ aSecondaryCliText = iSecondaryCliText ? *iSecondaryCliText : KNullDesC();
+ }
+
+// -----------------------------------------------------------
+// PhoneCallHeaderUtil::RemotePhoneNumber
+// -----------------------------------------------------------
+//
+const TDesC& PhoneCallHeaderUtil::RemotePhoneNumber( TInt aCallId ) const
+ {
+ return m_engineInfo.RemotePhoneNumber( aCallId );
+ }
+
+// ---------------------------------------------------------------------------
+// PhoneCallHeaderUtil::CallType
+// ---------------------------------------------------------------------------
+//
+TInt PhoneCallHeaderUtil::CallType(
+ const TInt aCallId )
+ {
+ return (TInt)m_engineInfo.CallType( aCallId );
+ }
+
+// ---------------------------------------------------------------------------
+// PhoneCallHeaderUtil::ServiceId
+// ---------------------------------------------------------------------------
+//
+TInt PhoneCallHeaderUtil::ServiceId(
+ const TInt aCallId )
+ {
+ return m_engineInfo.ServiceId( aCallId );
+ }
+
+// -----------------------------------------------------------
+// PhoneCallHeaderUtil::IsCallForwarded
+// -----------------------------------------------------------
+//
+TBool PhoneCallHeaderUtil::IsCallForwarded( TInt aCallId )
+ {
+ return m_engineInfo.IncomingCallForwarded(aCallId);
+ }
+
+// -----------------------------------------------------------
+// PhoneCallHeaderUtil::SecureSpecified
+// -----------------------------------------------------------
+//
+TBool PhoneCallHeaderUtil::SecureSpecified()
+ {
+ return m_engineInfo.SecureSpecified();
+ }
+
+// -----------------------------------------------------------
+// PhoneCallHeaderUtil::Ciphering
+// -----------------------------------------------------------
+//
+TBool PhoneCallHeaderUtil::Ciphering( TInt aCallId )
+ {
+ return m_engineInfo.IsSecureCall( aCallId );
+ }
+
+// -----------------------------------------------------------
+// PhoneCallHeaderUtil::CallState
+// -----------------------------------------------------------
+//
+TInt PhoneCallHeaderUtil::CallState( TInt aCallId ) const
+ {
+ return m_engineInfo.CallState(aCallId);
+ }
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::CallerImage
+// -----------------------------------------------------------------------------
+//
+const TDesC& PhoneCallHeaderUtil::CallerImage( const TInt aCallId )
+ {
+ if (iCallerImage)
+ {
+ delete iCallerImage;
+ iCallerImage = NULL;
+ }
+
+ // Set the call header picture data if it is available
+ if ( ( m_engineInfo.CallerImage( aCallId ).Length() > 0 ) &&
+ ( BaflUtils::FileExists( CCoeEnv::Static()->FsSession(),
+ m_engineInfo.CallerImage( aCallId ) ) ) )
+ {
+ iCallerImage = m_engineInfo.CallerImage( aCallId ).Alloc();
+ }
+
+ return iCallerImage ? *iCallerImage : KNullDesC();
+ }
+
+// -----------------------------------------------------------
// PhoneCallHeaderUtil::EmergencyHeaderText
// -----------------------------------------------------------
//
@@ -222,494 +335,148 @@
return iAttemptingEmergencyText ? *iAttemptingEmergencyText : KNullDesC();
}
-// -----------------------------------------------------------
-// PhoneCallHeaderUtil::CallState
-// -----------------------------------------------------------
+// ---------------------------------------------------------------------------
+// PhoneCallHeaderUtil::IsVoiceCall
+// ---------------------------------------------------------------------------
//
-TInt PhoneCallHeaderUtil::CallState( TInt aCallId ) const
- {
- return m_engineInfo.CallState(aCallId);
- }
-
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetCliParamatersL
-// -----------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetCliParamaters(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
+TBool PhoneCallHeaderUtil::IsVoiceCall(TInt aCallId) const
{
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::SetCliParamatersL( ) ");
-
- // Set call header number type
- aCallHeaderData->SetNumberType( m_engineInfo.RemotePhoneNumberType( aCallId ) );
-
- if ( ( m_engineInfo.RemotePhoneNumber( aCallId ).Length() ) &&
- ( !ContactInfoAvailable( aCallId ) ) )
+ if( aCallId < 0 )
{
- // Set phonenumber/URI as the CLI text for the call header
- aCallHeaderData->SetCLIText( m_engineInfo.RemotePhoneNumber( aCallId ),
- TPhoneCmdParamCallHeaderData::ELeft );
-
- // No contact name, use phonenumber when available.
- aCallHeaderData->SetParticipantListCLI(
- TPhoneCmdParamCallHeaderData::EPhoneParticipantCNAPText );
- }
- else
- {
- TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection cnapClippingDirection = TPhoneCmdParamCallHeaderData::ERight;
- TBuf<KCntMaxTextFieldLength> remoteInfoText( KNullDesC );
-
- TBool secondaryCli = GetRemoteInfoData( aCallId, remoteInfoText );
- cnapClippingDirection = TPhoneCmdParamCallHeaderData::ELeft;
-
- aCallHeaderData->SetCLIText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
-
- if (secondaryCli)
- {
- aCallHeaderData->SetCNAPText( m_engineInfo.RemotePhoneNumber( aCallId ),
- cnapClippingDirection );
- }
+ return ( m_engineInfo.CallTypeCommand()
+ == EPECallTypeCSVoice ||
+ m_engineInfo.CallTypeCommand()
+ == EPECallTypeVoIP );
}
- SetCallerImage( aCallId, aCallHeaderData );
-
- // Set the Caller text
- if ( m_engineInfo.CallerText( aCallId ).Length() > 0 )
- {
- aCallHeaderData->SetCallerText( m_engineInfo.CallerText( aCallId ) );
- }
- }
-
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetCallerImage
-// -----------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetCallerImage(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::SetCallerImage( ) ");
- // Set the call header picture data if it is available
- if ( ( m_engineInfo.CallerImage( aCallId ).Length() > 0 ) &&
- ( BaflUtils::FileExists( CCoeEnv::Static()->FsSession(),
- m_engineInfo.CallerImage( aCallId ) ) ) )
- {
- aCallHeaderData->SetPicture( m_engineInfo.CallerImage( aCallId ) );
- }
- else
- {
- // Set the thumbnail picture data if it is available
- aCallHeaderData->SetHasThumbnail( m_engineInfo.HasCallerThumbnail( aCallId ) );
- CFbsBitmap* picture = m_engineInfo.CallerThumbnail( aCallId );
- if ( picture )
- {
- aCallHeaderData->SetThumbnail( picture );
- }
- }
- }
-
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetBasicCallHeaderParamsL
-// ---------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetBasicCallHeaderParams(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::SetBasicCallHeaderParamsL( ) ");
- // Set call header call state
- aCallHeaderData->SetCallState(
- m_engineInfo.CallState( aCallId ) );
-
- // Set call header type
- aCallHeaderData->SetCallType( GetCallType( aCallId, aCallHeaderData ) );
-
- // Set call header voice privacy status
- aCallHeaderData->SetCiphering(
- m_engineInfo.IsSecureCall( aCallId ) );
- aCallHeaderData->SetCipheringIndicatorAllowed(
- m_engineInfo.SecureSpecified() );
-
- //see service provider settings API
- aCallHeaderData->SetServiceId(
- m_engineInfo.ServiceId( aCallId ) );
-
- // Set contact link, see virtual phonebook API
- aCallHeaderData->SetContactLink(
- m_engineInfo.ContactLink( aCallId ) );
-
- // Set remote phone number
- aCallHeaderData->SetRemotePhoneNumber(
- m_engineInfo.RemotePhoneNumber( aCallId ) );
- }
-
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::GetCallType
-// ---------------------------------------------------------------------------
-//
-TPECallType PhoneCallHeaderUtil::GetCallType(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::GetCallType( ) ");
- // Set call header type.
- TPECallType callType =
- m_engineInfo.CallType( aCallId );
- SetCallHeaderType( callType );
-
- if ( m_engineInfo.CallALSLine( aCallId )
- == CCCECallParameters::ECCELineTypeAux )
- {
- aCallHeaderData->SetLine2( ETrue );
- }
-
- __PHONELOG1( EBasic, EPhoneControl,
- "PhoneCallHeaderUtil::GetCallType() - callType: %d ",
- callType )
- return callType;
- }
-
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetCallHeaderType
-// ---------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetCallHeaderType(
- TInt aCallHeaderType )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::SetCallHeaderType( ) ");
- iCallHeaderType = aCallHeaderType;
- __PHONELOG1( EBasic, EPhoneControl,
- "PhoneCallHeaderUtil::SetCallHeaderType() - iCallHeaderType: %d ",
- iCallHeaderType )
- }
-
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::CallHeaderType
-// ---------------------------------------------------------------------------
-//
-TInt PhoneCallHeaderUtil::CallHeaderType() const
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::CallHeaderType( ) ");
- __PHONELOG1( EBasic, EPhoneControl,
- "PhoneCallHeaderUtil::CallHeaderType() - iCallHeaderType: %d ",
- iCallHeaderType )
- return iCallHeaderType;
+ return ( m_engineInfo.CallType( aCallId )
+ == EPECallTypeCSVoice ||
+ m_engineInfo.CallType( aCallId )
+ == EPECallTypeVoIP );
}
// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::ContactInfoAvailable
+// PhoneCallHeaderUtil::IsVideoCall
// ---------------------------------------------------------------------------
//
-TBool PhoneCallHeaderUtil::ContactInfoAvailable( const TInt aCallId ) const
+TBool PhoneCallHeaderUtil::IsVideoCall(int aCallId ) const
{
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::ContactInfoAvailable( ) ");
- TBool contactAvailable = EFalse;
- if ( ( m_engineInfo.RemoteName( aCallId ).Length() ) ||
- ( m_engineInfo.RemoteCompanyName( aCallId ).Length() ) )
+ if( aCallId < 0 )
{
- contactAvailable = ETrue;
+ return ( m_engineInfo.CallTypeCommand()
+ == EPECallTypeVideo );
}
- return contactAvailable;
+ return ( m_engineInfo.CallType( aCallId )
+ == EPECallTypeVideo );
}
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetCliAndCnapParamatersL
-// -----------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetCliAndCnapParamaters(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
+// -----------------------------------------------------------
+// PhoneCallHeaderUtil::SetCallHeaderLabelTextForRingingCall
+// -----------------------------------------------------------
+//
+void PhoneCallHeaderUtil::SetCallHeaderLabelTextForRingingCall( TInt aCallId )
{
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::SetCliAndCnapParamatersL( ) ");
- TBuf<KCntMaxTextFieldLength> cnapText( KNullDesC );
-
- // Set call header number type
- aCallHeaderData->SetNumberType( m_engineInfo.RemotePhoneNumberType( aCallId ) );
-
- const MPEClientInformation& info =
- m_engineInfo.CallClientInformation( aCallId );
-
- if ( ( m_engineInfo.RemotePhoneNumber( aCallId ).Length() ) &&
- ( !ContactInfoAvailable( aCallId ) ) &&
- ( !info.ShowNumber() ) )
- {
- // No contact info data available; use the phone number
- aCallHeaderData->SetCLIText(
- m_engineInfo.RemotePhoneNumber( aCallId ),
- TPhoneCmdParamCallHeaderData::ELeft);
-
- // No contact name, use phonenumber when available.
- aCallHeaderData->SetParticipantListCLI(
- TPhoneCmdParamCallHeaderData::EPhoneParticipantCNAPText );
- }
- else
- {
- TBuf<KCntMaxTextFieldLength> remoteInfoText( KNullDesC );
-
- GetRemoteInfoData( aCallId, remoteInfoText );
- aCallHeaderData->SetCLIText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
- }
-
- // Fetch CNAP text and clipping direction
- TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection cnapClippingDirection;
- GetCNAPText( aCallId, cnapText, cnapClippingDirection );
+ __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::CallHeaderLabelTextForRingingCall( ) ");
- // Set CNAP data
- aCallHeaderData->SetCNAPText( cnapText, cnapClippingDirection );
+ TInt labelId(0);
- // Set caller image
- SetCallerImage( aCallId, aCallHeaderData );
-
- // Set the Caller text
- if ( m_engineInfo.CallerText( aCallId ).Length() > 0 )
- {
- aCallHeaderData->SetCallerText( m_engineInfo.CallerText( aCallId ) );
- }
-
- // Set the call header CNAP data ( Contains possible CNAP name or received skype identification ).
- if ( IsFeatureSupported( KTelephonyLVFlagUUS, aCallId ) )
- {
- aCallHeaderData->SetCNAPText( m_engineInfo.RemotePartyName( aCallId ),
- TPhoneCmdParamCallHeaderData::ERight );
- }
- }
+ // Fetch engine info parameters.
+ const TBool auxLine( m_engineInfo.CallALSLine( aCallId ) == CCCECallParameters::ECCELineTypeAux );
+ const TBool cli( m_engineInfo.RemotePhoneNumber( aCallId ).Length());
+ const TBool cnap( m_engineInfo.RemotePartyName( aCallId ).Length());
+ const TBool videoCall( IsVideoCall( aCallId ) );
+ const TBool waitingCall( IsWaitingCall( aCallId ) );
+ const TInt numberType( m_engineInfo.RemotePhoneNumberType( aCallId ));
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::GetCNAPText
-// ---------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::GetCNAPText(
- const TInt aCallId,
- TDes& aData,
- TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection& aDirection ) const
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::GetCNAPText( ) ");
-
- // Set clipping direction
- aDirection = TPhoneCmdParamCallHeaderData::ERight;
-
- // If it's not a private number show further info
- if ( m_engineInfo.RemotePhoneNumberType( aCallId ) !=
- EPEPrivateNumber )
+ if ( !cli && !cnap && numberType != EPEPrivateNumber && numberType != EPEUnknownNumber )
{
- if ( ( m_engineInfo.RemoteName( aCallId ).Length() ||
- m_engineInfo.RemotePartyName( aCallId ).Length() ||
- m_engineInfo.RemoteCompanyName( aCallId ).Length() ) &&
- m_engineInfo.RemotePhoneNumber( aCallId ).Length() )
+ if ( auxLine )
{
- // Use the phone number for the CNAP display
- aData.Copy( m_engineInfo.RemotePhoneNumber( aCallId ) );
-
- // Clipping direction for non-private number
- aDirection = TPhoneCmdParamCallHeaderData::ELeft;
+ if ( waitingCall )
+ {
+ labelId = EPhoneIncomingLine2WaitingText; // waiting, line 2
+ }
+ else
+ {
+ labelId = EPhoneIncomingLine2Text; // on line 2
+ }
+ }
+ // If CLIR, but also network limitation(e.g. EPEUnknownNumber), then second line
+ // should be empty in call bubble.
+ else
+ {
+ labelId = KPhoneRssCommonFirst; // No second line in call bubble
}
}
- }
-
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::IsFeatureSupported
-// ---------------------------------------------------------------------------
-//
-TBool PhoneCallHeaderUtil::IsFeatureSupported(
- const TInt aFeatureKey,
- const TInt aCallId ) const
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::IsFeatureSupported( ) ");
- TBool featureSupport(EFalse);
- switch( aFeatureKey )
+ else // Voice or video call with CLI or with CNAP.
{
- case KTelephonyLVFlagUUS:
+ if ( waitingCall )
{
- if( ( CPhoneCenRepProxy::Instance()->IsTelephonyFeatureSupported( aFeatureKey ) ) &&
- ( m_engineInfo.RemotePartyName( aCallId ).Length() ) )
+ if ( auxLine )
{
- featureSupport = ETrue;
+ labelId = EPhoneIncomingLine2WaitingText; // waiting, line 2
+ }
+ else
+ {
+ labelId = EPhoneCallWaitingLabel; // waiting
}
}
- break;
- default:
- //Do nothing.
- break;
+ else // Mo other calls
+ {
+ if ( auxLine )
+ {
+ labelId = EPhoneIncomingLine2CallingText; // calling, line 2
+ }
+ else
+ {
+ // If CLIR, but not network limitation, then second line
+ // (calling or video call) should be shown in call bubble.
+ if ( videoCall )
+ {
+ labelId = EPhoneVideoCallIncoming; // video call
+ }
+ else
+ {
+ labelId = EPhoneIncomingCallLabel; // calling
+ }
+ }
+ }
}
- __PHONELOG1( EBasic, EPhoneControl,
- "PhoneCallHeaderUtil::IsFeatureSupported() - featureSupport: %d ",
- featureSupport )
-
- return featureSupport;
+ __PHONELOG1( EBasic, EPhoneControl, "PhoneCallHeaderUtil::SetCallHeaderTexts - labelId(%d)", labelId );
+ iLabelText = LoadResource(labelId) ;
}
// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetDivertIndicatorToCallHeader
-// ---------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetDivertIndicatorToCallHeader(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::SetDivertIndicatorToCallHeader( ) ");
- if( m_engineInfo.IncomingCallForwarded( aCallId ) )
- {
- aCallHeaderData->SetDiverted( ETrue );
- }
-
- if ( m_engineInfo.CallALSLine( aCallId ) == CCCECallParameters::ECCELineTypeAux )
- {
- __PHONELOG( EBasic, EPhoneControl,
- "PhoneCallHeaderUtil::SetDivertIndicatorToCallHeader - CallALSLine() == CCCECallParameters::ECCELineTypeAux");
- aCallHeaderData->SetLine2( ETrue );
- }
- }
-
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetDivertIndication
-// ---------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetDivertIndication( const TBool aDivertIndication )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::SetDivertIndication( ) ");
- iSetDivertIndication = aDivertIndication;
- __PHONELOG1( EBasic, EPhoneControl,
- "PhoneCallHeaderUtil::SetDivertIndication() - iSetDivertIndication: %d ",
- iSetDivertIndication )
- }
-
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetIncomingCallHeaderParams
-// ---------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetIncomingCallHeaderParams(
- const TInt aCallId,
- const TBool aWaitingCall,
- const TBool aVideoCall,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::SetIncomingCallHeaderParamsL( ) ");
- // Set basic params must be called before update is called.
- SetBasicCallHeaderParams( aCallId, aCallHeaderData );
-
- // Set call header labels
- SetCallHeaderTexts(
- aCallId,
- aWaitingCall,
- aVideoCall,
- aCallHeaderData );
-
- SetCliAndCnapParamaters( aCallId, aCallHeaderData );
-
- // Set divert indication to call header if needed.
- SetDivertIndicatorToCallHeader( aCallId, aCallHeaderData );
- }
-
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetOutgoingCallHeaderParams
+// PhoneCallHeaderUtil::RemoteNameAvailable
// ---------------------------------------------------------------------------
//
-void PhoneCallHeaderUtil::SetOutgoingCallHeaderParams(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
+TBool PhoneCallHeaderUtil::RemoteNameAvailable( const TInt aCallId ) const
{
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::SetOutgoingCallHeaderParams( ) ");
- // Set basic params must be called before update is called.
- SetBasicCallHeaderParams( aCallId, aCallHeaderData );
-
- // Set call header labels
- if ( aCallHeaderData->CallType() == EPECallTypeVideo )
- {
- LoadCallHeaderTexts(
- EPhoneOutgoingVideoCallLabel,
- aCallHeaderData );
- }
- else
- {
- LoadCallHeaderTexts(
- EPhoneOutgoingCallLabel,
- aCallHeaderData );
- }
+ __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::ContactInfoAvailable( ) ");
- SetCliParamaters( aCallId, aCallHeaderData );
- }
-
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::UpdateCallHeaderInfo
-// ---------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::UpdateCallHeaderInfo(
- const TInt aCallId,
- const TBool aWaitingCall,
- const TBool aVideoCall,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
- {
- __LOGMETHODSTARTEND(EPhoneControl, "PhoneCallHeaderUtil::UpdateCallHeaderInfoL( ) ");
- TBuf<KCntMaxTextFieldLength> remoteInfoText( KNullDesC );
+ TBool ret( m_engineInfo.RemoteName( aCallId ).Length() ||
+ m_engineInfo.RemoteCompanyName( aCallId ).Length() );
- // Set call header type
- GetCallType( aCallId, aCallHeaderData );
-
- // Set CLI text for the call header
- TBool secondaryCli = GetRemoteInfoData( aCallId, remoteInfoText );
- if ( remoteInfoText != KNullDesC )
+ if ( EFalse == ret && m_engineInfo.RemotePartyName( aCallId ).Length() )
{
- aCallHeaderData->SetCLIText( remoteInfoText, TPhoneCmdParamCallHeaderData::ERight );
- if ( secondaryCli )
- {
- aCallHeaderData->SetCNAPText( m_engineInfo.
- RemotePhoneNumber( aCallId ), TPhoneCmdParamCallHeaderData::ELeft );
- }
- }
- else
- {
- aCallHeaderData->SetCLIText(
- m_engineInfo.RemotePhoneNumber( aCallId ),
- TPhoneCmdParamCallHeaderData::ELeft );
+ ret = !CPhoneCenRepProxy::Instance()->
+ IsTelephonyFeatureSupported( KTelephonyLVFlagUUS );
}
-
- // If KTelephonyLVFlagUUS is enabled it will over write RemotePartyName setting.
- // Contains possible CNAP name or received skype identification
- if ( IsFeatureSupported( KTelephonyLVFlagUUS, aCallId ) )
- {
- TBuf<KCntMaxTextFieldLength> remotePartyName( KNullDesC );
- remotePartyName.Copy( m_engineInfo.RemotePartyName( aCallId ) );
-
- if ( m_engineInfo.CallState( aCallId ) == EPEStateRinging )
- {
- // Set CNAP text
- aCallHeaderData->SetCNAPText( remotePartyName, TPhoneCmdParamCallHeaderData::ERight );
- }
- else
- {
- aCallHeaderData->SetCLIText( remotePartyName, TPhoneCmdParamCallHeaderData::ERight );
- }
- }
-
- // Set call header labels
- SetCallHeaderTexts(
- aCallId,
- aWaitingCall,
- aVideoCall,
- aCallHeaderData );
-
- // Update caller image
- SetCallerImage(
- aCallId,
- aCallHeaderData );
+
+ return ret;
}
-
-
// ---------------------------------------------------------------------------
// PhoneCallHeaderUtil::GetRemoteInfoDataL
// ---------------------------------------------------------------------------
//
-TBool PhoneCallHeaderUtil::GetRemoteInfoData(
+void PhoneCallHeaderUtil::GetRemoteInfoData(
const TInt aCallId,
TDes& aData ) const
{
__LOGMETHODSTARTEND( EPhoneControl, "PhoneCallHeaderUtil::GetRemoteInfoDataL() ");
__PHONELOG1( EBasic, EPhoneControl, "PhoneCallHeaderUtil::GetRemoteInfoDataL() - call id =%d ", aCallId);
-
- TBool secondaryCli(EFalse);
-
+
if ( aCallId == KEmergencyCallId )
{
// Set emergency label text
@@ -717,21 +484,17 @@
}
else
{
- const RMobileCall::TMobileCallRemoteIdentityStatus identity =
- m_engineInfo.RemoteIdentity( aCallId );
// Note next if-statements are in priority order so be careful if you change order
// or add new if-statements.
if ( m_engineInfo.RemoteName( aCallId ).Length() )
{
// Display the contact name if it is available
aData.Copy( m_engineInfo.RemoteName( aCallId ) );
- secondaryCli = ETrue;
}
else if ( m_engineInfo.RemotePartyName( aCallId ).Length() )
{
// Display the CNAP or UUS info if it is available.
aData.Copy( m_engineInfo.RemotePartyName( aCallId ) );
- secondaryCli = ETrue;
}
else if ( m_engineInfo.RemoteCompanyName( aCallId ).Length() )
{
@@ -740,11 +503,14 @@
}
else if ( m_engineInfo.CallDirection( aCallId ) == RMobileCall::EMobileTerminated )
{
+ const RMobileCall::TMobileCallRemoteIdentityStatus identity =
+ m_engineInfo.RemoteIdentity( aCallId );
+
if ( EPEPrivateNumber == m_engineInfo.RemotePhoneNumberType( aCallId ) )
{
- if ( EPECallTypeVoIP == CallHeaderType() )
+ if ( EPECallTypeVoIP == m_engineInfo.CallType( aCallId ) )
{
- // TODO LoadResource( aData, iManagerUtility.Customization()->CustomizeCallHeaderText() );
+ // TODO voip LoadResource( aData, iManagerUtility.Customization()->CustomizeCallHeaderText() );
}
else
{
@@ -770,36 +536,59 @@
aData.Copy( m_engineInfo.RemotePhoneNumber( aCallId ) );
}
}
-
}
- return secondaryCli;
}
// -----------------------------------------------------------
-// PhoneCallHeaderUtil::LoadCallHeaderTexts
+// PhoneCallHeaderUtil::IsSecondaryCliAllowed
// -----------------------------------------------------------
//
-void PhoneCallHeaderUtil::LoadCallHeaderTexts(
- const TInt aLabelId,
- TPhoneCmdParamCallHeaderData* aCallHeaderData )
+TBool PhoneCallHeaderUtil::IsSecondaryCliAllowed( TInt aCallId )
{
- if ( aLabelId != EPhoneStringList )
+ TBool ret( ( aCallId != KEmergencyCallId &&
+ ( m_engineInfo.RemoteName( aCallId ).Length() ||
+ m_engineInfo.RemotePartyName( aCallId ).Length() ||
+ m_engineInfo.RemoteCompanyName( aCallId ).Length() ) &&
+ m_engineInfo.RemotePhoneNumber( aCallId ).Length() ) );
+
+ if ( ret && RMobileCall::EMobileTerminated ==
+ m_engineInfo.CallDirection( aCallId ) )
{
- TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC );
- LoadResource( labelText, aLabelId );
- aCallHeaderData->SetLabelText( labelText );
+ const RMobileCall::TMobileCallRemoteIdentityStatus identity =
+ m_engineInfo.RemoteIdentity( aCallId );
+
+ if ( m_engineInfo.RemotePhoneNumberType( aCallId ) == EPEPrivateNumber ||
+ identity == RMobileCall::ERemoteIdentityUnavailableNoCliCoinOrPayphone ||
+ identity == RMobileCall::ERemoteIdentityAvailableNoCliCoinOrPayphone ||
+ identity == RMobileCall::ERemoteIdentityUnknown )
+ {
+ ret = EFalse;
+ }
}
+
+ return ret;
}
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::LoadResource
-// ---------------------------------------------------------------------------
+// -----------------------------------------------------------
+// PhoneCallHeaderUtil::IsWaitingCall
+// -----------------------------------------------------------
//
-void PhoneCallHeaderUtil::LoadResource( TDes& aData, const TInt aResource ) const
+TBool PhoneCallHeaderUtil::IsWaitingCall(int callId) const
{
- StringLoader::Load(
- aData, CPhoneMainResourceResolver::Instance()->ResolveResourceID( aResource ),
- CCoeEnv::Static() );
+ bool waiting( EFalse );
+ if ( callId >= 0 &&
+ m_engineInfo.CallState( callId ) == EPEStateRinging )
+ {
+ if ( m_engineInfo.CheckIfCallStateExists(EPEStateConnected) ||
+ m_engineInfo.CheckIfCallStateExists(EPEStateConnectedConference) ||
+ m_engineInfo.CheckIfCallStateExists(EPEStateDisconnecting) ||
+ m_engineInfo.CheckIfCallStateExists(EPEStateHeld) ||
+ m_engineInfo.CheckIfCallStateExists(EPEStateHeldConference) )
+ {
+ waiting = ETrue;
+ }
+ }
+ return waiting;
}
// ---------------------------------------------------------------------------
@@ -818,16 +607,14 @@
}
// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::IsVideoCall
+// PhoneCallHeaderUtil::LoadResource
// ---------------------------------------------------------------------------
//
-TBool PhoneCallHeaderUtil::IsVideoCall(int aCallId ) const
+void PhoneCallHeaderUtil::LoadResource( TDes& aData, const TInt aResource ) const
{
- if( aCallId < 0 )
- {
- return ( m_engineInfo.CallTypeCommand()
- == EPECallTypeVideo );
- }
- return ( m_engineInfo.CallType( aCallId )
- == EPECallTypeVideo );
+ StringLoader::Load(
+ aData, CPhoneMainResourceResolver::Instance()->ResolveResourceID( aResource ),
+ CCoeEnv::Static() );
}
+
+
--- a/phoneapp/phoneuiqtviewadapter/src/phoneglobalnotes.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneglobalnotes.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -1,5 +1,5 @@
/*!
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -15,7 +15,6 @@
*/
#include "phoneglobalnotes.h"
-#include "tphonecmdparamglobalnote.h"
#include "tphonecmdparamquery.h"
#include "phoneresourceadapter.h"
#include "qtphonelog.h"
@@ -24,6 +23,8 @@
#include <hbaction.h>
#include <phoneappcommands.hrh>
#include <hbstringutil.h>
+#include <xqsystemtoneservice.h>
+
#include <restricted/hbdevicedialogsextensionsymbian_r.h>
const TInt KCriticalLevel = 2;
@@ -31,11 +32,14 @@
PhoneGlobalNotes::PhoneGlobalNotes(QObject *parent) :
QObject(parent),
m_timer(0),
+ m_toneService(0),
m_queryCanceledCommand(-1),
m_timeoutCommand(-1),
iProgressDialog(0)
{
PHONE_TRACE
+ m_toneService = new XQSystemToneService(this);
+
m_timer = new QTimer(this);
m_timer->setSingleShot(true);
connect(m_timer, SIGNAL(timeout()), SLOT(queryTimeout()));
@@ -82,6 +86,32 @@
return ret;
}
+void PhoneGlobalNotes::playToneIfNeeded(TPhoneNotificationToneType aTone)
+{
+ PHONE_TRACE
+
+ if (aTone != EPhoneNoTone) {
+ XQSystemToneService::ToneType toneType;
+ switch( aTone ) {
+ case EPhoneInformationTone:
+ toneType = XQSystemToneService::InformationBeepTone;
+ break;
+ case EPhoneConfirmationTone:
+ toneType = XQSystemToneService::ConfirmationBeepTone;
+ break;
+ case EPhoneWarningTone:
+ toneType = XQSystemToneService::WarningBeepTone;
+ break;
+ case EPhoneErrorTone:
+ default:
+ toneType = XQSystemToneService::ErrorBeepTone;
+ break;
+ }
+
+ m_toneService->playTone(toneType);
+ }
+}
+
void PhoneGlobalNotes::showGlobalWaitNote(TPhoneCmdParamQuery* params)
{
PHONE_TRACE
@@ -125,8 +155,8 @@
// the end button several times we should show only one "not allowed"
// note.
if (noteString == QString::fromUtf16(
- iMessageBoxList.at(i)->Text().Ptr(),
- iMessageBoxList.at(i)->Text().Length())) {
+ iMessageBoxList.at(i)->m_messageBox->Text().Ptr(),
+ iMessageBoxList.at(i)->m_messageBox->Text().Length())) {
showNote = false;
break;
}
@@ -143,12 +173,13 @@
type = CHbDeviceMessageBoxSymbian::EWarning;
break;
}
-
+
TRAP_IGNORE(
ShowDeviceMessageBoxL(
type,
TPtrC16(noteString.utf16()),
- params->Timeout());
+ params->Timeout(),
+ params->ToneType());
);
}
}
@@ -168,8 +199,8 @@
// the end button several times we should show only one "not allowed"
// note.
if (noteString == QString::fromUtf16(
- iNotificationList.at(i)->Title().Ptr(),
- iNotificationList.at(i)->Title().Length())) {
+ iNotificationList.at(i)->m_notificationDialog->Title().Ptr(),
+ iNotificationList.at(i)->m_notificationDialog->Title().Length())) {
showNote = false;
break;
}
@@ -179,7 +210,8 @@
TRAP_IGNORE(
ShowDeviceNotificationDialogL(
TPtrC16(noteString.utf16()),
- params->Timeout());
+ params->Timeout(),
+ params->ToneType());
);
}
}
@@ -204,12 +236,14 @@
void PhoneGlobalNotes::ShowDeviceMessageBoxL(
CHbDeviceMessageBoxSymbian::TType aType,
const TDesC16& aText,
- TInt aTimeout)
+ TInt aTimeout,
+ TPhoneNotificationToneType aTone
+ )
{
CHbDeviceMessageBoxSymbian *d = CHbDeviceMessageBoxSymbian::NewL(
aType, this);
CleanupStack::PushL(d);
-
+
// Show top of security
HbDeviceDialogsExtensionSymbian::SetShowLevel(d, KCriticalLevel);
@@ -222,18 +256,24 @@
}
if (iMessageBoxList.count() == 0) {
+ playToneIfNeeded(aTone);
// Show dialog only when there is no notifications ongoing.
// Delete dialog if show fails.
d->ShowL();
}
- iMessageBoxList.append(d);
+ MessageBoxData* data = NULL;
+ QT_TRYCATCH_LEAVING(data = new MessageBoxData());
+ data->m_messageBox = d;
+ data->m_tone = aTone;
+
+ iMessageBoxList.append(data);
CleanupStack::Pop(d);
}
void PhoneGlobalNotes::ShowDeviceNotificationDialogL(
- const TDesC16& aTitle, TInt aTimeout)
+ const TDesC16& aTitle, TInt aTimeout, TPhoneNotificationToneType aTone)
{
CHbDeviceNotificationDialogSymbian *d = CHbDeviceNotificationDialogSymbian::NewL(this);
CleanupStack::PushL(d);
@@ -250,12 +290,17 @@
}
if (iNotificationList.count() == 0) {
+ playToneIfNeeded(aTone);
// Show dialog only when there is no notifications ongoing.
// Delete dialog if show fails.
d->ShowL();
}
- iNotificationList.append(d);
+ NotificationDialogData* data = NULL;
+ QT_TRYCATCH_LEAVING(data = new NotificationDialogData());
+ data->m_notificationDialog = d;
+ data->m_tone = aTone;
+ iNotificationList.append(data);
CleanupStack::Pop(d);
}
@@ -294,14 +339,16 @@
const CHbDeviceNotificationDialogSymbian* aDialog, TInt )
{
PHONE_TRACE
- CHbDeviceNotificationDialogSymbian *notification = iNotificationList.takeFirst();
- Q_ASSERT( notification == aDialog );
+ NotificationDialogData *notification = iNotificationList.takeFirst();
+ Q_ASSERT( notification->m_notificationDialog == aDialog );
+ Q_UNUSED(aDialog);
+ delete notification->m_notificationDialog;
delete notification;
if ( 0 < iNotificationList.size() ) {
PHONE_DEBUG("PhoneGlobalNotes::show pending note");
- CHbDeviceNotificationDialogSymbian *notificationTemp = iNotificationList[0];
- TRAP_IGNORE( notificationTemp->ShowL() );
+ NotificationDialogData *notificationTemp = iNotificationList[0];
+ TRAP_IGNORE( notificationTemp->m_notificationDialog->ShowL() );
}
}
@@ -309,14 +356,16 @@
CHbDeviceMessageBoxSymbian::TButtonId )
{
PHONE_TRACE
- CHbDeviceMessageBoxSymbian *messageBox = iMessageBoxList.takeFirst();
- Q_ASSERT( messageBox == aMessageBox );
+ MessageBoxData *messageBox = iMessageBoxList.takeFirst();
+ Q_ASSERT( messageBox->m_messageBox == aMessageBox );
+ Q_UNUSED(aMessageBox);
+ delete messageBox->m_messageBox;
delete messageBox;
if ( 0 < iMessageBoxList.size() ) {
PHONE_DEBUG("PhoneGlobalNotes::show pending note");
- CHbDeviceMessageBoxSymbian *messageBoxTemp = iMessageBoxList[0];
- TRAP_IGNORE( messageBoxTemp->ShowL() );
+ MessageBoxData *messageBoxTemp = iMessageBoxList[0];
+ TRAP_IGNORE( messageBoxTemp->m_messageBox->ShowL() );
}
}
--- a/phoneapp/phoneuiqtviewadapter/src/phonenotecontroller.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phonenotecontroller.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -152,7 +152,9 @@
QObject::connect(m_dtmfNote, SIGNAL(aboutToClose()),
this, SLOT(removeMappings()));
- replaceDialogActions(m_dtmfNote, hbactions);
+ // Do not delete old actions, progress dialog has
+ // the ownership for the actions.
+ replaceDialogActions(m_dtmfNote, hbactions, false);
m_dtmfNote->show();
}
@@ -185,18 +187,22 @@
}
void PhoneNoteController::replaceDialogActions(
- HbDialog *dialog, QList<HbAction *> &actions)
+ HbDialog *dialog,
+ QList<HbAction *> &actions,
+ bool deleteOldActions)
{
PHONE_TRACE
// Remove default actions
foreach (QAction *action, dialog->actions()) {
dialog->removeAction(action);
- delete action;
+ if (deleteOldActions) {
+ delete action;
+ }
}
// Add new actions
foreach (HbAction *newAction, actions) {
- newAction->setParent(m_queryNote);
+ newAction->setParent(dialog);
connect(newAction, SIGNAL(triggered()), m_signalMapper, SLOT(map()));
m_signalMapper->setMapping(newAction, newAction->data().toInt());
m_actions.append(newAction);
--- a/phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -366,7 +366,7 @@
break;
case R_CALL_INFO_CAUSE_VALUE21:
{
- ret = hbTrId("txt_phone_info_request_rejected");
+ ret = hbTrId("txt_phone_info_call_rejected").arg(causeCode);
}
break;
case R_CALL_INFO_CAUSE_VALUE22:
--- a/phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneuicommandcontroller.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -49,7 +49,7 @@
QMap<int,int> callStates, QMap<int,int> serviceIds,
int serviceId, int expandedCallId )
{
- PHONE_DEBUG("PhoneMenuController::setCallMenuActions");
+ PHONE_TRACE
releaseMenu();
PhoneCommandExtensionWrapper *extension = commandExtension(serviceId);
@@ -93,6 +93,7 @@
int serviceId,
int callId)
{
+ PHONE_TRACE
QMap<PhoneAction::ActionType, PhoneAction *> translatedActions;
QList<int> commands = buttonCommandList(
callState, emergencyCall, callStates.values());
@@ -134,6 +135,7 @@
int serviceId,
int callId)
{
+ PHONE_TRACE
QList<PhoneAction *> actions;
//Set tool bar button flags
@@ -179,7 +181,7 @@
QList<int> PhoneUiCommandController::menuCommands(
QMap<int,int> callStates, QMap<int,int> serviceIds ) const
{
- PHONE_DEBUG("PhoneMenuController::menuCommands");
+ PHONE_TRACE
QList<int> commands;
bool sameServices = areServicesSame(callStates,serviceIds);
bool isEmergencyCall = emergencyCall(callStates);
@@ -282,6 +284,7 @@
TUid PhoneUiCommandController::ResolveImplementationUidL(
TUint32 aServiceId, TServicePropertyName aPropertyName ) const
{
+ PHONE_TRACE
TUid implUid = { 0 };
CSPEntry* entry = CSPEntry::NewLC();
@@ -309,6 +312,7 @@
PhoneCommandExtensionWrapper
*PhoneUiCommandController::CommandExtensionL( TUint aServiceId )
{
+ PHONE_TRACE
TUid pluginUid = ResolveImplementationUidL( aServiceId,
EPropertyCallMenuHandlerPluginId );
@@ -337,7 +341,7 @@
void PhoneUiCommandController::releaseMenu()
{
- PHONE_DEBUG("PhoneMenuController::setDialpadMenuActions");
+ PHONE_TRACE
for (int i=0;i<m_customMenuActions.count();i++) {
m_view.menuReference().removeAction(m_customMenuActions.at(i));
}
@@ -458,6 +462,7 @@
bool emergencyCall,
QList<int> callStates) const
{
+ PHONE_TRACE
QList<int> ret;
switch( callState ) {
--- a/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneuiqtviewadapter.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -237,15 +237,9 @@
createCallHeader(aCallId);
break;
case EPhoneViewUpdateBubble:
- updateCallHeaderState(aCallId);
+ updateCallHeader(aCallId);
setExpandActions();
break;
- case EPhoneViewUpdateCallHeaderRemoteInfoData:
- updateCallHeaderRemoteInfo(aCallId);
- break;
- case EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel:
- updateCallHeaderRemoteInfoAndLabel(aCallId);
- break;
case EPhoneViewCreateConference:
createConferenceBubble(aCallId);
break;
@@ -595,29 +589,16 @@
m_indicatorController->setActiveCallData();
}
-void PhoneUIQtViewAdapter::updateCallHeaderState(int callId)
+void PhoneUIQtViewAdapter::updateCallHeader(int callId)
{
PHONE_DEBUG("PhoneUIQtViewAdapter::updateCallHeaderState");
- m_phoneCallHeaderManager->updateCallHeaderState(callId);
-}
-
-void PhoneUIQtViewAdapter::updateCallHeaderRemoteInfo(int callId)
-{
- PHONE_DEBUG("PhoneUIQtViewAdapter::updateCallHeaderRemoteInfo");
- m_phoneCallHeaderManager->updateCallHeaderRemoteInfo(callId);
-
+ m_phoneCallHeaderManager->updateCallHeader(callId);
if ( m_phoneCallHeaderManager->isVoiceCall(callId) ) {
m_indicatorController->setActiveCallData();
}
}
-void PhoneUIQtViewAdapter::updateCallHeaderRemoteInfoAndLabel(int callId)
-{
- PHONE_DEBUG("PhoneUIQtViewAdapter::updateCallHeaderRemoteInfoAndLabel");
- m_phoneCallHeaderManager->updateCallHeaderRemoteInfoAndLabel(callId);
-}
-
void PhoneUIQtViewAdapter::handleCipheringInfoChange(int callId)
{
m_phoneCallHeaderManager->handleCipheringInfoChange(callId);
--- a/phoneapp/phoneuiqtviewadapter/src/phonevisibilityhandler.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phonevisibilityhandler.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -88,8 +88,6 @@
m_view.bringToForeground();
adjustVisibility(BringForwards);
}
-
-
}
/*!
@@ -107,6 +105,7 @@
*/
bool PhoneVisibilityHandler::phoneVisible()
{
+ PHONE_TRACE
// Should we check if there is phone's devicedialogs visible?
return (m_eikonEnv->RootWin().OrdinalPosition() == 0);
}
@@ -116,8 +115,9 @@
*/
void PhoneVisibilityHandler::sendToBackground(bool homeScreenForeground)
{
- PHONE_TRACE2(": homeScreenForeground =", homeScreenForeground);
- PHONE_TRACE2(": m_carModeEnabled =", m_carModeEnabled);
+ PHONE_TRACE4(": homeScreenForeground =", homeScreenForeground,
+ ", m_carModeEnabled =", m_carModeEnabled);
+
if(m_carModeEnabled) {
// Don't bring homescreen to foreground
return;
@@ -125,11 +125,12 @@
enableKeyGuard();
+ bool setHsToForeground = homeScreenForeground && phoneVisible();
// Send phone back on WSERV stack
adjustVisibility(SendToBack);
// Fetch homescreen to foreground if needed
- if (homeScreenForeground) {
+ if (setHsToForeground) {
_LIT(KPhoneHsAppName,"hsapplication");
TApaTaskList taskList(m_eikonEnv->WsSession());
TApaTask task = taskList.FindApp(KPhoneHsAppName);
@@ -159,6 +160,7 @@
*/
bool PhoneVisibilityHandler::disableKeyGuard()
{
+ PHONE_TRACE
TRAP_IGNORE(
CKeyguardAccessApi* keyguardAccess = CKeyguardAccessApi::NewL( );
if (!m_keyguardOnBeforeForeground) {
@@ -178,6 +180,7 @@
*/
void PhoneVisibilityHandler::enableKeyGuard()
{
+ PHONE_TRACE
if (phoneVisible() && m_keyguardOnBeforeForeground) {
// If phone is visible return to previous keyguard status
TRAP_IGNORE(
@@ -186,7 +189,6 @@
delete keyguardAccess;
);
}
-
m_keyguardOnBeforeForeground = false;
}
@@ -220,10 +222,7 @@
*/
void PhoneVisibilityHandler::adjustVisibility(AdjustAction action)
{
- PHONE_TRACE1(": START");
- int ordinalPos = m_eikonEnv->RootWin().OrdinalPosition();
- PHONE_TRACE2(": current pos:", ordinalPos);
-
+ PHONE_TRACE
if (m_carModeEnabled || (action == SendToBack)) {
PHONE_TRACE1(": SendPhoneToBackground");
m_eikonEnv->RootWin().SetOrdinalPosition(-1, ECoeWinPriorityNeverAtFront);
@@ -252,13 +251,13 @@
} else {
// Normalize visiblity after ie. device lock
PHONE_TRACE1(": Normalize");
+ int ordinalPos = m_eikonEnv->RootWin().OrdinalPosition();
+
m_eikonEnv->RootWin().SetOrdinalPosition(ordinalPos, ECoeWinPriorityNormal);
// Flush is needed here, because otherwise launching an application may fail
// if done same time with normalization.
m_eikonEnv->WsSession().Flush();
}
-
- PHONE_TRACE1(": END");
}
void PhoneVisibilityHandler::carModeChanged()
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonebubblewrapper/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonebubblewrapper/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -18,7 +18,7 @@
#include <QtTest/QtTest>
#include <QtGui>
#include <QSignalSpy>
-#include "qtestmains60.h"
+#include "phonetestmain.h"
#include "phonebubblewrapper.h"
#include "bubblemanagerif.h"
#include "pevirtualengine.h"
@@ -549,5 +549,5 @@
}
-QTEST_MAIN_S60(TestPhoneBubbleWrapper)
+PHONE_TEST_MAIN(TestPhoneBubbleWrapper)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheadermanager/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheadermanager/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -23,7 +23,8 @@
#include <mockservice.h>
#include <cpeengineinfo.h>
#include <pevirtualengine.h>
-#include "qtestmains60.h"
+#include "phoneconstants.h"
+#include "phonetestmain.h"
#include "phonecallheadermanager.h"
#include "phoneuiqtviewif_stub.h"
#include "bubblemanagerif_stub.h"
@@ -47,14 +48,12 @@
void testCreateCallHeader();
void testCreateEmergencyCallHeader();
void testRemoveCallHeader();
- void testUpdateCallHeaderState();
- void testUpdateCallHeaderRemoteInfo();
- void testUpdateCallHeaderRemoteInfoAndLabel();
+ void testUpdateCallHeader();
void testHandleCipheringInfoChange();
void testConferenceBubble();
void testExpandedConferenceCallHeader();
void testRemoveAllCallHeaders();
- void testIsVideoCall();
+ void testIsVoiceCall();
private:
@@ -110,7 +109,6 @@
int callId = 1;
iEngineInfo->SetCallState(EPEStateRinging, callId );
- EXPECT( PhoneCallHeaderUtil, SetIncomingCallHeaderParams);
EXPECT( PhoneBubbleWrapper, createCallHeader);
mCallHeaderManager->createCallHeader(callId);
QVERIFY(verify());
@@ -119,7 +117,6 @@
mIsConferenceExpanded = true;
mSetExpandedConferenceCalled = false;
- EXPECT( PhoneCallHeaderUtil, SetOutgoingCallHeaderParams);
mCallHeaderManager->createCallHeader(callId);
QVERIFY(verify());
QVERIFY(mSetExpandedConferenceCalled);
@@ -160,13 +157,13 @@
reset();
}
-void TestPhoneCallHeaderManager::testUpdateCallHeaderState()
+void TestPhoneCallHeaderManager::testUpdateCallHeader()
{
int callId = 1;
int bubbleId = -1;
EXPECT( PhoneBubbleWrapper, bubbleId).returns(bubbleId);
EXPECT( PhoneBubbleWrapper, setState).times(0);
- mCallHeaderManager->updateCallHeaderState(callId);
+ mCallHeaderManager->updateCallHeader(callId);
QVERIFY(verify());
reset();
@@ -174,45 +171,7 @@
EXPECT( PhoneBubbleWrapper, bubbleId).returns(bubbleId);
EXPECT( PhoneBubbleWrapper, setState).times(1);
- mCallHeaderManager->updateCallHeaderState(callId);
- QVERIFY(verify());
- reset();
-}
-
-void TestPhoneCallHeaderManager::testUpdateCallHeaderRemoteInfo()
-{
- int callId = 1;
- int bubbleId = -1;
- EXPECT( PhoneBubbleWrapper, bubbleId).returns(bubbleId);
- EXPECT( PhoneBubbleWrapper, setCli).times(0);
- mCallHeaderManager->updateCallHeaderRemoteInfo(callId);
- QVERIFY(verify());
- reset();
-
- bubbleId = 1;
-
- EXPECT( PhoneBubbleWrapper, bubbleId).returns(bubbleId);
- EXPECT( PhoneBubbleWrapper, setCli).times(1);
- mCallHeaderManager->updateCallHeaderRemoteInfo(callId);
- QVERIFY(verify());
- reset();
-}
-
-void TestPhoneCallHeaderManager::testUpdateCallHeaderRemoteInfoAndLabel()
-{
- int callId = 1;
- int bubbleId = -1;
- EXPECT( PhoneBubbleWrapper, bubbleId).returns(bubbleId);
- EXPECT( PhoneBubbleWrapper, setLabel).times(0);
- mCallHeaderManager->updateCallHeaderRemoteInfoAndLabel(callId);
- QVERIFY(verify());
- reset();
-
- bubbleId = 1;
-
- EXPECT( PhoneBubbleWrapper, bubbleId).returns(bubbleId);
- EXPECT( PhoneBubbleWrapper, setLabel).times(1);
- mCallHeaderManager->updateCallHeaderRemoteInfoAndLabel(callId);
+ mCallHeaderManager->updateCallHeader(callId);
QVERIFY(verify());
reset();
}
@@ -322,21 +281,13 @@
reset();
}
-void TestPhoneCallHeaderManager::testIsVideoCall()
+void TestPhoneCallHeaderManager::testIsVoiceCall()
{
- iEngineInfo->SetCallTypeCommand(EPECallTypeVideo);
- QVERIFY(mCallHeaderManager->isVideoCall( -1 ));
-
- iEngineInfo->SetCallTypeCommand(EPECallTypeVoIP);
- QVERIFY(false == mCallHeaderManager->isVideoCall( -1 ));
-
- int callId = 1;
- iEngineInfo->SetCallType(EPECallTypeVoIP, callId);
- QVERIFY(false == mCallHeaderManager->isVideoCall( callId ));
-
- iEngineInfo->SetCallType(EPECallTypeVideo, callId);
- QVERIFY(mCallHeaderManager->isVideoCall( callId ));
+ EXPECT( PhoneCallHeaderUtil, IsVoiceCall).returns(true);
+ QVERIFY(mCallHeaderManager->isVoiceCall( 1 ));
+ QVERIFY(verify());
+ reset();
}
-QTEST_MAIN_S60(TestPhoneCallHeaderManager)
+PHONE_TEST_MAIN(TestPhoneCallHeaderManager)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheadermanager/ut_phonecallheadermanager.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheadermanager/ut_phonecallheadermanager.pro Mon Oct 04 16:06:10 2010 +0300
@@ -40,7 +40,6 @@
-lengineinfo
TARGET.CAPABILITY = ALL -TCB
-DEFINES += FT_SYMBIAN_INTEGRATION
DEFINES += BUILD_PHONEUIQTVIEWADAPTER
# Input
@@ -54,4 +53,4 @@
SOURCES += ../../../../tsrc/stubs/stubs.cpp
SOURCES += unit_tests.cpp
-INCLUDE(../../../../tsrc/common/phonetest.pri)
+include(../../../../tsrc/common/phonetest.pri)
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheaderutil/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecallheaderutil/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -17,7 +17,7 @@
#include <QtTest/QtTest>
#include <mockservice.h>
-#include "qtestmains60.h"
+#include "phonetestmain.h"
#include "phonecallheaderutil.h"
#include "pevirtualengine.h"
#include "cpeengineinfo.h"
@@ -59,18 +59,15 @@
void cleanup ();
private slots:
- void testSetIncomingCallHeaderParams();
- void testSetOutgoingCallHeaderParams();
- void testUpdateCallHeaderInfo();
- void testSetCallHeaderType();
- void testSetDivertIndication();
+ void testLabelText();
+ void testGetCliTexts();
void testGetRemoteInfoData();
- void testSetCallHeaderTexts();
- void testLabelText();
+ void testEngineInfo();
+ void testIsVoiceCall();
+ void testIsVideoCall();
+ void testCallHeaderLabelTextForRingingCall();
void testEmergencyHeaderText();
void testAttemptingEmergencyText();
- void testCallState();
- void testLoadResource();
private:
CPEEngineInfo* m_engineInfo;
@@ -117,153 +114,274 @@
reset();
}
-void TestPhoneCallHeaderUtil::testSetIncomingCallHeaderParams()
+void TestPhoneCallHeaderUtil::testLabelText()
{
- TPhoneCmdParamCallHeaderData data;
-
const int callId = 1;
- const int serviceId = 100;
- _LIT(KPhoneNumber,"123456");
- _LIT(KCallerImage,"image.jpg");
+ QVERIFY( m_util->LabelText(1) == KNullDesC() );
- m_engineInfo->SetCallState(EPEStateRinging, callId);
m_engineInfo->SetCallType(EPECallTypeCSVoice, callId);
- m_engineInfo->SetCallSecureStatus(EFalse, callId);
- m_engineInfo->SetSecureSpecified(ETrue);
- m_engineInfo->SetServiceId(callId, serviceId);
- m_engineInfo->SetRemotePhoneNumber(KPhoneNumber(), callId);
- m_engineInfo->SetRemotePhoneNumberType(EPEMobileNumber, callId);
- m_engineInfo->SetCallerImage(KCallerImage(), callId);
- m_engineInfo->SetIncomingCallForwarded(ETrue, callId);
+
+ m_engineInfo->SetCallState(EPEStateHeld, callId);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneCallOnHold);
+ TBuf<100> label = m_util->LabelText(1);
+ QVERIFY(verify());
+ reset();
- EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneIncomingCallLabel);
- m_util->SetIncomingCallHeaderParams(callId,EFalse,EFalse,&data);
+ m_engineInfo->SetCallState(EPEStateHeldConference, callId);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneCallOnHold);
+ label = m_util->LabelText(1);
QVERIFY(verify());
+ reset();
- QVERIFY(data.CallState()==EPEStateRinging);
- QVERIFY(data.CallType()==EPECallTypeCSVoice);
- QVERIFY(data.Ciphering()==EFalse);
- QVERIFY(data.CipheringIndicatorAllowed()==ETrue);
- QVERIFY(data.ServiceId()==serviceId);
- QVERIFY(data.RemotePhoneNumber()==KPhoneNumber);
- QVERIFY(data.NumberType()==EPEMobileNumber);
- QVERIFY(data.Picture()==KCallerImage);
- QVERIFY(data.Diverted()==ETrue);
-}
-
-void TestPhoneCallHeaderUtil::testSetOutgoingCallHeaderParams()
-{
- TPhoneCmdParamCallHeaderData data;
+ m_engineInfo->SetCallState(EPEStateDisconnecting, callId);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneInCallDisconnected);
+ label = m_util->LabelText(1);
+ QVERIFY(verify());
+ reset();
- const int callId = 1;
- const int serviceId = 100;
- _LIT(KPhoneNumber,"123456");
- _LIT(KCallerImage,"image.jpg");
+ m_engineInfo->SetCallState(EPEStateConnectedConference, callId);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneCLIConferenceCall);
+ label = m_util->LabelText(1);
+ QVERIFY(verify());
+ reset();
m_engineInfo->SetCallState(EPEStateDialing, callId);
- m_engineInfo->SetCallType(EPECallTypeCSVoice, callId);
- m_engineInfo->SetCallSecureStatus(EFalse, callId);
- m_engineInfo->SetSecureSpecified(ETrue);
- m_engineInfo->SetServiceId(callId, serviceId);
- m_engineInfo->SetRemotePhoneNumber(KPhoneNumber(), callId);
- m_engineInfo->SetRemotePhoneNumberType(EPEMobileNumber, callId);
- m_engineInfo->SetCallerImage(KCallerImage(), callId);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneOutgoingCallLabel);
+ label = m_util->LabelText(1);
+ QVERIFY(verify());
+ reset();
- EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneOutgoingCallLabel);
- m_util->SetOutgoingCallHeaderParams(callId,&data);
+ m_engineInfo->SetCallType(EPECallTypeVideo, callId);
+ m_engineInfo->SetCallState(EPEStateDialing, callId);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneOutgoingVideoCallLabel);
+ label = m_util->LabelText(1);
QVERIFY(verify());
-
- QVERIFY(data.CallState()==EPEStateDialing);
- QVERIFY(data.CallType()==EPECallTypeCSVoice);
- QVERIFY(data.Ciphering()==EFalse);
- QVERIFY(data.CipheringIndicatorAllowed()==ETrue);
- QVERIFY(data.ServiceId()==serviceId);
- QVERIFY(data.RemotePhoneNumber()==KPhoneNumber);
- QVERIFY(data.NumberType()==EPEMobileNumber);
- QVERIFY(data.Picture()==KCallerImage);
+ reset();
}
-void TestPhoneCallHeaderUtil::testUpdateCallHeaderInfo()
+void TestPhoneCallHeaderUtil::testGetCliTexts()
{
- TPhoneCmdParamCallHeaderData data;
+ const int callId = 1;
+ const int conferenceCallId = 8;
+ const int emergencyCallId = 7;
+ _LIT(KPhoneNumber,"123456");
+ _LIT(KPhoneRemoteName,"test_name");
- const int callId = 1;
- const int serviceId = 100;
- _LIT(KPhoneNumber,"123456");
- _LIT(KCallerImage,"image.jpg");
+ TBuf<100> cliText;
+ PhoneCallHeaderUtil::ClippingDirection cliClip;
+ TBuf<100> secondaryCliText;
+ PhoneCallHeaderUtil::ClippingDirection secondaryCliClip;
+
m_engineInfo->SetRemotePhoneNumber(KPhoneNumber(), callId);
- m_engineInfo->SetRemotePhoneNumberType(EPEMobileNumber, callId);
- m_engineInfo->SetRemoteIdentity(RMobileCall::ERemoteIdentityAvailable, callId);
- m_engineInfo->SetCallerImage(KCallerImage(), callId);
+
+ m_util->GetCliTexts(callId,cliText, cliClip, secondaryCliText, secondaryCliClip);
+ QVERIFY(cliText == KPhoneNumber());
+ QVERIFY(cliClip == PhoneCallHeaderUtil::ELeft);
+ QVERIFY(secondaryCliText == KNullDesC());
- EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneIncomingCallLabel);
- m_util->UpdateCallHeaderInfo(1,0,0,&data);
- QVERIFY(verify());
+ m_engineInfo->SetRemoteName(KPhoneRemoteName(), callId);
+
+ m_util->GetCliTexts(callId,cliText, cliClip, secondaryCliText, secondaryCliClip);
+ QVERIFY(cliText == KPhoneRemoteName());
+ QVERIFY(cliClip == PhoneCallHeaderUtil::ERight);
+ QVERIFY(secondaryCliText == KPhoneNumber());
+ QVERIFY(secondaryCliClip == PhoneCallHeaderUtil::ELeft);
- QVERIFY(data.CLIText()==KPhoneNumber);
- QVERIFY(data.Picture()==KCallerImage);
-}
-
-void TestPhoneCallHeaderUtil::testSetCallHeaderType()
-{
- m_util->SetCallHeaderType(EPECallTypeCSVoice);
- QVERIFY(m_util->CallHeaderType()==EPECallTypeCSVoice);
-}
-
-void TestPhoneCallHeaderUtil::testSetDivertIndication()
-{
- m_util->SetDivertIndication(ETrue);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneCLIConferenceCall);
+ m_util->GetCliTexts(conferenceCallId,cliText, cliClip, secondaryCliText, secondaryCliClip);
+ QVERIFY(verify());
+ reset();
+
+ secondaryCliText = KNullDesC();
+ m_util->GetCliTexts(emergencyCallId,cliText, cliClip, secondaryCliText, secondaryCliClip);
+ QVERIFY( secondaryCliText == KNullDesC() );
+ QVERIFY( cliClip == PhoneCallHeaderUtil::ERight );
+
+ m_util->GetSecondaryCli(emergencyCallId, secondaryCliText, secondaryCliClip);
+ QVERIFY( secondaryCliText == KNullDesC() );
+
+ m_util->GetCli(emergencyCallId, cliText, cliClip);
+ QVERIFY( secondaryCliText == KNullDesC() );
}
void TestPhoneCallHeaderUtil::testGetRemoteInfoData()
{
- TBuf<100> buf;
const int callId = 1;
+ const int conferenceCallId = 8;
+ const int emergencyCallId = 7;
_LIT(KPhoneNumber,"123456");
-
+ _LIT(KPhoneRemoteName,"test_remotename");
+ _LIT(KPhoneRemotePartyName,"test_remotepartyname");
+ _LIT(KPhoneRemoteCompanyName,"test_remotecompanyname");
+ TBuf<100> cliText;
+ PhoneCallHeaderUtil::ClippingDirection cliClip;
+
m_engineInfo->SetRemotePhoneNumber(KPhoneNumber(), callId);
- m_engineInfo->SetRemotePhoneNumberType(EPEMobileNumber, callId);
- m_engineInfo->SetCallDirection(RMobileCall::EMobileTerminated, callId);
- m_engineInfo->SetRemoteIdentity(RMobileCall::ERemoteIdentityAvailable, callId);
+ m_engineInfo->SetRemoteName(KPhoneRemoteName(), callId);
+
+ m_util->GetCli(callId,cliText, cliClip);
+ QVERIFY(cliText == KPhoneRemoteName());
+ QVERIFY(cliClip == PhoneCallHeaderUtil::ERight);
+
+ m_engineInfo->SetRemoteName(KNullDesC(), callId);
+ m_engineInfo->SetRemotePartyName(KPhoneRemotePartyName(), callId);
+ m_util->GetCli(callId,cliText, cliClip);
+ QVERIFY(cliText == KPhoneRemotePartyName());
+ QVERIFY(cliClip == PhoneCallHeaderUtil::ERight);
+
+ m_engineInfo->SetRemotePartyName(KNullDesC(), callId);
+ m_engineInfo->SetRemoteCompanyName(KPhoneRemoteCompanyName(), callId);
+ m_util->GetCli(callId,cliText, cliClip);
+ QVERIFY(cliText == KPhoneRemoteCompanyName());
+ QVERIFY(cliClip == PhoneCallHeaderUtil::ERight);
- m_util->GetRemoteInfoData(callId,buf);
- QVERIFY(buf==KPhoneNumber());
+ m_engineInfo->SetRemoteCompanyName(KNullDesC(), callId);
+ m_engineInfo->SetRemotePhoneNumber(KNullDesC(), callId);
+ m_engineInfo->SetCallDirection(RMobileCall::EMobileTerminated , callId);
+ m_engineInfo->SetRemotePhoneNumberType( EPEPrivateNumber, callId);
+
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneCLIWithheld);
+ m_util->GetCli(callId,cliText, cliClip);
+ QVERIFY(verify());
+ reset();
+
+ m_engineInfo->SetRemotePhoneNumberType( EPEMobileNumber, callId);
+ m_engineInfo->SetRemoteIdentity(
+ RMobileCall::ERemoteIdentityUnavailableNoCliCoinOrPayphone, callId);
+
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneCLIPayphone);
+ m_util->GetCli(callId,cliText, cliClip);
+ QVERIFY(verify());
+ reset();
+
+ m_engineInfo->SetRemoteIdentity(
+ RMobileCall::ERemoteIdentityAvailableNoCliCoinOrPayphone, callId);
+
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneCLIPayphone);
+ m_util->GetCli(callId,cliText, cliClip);
+ QVERIFY(verify());
+ reset();
+
+ m_engineInfo->SetRemoteIdentity(
+ RMobileCall::ERemoteIdentityUnknown, callId);
+
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneCallCLIUnknown);
+ m_util->GetCli(callId,cliText, cliClip);
+ QVERIFY(verify());
+ reset();
}
-void TestPhoneCallHeaderUtil::testSetCallHeaderTexts()
+void TestPhoneCallHeaderUtil::testEngineInfo()
{
- TPhoneCmdParamCallHeaderData data;
-
const int callId = 1;
- const int serviceId = 100;
_LIT(KPhoneNumber,"123456");
-
- m_engineInfo->SetRemotePhoneNumber(KPhoneNumber(), callId);
- m_engineInfo->SetRemotePhoneNumberType(EPEMobileNumber, callId);
- m_engineInfo->SetALSLine(CCCECallParameters::ECCELineTypePrimary);
+ m_engineInfo->SetRemotePhoneNumber(KPhoneNumber(),callId);
+ QVERIFY(m_util->RemotePhoneNumber(callId)==KPhoneNumber());
+
+ m_engineInfo->SetCallType(EPECallTypeCSVoice, callId);
+ QVERIFY(m_util->CallType(callId)==EPECallTypeCSVoice);
+
+ m_engineInfo->SetServiceId(callId, 1);
+ QVERIFY(m_util->ServiceId(callId)==1);
- EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneIncomingCallLabel);
- m_util->SetCallHeaderTexts(1,0,0,&data);
-
- QVERIFY(verify());
+ m_engineInfo->SetIncomingCallForwarded(true,callId);
+ QVERIFY(m_util->IsCallForwarded(callId)==true);
+
+ m_engineInfo->SetSecureSpecified(true);
+ QVERIFY(m_util->SecureSpecified()==true);
+
+ m_engineInfo->SetCallSecureStatus(true, callId);
+ QVERIFY(m_util->Ciphering(callId)==true);
+
+ QVERIFY(m_util->CallerImage(callId)==KNullDesC());
+
+ m_engineInfo->SetCallState(EPEStateDialing,callId);
+ QVERIFY(m_util->CallState(callId)==EPEStateDialing);
}
-void TestPhoneCallHeaderUtil::testLabelText()
+
+void TestPhoneCallHeaderUtil::testIsVoiceCall()
+{
+ const int callId = 1;
+ const int invalidCallId = -1;
+
+ m_engineInfo->SetCallType(EPECallTypeCSVoice, callId);
+ QVERIFY(true == m_util->IsVoiceCall(callId));
+
+ m_engineInfo->SetCallType(EPECallTypeVoIP, callId);
+ QVERIFY(true == m_util->IsVoiceCall(callId));
+
+ m_engineInfo->SetCallType(EPECallTypeVideo, callId);
+ QVERIFY(false == m_util->IsVoiceCall(callId));
+
+ m_engineInfo->SetCallTypeCommand(EPECallTypeCSVoice);
+ QVERIFY(true == m_util->IsVoiceCall(invalidCallId));
+
+ m_engineInfo->SetCallTypeCommand(EPECallTypeVoIP);
+ QVERIFY(true == m_util->IsVoiceCall(invalidCallId));
+
+ m_engineInfo->SetCallTypeCommand(EPECallTypeVideo);
+ QVERIFY(false == m_util->IsVoiceCall(invalidCallId));
+}
+
+void TestPhoneCallHeaderUtil::testIsVideoCall()
{
const int callId = 1;
-
- m_engineInfo->SetCallState(EPEStateHeld, callId);
+ const int invalidCallId = -1;
+
+ m_engineInfo->SetCallType(EPECallTypeCSVoice, callId);
+ QVERIFY(false == m_util->IsVideoCall(callId));
+
+ m_engineInfo->SetCallType(EPECallTypeVideo, callId);
+ QVERIFY(true == m_util->IsVideoCall(callId));
+
+ m_engineInfo->SetCallTypeCommand(EPECallTypeCSVoice);
+ QVERIFY(false == m_util->IsVideoCall(invalidCallId));
+
+ m_engineInfo->SetCallTypeCommand(EPECallTypeVideo);
+ QVERIFY(true == m_util->IsVideoCall(invalidCallId));
+}
+
+void TestPhoneCallHeaderUtil::testCallHeaderLabelTextForRingingCall()
+{
+ const int callId = 1;
+
m_engineInfo->SetCallType(EPECallTypeCSVoice, callId);
+ m_engineInfo->SetCallState(EPEStateRinging, callId);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneIncomingCallLabel);
TBuf<100> label = m_util->LabelText(1);
- EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneCallOnHold);
+ QVERIFY(verify());
+ reset();
+
+ m_engineInfo->SetCallType(EPECallTypeVideo, callId);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneVideoCallIncoming);
+ label = m_util->LabelText(1);
+ QVERIFY(verify());
+ reset();
+
+ m_engineInfo->SetCallType(EPECallTypeCSVoice, callId);
+ m_engineInfo->SetCallState(EPEStateConnected, 2);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(EPhoneCallWaitingLabel);
+ label = m_util->LabelText(1);
+ QVERIFY(verify());
+ reset();
+
+ m_engineInfo->SetCallState(EPEStateIdle, 2);
+ m_engineInfo->SetRemotePhoneNumberType(EPEMobileNumber, callId);
+ m_engineInfo->SetRemotePhoneNumber(KNullDesC(), callId);
+ m_engineInfo->SetRemotePartyName(KNullDesC(), callId);
+ EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(KPhoneRssCommonFirst);
+ label = m_util->LabelText(1);
+ QVERIFY(verify());
+ reset();
}
void TestPhoneCallHeaderUtil::testEmergencyHeaderText()
{
_LIT( KResourceText, "emergency" );
- HBufC* text = KResourceText().AllocLC();
+ HBufC* text = KResourceText().AllocL();
EXPECT(StringLoader,LoadL).returns<HBufC*>(0);
QVERIFY(m_util->EmergencyHeaderText()==KNullDesC);
verify();
@@ -275,7 +393,7 @@
void TestPhoneCallHeaderUtil::testAttemptingEmergencyText()
{
_LIT( KResourceText, "attempting" );
- HBufC* text = KResourceText().AllocLC();
+ HBufC* text = KResourceText().AllocL();
EXPECT(StringLoader,LoadL).returns<HBufC*>(0);
QVERIFY(m_util->AttemptingEmergencyText()==KNullDesC);
verify();
@@ -284,30 +402,5 @@
verify();
}
-void TestPhoneCallHeaderUtil::testCallState()
-{
- m_engineInfo->SetCallState(EPEStateDialing,1);
- QVERIFY(m_util->CallState(1)==EPEStateDialing);
-}
-
-void TestPhoneCallHeaderUtil::testLoadResource()
-{
- TBuf<100> buf;
-
- EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(1).returns(1);
- EXPECT(StringLoader,Load).willOnce(invoke(simulateStringLoad));
- m_util->LoadResource(buf,1);
- QVERIFY(verify());
- QVERIFY(buf==KSimulatedStringLoaderString());
-
- _LIT( KResourceText, "resource" );
- HBufC* text = KResourceText().AllocLC();
- EXPECT(CPhoneMainResourceResolver,ResolveResourceID).with(1).returns(1);
- EXPECT(StringLoader,LoadL).returns(text);
- HBufC* ret = m_util->LoadResource(1);
- QVERIFY(ret==text);
- delete text;
-}
-
-QTEST_MAIN_S60(TestPhoneCallHeaderUtil)
+PHONE_TEST_MAIN(TestPhoneCallHeaderUtil)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecommandextensionwrapper/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecommandextensionwrapper/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -24,7 +24,7 @@
#include "phonecommandextensionwrapper.h"
#include "pevirtualengine.h"
#include "menuextension_stub.h"
-#include "qtestmains60.h"
+#include "phonetestmain.h"
extern bool m_modifyMenuCommandListCalled;
extern bool m_modifyPushButtonCommandListCalled;
@@ -251,5 +251,5 @@
}
-QTEST_MAIN_S60(TestPhoneCommandExtensionWrapper)
+PHONE_TEST_MAIN(TestPhoneCommandExtensionWrapper)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecommandextensionwrapper/ut_phonecommandextensionwrapper.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonecommandextensionwrapper/ut_phonecommandextensionwrapper.pro Mon Oct 04 16:06:10 2010 +0300
@@ -38,7 +38,6 @@
HEADERS += /epoc32/include/mw/xqpluginloader.h
TARGET.CAPABILITY = ALL -TCB
-DEFINES += FT_SYMBIAN_INTEGRATION
DEFINES += BUILD_PHONEUIQTVIEWADAPTER
# Input
@@ -49,6 +48,6 @@
SOURCES += xqpluginloader_stub.cpp
SOURCES += unit_tests.cpp
-INCLUDE(../../../../tsrc/common/phonetest.pri)
+include(../../../../tsrc/common/phonetest.pri)
symbian:MMP_RULES += SMPSAFE
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/phonevisibilityhandler_stub.cpp Fri Sep 17 17:09:12 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-/*!
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*/
-
-#include <xqcallinfo.h>
-#include <MediatorDomainUIDs.h>
-#include <callinformation.h>
-#include <eikenv.h>
-#include <xqserviceutil.h>
-#include <devicelockaccessapi.h>
-#include <qdebug.h>
-#include <telinformationpskeys.h>
-#include <coreapplicationuisdomainpskeys.h>
-#include <apgtask.h>
-#include "phonevisibilityhandler.h"
-#include "cphonepubsubproxy.h"
-#include "phoneconstants.h"
-#include "phoneuiqtviewif.h"
-
-bool m_bringToForegroundCalled;
-bool m_sendToBackgroundCalled;
-bool m_ordinalPositionCalled;
-bool m_phoneVisibleReturnValue;
-
-/*!
- PhoneVisibilityHandler::PhoneVisibilityHandler.
- */
-PhoneVisibilityHandler::PhoneVisibilityHandler(PhoneUIQtViewIF &view, QObject *parent)
- :
- QObject(parent),
- m_view(view),
- m_eikonEnv(0),
- m_carModeEnabled(false),
- m_hideDeviceDialogs(false)
-{
- m_phoneVisibleReturnValue = false;
-}
-
-
-/*!
- PhoneVisibilityHandler::~PhoneVisibilityHandler.
- */
-PhoneVisibilityHandler::~PhoneVisibilityHandler()
-{
-
-}
-
-/*!
- PhoneVisibilityHandler::bringToForeground.
- */
-void PhoneVisibilityHandler::bringToForeground()
-{
- m_bringToForegroundCalled = true;
-}
-
-/*!
- PhoneVisibilityHandler::sendToBackground.
- */
-void PhoneVisibilityHandler::sendToBackground(bool homeScreenForeground)
-{
- m_sendToBackgroundCalled = true;
-}
-
-/*!
- PhoneVisibilityHandler::hideDeviceDialogs.
- */
-void PhoneVisibilityHandler::hideDeviceDialogs(bool hide)
-{
- Q_UNUSED(hide)
-}
-
-/*!
- PhoneVisibilityHandler::ordinalPosition.
- */
-bool PhoneVisibilityHandler::phoneVisible()
-{
- m_ordinalPositionCalled = true;
- return m_phoneVisibleReturnValue;
-}
-
-/*!
- PhoneVisibilityHandler::checkCorrectVisibility.
- */
-void PhoneVisibilityHandler::checkCorrectVisibility()
-{
-
-}
-
-/*!
- PhoneVisibilityHandler::HandlePropertyChangedL.
- */
-void PhoneVisibilityHandler::HandlePropertyChangedL(const TUid& aCategory,
- const TUint aKey, const TInt aValue)
-{
- Q_UNUSED(aCategory)
- Q_UNUSED(aKey)
- Q_UNUSED(aValue)
-}
-
-/*!
- PhoneVisibilityHandler::adjustVisibility.
- */
-void PhoneVisibilityHandler::adjustVisibility(AdjustAction action)
-{
- Q_UNUSED(action)
-}
-
-/*!
- PhoneVisibilityHandler::carModeChanged.
- */
-void PhoneVisibilityHandler::carModeChanged()
-{
-
-}
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -43,6 +43,7 @@
#include "phoneindicatorcontroller.h"
#include "phoneindicators.h"
#include "hbindicatorstubhelper.h"
+#include "phoneuitestmain.h"
extern bool m_logsModelCreated;
@@ -52,21 +53,6 @@
extern int m_modelMaxSize;
extern bool m_bringToForegroundCalled;
-#define PHONE_QT_INDICATOR_CONTROLLER_TEST_MAIN(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
- HbApplication app(argc, argv); \
- TestObject tc; \
- QResource::registerResource("../hbcore.rcc"); \
- int ret = QTest::qExec(&tc, argc, argv); \
- /* Core dump if HbIconLoader instance is not destroyed before the application instance. */ \
- /* HbIconLoader uses QCoreApplication::aboutToQuit() signal to destroy itself. */ \
- /* app.exec() where the signal is normally emitted is not called here. */ \
- /* So, invoking the signal explicitly. */ \
- QMetaObject::invokeMethod(&app, "aboutToQuit", Qt::DirectConnection); \
- return ret; \
-}
-
class UT_PhoneIndicatorController : public QObject, public MockService
{
Q_OBJECT
@@ -239,6 +225,6 @@
QVERIFY(m_aiwRequestSended);
}
-PHONE_QT_INDICATOR_CONTROLLER_TEST_MAIN(UT_PhoneIndicatorController)
+PHONE_UITEST_MAIN(UT_PhoneIndicatorController)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/ut_phoneindicatorcontroller.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneindicatorcontroller/ut_phoneindicatorcontroller.pro Mon Oct 04 16:06:10 2010 +0300
@@ -22,7 +22,8 @@
../../../../inc \
../../../phoneuiutils/inc/ \
../../../phoneuiview2/inc \
- ../../../../phoneplugins/phoneindicatorplugin/inc
+ ../../../../phoneplugins/phoneindicatorplugin/inc \
+ ../../../../tsrc/common
LIBS += -lmocklib \
-lsymbianmock \
-lxqsettingsmanager \
@@ -36,7 +37,7 @@
HEADERS += ../../inc/phoneindicatorcontroller.h
SOURCES += ../../src/phoneindicatorcontroller.cpp
HEADERS += ../../inc/phonevisibilityhandler.h
-SOURCES += phonevisibilityhandler_stub.cpp
+SOURCES += ../../../../tsrc/stubs/phoneuiqtviewadapter/phonevisibilityhandler_stub.cpp
HEADERS += phoneuiqtviewif_stub.h
HEADERS += logsmodel.h
SOURCES += logsmodel_stub.cpp
@@ -54,4 +55,4 @@
# MOCKED DEPENDENCIES
HEADERS +=
-include(../../../../tsrc/common/phonetest.pri)
+include(../../../../tsrc/common/phoneuitest.pri)
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonemessagecontroller/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -20,7 +20,7 @@
#include <HbGlobal>
#include <mockservice.h>
#include <settingsinternalcrkeys.h>
-#include "qtestmains60.h"
+#include "phonetestmain.h"
#include "phoneapplauncher.h"
#include "phonemessagecontroller.h"
#include "tphonecmdparamsfidata.h"
@@ -157,5 +157,5 @@
}
-QTEST_MAIN_S60(UT_PhoneMessageController)
+PHONE_TEST_MAIN(UT_PhoneMessageController)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonenotecontroller/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonenotecontroller/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -27,21 +27,8 @@
#include "tphonecmdparamquery.h"
#include "phoneresourceadapter.h"
#include "phoneconstants.h"
+#include "phoneuitestmain.h"
-#define PHONE_QT_NOTE_CONTROLLER_TEST_MAIN(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
- HbApplication app(argc, argv); \
- TestObject tc; \
- QResource::registerResource("../hbcore.rcc"); \
- int ret = QTest::qExec(&tc, argc, argv); \
- /* Core dump if HbIconLoader instance is not destroyed before the application instance. */ \
- /* HbIconLoader uses QCoreApplication::aboutToQuit() signal to destroy itself. */ \
- /* app.exec() where the signal is normally emitted is not called here. */ \
- /* So, invoking the signal explicitly. */ \
- QMetaObject::invokeMethod(&app, "aboutToQuit", Qt::DirectConnection); \
- return ret; \
-}
class TestPhoneNoteController : public QObject
{
@@ -350,5 +337,5 @@
QTest::qWait(20000);
}
-PHONE_QT_NOTE_CONTROLLER_TEST_MAIN(TestPhoneNoteController)
+PHONE_UITEST_MAIN(TestPhoneNoteController)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonenotecontroller/ut_phonenotecontroller.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonenotecontroller/ut_phonenotecontroller.pro Mon Oct 04 16:06:10 2010 +0300
@@ -16,7 +16,6 @@
#
TEMPLATE = app
-TARGET =
TARGET.UID3 = 0xEDA69234
DEPENDPATH += .
INCLUDEPATH += .
@@ -31,10 +30,13 @@
../../../phoneuiutils/inc/ \
../../../phoneuiview2/inc \
../../../../inc \
- ../../../phoneui2/srcdata
+ ../../../phoneui2/srcdata \
+ ../../../../tsrc/common
LIBS += -lphoneuiutils
LIBS += -lphoneuiqtview
+ LIBS += -lxqsystemtoneservice
+
TARGET.CAPABILITY = ALL -TCB
DEFINES += FT_SYMBIAN_INTEGRATION
@@ -52,5 +54,5 @@
SOURCES += ../../src/phoneglobalnotes.cpp
SOURCES += unit_tests.cpp
-
+include(../../../../tsrc/common/phoneuitest.pri)
symbian:MMP_RULES += SMPSAFE
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneresourceadapter/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -24,7 +24,7 @@
#include <phoneappvoipcommands.hrh>
#include <xqphoneappcommands.h>
#include <mockservice.h>
-#include "qtestmains60.h"
+#include "phonetestmain.h"
#include "phoneresourceadapter.h"
#include "phoneuiqtbuttonscontroller.h"
#include "phoneresourceids.h"
@@ -643,5 +643,5 @@
testList.clear();
}
-QTEST_MAIN_S60(TestPhoneResourceAdapter)
+PHONE_TEST_MAIN(TestPhoneResourceAdapter)
#include "unit_tests.moc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/hb_stub.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,76 @@
+/*!
+* 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 <hbaction.h>
+
+QString hbTrId(const char *id, int n) { return QString(id); };
+
+HbAction::HbAction(QObject *parent)
+ : QAction(parent), d_ptr(0)
+{
+}
+
+HbAction::HbAction(const QString &text, QObject *parent)
+ : QAction(text, parent), d_ptr(0)
+{
+}
+
+HbAction::~HbAction()
+{
+}
+
+int HbAction::qt_metacall(enum QMetaObject::Call, int, void * *) {};
+void* HbAction::qt_metacast(char const *) {};
+struct QMetaObject const * HbAction::metaObject(void) const {};
+
+#include <hbicon.h>
+
+class HbIconPrivate
+{
+ public:
+ HbIconPrivate(){};
+ ~HbIconPrivate(){};
+
+ QAtomicInt ref;
+};
+
+HbIcon::HbIcon() {};
+HbIcon::HbIcon(const QString& string) {};
+HbIcon::~HbIcon() {};
+
+#include <qgraphicswidget.h>
+
+void QGraphicsWidget::addAction(QAction *action)
+{
+}
+
+void QGraphicsWidget::removeAction(QAction *action)
+{
+}
+
+#include "phoneaction.h"
+
+PhoneAction::PhoneAction () :
+ m_text (QString ()), m_command (-1), m_icon (0), m_disabled(false),
+ m_role(PhoneAction::None)
+{
+}
+
+PhoneAction::~PhoneAction ()
+{
+}
+
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -29,6 +29,7 @@
#include "phoneresourceids.h"
#include "phoneresourceadapter.h"
#include "phoneuiqtbuttonscontroller.h"
+#include "phonetestmain.h"
extern bool m_setActions;
extern bool m_setInvalidCommand;
@@ -38,21 +39,6 @@
extern bool m_setCustomToolBarCommands;
extern int m_phoneButtonFlags;
-#define PHONE_QT_VIEW_ADAPTER_TEST_MAIN(TestObject) \
-int main(int argc, char *argv[]) \
- { \
- HbApplication app(argc, argv); \
- TestObject tc; \
- QResource::registerResource("../hbcore.rcc"); \
- int ret = QTest::qExec(&tc, argc, argv); \
- /* Core dump if HbIconLoader instance is not destroyed before the application instance. */ \
- /* HbIconLoader uses QCoreApplication::aboutToQuit() signal to destroy itself. */ \
- /* app.exec() where the signal is normally emitted is not called here. */ \
- /* So, invoking the signal explicitly. */ \
- QMetaObject::invokeMethod(&app, "aboutToQuit", Qt::DirectConnection); \
- return ret; \
- }
-
class TestPhoneUiCommandController : public QObject, public PhoneUIQtViewIF, public BubbleManagerIF
{
@@ -95,7 +81,7 @@
void setMenuActions(const QList<PhoneAction*>& ) { m_setMenuActionsCalled = true;};
void shutdownPhoneApp() {};
void setBackButtonVisible(bool ) {};
- HbMenu &menuReference(){return m_menu;};
+ HbMenu &menuReference(){ HbMenu* menu = NULL; return *menu;};
void captureKey(Qt::Key , bool ) {};
// From BubbleManagerIF
@@ -200,8 +186,6 @@
bool m_setMenuActionsCalled;
bool m_isDialpadVisible;
QString m_dialpadText;
- HbMenu m_menu;
-
};
TestPhoneUiCommandController::TestPhoneUiCommandController ()
@@ -826,5 +810,5 @@
QVERIFY(4==actions.count());
}
-PHONE_QT_VIEW_ADAPTER_TEST_MAIN(TestPhoneUiCommandController)
+PHONE_TEST_MAIN(TestPhoneUiCommandController)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/ut_phoneuicommandcontroller.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuicommandcontroller/ut_phoneuicommandcontroller.pro Mon Oct 04 16:06:10 2010 +0300
@@ -16,7 +16,6 @@
#
TEMPLATE = app
-TARGET =
TARGET.UID3 = 0xEFF8FEA9
DEPENDPATH += .
INCLUDEPATH += .
@@ -34,7 +33,8 @@
../../../phonemediatorcenter/inc/ \
../../../phoneuiview2/inc \
../../../../inc \
- ../../../phoneui2/srcdata
+ ../../../phoneui2/srcdata \
+ ../../../../tsrc/common
LIBS += -lphoneuiutils
@@ -56,7 +56,8 @@
SOURCES += phoneuiqtbuttonscontroller_stub.cpp
SOURCES += phonecommandextensionwrapper_stub.cpp
SOURCES += unit_tests.cpp
+SOURCES += hb_stub.cpp
-
+include(../../../../tsrc/common/phonetest.pri)
symbian:MMP_RULES += SMPSAFE
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtbuttonscontroller/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtbuttonscontroller/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -19,7 +19,7 @@
#include <QtGui>
#include <hbapplication.h>
#include <QSignalSpy>
-#include "qtestmains60.h"
+#include "phonetestmain.h"
#include "phoneuiqtbuttonscontroller.h"
class TestPhoneUIQtButtonsController : public QObject
@@ -278,5 +278,5 @@
m_buttonsCtrl->setButtonFlags(PhoneUIQtButtonsController::Btaa,btaa);
}
-QTEST_MAIN_S60(TestPhoneUIQtButtonsController)
+PHONE_TEST_MAIN(TestPhoneUIQtButtonsController)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonecallheadermanager_stub.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonecallheadermanager_stub.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -100,21 +100,11 @@
m_removeCallHeaderCallId = callId;
}
-void PhoneCallHeaderManager::updateCallHeaderState(int callId)
+void PhoneCallHeaderManager::updateCallHeader(int callId)
{
m_updateCallHeaderCallId = callId;
}
-void PhoneCallHeaderManager::updateCallHeaderRemoteInfo(int callId)
-{
- m_updateCallHeaderRemoteInfoCallId = callId;
-}
-
-void PhoneCallHeaderManager::updateCallHeaderRemoteInfoAndLabel (int callId)
-{
- m_updateCallHeaderRemoteInfoAndLabelCallId = callId;
-}
-
void PhoneCallHeaderManager::handleCipheringInfoChange(int callId)
{
m_handleCipheringInfoChangeCallId = callId;
@@ -159,31 +149,11 @@
// PhoneCallHeaderUtil::IsVoiceCall
// ---------------------------------------------------------------------------
//
-bool PhoneCallHeaderManager::isVoiceCall(int callId) const
+bool PhoneCallHeaderManager::isVoiceCall(int callId)
{
return m_isVoiceCall;
}
-// ---------------------------------------------------------------------------
-// PhoneCallHeaderUtil::IsVideoCall
-// ---------------------------------------------------------------------------
-//
-bool PhoneCallHeaderManager::isVideoCall(int callId) const
- {
- return false;
- }
-
-bool PhoneCallHeaderManager::isIncoming(int callId) const
- {
- return false;
- }
-
-bool PhoneCallHeaderManager::isWaitingCall(int callId) const
- {
- bool waiting( EFalse );
-
- return waiting;
- }
PhoneCallHeaderUtil *PhoneCallHeaderManager::callHeaderUtil()
{
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/phonevisibilityhandler_stub.cpp Fri Sep 17 17:09:12 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +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: Adjusts visibility of Phone app in device lock situations.
-*
-*/
-#include <xqcallinfo.h>
-#include <MediatorDomainUIDs.h>
-#include <callinformation.h>
-#include <eikenv.h>
-#include <xqserviceutil.h>
-#include <devicelockaccessapi.h>
-#include <qdebug.h>
-#include <telinformationpskeys.h>
-#include <coreapplicationuisdomainpskeys.h>
-#include <apgtask.h>
-#include "phonevisibilityhandler.h"
-#include "cphonepubsubproxy.h"
-#include "phoneconstants.h"
-#include "phoneuiqtviewif.h"
-
-bool m_bringToForegroundCalled;
-bool m_sendToBackgroundCalled;
-bool m_ordinalPositionCalled;
-bool m_phoneVisibleReturnValue;
-
-/*!
- PhoneVisibilityHandler::PhoneVisibilityHandler.
- */
-PhoneVisibilityHandler::PhoneVisibilityHandler(PhoneUIQtViewIF &view, QObject *parent)
- :
- QObject(parent),
- m_view(view),
- m_eikonEnv(0),
- m_carModeEnabled(false),
- m_hideDeviceDialogs(false)
-{
- m_phoneVisibleReturnValue = false;
-}
-
-
-/*!
- PhoneVisibilityHandler::~PhoneVisibilityHandler.
- */
-PhoneVisibilityHandler::~PhoneVisibilityHandler()
-{
-
-}
-
-/*!
- PhoneVisibilityHandler::bringToForeground.
- */
-void PhoneVisibilityHandler::bringToForeground()
-{
- m_bringToForegroundCalled = true;
-}
-
-/*!
- PhoneVisibilityHandler::sendToBackground.
- */
-void PhoneVisibilityHandler::sendToBackground(bool homeScreenForeground)
-{
- m_sendToBackgroundCalled = true;
-}
-
-/*!
- PhoneVisibilityHandler::hideDeviceDialogs.
- */
-void PhoneVisibilityHandler::hideDeviceDialogs(bool hide)
-{
- Q_UNUSED(hide)
-}
-
-/*!
- PhoneVisibilityHandler::ordinalPosition.
- */
-bool PhoneVisibilityHandler::phoneVisible()
-{
- m_ordinalPositionCalled = true;
- return m_phoneVisibleReturnValue;
-}
-
-/*!
- PhoneVisibilityHandler::HandlePropertyChangedL.
- */
-void PhoneVisibilityHandler::HandlePropertyChangedL(const TUid& aCategory,
- const TUint aKey, const TInt aValue)
-{
- Q_UNUSED(aCategory)
- Q_UNUSED(aKey)
- Q_UNUSED(aValue)
-}
-
-/*!
- PhoneVisibilityHandler::adjustVisibility.
- */
-void PhoneVisibilityHandler::adjustVisibility(AdjustAction action)
-{
- Q_UNUSED(action)
-}
-
-/*!
- PhoneVisibilityHandler::carModeChanged.
- */
-void PhoneVisibilityHandler::carModeChanged()
-{
-
-}
-
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -24,7 +24,6 @@
#include <hbmainwindow.h>
#include <phoneappcommands.hrh>
#include <hbmenu.h>
-#include "qtestmains60.h"
#include "phoneuiqtviewadapter.h"
#include "tphonecmdparaminteger.h"
#include "tphonecmdparamaudiooutput.h"
@@ -43,6 +42,7 @@
#include "tphonecmdparamglobalnote.h"
#include "tphonecmdparamstring.h"
#include "phoneindicatorcontroller.h"
+#include "phoneuitestmain.h"
extern int m_phoneButtonFlags;
extern bool m_EPhoneViewMuteRingToneOnAnswer_called;
@@ -76,21 +76,6 @@
extern int m_removeCallHeaderCallId;
extern bool m_isVoiceCall;
-#define PHONE_QT_VIEW_ADAPTER_TEST_MAIN(TestObject) \
-int main(int argc, char *argv[]) \
- { \
- HbApplication app(argc, argv); \
- TestObject tc; \
- QResource::registerResource("../hbcore.rcc"); \
- int ret = QTest::qExec(&tc, argc, argv); \
- /* Core dump if HbIconLoader instance is not destroyed before the application instance. */ \
- /* HbIconLoader uses QCoreApplication::aboutToQuit() signal to destroy itself. */ \
- /* app.exec() where the signal is normally emitted is not called here. */ \
- /* So, invoking the signal explicitly. */ \
- QMetaObject::invokeMethod(&app, "aboutToQuit", Qt::DirectConnection); \
- return ret; \
- }
-
// Own assert initialization
/*void qt_assert(const char *assertion, const char *file, int line)
{
@@ -222,8 +207,6 @@
void testEPhoneViewCreateCallHeaderCommand2 ();
void testEPhoneViewCreateEmergencyCallHeader ();
void testEPhoneViewUpdateBubble ();
- void testEPhoneViewUpdateCallHeaderRemoteInfoData ();
- void testEPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel();
void testCallIdByState ();
void testSetToolbarButtons ();
void testEPhoneViewHideNaviPaneAudioVolume ();
@@ -421,23 +404,6 @@
}
-void TestPhoneUIQtViewAdapter::testEPhoneViewUpdateCallHeaderRemoteInfoData()
-{
- int callId = 3;
- m_adapter->ExecuteCommandL(EPhoneViewUpdateCallHeaderRemoteInfoData, callId);
-
- QCOMPARE(m_updateCallHeaderRemoteInfoCallId, callId);
-
-}
-
-void TestPhoneUIQtViewAdapter::testEPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel ()
-{
- int callId = 3;
- m_adapter->ExecuteCommandL(EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel, callId);
-
- QCOMPARE(m_updateCallHeaderRemoteInfoAndLabelCallId, callId);
-}
-
void TestPhoneUIQtViewAdapter::testCallIdByState ()
{
TPhoneCmdParamCallStateData data;
@@ -1137,5 +1103,5 @@
QVERIFY(m_capturedKey == Qt::Key_0);
}
-PHONE_QT_VIEW_ADAPTER_TEST_MAIN(TestPhoneUIQtViewAdapter)
+PHONE_UITEST_MAIN(TestPhoneUIQtViewAdapter)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phoneuiqtviewadapter/ut_phoneuiqtviewadapter.pro Mon Oct 04 16:06:10 2010 +0300
@@ -16,7 +16,6 @@
#
TEMPLATE = app
-TARGET =
TARGET.UID3 = 0xEFF8FEA2
DEPENDPATH += .
INCLUDEPATH += .
@@ -72,7 +71,7 @@
SOURCES += ../../src/phonemessagecontroller.cpp
HEADERS += ../../inc/phonevisibilityhandler.h
HEADERS += ../../inc/phonecallheadermanager.h
-SOURCES += phonevisibilityhandler_stub.cpp
+SOURCES += ../../../../tsrc/stubs/phoneuiqtviewadapter/phonevisibilityhandler_stub.cpp
HEADERS += phoneindicatorcontroller.h
SOURCES += phoneindicatorcontroller_stub.cpp
SOURCES += phoneuiqtbuttonscontroller_stub.cpp
@@ -88,5 +87,5 @@
SOURCES += unit_tests.cpp
-
+include(../../../../tsrc/common/phoneuitest.pri)
symbian:MMP_RULES += SMPSAFE
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -27,7 +27,9 @@
#include <telinformationpskeys.h>
#include <coreapplicationuisdomainpskeys.h>
#include <ccallinfoiter.h>
+#include <ccallinformation.h>
#include <keyguardaccessapi.h>
+#include <phoneuitestmain.h>
#include "phoneuiqtviewif.h"
#define private public
#include "phonevisibilityhandler.h"
@@ -37,21 +39,12 @@
int g_keyGuardEnabled = false;
int g_enableKeyGuardCalled = false;
int g_disableKeyGuardCalled = false;
+CCallInformation* CCallInformation::NewL() {};
+CCallInfoIter * CCallInfoIter::NewL(class CCallInfos &) {};
-#define PHONE_TEST_MAIN(TestObject) \
-int main(int argc, char *argv[]) \
- { \
- HbApplication app(argc, argv); \
- TestObject tc; \
- QResource::registerResource("../hbcore.rcc"); \
- int ret = QTest::qExec(&tc, argc, argv); \
- /* Core dump if HbIconLoader instance is not destroyed before the application instance. */ \
- /* HbIconLoader uses QCoreApplication::aboutToQuit() signal to destroy itself. */ \
- /* app.exec() where the signal is normally emitted is not called here. */ \
- /* So, invoking the signal explicitly. */ \
- QMetaObject::invokeMethod(&app, "aboutToQuit", Qt::DirectConnection); \
- return ret; \
- }
+CCallInformation::CCallInformation() {}
+CCallInformation::~CCallInformation() {}
+CCallInfoIter& CCallInformation::GetCallsL( ){}
TInt CCallInfoIter::Count() const
{
@@ -183,7 +176,6 @@
void TestPhoneVisibilityHandler::init ()
{
-
}
void TestPhoneVisibilityHandler::cleanup ()
@@ -427,5 +419,5 @@
}
-PHONE_TEST_MAIN(TestPhoneVisibilityHandler)
+PHONE_UITEST_MAIN(TestPhoneVisibilityHandler)
#include "unit_tests.moc"
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/ut_phonevisibilityhandler.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/ut_phonevisibilityhandler.pro Mon Oct 04 16:06:10 2010 +0300
@@ -16,7 +16,6 @@
#
TEMPLATE = app
-TARGET =
TARGET.UID3 = 0xEFF8FFF2
DEPENDPATH += .
INCLUDEPATH += .
@@ -24,7 +23,6 @@
CONFIG += qtestlib
CONFIG += mobility
MOBILITY = publishsubscribe
-
symbian {
INCLUDEPATH += \epoc32\include\platform\mw \
@@ -37,7 +35,8 @@
../../../phoneuiview2/inc \
../../../../inc \
../../../phoneringingtoneplayer/inc \
- ../../../phoneui2/srcdata
+ ../../../phoneui2/srcdata \
+ ../../../../tsrc/common
LIBS += -ltelephonyservice
LIBS += -lapgrfx
@@ -56,6 +55,6 @@
SOURCES += cphonepubsubproxy_stub.cpp
SOURCES += unit_tests.cpp
-
+include(../../../../tsrc/common/phoneuitest.pri)
symbian:MMP_RULES += SMPSAFE
--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_telephonyservice/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_telephonyservice/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -27,7 +27,7 @@
#include "phoneuiqtviewif.h"
#include "phoneuiqtviewadapter.h"
#include "tphonecmdparaminteger.h"
-#include "qtestmains60.h"
+#include "phonetestmain.h"
class TestTelephonyService : public QObject, PhoneUIQtViewIF, MockService
{
@@ -144,5 +144,5 @@
QVERIFY(verify());
}
-QTEST_MAIN_S60(TestTelephonyService)
+PHONE_TEST_MAIN(TestTelephonyService)
#include "unit_tests.moc"
--- a/phoneapp/phoneuistates/inc/cphoneconference.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconference.h Mon Oct 04 16:06:10 2010 +0300
@@ -97,14 +97,10 @@
virtual void MakeStateTransitionToTwoSinglesL();
- void UpdateConferenceSecurityStatusL( TInt aCallId );
+ void UpdateConferenceSecurityStatusL();
private:
-
- void HandleHeldConferenceL( TInt aCallId );
-
- void HandleConnectedConferenceL();
void ToggleHoldL();
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandsingle.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandsingle.h Mon Oct 04 16:06:10 2010 +0300
@@ -86,16 +86,7 @@
virtual void HandleConferenceIdleL();
-
private:
-
- void HandleConnectedConferenceL();
-
- void HandleHeldConferenceL();
-
- void HandleConnectedL( TInt aCallId );
-
- void HandleHeldL( TInt aCallId );
void JoinToConferenceL();
--- a/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonesingleandwaiting.h Mon Oct 04 16:06:10 2010 +0300
@@ -139,16 +139,6 @@
* @param aCallId: the call id of the call
*/
void HandleDisconnectingL( TInt aCallId );
-
- /**
- * Handles received EPhoneCmdUpdateUiControls command.
- */
- void UpdateUiControlsL();
-
- /**
- * Updates call bubble and ui commands
- */
- void UpdateBubbleAndUICommandsL( TInt aCallId );
private: //Data
--- a/phoneapp/phoneuistates/inc/cphonesinglecall.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonesinglecall.h Mon Oct 04 16:06:10 2010 +0300
@@ -86,10 +86,6 @@
*/
IMPORT_C TInt CallId() const;
private:
-
- void HandleHeldL( TInt aCallId );
-
- void HandleConnectedL( TInt aCallId );
void ToggleHoldL();
--- a/phoneapp/phoneuistates/inc/cphonetwosingles.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonetwosingles.h Mon Oct 04 16:06:10 2010 +0300
@@ -89,10 +89,6 @@
private:
void HandleIdleL( TInt aCallId );
-
- void HandleConnectedL( TInt aCallId );
-
- void HandleHeldL( TInt aCallId );
void HandleIncomingL( TInt aCallId );
};
--- a/phoneapp/phoneuistates/inc/cphonetwosinglesandwaiting.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphonetwosinglesandwaiting.h Mon Oct 04 16:06:10 2010 +0300
@@ -106,11 +106,6 @@
*/
void HandleNumberEntryClearedL();
- /**
- * Handles received EPhoneCmdUpdateUiControls command.
- */
- void UpdateUiControlsL();
-
// call id of ringing call
TInt iRingingCallId;
};
--- a/phoneapp/phoneuistates/src/cphonecallsetup.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonecallsetup.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -148,7 +148,6 @@
// should still be able to cancel the MO call before the call is connected.
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneCallSetup::HandleConnectingL()");
BeginUiUpdateLC();
- UpdateRemoteInfoDataL ( aCallId );
TPhoneCmdParamBoolean globalNotifierParam;
globalNotifierParam.SetBoolean( EFalse );
@@ -160,10 +159,9 @@
iViewCommandHandle->ExecuteCommand( EPhoneViewHsToForegroundAfterCall,
&booleanParam );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId);
+ UpdateCallHeaderAndUiCommandsL( aCallId);
SetToolbarButtonLoudspeakerEnabled();
- UpdateUiCommands();
EndUiUpdate();
iStateMachine->ChangeState( EPhoneStateAlerting );
}
--- a/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -138,12 +138,9 @@
if( callStateData.CallId() > KErrNotFound )
{
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
- callStateData.CallId() );
-
BringIncomingToForegroundL();
SetRingingTonePlaybackL( callStateData.CallId() );
- UpdateUiCommands();
+ UpdateCallHeaderAndUiCommandsL( callStateData.CallId() );
SetBackButtonActive(EFalse);
iStateMachine->ChangeState( EPhoneStateIncoming );
}
@@ -162,11 +159,7 @@
void CPhoneCallSetupAndWaiting::HandleConnectedL( TInt aCallId )
{
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneCallSetupAndWaiting::HandleConnectedL() ");
- BeginUiUpdateLC();
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-
- UpdateUiCommands();
- EndUiUpdate();
+ UpdateCallHeaderAndUiCommandsL( aCallId );
iNumberEntryManager->SetVisibilityIfNumberEntryUsedL(ETrue);
iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
}
--- a/phoneapp/phoneuistates/src/cphoneconference.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconference.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -125,15 +125,12 @@
break;
case MEngineMonitor::EPEMessageHeldConference:
- HandleHeldConferenceL( aCallId );
- break;
-
case MEngineMonitor::EPEMessageConnectedConference:
- HandleConnectedConferenceL();
+ UpdateCallHeaderAndUiCommandsL( aCallId );
break;
case MEngineMonitor::EPEMessageAddedConferenceMember:
- UpdateConferenceSecurityStatusL( aCallId );
+ UpdateConferenceSecurityStatusL();
break;
case MEngineMonitor::EPEMessageWentOneToOne:
@@ -143,7 +140,7 @@
case MEngineMonitor::EPEMessageHeld:
case MEngineMonitor::EPEMessageConnected:
{
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
+ UpdateCallHeader( aCallId );
}
break;
@@ -351,32 +348,6 @@
}
// -----------------------------------------------------------
-// CPhoneConference::HandleHeldConferenceL
-// -----------------------------------------------------------
-//
-void CPhoneConference::HandleHeldConferenceL( TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConference::HandleHeldConferenceL()");
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateBubble, aCallId );
- UpdateUiCommands();
- }
-
-// -----------------------------------------------------------
-// CPhoneConference::HandleConnectedConferenceL
-// -----------------------------------------------------------
-//
-void CPhoneConference::HandleConnectedConferenceL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConference::HandleConnectedConferenceL()");
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateBubble, KConferenceCallId );
- UpdateUiCommands();
- }
-
-// -----------------------------------------------------------
// CPhoneConference::DropSelectedParticipantL
// -----------------------------------------------------------
//
@@ -537,11 +508,10 @@
// CPhoneConference::UpdateConferenceSecurityStatusL
// -----------------------------------------------------------
//
-void CPhoneConference::UpdateConferenceSecurityStatusL( TInt aCallId )
+void CPhoneConference::UpdateConferenceSecurityStatusL( )
{
- __PHONELOG1( EBasic, EPhoneUIStates,
- "CPhoneConference::UpdateConferenceSecurityStatusL() - callId = %d", aCallId );
-
+ __LOGMETHODSTARTEND( EPhoneUIStates,
+ "CPhoneConference::UpdateConferenceSecurityStatusL()");
iViewCommandHandle->ExecuteCommandL(
EPhoneViewCipheringInfoChange,
KPEConferenceCallID);
--- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -182,7 +182,6 @@
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandleConnectingL()");
BeginUiUpdateLC();
- UpdateRemoteInfoDataL ( aCallId );
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
TPhoneCmdParamBoolean globalNotifierParam;
@@ -192,9 +191,8 @@
iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-
- UpdateUiCommands();
+ UpdateCallHeaderAndUiCommandsL( aCallId );
+
EndUiUpdate();
}
@@ -205,13 +203,8 @@
void CPhoneConferenceAndCallSetup::HandleConnectedL( TInt aCallId )
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneConferenceAndCallSetup::HandleConnectedL()");
- BeginUiUpdateLC();
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-
+ UpdateCallHeaderAndUiCommandsL( aCallId );
iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();
- UpdateUiCommands();
- EndUiUpdate();
iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
}
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -103,19 +103,10 @@
switch ( aMessage )
{
case MEngineMonitor::EPEMessageConnectedConference:
- HandleConnectedConferenceL();
- break;
-
case MEngineMonitor::EPEMessageHeldConference:
- HandleHeldConferenceL();
- break;
-
+ case MEngineMonitor::EPEMessageHeld:
case MEngineMonitor::EPEMessageConnected:
- HandleConnectedL( aCallId );
- break;
-
- case MEngineMonitor::EPEMessageHeld:
- HandleHeldL( aCallId );
+ UpdateCallHeaderAndUiCommandsL( aCallId );
break;
case MEngineMonitor::EPEMessageInValidEmergencyNumber:
@@ -173,70 +164,15 @@
}
// -----------------------------------------------------------
-// CPhoneConferenceAndSingle::HandleConnectedConferenceL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndSingle::HandleConnectedConferenceL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneConferenceAndSingle::HandleConnectedConferenceL");
- BeginUiUpdateLC();
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateBubble,
- KConferenceCallId );
- UpdateUiCommands();
- EndUiUpdate();
- }
-
-// -----------------------------------------------------------
-// CPhoneConferenceAndSingle::HandleHeldConferenceL
-//
-// one of the calls is on hold all the time, conference or single call
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndSingle::HandleHeldConferenceL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleHeldConferenceL");
- BeginUiUpdateLC();
-
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateBubble, KConferenceCallId );
- UpdateUiCommands();
- EndUiUpdate();
- }
-
-// -----------------------------------------------------------
-// CPhoneConferenceAndSingle::HandleConnectedL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndSingle::HandleConnectedL( TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleConnectedL");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
- UpdateUiCommands();
- }
-
-// -----------------------------------------------------------
-// CPhoneConferenceAndSingle::HandleHeldL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndSingle::HandleHeldL( TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleHeldL");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
- UpdateUiCommands();
- }
-
-// -----------------------------------------------------------
// CPhoneConferenceAndSingle::HandleAddedConferenceMemberL
// -----------------------------------------------------------
//
-void CPhoneConferenceAndSingle::HandleAddedConferenceMemberL( TInt aCallId )
+void CPhoneConferenceAndSingle::HandleAddedConferenceMemberL( TInt /*aCallId*/ )
{
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleAddedConferenceMemberL");
BeginUiUpdateLC();
iViewCommandHandle->ExecuteCommandL( EPhoneViewAddToConference );
- UpdateConferenceSecurityStatusL( aCallId );
+ UpdateConferenceSecurityStatusL();
UpdateUiCommands();
EndUiUpdate();
iStateMachine->ChangeState( EPhoneStateConference );
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -174,11 +174,11 @@
// CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL
// -----------------------------------------------------------
//
-void CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL( TInt aCallId )
+void CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL( TInt /*aCallId*/ )
{
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL");
iViewCommandHandle->ExecuteCommandL( EPhoneViewAddToConference );
- UpdateConferenceSecurityStatusL( aCallId );
+ UpdateConferenceSecurityStatusL();
MakeStateTransitionToConferenceAndWaitingL( KConferenceCallId );
}
@@ -272,11 +272,8 @@
&callStateData );
if ( callStateData.CallId() != KErrNotFound )
{
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
- callStateData.CallId() );
-
+ UpdateCallHeaderAndUiCommandsL( callStateData.CallId() );
SetRingingTonePlaybackL( callStateData.CallId() );
- UpdateUiCommands();
SetBackButtonActive(EFalse);
iStateMachine->ChangeState( EPhoneStateIncoming );
}
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -206,7 +206,7 @@
else
{
// member of conference call which is on hold
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
+ UpdateCallHeader( aCallId );
}
}
@@ -217,15 +217,9 @@
void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId )
{
__LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()");
+ UpdateCallHeaderAndUiCommandsL( aCallId );
+ iNumberEntryManager->SetVisibilityIfNumberEntryUsedL( ETrue );
- BeginUiUpdateLC();
- UpdateRemoteInfoDataL ( aCallId );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-
- iNumberEntryManager->SetVisibilityIfNumberEntryUsedL( ETrue );
- UpdateUiCommands();
- EndUiUpdate();
iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
}
@@ -290,8 +284,7 @@
case ENoActiveCalls: // Go to incoming state
{
BringIncomingToForegroundL();
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
- iRingingCallId );
+ UpdateCallHeaderAndUiCommandsL( iRingingCallId );
if ( iNumberEntryManager->IsNumberEntryVisibleL() )
{
@@ -299,7 +292,6 @@
}
SetRingingTonePlaybackL( iRingingCallId );
- UpdateUiCommands();
SetBackButtonActive(EFalse);
iStateMachine->ChangeState( EPhoneStateIncoming );
}
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -182,7 +182,6 @@
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConferenceAndWaitingAndCallSetup::HandleConnectingL");
BeginUiUpdateLC();
- UpdateRemoteInfoDataL ( aCallId );
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
TPhoneCmdParamBoolean globalNotifierParam;
@@ -190,11 +189,9 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
+ UpdateCallHeaderAndUiCommandsL( aCallId );
iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();
-
- UpdateUiCommands();
EndUiUpdate();
}
@@ -207,9 +204,8 @@
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneConferenceAndWaitingAndCallSetup::HandleConnectedL");
BeginUiUpdateLC();
- UpdateRemoteInfoDataL ( aCallId );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
+
+ UpdateCallHeader( aCallId );
iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();
--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -325,10 +325,11 @@
iViewCommandHandle->ExecuteCommandL(
EPhoneViewCreateEmergencyCallHeader,
aCallId );
-
+
SetBackButtonActive(EFalse);
+
+ UpdateSetupCbaL();
EndUiUpdate();
- UpdateSetupCbaL();
}
}
// -----------------------------------------------------------
@@ -343,18 +344,12 @@
globalNotifierParam.SetBoolean( EFalse );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
- &globalNotifierParam );
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
- // Notify the view
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateBubble,
- aCallId );
+ UpdateCallHeaderAndUiCommandsL( aCallId );
SetToolbarButtonLoudspeakerEnabled();
- UpdateUiCommands();
}
// -----------------------------------------------------------
@@ -364,13 +359,8 @@
void CPhoneEmergency::HandleConnectedL( TInt aCallId )
{
__LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleConnectedL() ");
- BeginUiUpdateLC();
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateBubble,
- aCallId );
+ UpdateCallHeaderAndUiCommandsL( aCallId );
SetBackButtonActive(ETrue);
- UpdateUiCommands();
- EndUiUpdate();
}
// --------------------------------------------------------------
--- a/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -118,7 +118,7 @@
&globalNotifierParam );
TPhoneCmdParamGlobalNote globalNoteParam;
- PhoneNotificationType type = aNotificationDialog ?
+ TPhoneNotificationType type = aNotificationDialog ?
EPhoneNotificationDialog : EPhoneMessageBoxInformation;
globalNoteParam.SetType( type );
globalNoteParam.SetNotificationDialog( aNotificationDialog );
@@ -140,6 +140,7 @@
CPhoneMainResourceResolver::Instance()->
ResolveResourceID( aResourceId ) );
}
+ globalNoteParam.SetToneType( EPhoneInformationTone );
iViewCommandHandle->ExecuteCommandL(
EPhoneViewShowGlobalNote, &globalNoteParam );
@@ -162,7 +163,7 @@
&globalNotifierParam );
TPhoneCmdParamGlobalNote globalNoteParam;
- PhoneNotificationType type = aNotificationDialog ?
+ TPhoneNotificationType type = aNotificationDialog ?
EPhoneNotificationDialog : EPhoneMessageBoxInformation;
globalNoteParam.SetType( type );
globalNoteParam.SetNotificationDialog( aNotificationDialog );
@@ -184,6 +185,7 @@
CPhoneMainResourceResolver::Instance()->
ResolveResourceID( aResourceId ) );
}
+ globalNoteParam.SetToneType( EPhoneErrorTone );
iViewCommandHandle->ExecuteCommandL(
EPhoneViewShowGlobalNote, &globalNoteParam );
@@ -206,7 +208,7 @@
&globalNotifierParam );
TPhoneCmdParamGlobalNote globalNoteParam;
- PhoneNotificationType type = aNotificationDialog ?
+ TPhoneNotificationType type = aNotificationDialog ?
EPhoneNotificationDialog : EPhoneMessageBoxInformation;
globalNoteParam.SetType( type );
globalNoteParam.SetNotificationDialog( aNotificationDialog );
@@ -228,6 +230,7 @@
CPhoneMainResourceResolver::Instance()->
ResolveResourceID( aResourceId ) );
}
+ globalNoteParam.SetToneType( EPhoneWarningTone );
iViewCommandHandle->ExecuteCommandL(
EPhoneViewShowGlobalNote, &globalNoteParam );
}
@@ -435,7 +438,7 @@
}
else if ( IsVoiceCall( aErrorInfo.iCallId ))
{
- SendGlobalWarningNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls, ETrue );
+ SendGlobalWarningNoteL( EPhoneNoteCallInfoCauseValue21, ETrue );
}
}
break;
@@ -785,9 +788,16 @@
case KErrGsmCCCallRejected:
if ( !iStateMachine->PhoneEngineInfo()->IsOutgoingCallBarringActivated() )
{
- aResourceId = EPhoneNoteCalledNumberHasBarredIncomingCalls;
+ if ( IsVideoCall( callId ) )
+ {
+ aResourceId = EPhoneNoteCalledNumberHasBarredIncomingCalls;
+ aNotification = EFalse;
+ }
+ else
+ {
+ aResourceId = EPhoneNoteCallInfoCauseValue21;
+ }
aCauseCode = 21;
- aNotification = (EFalse == IsVideoCall( callId ));
}
break;
--- a/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -173,7 +173,7 @@
&globalNotifierParam );
TPhoneCmdParamGlobalNote globalNoteParam;
- PhoneNotificationType type = aNotificationDialog ?
+ TPhoneNotificationType type = aNotificationDialog ?
EPhoneNotificationDialog : EPhoneMessageBoxInformation;
globalNoteParam.SetType( type );
@@ -181,7 +181,7 @@
CPhoneMainResourceResolver::Instance()->
ResolveResourceID( aResourceId ) );
globalNoteParam.SetNotificationDialog( aNotificationDialog );
-
+ globalNoteParam.SetToneType( EPhoneInformationTone );
iViewCommandHandle.ExecuteCommandL(
EPhoneViewShowGlobalNote, &globalNoteParam );
}
@@ -202,14 +202,14 @@
&globalNotifierParam );
TPhoneCmdParamGlobalNote globalNoteParam;
- PhoneNotificationType type = aNotificationDialog ?
+ TPhoneNotificationType type = aNotificationDialog ?
EPhoneNotificationDialog : EPhoneMessageBoxInformation;
globalNoteParam.SetType( type );
globalNoteParam.SetTextResourceId(
CPhoneMainResourceResolver::Instance()->
ResolveResourceID( aResourceId ) );
globalNoteParam.SetNotificationDialog( aNotificationDialog );
-
+ globalNoteParam.SetToneType( EPhoneErrorTone );
iViewCommandHandle.ExecuteCommandL(
EPhoneViewShowGlobalNote, &globalNoteParam );
--- a/phoneapp/phoneuistates/src/cphonegsmincall.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonegsmincall.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -255,10 +255,7 @@
TPhoneCmdParamBoolean globalNotifierParam;
globalNotifierParam.SetBoolean( ETrue );
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
- &globalNotifierParam );
- iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
- &globalNotifierParam );
-
+ &globalNotifierParam );
}
--- a/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandalerting.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -180,18 +180,12 @@
if( callStateData.CallId() == aCallId )
{
- BeginUiUpdateLC();
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-
- UpdateUiCommands();
- EndUiUpdate();
-
+ UpdateCallHeaderAndUiCommandsL( aCallId );
iStateMachine->ChangeState( EPhoneStateTwoSingles );
}
else
{
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
+ UpdateCallHeader( aCallId );
}
}
// -----------------------------------------------------------
--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -206,8 +206,6 @@
BeginUiUpdateLC();
- UpdateRemoteInfoDataL ( aCallId );
-
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
// Re-enable global notes
@@ -218,8 +216,7 @@
iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
- UpdateUiCommands();
+ UpdateCallHeaderAndUiCommandsL( aCallId );
EndUiUpdate();
// Go to alerting state
@@ -233,24 +230,15 @@
void CPhoneSingleAndCallSetup::HandleConnectedL( TInt aCallId )
{
__LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleAndCallSetup::HandleConnectedL()");
-
- BeginUiUpdateLC();
-
- // Show bubble
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-
+ "CPhoneSingleAndCallSetup::HandleConnectedL()");
// Remove the number entry if it isn't DTMF dialer
if ( !iNumberEntryManager->IsNumberEntryVisibleL() )
{
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
}
- UpdateUiCommands();
+ UpdateCallHeaderAndUiCommandsL( aCallId );
- EndUiUpdate();
-
- // Go to two singles state
iStateMachine->ChangeState( EPhoneStateTwoSingles );
}
--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -317,14 +317,7 @@
iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
&globalNotifierParam );
- BeginUiUpdateLC();
- UpdateRemoteInfoDataL( aCallId );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateBubble,
- aCallId );
-
- UpdateUiCommands();
- EndUiUpdate();
+ UpdateCallHeaderAndUiCommandsL( aCallId );
}
// -----------------------------------------------------------
@@ -336,7 +329,7 @@
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndCallSetupAndWaiting::HandleConnectedL()");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
+ UpdateCallHeader( aCallId );
iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();
--- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -126,7 +126,7 @@
break;
case MEngineMonitor::EPEMessageHeld:
- UpdateBubbleAndUICommandsL( aCallId );
+ UpdateCallHeaderAndUiCommandsL( aCallId );
break;
case MEngineMonitor::EPEMessageConnected:
@@ -197,7 +197,7 @@
break;
case EPhoneCmdUpdateUiControls:
- UpdateUiControlsL();
+ UpdateUiCommands();
break;
default:
@@ -299,8 +299,7 @@
// Display ringing bubble
if ( callStateData.CallId() > KErrNotFound )
{
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
- callStateData.CallId() );
+ UpdateCallHeaderAndUiCommandsL( callStateData.CallId() );
if ( iNumberEntryManager->IsNumberEntryVisibleL() )
{
@@ -308,7 +307,6 @@
}
SetRingingTonePlaybackL( callStateData.CallId() );
- UpdateUiCommands();
BringIncomingToForegroundL();
}
SetBackButtonActive(EFalse);
@@ -350,7 +348,7 @@
{
// Connected message came for the hold call, we still
// have the waiting call also
- UpdateBubbleAndUICommandsL( aCallId );
+ UpdateCallHeaderAndUiCommandsL( aCallId );
}
else
{
@@ -367,9 +365,7 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndWaiting::HandleUnholdL() ");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-
- UpdateUiCommands();
+ UpdateCallHeaderAndUiCommandsL( aCallId );
}
// -----------------------------------------------------------
@@ -380,20 +376,13 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() ");
+ UpdateCallHeaderAndUiCommandsL( aCallId );
- BeginUiUpdateLC();
-
- UpdateRemoteInfoDataL ( aCallId );
-
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-
if ( iNumberEntryManager->IsNumberEntryUsedL() )
{
iNumberEntryManager->SetNumberEntryVisibilityL(ETrue);
}
- UpdateUiCommands();
- EndUiUpdate();
iStateMachine->ChangeState( EPhoneStateTwoSingles );
}
@@ -438,28 +427,4 @@
__LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::HandleDisconnectingL( ) ");
}
-// -----------------------------------------------------------
-// CPhoneSingleAndWaiting::UpdateUiControlsL
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::UpdateUiControlsL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::UpdateUiControlsL( ) ");
- UpdateUiCommands();
- }
-
-// -----------------------------------------------------------
-// Updates bubble and ui commands
-// -----------------------------------------------------------
-//
-void CPhoneSingleAndWaiting::UpdateBubbleAndUICommandsL(
- TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleAndWaiting::UpdateBubbleAndUICommandsL() ");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-
- UpdateUiCommands();
- }
-
// End of File
--- a/phoneapp/phoneuistates/src/cphonesinglecall.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesinglecall.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -194,11 +194,8 @@
switch ( aMessage )
{
case MEngineMonitor::EPEMessageHeld:
- HandleHeldL( aCallId );
- break;
-
case MEngineMonitor::EPEMessageConnected:
- HandleConnectedL( aCallId );
+ UpdateCallHeaderAndUiCommandsL( aCallId );
break;
case MEngineMonitor::EPEMessageIncoming:
@@ -280,33 +277,6 @@
}
// -----------------------------------------------------------
-// CPhoneSingleCall::HandleHeldL
-// -----------------------------------------------------------
-//
-void CPhoneSingleCall::HandleHeldL( TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleCall::HandleHeldL()");
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewUpdateBubble, aCallId );
-
- UpdateUiCommands();
- }
-
-// -----------------------------------------------------------
-// CPhoneSingleCall::HandleConnectedL
-// -----------------------------------------------------------
-//
-void CPhoneSingleCall::HandleConnectedL( TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneSingleCall::HandleConnectedL()");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-
- UpdateUiCommands();
- }
-
-// -----------------------------------------------------------
// CPhoneSingleCall::ToggleHold
// -----------------------------------------------------------
//
--- a/phoneapp/phoneuistates/src/cphonetwosingles.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonetwosingles.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -117,11 +117,8 @@
break;
case MEngineMonitor::EPEMessageConnected:
- HandleConnectedL( aCallId );
- break;
-
case MEngineMonitor::EPEMessageHeld:
- HandleHeldL( aCallId );
+ UpdateCallHeaderAndUiCommandsL( aCallId );
break;
case MEngineMonitor::EPEMessageConnectedConference:
@@ -201,30 +198,6 @@
}
// -----------------------------------------------------------
-// CPhoneTwoSingles::HandleConnectedL
-// -----------------------------------------------------------
-//
-void CPhoneTwoSingles::HandleConnectedL( TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneTwoSingles::HandleConnectedL()");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
- UpdateUiCommands();
- }
-
-// -----------------------------------------------------------
-// CPhoneTwoSingles::HandleHeldL
-// -----------------------------------------------------------
-//
-void CPhoneTwoSingles::HandleHeldL( TInt aCallId )
- {
- __LOGMETHODSTARTEND( EPhoneUIStates,
- "CPhoneTwoSingles::HandleHeldL()");
- iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
- UpdateUiCommands();
- }
-
-// -----------------------------------------------------------
// CPhoneTwoSingles::HandleNumberEntryClearedL()
// -----------------------------------------------------------
//
--- a/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -267,7 +267,7 @@
switch( aCommand )
{
case EPhoneCmdUpdateUiControls:
- UpdateUiControlsL();
+ UpdateUiCommands();
break;
default:
@@ -278,14 +278,5 @@
return commandStatus;
}
-// -----------------------------------------------------------
-// CPhoneTwoSinglesAndWaiting::UpdateUiControlsL
-// -----------------------------------------------------------
-//
-void CPhoneTwoSinglesAndWaiting::UpdateUiControlsL()
- {
- __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::UpdateUiControlsL( ) ");
- UpdateUiCommands();
- }
// End of File
--- a/phoneapp/phoneuistates/tsrc/common/cphonestateidlestub.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/common/cphonestateidlestub.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -81,16 +81,6 @@
}
-void CPhoneStateIdle::HandlePhoneForegroundEventL()
- {
-
- }
-
-void CPhoneStateIdle::HandleIdleForegroundEventL()
- {
-
- }
-
void CPhoneStateIdle::DialL( const TDesC& /*aNumber*/,
TPhoneNumberType /*aNumberType*/, TDialInitiationMethod /*aDialMethod*/ )
{
--- a/phoneapp/phoneuistates/tsrc/common/cphonestatestartupstub.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/common/cphonestatestartupstub.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -59,11 +59,6 @@
}
-void CPhoneStateStartup::HandleIdleForegroundEventL()
- {
-
- }
-
void CPhoneStateStartup::HandlePhoneStartupL()
{
--- a/phoneapp/phoneuistates/tsrc/common/cphonestatestub.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/common/cphonestatestub.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -199,15 +199,6 @@
{
}
-
-// -----------------------------------------------------------------------------
-// CPhoneState::HandleRemoteBusyL
-// -----------------------------------------------------------------------------
-//
-void CPhoneState::HandleRemoteBusyL( TInt /*aCallId*/ )
- {
-
- }
// -----------------------------------------------------------
// CPhoneState::HandleDisconnectingL
@@ -332,14 +323,6 @@
{
}
-// -----------------------------------------------------------
-// CPhoneState::ChangeAudioVolumeL()
-// -----------------------------------------------------------
-//
-void CPhoneState::ChangeAudioVolumeL( TInt /*aLevel*/, TBool /*aUpdateControl*/ )
- {
- }
-
// <-------------------------- COMMON STATE FUNCTIONS ------------------------>
// -----------------------------------------------------------
@@ -387,13 +370,20 @@
// -----------------------------------------------------------
-// CPhoneState::UpdateRemoteInfoDataL
+// CPhoneState::UpdateCallHeader
// -----------------------------------------------------------
//
-void CPhoneState::UpdateRemoteInfoDataL( TInt /*aCallId*/ )
+void CPhoneState::UpdateCallHeader( TInt /*aCallId*/ )
{
}
+// -----------------------------------------------------------
+// CPhoneState::UpdateCallHeaderAndUiCommandsL
+// -----------------------------------------------------------
+//
+void CPhoneState::UpdateCallHeaderAndUiCommandsL( TInt /*aCallId*/ )
+ {
+ }
// -----------------------------------------------------------
// CPhoneState::ShowNoteL
@@ -473,15 +463,6 @@
}
// ---------------------------------------------------------
-// CPhoneState::GetActiveCallIdL()
-// ---------------------------------------------------------
-//
-TInt CPhoneState::GetActiveCallIdL()
- {
-
- }
-
-// ---------------------------------------------------------
// CPhoneState::IsVideoCall()
// ---------------------------------------------------------
//
@@ -621,15 +602,6 @@
{
}
-// -----------------------------------------------------------
-// CPhoneState::GetVolumeLevel
-// -----------------------------------------------------------
-//
-TInt CPhoneState::GetVolumeLevel()
- {
- }
-
-
// -----------------------------------------------------------------------------
// CPhoneState::SimSecurityStatus
// -----------------------------------------------------------------------------
--- a/phoneapp/phoneuistates/tsrc/ut_cphconfandwaitingandcallsetup/Src/ut_cphconfandwaitingandcallsetup.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphconfandwaitingandcallsetup/Src/ut_cphconfandwaitingandcallsetup.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -131,10 +131,8 @@
TInt callId(2);
TPhoneCmdParamCallHeaderData callHeaderParam;
callHeaderParam.SetCallState( EPEStateConnected );
- iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TInt> (
- EPhoneViewUpdateBubble,
- callId );
+ iMockContext->ExpectCallL( "CPhoneState::UpdateCallHeader" ).
+ WithL<TInt> ( callId );
iStateConferenceAndCallSetupAndWaiting->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnected, callId );
EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneconference/Src/ut_cphoneconference.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconference/Src/ut_cphoneconference.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -100,11 +100,12 @@
//
void ut_cphoneconference::T_HandleConnectedL( )
{
-
+ iMockContext->Reset();
+ iMockContext->ExpectCallL( "CPhoneState::UpdateCallHeader" ).
+ WithL<TInt> ( 2 );
iStateConference->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnected, 2 );
- iViewCommandHandle->VerifyViewCommand( EPhoneViewUpdateBubble );
-
+ EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
}
// -----------------------------------------------------------------------------
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneconference/group/ut_cphoneconference.mmp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconference/group/ut_cphoneconference.mmp Mon Oct 04 16:06:10 2010 +0300
@@ -30,12 +30,14 @@
SOURCE cphonestatemachinestub.cpp
SOURCE cphonestateincallstub.cpp
SOURCE cphonegsmincallstub.cpp
-SOURCE cphonestatestub.cpp
SOURCE stubs.cpp
SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol
SOURCE mock_cphonenumberentrymanager.cpp
+SOURCEPATH ../../../../internal/mocks/phoneuicontrol
+SOURCE mock_cphonestate.cpp
+
SOURCEPATH ../../../../internal/mocks/phoneuiutils
SOURCE mock_tphonetouchbuttonconfig.cpp
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandcallsetup/Src/ut_cphoneconferenceandcallsetup.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandcallsetup/Src/ut_cphoneconferenceandcallsetup.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -99,10 +99,12 @@
//
void ut_cphoneconferenceandcallsetup::T_HandleConnectedL( )
{
+ iMockContext->Reset();
+ iMockContext->ExpectCallL( "CPhoneState::UpdateCallHeaderAndUiCommandsL" ).
+ WithL<TInt> ( 2 );
iStateConferenceAndCallSetup->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnected, 2 );
- iViewCommandHandle->VerifyViewCommand( EPhoneViewUpdateBubble );
-
+ EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
}
// -----------------------------------------------------------------------------
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandcallsetup/group/ut_cphoneconferenceandcallsetup.mmp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandcallsetup/group/ut_cphoneconferenceandcallsetup.mmp Mon Oct 04 16:06:10 2010 +0300
@@ -30,12 +30,14 @@
SOURCE cphonestatemachinestub.cpp
SOURCE cphonestateincallstub.cpp
SOURCE cphonegsmincallstub.cpp
-SOURCE cphonestatestub.cpp
SOURCE stubs.cpp
SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol
SOURCE mock_cphonenumberentrymanager.cpp
+SOURCEPATH ../../../../internal/mocks/phoneuicontrol
+SOURCE mock_cphonestate.cpp
+
SOURCEPATH ../../../../internal/mocks/phoneuiutils
SOURCE mock_tphonetouchbuttonconfig.cpp
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingle/Src/ut_cphoneconferenceandsingle.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingle/Src/ut_cphoneconferenceandsingle.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -97,10 +97,12 @@
//
void ut_cphoneconferenceandsingle::T_HandleConnectedL( )
{
+ iMockContext->Reset();
+ iMockContext->ExpectCallL( "CPhoneState::UpdateCallHeaderAndUiCommandsL" ).
+ WithL<TInt> ( 2 );
iStateConferenceAndSingle->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnected, 2 );
- iViewCommandHandle->VerifyViewCommand( EPhoneViewUpdateBubble );
-
+ EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
}
// -----------------------------------------------------------------------------
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingle/group/ut_cphoneconferenceandsingle.mmp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingle/group/ut_cphoneconferenceandsingle.mmp Mon Oct 04 16:06:10 2010 +0300
@@ -30,12 +30,14 @@
SOURCE cphonestatemachinestub.cpp
SOURCE cphonestateincallstub.cpp
SOURCE cphonegsmincallstub.cpp
-SOURCE cphonestatestub.cpp
SOURCE stubs.cpp
SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol
SOURCE mock_cphonenumberentrymanager.cpp
+SOURCEPATH ../../../../internal/mocks/phoneuicontrol
+SOURCE mock_cphonestate.cpp
+
SOURCEPATH ../../../../internal/mocks/phoneuiutils
SOURCE mock_tphonetouchbuttonconfig.cpp
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingleandwaiting/Src/ut_cphoneconferenceandsingleandwaiting.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingleandwaiting/Src/ut_cphoneconferenceandsingleandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -96,11 +96,12 @@
//
void ut_cphoneconferenceandsingleandwaiting::T_HandleConnectedL( )
{
-
+ iMockContext->Reset();
+ iMockContext->ExpectCallL( "CPhoneState::UpdateCallHeaderAndUiCommandsL" ).
+ WithL<TInt> ( 2 );
iStateConferenceAndSingleAndWaiting->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnected, 2 );
- iViewCommandHandle->VerifyViewCommand( EPhoneViewUpdateBubble );
-
+ EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
}
// -----------------------------------------------------------------------------
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingleandwaiting/group/ut_cphoneconferenceandsingleandwaiting.mmp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandsingleandwaiting/group/ut_cphoneconferenceandsingleandwaiting.mmp Mon Oct 04 16:06:10 2010 +0300
@@ -30,12 +30,14 @@
SOURCE cphonestatemachinestub.cpp
SOURCE cphonestateincallstub.cpp
SOURCE cphonegsmincallstub.cpp
-SOURCE cphonestatestub.cpp
SOURCE stubs.cpp
SOURCEPATH ../../../../../internal/mocks/phoneapp/phoneuicontrol
SOURCE mock_cphonenumberentrymanager.cpp
+SOURCEPATH ../../../../internal/mocks/phoneuicontrol
+SOURCE mock_cphonestate.cpp
+
SOURCEPATH ../../../../internal/mocks/phoneuiutils
SOURCE mock_tphonetouchbuttonconfig.cpp
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/Src/ut_cphoneconferenceandwaiting.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneconferenceandwaiting/Src/ut_cphoneconferenceandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -155,8 +155,8 @@
//
void ut_cphoneconferenceandwaiting::T_HandleConnected_1L( )
{
- iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TInt> ( EPhoneViewUpdateBubble, 2 );
+ iMockContext->ExpectCallL( "CPhoneState::UpdateCallHeaderAndUiCommandsL" ).
+ WithL<TInt> ( 2 );
iMockContext->ExpectCallL( "CPhoneStateMachine::ChangeState" ).
WithL<TInt> ( EPhoneStateConferenceAndSingle );
@@ -173,8 +173,8 @@
//
void ut_cphoneconferenceandwaiting::T_HandleConnected_2L( )
{
- iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TInt> ( EPhoneViewUpdateBubble, 0 );
+ iMockContext->ExpectCallL( "CPhoneState::UpdateCallHeader" ).
+ WithL<TInt> ( 0 );
iStateConferenceAndWaiting->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnected, 0 );
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneemergency/Src/ut_cphoneemergency.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneemergency/Src/ut_cphoneemergency.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -191,12 +191,10 @@
globalNotifierParam.SetBoolean( EFalse );
iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
WithL<TPhoneViewCommandId, TPhoneCommandParam&> ( EPhoneViewSetGlobalNotifiersDisabled, globalNotifierParam );
- iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TPhoneCommandParam&> ( EPhoneViewSetEikonNotifiersDisabled, globalNotifierParam );
TInt callID(0);
- iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TInt> ( EPhoneViewUpdateBubble, callID );
+ iMockContext->ExpectCallL( "CPhoneState::UpdateCallHeaderAndUiCommandsL" ).
+ WithL<TInt> ( callID );
iStateEmergency->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnecting, 0 );
EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
@@ -233,8 +231,8 @@
{
TInt callID(0);
- iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TInt> ( EPhoneViewUpdateBubble, callID );
+ iMockContext->ExpectCallL( "CPhoneState::UpdateCallHeaderAndUiCommandsL" ).
+ WithL<TInt> ( callID );
//first callsetup runs connecting before connected
iStateEmergency->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnected, 0 );
@@ -307,16 +305,13 @@
globalNotifierParam.SetBoolean( EFalse );
iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
WithL<TPhoneViewCommandId, TPhoneCommandParam&> ( EPhoneViewSetGlobalNotifiersDisabled, globalNotifierParam );
- iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TPhoneCommandParam&> ( EPhoneViewSetEikonNotifiersDisabled, globalNotifierParam );
- iMockContext->ExpectCallL( "CPhoneViewCommandHandleMock::ExecuteCommandL" ).
- WithL<TPhoneViewCommandId, TInt> ( EPhoneViewUpdateBubble, 0 );
+ iMockContext->ExpectCallL( "CPhoneState::UpdateCallHeaderAndUiCommandsL" ).
+ WithL<TInt> ( 0 );
iMockContext->ExpectCallL( "CPhoneState::SetToolbarButtonLoudspeakerEnabled" ).
TimesL(1);
- iMockContext->ExpectCallL( "CPhoneState::UpdateUiCommands" );
//first callsetup runs connecting before connected
iStateEmergency->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnected, 0 );
--- a/phoneapp/phoneuistates/tsrc/ut_cphoneerrormessageshandler/Src/ut_cphoneerrormessageshandler.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphoneerrormessageshandler/Src/ut_cphoneerrormessageshandler.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -299,7 +299,7 @@
EUNIT_PRINT( _L( "CS Voice call and ECCPErrorCCCallRejected" ) );
iMockContext->InitializeL();
- VerifyNote( EPECallTypeCSVoice, ECCPErrorCCCallRejected, EPhoneNoteCalledNumberHasBarredIncomingCalls);
+ VerifyNote( EPECallTypeCSVoice, ECCPErrorCCCallRejected, EPhoneNoteCallInfoCauseValue21);
iMockContext->Reset();
EUNIT_PRINT( _L( "Video call and ECCPErrorNoAnswerForVideo" ) );
--- a/phoneapp/phoneuistates/tsrc/ut_cphonesingleandwaiting/Src/ut_cphonesingleandwaiting.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphonesingleandwaiting/Src/ut_cphonesingleandwaiting.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -166,9 +166,7 @@
void ut_cphonesingleandwaiting::TestBubbleAndUICommandsAreUpdatedWhenCallIsPutToHoldL()
{
TInt callId( 1 );
- iMockContext->ExpectCallL("CPhoneState::UpdateUiCommands");
- iMockContext->ExpectCallL("CPhoneViewCommandHandleMock::ExecuteCommandL").
- WithL<TPhoneViewCommandId,TInt>(EPhoneViewUpdateBubble, callId);
+ iMockContext->ExpectCallL("CPhoneState::UpdateCallHeaderAndUiCommandsL");
iState->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageHeld, callId );
EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
@@ -177,9 +175,7 @@
void ut_cphonesingleandwaiting::TestBubbleAndUICommandsAreUpdatedWhenCallIsResumedL()
{
TInt callId( 0 );
- iMockContext->ExpectCallL("CPhoneState::UpdateUiCommands");
- iMockContext->ExpectCallL("CPhoneViewCommandHandleMock::ExecuteCommandL").
- WithL<TPhoneViewCommandId,TInt>(EPhoneViewUpdateBubble, callId);
+ iMockContext->ExpectCallL("CPhoneState::UpdateCallHeaderAndUiCommandsL");
iState->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnected, callId );
EUNIT_ASSERT_EQUALS( KErrNone, iMockContext->VerifyExpectations() );
--- a/phoneapp/phoneuistates/tsrc/ut_cphonesinglecall/Src/ut_cphonesinglecall.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/tsrc/ut_cphonesinglecall/Src/ut_cphonesinglecall.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -127,9 +127,8 @@
void ut_cphonesinglecall::T_HandleConnectedL( )
{
const TInt callId( 0 );
- iMockContext->ExpectCallL("CPhoneState::UpdateUiCommands");
- iMockContext->ExpectCallL("CPhoneViewCommandHandleMock::ExecuteCommandL").
- WithL<TPhoneViewCommandId, TInt>(EPhoneViewUpdateBubble, callId);
+ iMockContext->ExpectCallL("CPhoneState::UpdateCallHeaderAndUiCommandsL").
+ WithL<TInt>(callId);
iStateSingleCall->HandlePhoneEngineMessageL( MEngineMonitor::EPEMessageConnected, callId );
--- a/phoneapp/phoneuiutils/bwins/phoneuiutilsu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiutils/bwins/phoneuiutilsu.def Mon Oct 04 16:06:10 2010 +0300
@@ -1,298 +1,300 @@
EXPORTS
?DynMenu@TPhoneCmdParamDynMenu@@QAEPAXXZ @ 1 NONAME ; void * TPhoneCmdParamDynMenu::DynMenu(void)
- ?SetParticipantListCLI@TPhoneCmdParamCallHeaderData@@QAEXW4TPhoneParticipantListCLI@1@@Z @ 2 NONAME ; void TPhoneCmdParamCallHeaderData::SetParticipantListCLI(enum TPhoneCmdParamCallHeaderData::TPhoneParticipantListCLI)
- ?ContactLink@TPhoneCmdParamCallHeaderData@@QBEABVTDesC8@@XZ @ 3 NONAME ; class TDesC8 const & TPhoneCmdParamCallHeaderData::ContactLink(void) const
- ?LogIt@CPhoneLogger@@QAAXW4TPhoneUILoggingLevel@@W4TPhoneUILoggingComponent@@V?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 4 NONAME ; void CPhoneLogger::LogIt(enum TPhoneUILoggingLevel, enum TPhoneUILoggingComponent, class TRefByValue<class TDesC16 const >, ...)
- ?IsEscapeKey@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 5 NONAME ; int CPhoneKeys::IsEscapeKey(struct TKeyEvent const &, enum TEventCode)
- ?Tone@TPhoneCmdParamNote@@QBE?AW4TTone@CAknNoteDialog@@XZ @ 6 NONAME ; enum CAknNoteDialog::TTone TPhoneCmdParamNote::Tone(void) const
- ?LogStateChange@CPhoneLogger@@QAEXHH@Z @ 7 NONAME ; void CPhoneLogger::LogStateChange(int, int)
- ?SetObserver@TPhoneCmdParamNumberEntryObserver@@QAEXVTCallBack@@@Z @ 8 NONAME ; void TPhoneCmdParamNumberEntryObserver::SetObserver(class TCallBack)
- ?QueryType@TPhoneCmdParamQuery@@QBE?AW4TPhoneQueryType@@XZ @ 9 NONAME ; enum TPhoneQueryType TPhoneCmdParamQuery::QueryType(void) const
- ?SetCallType@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 10 NONAME ; void TPhoneCmdParamCallHeaderData::SetCallType(int)
- ?NumberType@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 11 NONAME ; int TPhoneCmdParamCallHeaderData::NumberType(void) const
- ?CbaCommandMapping@TPhoneCmdParamQuery@@QBEHH@Z @ 12 NONAME ; int TPhoneCmdParamQuery::CbaCommandMapping(int) const
- ?SetTone@TPhoneCmdParamQuery@@QAEXH@Z @ 13 NONAME ; void TPhoneCmdParamQuery::SetTone(int)
- ?CLIText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 14 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::CLIText(void) const
- ??0CPhoneLogger@@QAE@VTUid@@@Z @ 15 NONAME ; CPhoneLogger::CPhoneLogger(class TUid)
- ?RingingType@TPhoneCmdParamRingTone@@QBEHXZ @ 16 NONAME ; int TPhoneCmdParamRingTone::RingingType(void) const
- ?Remove@CPhoneRecoverySystem@@SAXH@Z @ 17 NONAME ; void CPhoneRecoverySystem::Remove(int)
- ??0TPhoneCmdParamKeyEvent@@QAE@XZ @ 18 NONAME ; TPhoneCmdParamKeyEvent::TPhoneCmdParamKeyEvent(void)
- ?SetPhoneEngine@CPhoneLogger@@QAEXPAVMPEPhoneModel@@@Z @ 19 NONAME ; void CPhoneLogger::SetPhoneEngine(class MPEPhoneModel *)
- ?SetSendKeyEnabled@TPhoneCmdParamQuery@@QAEXH@Z @ 20 NONAME ; void TPhoneCmdParamQuery::SetSendKeyEnabled(int)
- ?Pointer@TPhoneCmdParamPointer@@QBEPAXXZ @ 21 NONAME ; void * TPhoneCmdParamPointer::Pointer(void) const
- ?SetCallerText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 22 NONAME ; void TPhoneCmdParamCallHeaderData::SetCallerText(class TDesC16 const &)
- ?Line2@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 23 NONAME ; int TPhoneCmdParamIncallIndicatorData::Line2(void) const
- ?Text@TPhoneCmdParamGlobalNote@@QBEABVTDesC16@@XZ @ 24 NONAME ; class TDesC16 const & TPhoneCmdParamGlobalNote::Text(void) const
- ?RecoverNow@CPhoneRecoverySystem@@QAEHHCH@Z @ 25 NONAME ; int CPhoneRecoverySystem::RecoverNow(int, signed char, int)
- ?LogMsgFromControlToView@CPhoneLogger@@QAEXHH@Z @ 26 NONAME ; void CPhoneLogger::LogMsgFromControlToView(int, int)
- ??0TPhoneCmdParamBitmap@@QAE@XZ @ 27 NONAME ; TPhoneCmdParamBitmap::TPhoneCmdParamBitmap(void)
- ?SetHasThumbnail@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 28 NONAME ; void TPhoneCmdParamCallHeaderData::SetHasThumbnail(int)
- ?Text@TPhoneCmdParamNote@@QBEABVTDesC16@@XZ @ 29 NONAME ; class TDesC16 const & TPhoneCmdParamNote::Text(void) const
- ??1CPhoneMethodLogger@@UAE@XZ @ 30 NONAME ; CPhoneMethodLogger::~CPhoneMethodLogger(void)
- ?MaskBitmap@TPhoneCmdParamBitmap@@QBEPAVCFbsBitmap@@XZ @ 31 NONAME ; class CFbsBitmap * TPhoneCmdParamBitmap::MaskBitmap(void) const
- ?SetText@TPhoneCmdParamGlobalNote@@QAEXABVTDesC16@@@Z @ 32 NONAME ; void TPhoneCmdParamGlobalNote::SetText(class TDesC16 const &)
- ?AddLibraryL@CPhoneLibraryContainer@@QAEXABVRLibrary@@@Z @ 33 NONAME ; void CPhoneLibraryContainer::AddLibraryL(class RLibrary const &)
- ??1CPhoneResourceResolverBase@@UAE@XZ @ 34 NONAME ; CPhoneResourceResolverBase::~CPhoneResourceResolverBase(void)
- ?SetInt@CPhoneCenRepProxy@@QAEHABVTUid@@IH@Z @ 35 NONAME ; int CPhoneCenRepProxy::SetInt(class TUid const &, unsigned int, int)
- ?GetCustomCommandForTimeOut@TPhoneCmdParamQuery@@QBEHAAH@Z @ 36 NONAME ; int TPhoneCmdParamQuery::GetCustomCommandForTimeOut(int &) const
- ?ParamId@TPhoneCommandParam@@QBE?AW4TPhoneParamId@1@XZ @ 37 NONAME ; enum TPhoneCommandParam::TPhoneParamId TPhoneCommandParam::ParamId(void) const
- ?SetString@CPhoneCenRepProxy@@QAEHABVTUid@@IABVTDesC16@@@Z @ 38 NONAME ; int CPhoneCenRepProxy::SetString(class TUid const &, unsigned int, class TDesC16 const &)
- ?Line2@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 39 NONAME ; int TPhoneCmdParamCallHeaderData::Line2(void) const
- ??1CPhoneTimer@@UAE@XZ @ 40 NONAME ; CPhoneTimer::~CPhoneTimer(void)
- ?LogMsgFromPEToPhoneUIEnd@CPhoneLogger@@QAEXH@Z @ 41 NONAME ; void CPhoneLogger::LogMsgFromPEToPhoneUIEnd(int)
- ?DialerController@TPhoneCmdParamCustomDialer@@QAEPAVMPhoneDialerController@@XZ @ 42 NONAME ; class MPhoneDialerController * TPhoneCmdParamCustomDialer::DialerController(void)
- ?SetMultipleInstances@TPhoneCmdParamAppInfo@@QAEXH@Z @ 43 NONAME ; void TPhoneCmdParamAppInfo::SetMultipleInstances(int)
- ?ChangePropertyValue@CPhonePubSubProxy@@QAEXABVTUid@@IH@Z @ 44 NONAME ; void CPhonePubSubProxy::ChangePropertyValue(class TUid const &, unsigned int, int)
- ?SetThumbnail@TPhoneCmdParamCallHeaderData@@QAEXPAVCFbsBitmap@@@Z @ 45 NONAME ; void TPhoneCmdParamCallHeaderData::SetThumbnail(class CFbsBitmap *)
- ?SetCbaCommandMapping@TPhoneCmdParamQuery@@QAEXHH@Z @ 46 NONAME ; void TPhoneCmdParamQuery::SetCbaCommandMapping(int, int)
- ?EventCode@TPhoneCmdParamKeyEvent@@QBE?AW4TEventCode@@XZ @ 47 NONAME ; enum TEventCode TPhoneCmdParamKeyEvent::EventCode(void) const
- ?KeyEvent@TPhoneCmdParamKeyEvent@@QBE?BUTKeyEvent@@XZ @ 48 NONAME ; struct TKeyEvent const TPhoneCmdParamKeyEvent::KeyEvent(void) const
- ?SetDataText@TPhoneCmdParamQuery@@QAEXPAVTDes16@@@Z @ 49 NONAME ; void TPhoneCmdParamQuery::SetDataText(class TDes16 *)
- ??0TPhoneCmdParamAppInfo@@QAE@XZ @ 50 NONAME ; TPhoneCmdParamAppInfo::TPhoneCmdParamAppInfo(void)
- ?LittleBubbleVisible@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 51 NONAME ; int TPhoneCmdParamIncallIndicatorData::LittleBubbleVisible(void) const
- ?SetCallState@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 52 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCallState(int)
- ?GetString@CPhoneCenRepProxy@@QBEHABVTUid@@IAAVTDes16@@@Z @ 53 NONAME ; int CPhoneCenRepProxy::GetString(class TUid const &, unsigned int, class TDes16 &) const
- ?SetCauseCode@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 54 NONAME ; void TPhoneCmdParamGlobalNote::SetCauseCode(int)
- ?ResourceId@TPhoneCmdParamProgressNote@@QBEHXZ @ 55 NONAME ; int TPhoneCmdParamProgressNote::ResourceId(void) const
- ?CallId@TPhoneCmdParamCallStateData@@QBEHXZ @ 56 NONAME ; int TPhoneCmdParamCallStateData::CallId(void) const
- ?NotifyChangeL@CPhoneCenRepProxy@@QAEXABVTUid@@IPAVMPhoneCenRepObserver@@@Z @ 57 NONAME ; void CPhoneCenRepProxy::NotifyChangeL(class TUid const &, unsigned int, class MPhoneCenRepObserver *)
- ?SetResourceId@TPhoneCmdParamDynMenu@@QAEXH@Z @ 58 NONAME ; void TPhoneCmdParamDynMenu::SetResourceId(int)
- ?Validate@CPhoneKeys@@SAHABVTDesC16@@@Z @ 59 NONAME ; int CPhoneKeys::Validate(class TDesC16 const &)
- ??0TPhoneCmdParamKeyCapture@@QAE@XZ @ 60 NONAME ; TPhoneCmdParamKeyCapture::TPhoneCmdParamKeyCapture(void)
- ?SetResourceId@TPhoneCmdParamNote@@QAEXH@Z @ 61 NONAME ; void TPhoneCmdParamNote::SetResourceId(int)
- ?LogMsgFromPEToPhoneUI@CPhoneLogger@@QAEXHH@Z @ 62 NONAME ; void CPhoneLogger::LogMsgFromPEToPhoneUI(int, int)
- ?SetNotificationDialog@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 63 NONAME ; void TPhoneCmdParamGlobalNote::SetNotificationDialog(int)
- ??0TPhoneCmdParamProgressNote@@QAE@XZ @ 64 NONAME ; TPhoneCmdParamProgressNote::TPhoneCmdParamProgressNote(void)
- ?CallState@TPhoneCmdParamCallStateData@@QBEHXZ @ 65 NONAME ; int TPhoneCmdParamCallStateData::CallState(void) const
- ?SetPointer@TPhoneCmdParamPointer@@QAEXPAX@Z @ 66 NONAME ; void TPhoneCmdParamPointer::SetPointer(void *)
- ??1CPhoneCenRepProxy@@UAE@XZ @ 67 NONAME ; CPhoneCenRepProxy::~CPhoneCenRepProxy(void)
- ?SetEventCode@TPhoneCmdParamKeyEvent@@QAEXW4TEventCode@@@Z @ 68 NONAME ; void TPhoneCmdParamKeyEvent::SetEventCode(enum TEventCode)
- ?WaitTime@TPhoneCmdParamProgressNote@@QBE?AVTTimeIntervalMicroSeconds32@@XZ @ 69 NONAME ; class TTimeIntervalMicroSeconds32 TPhoneCmdParamProgressNote::WaitTime(void) const
- ?SetParam@TPhoneCmdParamAppInfo@@QAEXABVTDesC8@@@Z @ 70 NONAME ; void TPhoneCmdParamAppInfo::SetParam(class TDesC8 const &)
- ??0TPhoneCmdParamPointer@@QAE@XZ @ 71 NONAME ; TPhoneCmdParamPointer::TPhoneCmdParamPointer(void)
- ??0TPhoneCmdParamGlobalNote@@QAE@XZ @ 72 NONAME ; TPhoneCmdParamGlobalNote::TPhoneCmdParamGlobalNote(void)
- ?CallType@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 73 NONAME ; int TPhoneCmdParamCallHeaderData::CallType(void) const
- ?SetCiphering@TPhoneCmdParamEmergencyCallHeaderData@@QAEXH@Z @ 74 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetCiphering(int)
- ?SetTone@TPhoneCmdParamNote@@QAEXW4TTone@CAknNoteDialog@@@Z @ 75 NONAME ; void TPhoneCmdParamNote::SetTone(enum CAknNoteDialog::TTone)
- ?SetCustomCommandForTimeOut@TPhoneCmdParamQuery@@QAEXH@Z @ 76 NONAME ; void TPhoneCmdParamQuery::SetCustomCommandForTimeOut(int)
- ??1TPhoneCmdParamCallHeaderData@@QAE@XZ @ 77 NONAME ; TPhoneCmdParamCallHeaderData::~TPhoneCmdParamCallHeaderData(void)
- ?IsBTAccAvailable@TPhoneCmdParamAudioAvailability@@QBEHXZ @ 78 NONAME ; int TPhoneCmdParamAudioAvailability::IsBTAccAvailable(void) const
- ?NewL@CPhoneStorage@@SAPAV1@XZ @ 79 NONAME ; class CPhoneStorage * CPhoneStorage::NewL(void)
- ?CNAPTextClippingDirection@TPhoneCmdParamCallHeaderData@@QBE?AW4TPhoneTextClippingDirection@1@XZ @ 80 NONAME ; enum TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection TPhoneCmdParamCallHeaderData::CNAPTextClippingDirection(void) const
- ?Timeout@TPhoneCmdParamNote@@QBE?AW4TTimeout@CAknNoteDialog@@XZ @ 81 NONAME ; enum CAknNoteDialog::TTimeout TPhoneCmdParamNote::Timeout(void) const
- ?Instance@CPhoneRecoverySystem@@SAPAV1@XZ @ 82 NONAME ; class CPhoneRecoverySystem * CPhoneRecoverySystem::Instance(void)
- ?CancelTimer@CPhoneTimer@@QAEXXZ @ 83 NONAME ; void CPhoneTimer::CancelTimer(void)
- ?NewL@CPhoneTimer@@SAPAV1@H@Z @ 84 NONAME ; class CPhoneTimer * CPhoneTimer::NewL(int)
- ?GetInt@CPhoneCenRepProxy@@QBEHABVTUid@@IAAH@Z @ 85 NONAME ; int CPhoneCenRepProxy::GetInt(class TUid const &, unsigned int, int &) const
- ?SetTextToSay@TPhoneCmdParamRingTone@@QAEXABVTDesC16@@@Z @ 86 NONAME ; void TPhoneCmdParamRingTone::SetTextToSay(class TDesC16 const &)
- ?SetCallState@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 87 NONAME ; void TPhoneCmdParamCallHeaderData::SetCallState(int)
- ?ContentCba@TPhoneCmdParamQuery@@QBEHXZ @ 88 NONAME ; int TPhoneCmdParamQuery::ContentCba(void) const
- ?SetTextResourceId@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 89 NONAME ; void TPhoneCmdParamGlobalNote::SetTextResourceId(int)
- ??0TPhoneCmdParamDynMenu@@QAE@XZ @ 90 NONAME ; TPhoneCmdParamDynMenu::TPhoneCmdParamDynMenu(void)
- ?CancelAllNotifications@CPhonePubSubProxy@@SAXPAVMPhonePubSubObserver@@@Z @ 91 NONAME ; void CPhonePubSubProxy::CancelAllNotifications(class MPhonePubSubObserver *)
- ??0TPhoneCommandParam@@QAE@XZ @ 92 NONAME ; TPhoneCommandParam::TPhoneCommandParam(void)
- ?SetCLIText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@W4TPhoneTextClippingDirection@1@@Z @ 93 NONAME ; void TPhoneCmdParamCallHeaderData::SetCLIText(class TDesC16 const &, enum TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection)
- ??1CPhoneLogger@@UAE@XZ @ 94 NONAME ; CPhoneLogger::~CPhoneLogger(void)
- ?SetCallState@TPhoneCmdParamCallStateData@@QAEXH@Z @ 95 NONAME ; void TPhoneCmdParamCallStateData::SetCallState(int)
- ?CallerText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 96 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::CallerText(void) const
- ?Diverted@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 97 NONAME ; int TPhoneCmdParamCallHeaderData::Diverted(void) const
- ?String@TPhoneCmdParamString@@QAEPAVTPtr16@@XZ @ 98 NONAME ; class TPtr16 * TPhoneCmdParamString::String(void)
- ?SetKey@TPhoneCmdParamKeyCapture@@QAEXW4TStdScanCode@@@Z @ 99 NONAME ; void TPhoneCmdParamKeyCapture::SetKey(enum TStdScanCode)
- ?NotificationDialog@TPhoneCmdParamGlobalNote@@QBEHXZ @ 100 NONAME ; int TPhoneCmdParamGlobalNote::NotificationDialog(void) const
- ?IsExtraChar@CPhoneKeys@@SAHH@Z @ 101 NONAME ; int CPhoneKeys::IsExtraChar(int)
- ?SetDynMenu@TPhoneCmdParamDynMenu@@QAEXPAX@Z @ 102 NONAME ; void TPhoneCmdParamDynMenu::SetDynMenu(void *)
- ?IsSecondHashKey@CPhoneKeys@@SAHABVTDes16@@@Z @ 103 NONAME ; int CPhoneKeys::IsSecondHashKey(class TDes16 const &)
- ?SetCallerImageStatus@TPhoneCmdParamRingTone@@QAEXH@Z @ 104 NONAME ; void TPhoneCmdParamRingTone::SetCallerImageStatus(int)
- ?SetTimeout@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 105 NONAME ; void TPhoneCmdParamGlobalNote::SetTimeout(int)
- ?GetReal@CPhoneCenRepProxy@@QBEHABVTUid@@IAAN@Z @ 106 NONAME ; int CPhoneCenRepProxy::GetReal(class TUid const &, unsigned int, double &) const
- ?SetShortLabelText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 107 NONAME ; void TPhoneCmdParamCallHeaderData::SetShortLabelText(class TDesC16 const &)
- ?SetDialerController@TPhoneCmdParamCustomDialer@@QAEXPAVMPhoneDialerController@@@Z @ 108 NONAME ; void TPhoneCmdParamCustomDialer::SetDialerController(class MPhoneDialerController *)
- ?RingTone@TPhoneCmdParamRingTone@@QBEABVTDesC16@@XZ @ 109 NONAME ; class TDesC16 const & TPhoneCmdParamRingTone::RingTone(void) const
- ?TimeOut@TPhoneCmdParamQuery@@QBEHXZ @ 110 NONAME ; int TPhoneCmdParamQuery::TimeOut(void) const
- ?ShortLabelText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 111 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::ShortLabelText(void) const
- ?SetInteger@TPhoneCmdParamInteger@@QAEXH@Z @ 112 NONAME ; void TPhoneCmdParamInteger::SetInteger(int)
- ?SetMaskBitmap@TPhoneCmdParamBitmap@@QAEXPAVCFbsBitmap@@@Z @ 113 NONAME ; void TPhoneCmdParamBitmap::SetMaskBitmap(class CFbsBitmap *)
- ?SetTimeout@TPhoneCmdParamNote@@QAEXW4TTimeout@CAknNoteDialog@@@Z @ 114 NONAME ; void TPhoneCmdParamNote::SetTimeout(enum CAknNoteDialog::TTimeout)
- ?SetCustomMessage@TPhoneCmdParamAppInfo@@QAEXABVTDesC8@@@Z @ 115 NONAME ; void TPhoneCmdParamAppInfo::SetCustomMessage(class TDesC8 const &)
- ?BaseConstructL@CPhoneResourceResolverBase@@QAEXXZ @ 116 NONAME ; void CPhoneResourceResolverBase::BaseConstructL(void)
- ?SetTextResourceId@TPhoneCmdParamNote@@QAEXH@Z @ 117 NONAME ; void TPhoneCmdParamNote::SetTextResourceId(int)
- ?SetString@TPhoneCmdParamString@@QAEXPAVTPtr16@@@Z @ 118 NONAME ; void TPhoneCmdParamString::SetString(class TPtr16 *)
- ?SetAppUid@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 119 NONAME ; void TPhoneCmdParamAppInfo::SetAppUid(class TUid const &)
- ?SetBTAccAvailable@TPhoneCmdParamAudioAvailability@@QAEXH@Z @ 120 NONAME ; void TPhoneCmdParamAudioAvailability::SetBTAccAvailable(int)
- ?IsTelephonyFeatureSupported@CPhoneCenRepProxy@@QAEHH@Z @ 121 NONAME ; int CPhoneCenRepProxy::IsTelephonyFeatureSupported(int)
- ?CallImageThemeFilePath@CPhoneCallThemeMonitor@@QBE?AVTPtrC16@@XZ @ 122 NONAME ; class TPtrC16 CPhoneCallThemeMonitor::CallImageThemeFilePath(void) const
- ?HasThumbnail@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 123 NONAME ; int TPhoneCmdParamCallHeaderData::HasThumbnail(void) const
- ?ClearBlackListNow@CPhoneClearBlacklist@@QAEXXZ @ 124 NONAME ; void CPhoneClearBlacklist::ClearBlackListNow(void)
- ?SetCipheringIndicatorAllowed@TPhoneCmdParamEmergencyCallHeaderData@@QAEXH@Z @ 125 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetCipheringIndicatorAllowed(int)
- ?SetCommandParamId@TPhoneCmdParamQuery@@QAEXW4TPhoneParamId@TPhoneCommandParam@@@Z @ 126 NONAME ; void TPhoneCmdParamQuery::SetCommandParamId(enum TPhoneCommandParam::TPhoneParamId)
- ??0TPhoneCmdParamEmergencyCallHeaderData@@QAE@XZ @ 127 NONAME ; TPhoneCmdParamEmergencyCallHeaderData::TPhoneCmdParamEmergencyCallHeaderData(void)
- ?After@CPhoneTimer@@QAEXVTTimeIntervalMicroSeconds32@@PAVMPhoneTimer@@@Z @ 128 NONAME ; void CPhoneTimer::After(class TTimeIntervalMicroSeconds32, class MPhoneTimer *)
- ?NewL@CPhoneLibraryContainer@@SAPAV1@XZ @ 129 NONAME ; class CPhoneLibraryContainer * CPhoneLibraryContainer::NewL(void)
- ?CreateL@CPhoneClearBlacklist@@SAPAV1@AAVRWsSession@@ABVRWindowBase@@@Z @ 130 NONAME ; class CPhoneClearBlacklist * CPhoneClearBlacklist::CreateL(class RWsSession &, class RWindowBase const &)
- ??1CPhoneStorage@@UAE@XZ @ 131 NONAME ; CPhoneStorage::~CPhoneStorage(void)
- ?SetVolume@TPhoneCmdParamRingTone@@QAEXH@Z @ 132 NONAME ; void TPhoneCmdParamRingTone::SetVolume(int)
- ??0TPhoneCmdParamString@@QAE@XZ @ 133 NONAME ; TPhoneCmdParamString::TPhoneCmdParamString(void)
- ?SetContactLink@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC8@@@Z @ 134 NONAME ; void TPhoneCmdParamCallHeaderData::SetContactLink(class TDesC8 const &)
- ??4TPhoneCmdParamQuery@@QAEAAV0@ABV0@@Z @ 135 NONAME ; class TPhoneCmdParamQuery & TPhoneCmdParamQuery::operator=(class TPhoneCmdParamQuery const &)
- ??0TPhoneCmdParamAudioAvailability@@QAE@XZ @ 136 NONAME ; TPhoneCmdParamAudioAvailability::TPhoneCmdParamAudioAvailability(void)
- ?Timeout@TPhoneCmdParamGlobalNote@@QBEHXZ @ 137 NONAME ; int TPhoneCmdParamGlobalNote::Timeout(void) const
- ??0TPhoneCmdParamRingTone@@QAE@XZ @ 138 NONAME ; TPhoneCmdParamRingTone::TPhoneCmdParamRingTone(void)
- ?Observer@TPhoneCmdParamNumberEntryObserver@@QAE?AVTCallBack@@XZ @ 139 NONAME ; class TCallBack TPhoneCmdParamNumberEntryObserver::Observer(void)
- ??0CPhoneResourceResolverBase@@IAE@XZ @ 140 NONAME ; CPhoneResourceResolverBase::CPhoneResourceResolverBase(void)
- ?SetCallId@TPhoneCmdParamCallStateData@@QAEXH@Z @ 141 NONAME ; void TPhoneCmdParamCallStateData::SetCallId(int)
- ?MultipleInstances@TPhoneCmdParamAppInfo@@QBEHXZ @ 142 NONAME ; int TPhoneCmdParamAppInfo::MultipleInstances(void) const
- ?ItemTextArrayForListQuery@TPhoneCmdParamQuery@@QBEPAVMDesC16Array@@XZ @ 143 NONAME ; class MDesC16Array * TPhoneCmdParamQuery::ItemTextArrayForListQuery(void) const
- ?SetHeaderText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 144 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetHeaderText(class TDesC16 const &)
- ?SetContentCba@TPhoneCmdParamQuery@@QAEXH@Z @ 145 NONAME ; void TPhoneCmdParamQuery::SetContentCba(int)
- ?CaptureType@TPhoneCmdParamKeyCapture@@QBE?AW4TPhoneCaptureType@@XZ @ 146 NONAME ; enum TPhoneCaptureType TPhoneCmdParamKeyCapture::CaptureType(void) const
- ?SetQueryResourceId@TPhoneCmdParamQuery@@QAEXH@Z @ 147 NONAME ; void TPhoneCmdParamQuery::SetQueryResourceId(int)
- ?CancelNotify@CPhoneCenRepProxy@@QAEXPAVMPhoneCenRepObserver@@I@Z @ 148 NONAME ; void CPhoneCenRepProxy::CancelNotify(class MPhoneCenRepObserver *, unsigned int)
- ?Param@TPhoneCmdParamAppInfo@@QBEABVTDesC8@@XZ @ 149 NONAME ; class TDesC8 const & TPhoneCmdParamAppInfo::Param(void) const
- ??0CPhoneMethodLogger@@QAE@W4TPhoneUILoggingComponent@@VTPtrC16@@@Z @ 150 NONAME ; CPhoneMethodLogger::CPhoneMethodLogger(enum TPhoneUILoggingComponent, class TPtrC16)
- ?IsDtmfTone@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 151 NONAME ; int CPhoneKeys::IsDtmfTone(struct TKeyEvent const &, enum TEventCode)
- ?SetMode@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 152 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetMode(int)
- ?NewL@CPhoneCallThemeMonitor@@SAPAV1@XZ @ 153 NONAME ; class CPhoneCallThemeMonitor * CPhoneCallThemeMonitor::NewL(void)
- ?SendKeyEnabled@TPhoneCmdParamQuery@@QBEHXZ @ 154 NONAME ; int TPhoneCmdParamQuery::SendKeyEnabled(void) const
- ?SetNeedToEnableKeylock@CPhoneStorage@@UAEXH@Z @ 155 NONAME ; void CPhoneStorage::SetNeedToEnableKeylock(int)
- ?Find@CPhoneCenRepProxy@@QBEHABVTUid@@KKAAV?$RArray@K@@@Z @ 156 NONAME ; int CPhoneCenRepProxy::Find(class TUid const &, unsigned long, unsigned long, class RArray<unsigned long> &) const
- ?SetLabelText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 157 NONAME ; void TPhoneCmdParamCallHeaderData::SetLabelText(class TDesC16 const &)
- ?CNAPText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 158 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::CNAPText(void) const
- ?SetOwnPhoneNumberText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 159 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetOwnPhoneNumberText(class TDesC16 const &)
- ?Emergency@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 160 NONAME ; int TPhoneCmdParamIncallIndicatorData::Emergency(void) const
- ?AppUid@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 161 NONAME ; class TUid TPhoneCmdParamAppInfo::AppUid(void) const
- ?CustomMessage@TPhoneCmdParamAppInfo@@QBEABVTDesC8@@XZ @ 162 NONAME ; class TDesC8 const & TPhoneCmdParamAppInfo::CustomMessage(void) const
- ?QueryResourceId@TPhoneCmdParamQuery@@QBEHXZ @ 163 NONAME ; int TPhoneCmdParamQuery::QueryResourceId(void) const
- ?NotifyChangeL@CPhonePubSubProxy@@QAEXABVTUid@@IPAVMPhonePubSubObserver@@@Z @ 164 NONAME ; void CPhonePubSubProxy::NotifyChangeL(class TUid const &, unsigned int, class MPhonePubSubObserver *)
- ?SetRingTone@TPhoneCmdParamRingTone@@QAEXABVTDesC16@@@Z @ 165 NONAME ; void TPhoneCmdParamRingTone::SetRingTone(class TDesC16 const &)
- ?SetEmergency@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 166 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetEmergency(int)
- ?SetDefaultCba@TPhoneCmdParamQuery@@QAEXH@Z @ 167 NONAME ; void TPhoneCmdParamQuery::SetDefaultCba(int)
- ?Type@TPhoneCmdParamTransEffect@@QBE?AW4TPhoneTransEffectType@@XZ @ 168 NONAME ; enum TPhoneTransEffectType TPhoneCmdParamTransEffect::Type(void) const
- ??0TPhoneCmdParamSfiData@@QAE@XZ @ 169 NONAME ; TPhoneCmdParamSfiData::TPhoneCmdParamSfiData(void)
- ??0TPhoneCmdParamCallHeaderData@@QAE@XZ @ 170 NONAME ; TPhoneCmdParamCallHeaderData::TPhoneCmdParamCallHeaderData(void)
- ??1CPhoneClearBlacklist@@UAE@XZ @ 171 NONAME ; CPhoneClearBlacklist::~CPhoneClearBlacklist(void)
- ?SetMute@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 172 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetMute(int)
- ?KeyCode@TPhoneCmdParamKeyCapture@@QBE?AW4TKeyCode@@XZ @ 173 NONAME ; enum TKeyCode TPhoneCmdParamKeyCapture::KeyCode(void) const
- ?IsNumberKey@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 174 NONAME ; int CPhoneKeys::IsNumberKey(struct TKeyEvent const &, enum TEventCode)
- ?TextResourceId@TPhoneCmdParamGlobalNote@@QBEHXZ @ 175 NONAME ; int TPhoneCmdParamGlobalNote::TextResourceId(void) const
- ?SetCiphering@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 176 NONAME ; void TPhoneCmdParamCallHeaderData::SetCiphering(int)
- ?EnablePreconditionL@CPhoneRecoverySystem@@QAEXXZ @ 177 NONAME ; void CPhoneRecoverySystem::EnablePreconditionL(void)
- ?AddL@CPhoneRecoverySystem@@QAEHVTCallBack@@CW4TRecoveryState@CTeleRecoverySystem@@@Z @ 178 NONAME ; int CPhoneRecoverySystem::AddL(class TCallBack, signed char, enum CTeleRecoverySystem::TRecoveryState)
- ?SetLine2@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 179 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetLine2(int)
- ?SetAudioOutput@TPhoneCmdParamAudioOutput@@QAEXW4TPEAudioOutput@@@Z @ 180 NONAME ; void TPhoneCmdParamAudioOutput::SetAudioOutput(enum TPEAudioOutput)
- ?HeaderText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 181 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::HeaderText(void) const
- ?CallImageThemeSettings@CPhoneCallThemeMonitor@@QBEHXZ @ 182 NONAME ; int CPhoneCallThemeMonitor::CallImageThemeSettings(void) const
- ??0TPhoneCmdParamTransEffect@@QAE@XZ @ 183 NONAME ; TPhoneCmdParamTransEffect::TPhoneCmdParamTransEffect(void)
- ?Number@TPhoneCmdParamSfiData@@QBEABVTDesC16@@XZ @ 184 NONAME ; class TDesC16 const & TPhoneCmdParamSfiData::Number(void) const
- ?OwnPhoneNumberText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 185 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::OwnPhoneNumberText(void) const
- ?CauseCode@TPhoneCmdParamGlobalNote@@QBEHXZ @ 186 NONAME ; int TPhoneCmdParamGlobalNote::CauseCode(void) const
- ?QueryPrompt@TPhoneCmdParamQuery@@QBEABVTDesC16@@XZ @ 187 NONAME ; class TDesC16 const & TPhoneCmdParamQuery::QueryPrompt(void) const
- ?SetQueryPrompt@TPhoneCmdParamQuery@@QAEXABVTDesC16@@@Z @ 188 NONAME ; void TPhoneCmdParamQuery::SetQueryPrompt(class TDesC16 const &)
- ?Type@TPhoneCmdParamGlobalNote@@QBE?AW4PhoneNotificationType@@XZ @ 189 NONAME ; enum PhoneNotificationType TPhoneCmdParamGlobalNote::Type(void) const
- ?IsNumericKey@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 190 NONAME ; int CPhoneKeys::IsNumericKey(struct TKeyEvent const &, enum TEventCode)
- ?SetCaptureType@TPhoneCmdParamKeyCapture@@QAEXW4TPhoneCaptureType@@@Z @ 191 NONAME ; void TPhoneCmdParamKeyCapture::SetCaptureType(enum TPhoneCaptureType)
- ?ViewUid@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 192 NONAME ; class TUid TPhoneCmdParamAppInfo::ViewUid(void) const
- ?SetLabelText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 193 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetLabelText(class TDesC16 const &)
- ?IsCallerText@TPhoneCmdParamRingTone@@QAEHXZ @ 194 NONAME ; int TPhoneCmdParamRingTone::IsCallerText(void)
- ?SetBitmap@TPhoneCmdParamBitmap@@QAEXPAVCFbsBitmap@@@Z @ 195 NONAME ; void TPhoneCmdParamBitmap::SetBitmap(class CFbsBitmap *)
- ?SetNumber@TPhoneCmdParamSfiData@@QAEXABVTDesC16@@@Z @ 196 NONAME ; void TPhoneCmdParamSfiData::SetNumber(class TDesC16 const &)
- ?CipheringIndicatorAllowed@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 197 NONAME ; int TPhoneCmdParamCallHeaderData::CipheringIndicatorAllowed(void) const
- ?Name@TPhoneCmdParamSfiData@@QBEABVTDesC16@@XZ @ 198 NONAME ; class TDesC16 const & TPhoneCmdParamSfiData::Name(void) const
- ??0TPhoneCmdParamQuery@@QAE@ABV0@@Z @ 199 NONAME ; TPhoneCmdParamQuery::TPhoneCmdParamQuery(class TPhoneCmdParamQuery const &)
- ?CallState@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 200 NONAME ; int TPhoneCmdParamCallHeaderData::CallState(void) const
- ??0TPhoneCmdParamIncallIndicatorData@@QAE@XZ @ 201 NONAME ; TPhoneCmdParamIncallIndicatorData::TPhoneCmdParamIncallIndicatorData(void)
- ?Picture@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 202 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::Picture(void) const
- ?SetCallThemeSettingsObserver@CPhoneCallThemeMonitor@@QAEXPAVMPhoneCallThemeSettingsObserver@@@Z @ 203 NONAME ; void CPhoneCallThemeMonitor::SetCallThemeSettingsObserver(class MPhoneCallThemeSettingsObserver *)
- ?SetDiverted@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 204 NONAME ; void TPhoneCmdParamCallHeaderData::SetDiverted(int)
- ?ServiceId@TPhoneCmdParamCallHeaderData@@QBEKXZ @ 205 NONAME ; unsigned long TPhoneCmdParamCallHeaderData::ServiceId(void) const
- ?LabelText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 206 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::LabelText(void) const
- ?Overflow@CPhoneLogger@@EAEXAAVTDes16@@@Z @ 207 NONAME ; void CPhoneLogger::Overflow(class TDes16 &)
- ?SetCNAPText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@W4TPhoneTextClippingDirection@1@@Z @ 208 NONAME ; void TPhoneCmdParamCallHeaderData::SetCNAPText(class TDesC16 const &, enum TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection)
- ?SetKeyEvent@TPhoneCmdParamKeyEvent@@QAEXABUTKeyEvent@@@Z @ 209 NONAME ; void TPhoneCmdParamKeyEvent::SetKeyEvent(struct TKeyEvent const &)
- ?Instance@CPhonePubSubProxy@@SAPAV1@XZ @ 210 NONAME ; class CPhonePubSubProxy * CPhonePubSubProxy::Instance(void)
- ?ResourceId@TPhoneCmdParamNote@@QBEHXZ @ 211 NONAME ; int TPhoneCmdParamNote::ResourceId(void) const
- ?CipheringIndicatorAllowed@TPhoneCmdParamEmergencyCallHeaderData@@QBEHXZ @ 212 NONAME ; int TPhoneCmdParamEmergencyCallHeaderData::CipheringIndicatorAllowed(void) const
- ?CancelAllNotifies@CPhoneCenRepProxy@@SAXPAVMPhoneCenRepObserver@@@Z @ 213 NONAME ; void CPhoneCenRepProxy::CancelAllNotifies(class MPhoneCenRepObserver *)
- ?TextResourceId@TPhoneCmdParamNote@@QBEHXZ @ 214 NONAME ; int TPhoneCmdParamNote::TextResourceId(void) const
- ?SetRemotePhoneNumber@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 215 NONAME ; void TPhoneCmdParamCallHeaderData::SetRemotePhoneNumber(class TDesC16 const &)
- ?CipheringIndicatorAllowed@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 216 NONAME ; int TPhoneCmdParamIncallIndicatorData::CipheringIndicatorAllowed(void) const
- ??0TPhoneCmdParamCallStateData@@QAE@XZ @ 217 NONAME ; TPhoneCmdParamCallStateData::TPhoneCmdParamCallStateData(void)
- ?SetKeyCode@TPhoneCmdParamKeyCapture@@QAEXW4TKeyCode@@@Z @ 218 NONAME ; void TPhoneCmdParamKeyCapture::SetKeyCode(enum TKeyCode)
- ?CustomMessageId@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 219 NONAME ; class TUid TPhoneCmdParamAppInfo::CustomMessageId(void) const
- ?RemotePhoneNumber@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 220 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::RemotePhoneNumber(void) const
- ?SetType@TPhoneCmdParamNote@@QAEXW4TPhoneNoteType@@@Z @ 221 NONAME ; void TPhoneCmdParamNote::SetType(enum TPhoneNoteType)
- ?Instance@CPhoneClearBlacklist@@SAPAV1@XZ @ 222 NONAME ; class CPhoneClearBlacklist * CPhoneClearBlacklist::Instance(void)
- ?TextToSay@TPhoneCmdParamRingTone@@QBEABVTDesC16@@XZ @ 223 NONAME ; class TDesC16 const & TPhoneCmdParamRingTone::TextToSay(void) const
- ?Type@TPhoneCmdParamNote@@QBE?AW4TPhoneNoteType@@XZ @ 224 NONAME ; enum TPhoneNoteType TPhoneCmdParamNote::Type(void) const
- ?SetPicture@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 225 NONAME ; void TPhoneCmdParamCallHeaderData::SetPicture(class TDesC16 const &)
- ?Integer@TPhoneCmdParamInteger@@QBEHXZ @ 226 NONAME ; int TPhoneCmdParamInteger::Integer(void) const
- ?Mode@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 227 NONAME ; int TPhoneCmdParamIncallIndicatorData::Mode(void) const
- ?SetCallerTextStatus@TPhoneCmdParamRingTone@@QAEXH@Z @ 228 NONAME ; void TPhoneCmdParamRingTone::SetCallerTextStatus(int)
- ?SetText@TPhoneCmdParamNote@@QAEXABVTDesC16@@@Z @ 229 NONAME ; void TPhoneCmdParamNote::SetText(class TDesC16 const &)
- ?IsWiredAccAvailable@TPhoneCmdParamAudioAvailability@@QBEHXZ @ 230 NONAME ; int TPhoneCmdParamAudioAvailability::IsWiredAccAvailable(void) const
- ??0TPhoneCmdParamBoolean@@QAE@XZ @ 231 NONAME ; TPhoneCmdParamBoolean::TPhoneCmdParamBoolean(void)
- ?QueryCommandObserver@TPhoneCmdParamQuery@@QAEPAVMPhoneQueryCommandObserver@@XZ @ 232 NONAME ; class MPhoneQueryCommandObserver * TPhoneCmdParamQuery::QueryCommandObserver(void)
- ?DataText@TPhoneCmdParamQuery@@QBEPAVTDes16@@XZ @ 233 NONAME ; class TDes16 * TPhoneCmdParamQuery::DataText(void) const
- ?SetReal@CPhoneCenRepProxy@@QAEHABVTUid@@IN@Z @ 234 NONAME ; int CPhoneCenRepProxy::SetReal(class TUid const &, unsigned int, double)
- ??0TPhoneCmdParamCustomDialer@@QAE@XZ @ 235 NONAME ; TPhoneCmdParamCustomDialer::TPhoneCmdParamCustomDialer(void)
- ??1CPhonePubSubProxy@@UAE@XZ @ 236 NONAME ; CPhonePubSubProxy::~CPhonePubSubProxy(void)
- ??0TPhoneCmdParamNote@@QAE@XZ @ 237 NONAME ; TPhoneCmdParamNote::TPhoneCmdParamNote(void)
- ?Volume@TPhoneCmdParamRingTone@@QBEHXZ @ 238 NONAME ; int TPhoneCmdParamRingTone::Volume(void) const
- ?SetItemTextArrayForListQuery@TPhoneCmdParamQuery@@QAEXAAVMDesC16Array@@@Z @ 239 NONAME ; void TPhoneCmdParamQuery::SetItemTextArrayForListQuery(class MDesC16Array &)
- ?Type@TPhoneCmdParamRingTone@@QBE?AW4TPhoneRingToneType@@XZ @ 240 NONAME ; enum TPhoneRingToneType TPhoneCmdParamRingTone::Type(void) const
- ?Key@TPhoneCmdParamKeyCapture@@QBE?AW4TStdScanCode@@XZ @ 241 NONAME ; enum TStdScanCode TPhoneCmdParamKeyCapture::Key(void) const
- ?LabelText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 242 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::LabelText(void) const
- ?Ciphering@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 243 NONAME ; int TPhoneCmdParamIncallIndicatorData::Ciphering(void) const
- ?SetQueryCommandObserver@TPhoneCmdParamQuery@@QAEXAAVMPhoneQueryCommandObserver@@@Z @ 244 NONAME ; void TPhoneCmdParamQuery::SetQueryCommandObserver(class MPhoneQueryCommandObserver &)
- ?IsPhoneUIFeatureSupported@CPhoneCenRepProxy@@QAEHH@Z @ 245 NONAME ; int CPhoneCenRepProxy::IsPhoneUIFeatureSupported(int)
- ?DefaultCba@TPhoneCmdParamQuery@@QBEHXZ @ 246 NONAME ; int TPhoneCmdParamQuery::DefaultCba(void) const
- ?CallState@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 247 NONAME ; int TPhoneCmdParamIncallIndicatorData::CallState(void) const
- ??0TPhoneCmdParamNumberEntryObserver@@QAE@XZ @ 248 NONAME ; TPhoneCmdParamNumberEntryObserver::TPhoneCmdParamNumberEntryObserver(void)
- ?SetLine2@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 249 NONAME ; void TPhoneCmdParamCallHeaderData::SetLine2(int)
- ?FetchValuesFromCenRepL@CPhoneCenRepProxy@@QAEXAAVTPhoneCmdParamAppInfo@@W4TKeyCode@@PAVHBufC8@@AAH@Z @ 250 NONAME ; void CPhoneCenRepProxy::FetchValuesFromCenRepL(class TPhoneCmdParamAppInfo &, enum TKeyCode, class HBufC8 *, int &)
- ?ParticipantCLI@TPhoneCmdParamCallHeaderData@@QBE?AW4TPhoneParticipantListCLI@1@XZ @ 251 NONAME ; enum TPhoneCmdParamCallHeaderData::TPhoneParticipantListCLI TPhoneCmdParamCallHeaderData::ParticipantCLI(void) const
- ?Thumbnail@TPhoneCmdParamCallHeaderData@@QBEPAVCFbsBitmap@@XZ @ 252 NONAME ; class CFbsBitmap * TPhoneCmdParamCallHeaderData::Thumbnail(void) const
- ?SetTimeOut@TPhoneCmdParamQuery@@QAEXH@Z @ 253 NONAME ; void TPhoneCmdParamQuery::SetTimeOut(int)
- ?Boolean@TPhoneCmdParamBoolean@@QBEHXZ @ 254 NONAME ; int TPhoneCmdParamBoolean::Boolean(void) const
- ?CLITextClippingDirection@TPhoneCmdParamCallHeaderData@@QBE?AW4TPhoneTextClippingDirection@1@XZ @ 255 NONAME ; enum TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection TPhoneCmdParamCallHeaderData::CLITextClippingDirection(void) const
- ?LogMsgFromPhoneUIToPE@CPhoneLogger@@QAEXHH@Z @ 256 NONAME ; void CPhoneLogger::LogMsgFromPhoneUIToPE(int, int)
- ?SetCustomMessageId@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 257 NONAME ; void TPhoneCmdParamAppInfo::SetCustomMessageId(class TUid const &)
- ?ResolveResourceID@CPhoneResourceResolverBase@@UBEHABH@Z @ 258 NONAME ; int CPhoneResourceResolverBase::ResolveResourceID(int const &) const
- ?SetName@TPhoneCmdParamSfiData@@QAEXABVTDesC16@@@Z @ 259 NONAME ; void TPhoneCmdParamSfiData::SetName(class TDesC16 const &)
- ?SetLittleBubbleVisible@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 260 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetLittleBubbleVisible(int)
- ?Ciphering@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 261 NONAME ; int TPhoneCmdParamCallHeaderData::Ciphering(void) const
- ?SetType@TPhoneCmdParamRingTone@@QAEXW4TPhoneRingToneType@@@Z @ 262 NONAME ; void TPhoneCmdParamRingTone::SetType(enum TPhoneRingToneType)
- ?ResourceId@TPhoneCmdParamDynMenu@@QBEHXZ @ 263 NONAME ; int TPhoneCmdParamDynMenu::ResourceId(void) const
- ?SetCipheringIndicatorAllowed@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 264 NONAME ; void TPhoneCmdParamCallHeaderData::SetCipheringIndicatorAllowed(int)
- ?SetWaitTime@TPhoneCmdParamProgressNote@@QAEXVTTimeIntervalMicroSeconds32@@@Z @ 265 NONAME ; void TPhoneCmdParamProgressNote::SetWaitTime(class TTimeIntervalMicroSeconds32)
- ?Ciphering@TPhoneCmdParamEmergencyCallHeaderData@@QBEHXZ @ 266 NONAME ; int TPhoneCmdParamEmergencyCallHeaderData::Ciphering(void) const
- ??1CPhoneCallThemeMonitor@@UAE@XZ @ 267 NONAME ; CPhoneCallThemeMonitor::~CPhoneCallThemeMonitor(void)
- ?SetNumberType@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 268 NONAME ; void TPhoneCmdParamCallHeaderData::SetNumberType(int)
- ?Mute@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 269 NONAME ; int TPhoneCmdParamIncallIndicatorData::Mute(void) const
- ?SetBoolean@TPhoneCmdParamBoolean@@QAEXH@Z @ 270 NONAME ; void TPhoneCmdParamBoolean::SetBoolean(int)
- ?IsTelephonyFeatureSupported@CPhoneResourceResolverBase@@MBEHH@Z @ 271 NONAME ; int CPhoneResourceResolverBase::IsTelephonyFeatureSupported(int) const
- ?Instance@CPhoneMainErrorMessagesHandler@@SAPAV1@XZ @ 272 NONAME ; class CPhoneMainErrorMessagesHandler * CPhoneMainErrorMessagesHandler::Instance(void)
- ?SetViewUid@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 273 NONAME ; void TPhoneCmdParamAppInfo::SetViewUid(class TUid const &)
- ?SetServiceId@TPhoneCmdParamCallHeaderData@@QAEXK@Z @ 274 NONAME ; void TPhoneCmdParamCallHeaderData::SetServiceId(unsigned long)
- ?Instance@CPhoneCenRepProxy@@SAPAV1@XZ @ 275 NONAME ; class CPhoneCenRepProxy * CPhoneCenRepProxy::Instance(void)
- ?SetQueryType@TPhoneCmdParamQuery@@QAEXW4TPhoneQueryType@@@Z @ 276 NONAME ; void TPhoneCmdParamQuery::SetQueryType(enum TPhoneQueryType)
- ?Value@CPhonePubSubProxy@@QAEHABVTUid@@I@Z @ 277 NONAME ; int CPhonePubSubProxy::Value(class TUid const &, unsigned int)
- ?SetWiredAccAvailable@TPhoneCmdParamAudioAvailability@@QAEXH@Z @ 278 NONAME ; void TPhoneCmdParamAudioAvailability::SetWiredAccAvailable(int)
- ??0TPhoneCmdParamAudioOutput@@QAE@XZ @ 279 NONAME ; TPhoneCmdParamAudioOutput::TPhoneCmdParamAudioOutput(void)
- ?IsCallerImage@TPhoneCmdParamRingTone@@QAEHXZ @ 280 NONAME ; int TPhoneCmdParamRingTone::IsCallerImage(void)
- ??0TPhoneCmdParamQuery@@QAE@XZ @ 281 NONAME ; TPhoneCmdParamQuery::TPhoneCmdParamQuery(void)
- ?Instance@CPhoneMainResourceResolver@@SAPAV1@XZ @ 282 NONAME ; class CPhoneMainResourceResolver * CPhoneMainResourceResolver::Instance(void)
- ??1CPhoneLibraryContainer@@UAE@XZ @ 283 NONAME ; CPhoneLibraryContainer::~CPhoneLibraryContainer(void)
- ?ClearBlackListOnNextKey@CPhoneClearBlacklist@@QAEXXZ @ 284 NONAME ; void CPhoneClearBlacklist::ClearBlackListOnNextKey(void)
- ?Tone@TPhoneCmdParamQuery@@QBEHXZ @ 285 NONAME ; int TPhoneCmdParamQuery::Tone(void) const
- ?SetCiphering@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 286 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCiphering(int)
- ?SetRingingType@TPhoneCmdParamRingTone@@QAEXH@Z @ 287 NONAME ; void TPhoneCmdParamRingTone::SetRingingType(int)
- ?SetCipheringIndicatorAllowed@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 288 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCipheringIndicatorAllowed(int)
- ?NeedToEnableKeylock@CPhoneStorage@@UAEHXZ @ 289 NONAME ; int CPhoneStorage::NeedToEnableKeylock(void)
- ?AudioOutput@TPhoneCmdParamAudioOutput@@QBE?AW4TPEAudioOutput@@XZ @ 290 NONAME ; enum TPEAudioOutput TPhoneCmdParamAudioOutput::AudioOutput(void) const
- ?SetResourceId@TPhoneCmdParamProgressNote@@QAEXH@Z @ 291 NONAME ; void TPhoneCmdParamProgressNote::SetResourceId(int)
- ??0TPhoneCmdParamInteger@@QAE@XZ @ 292 NONAME ; TPhoneCmdParamInteger::TPhoneCmdParamInteger(void)
- ?SetType@TPhoneCmdParamGlobalNote@@QAEXW4PhoneNotificationType@@@Z @ 293 NONAME ; void TPhoneCmdParamGlobalNote::SetType(enum PhoneNotificationType)
- ?SetType@TPhoneCmdParamTransEffect@@QAEXW4TPhoneTransEffectType@@@Z @ 294 NONAME ; void TPhoneCmdParamTransEffect::SetType(enum TPhoneTransEffectType)
- ?Bitmap@TPhoneCmdParamBitmap@@QBEPAVCFbsBitmap@@XZ @ 295 NONAME ; class CFbsBitmap * TPhoneCmdParamBitmap::Bitmap(void) const
- ?After@CPhoneTimer@@QAEXVTTimeIntervalMicroSeconds32@@VTCallBack@@@Z @ 296 NONAME ; void CPhoneTimer::After(class TTimeIntervalMicroSeconds32, class TCallBack)
+ ?SetType@TPhoneCmdParamGlobalNote@@QAEXW4TPhoneNotificationType@@@Z @ 2 NONAME ; void TPhoneCmdParamGlobalNote::SetType(enum TPhoneNotificationType)
+ ?SetParticipantListCLI@TPhoneCmdParamCallHeaderData@@QAEXW4TPhoneParticipantListCLI@1@@Z @ 3 NONAME ; void TPhoneCmdParamCallHeaderData::SetParticipantListCLI(enum TPhoneCmdParamCallHeaderData::TPhoneParticipantListCLI)
+ ?ContactLink@TPhoneCmdParamCallHeaderData@@QBEABVTDesC8@@XZ @ 4 NONAME ; class TDesC8 const & TPhoneCmdParamCallHeaderData::ContactLink(void) const
+ ?LogIt@CPhoneLogger@@QAAXW4TPhoneUILoggingLevel@@W4TPhoneUILoggingComponent@@V?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 5 NONAME ; void CPhoneLogger::LogIt(enum TPhoneUILoggingLevel, enum TPhoneUILoggingComponent, class TRefByValue<class TDesC16 const >, ...)
+ ?IsEscapeKey@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 6 NONAME ; int CPhoneKeys::IsEscapeKey(struct TKeyEvent const &, enum TEventCode)
+ ?Tone@TPhoneCmdParamNote@@QBE?AW4TTone@CAknNoteDialog@@XZ @ 7 NONAME ; enum CAknNoteDialog::TTone TPhoneCmdParamNote::Tone(void) const
+ ?LogStateChange@CPhoneLogger@@QAEXHH@Z @ 8 NONAME ; void CPhoneLogger::LogStateChange(int, int)
+ ?SetObserver@TPhoneCmdParamNumberEntryObserver@@QAEXVTCallBack@@@Z @ 9 NONAME ; void TPhoneCmdParamNumberEntryObserver::SetObserver(class TCallBack)
+ ?QueryType@TPhoneCmdParamQuery@@QBE?AW4TPhoneQueryType@@XZ @ 10 NONAME ; enum TPhoneQueryType TPhoneCmdParamQuery::QueryType(void) const
+ ?SetCallType@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 11 NONAME ; void TPhoneCmdParamCallHeaderData::SetCallType(int)
+ ?NumberType@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 12 NONAME ; int TPhoneCmdParamCallHeaderData::NumberType(void) const
+ ?CbaCommandMapping@TPhoneCmdParamQuery@@QBEHH@Z @ 13 NONAME ; int TPhoneCmdParamQuery::CbaCommandMapping(int) const
+ ?SetTone@TPhoneCmdParamQuery@@QAEXH@Z @ 14 NONAME ; void TPhoneCmdParamQuery::SetTone(int)
+ ?CLIText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 15 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::CLIText(void) const
+ ??0CPhoneLogger@@QAE@VTUid@@@Z @ 16 NONAME ; CPhoneLogger::CPhoneLogger(class TUid)
+ ?RingingType@TPhoneCmdParamRingTone@@QBEHXZ @ 17 NONAME ; int TPhoneCmdParamRingTone::RingingType(void) const
+ ?Remove@CPhoneRecoverySystem@@SAXH@Z @ 18 NONAME ; void CPhoneRecoverySystem::Remove(int)
+ ??0TPhoneCmdParamKeyEvent@@QAE@XZ @ 19 NONAME ; TPhoneCmdParamKeyEvent::TPhoneCmdParamKeyEvent(void)
+ ?SetPhoneEngine@CPhoneLogger@@QAEXPAVMPEPhoneModel@@@Z @ 20 NONAME ; void CPhoneLogger::SetPhoneEngine(class MPEPhoneModel *)
+ ?SetSendKeyEnabled@TPhoneCmdParamQuery@@QAEXH@Z @ 21 NONAME ; void TPhoneCmdParamQuery::SetSendKeyEnabled(int)
+ ?Pointer@TPhoneCmdParamPointer@@QBEPAXXZ @ 22 NONAME ; void * TPhoneCmdParamPointer::Pointer(void) const
+ ?SetCallerText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 23 NONAME ; void TPhoneCmdParamCallHeaderData::SetCallerText(class TDesC16 const &)
+ ?Line2@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 24 NONAME ; int TPhoneCmdParamIncallIndicatorData::Line2(void) const
+ ?Text@TPhoneCmdParamGlobalNote@@QBEABVTDesC16@@XZ @ 25 NONAME ; class TDesC16 const & TPhoneCmdParamGlobalNote::Text(void) const
+ ?RecoverNow@CPhoneRecoverySystem@@QAEHHCH@Z @ 26 NONAME ; int CPhoneRecoverySystem::RecoverNow(int, signed char, int)
+ ?LogMsgFromControlToView@CPhoneLogger@@QAEXHH@Z @ 27 NONAME ; void CPhoneLogger::LogMsgFromControlToView(int, int)
+ ??0TPhoneCmdParamBitmap@@QAE@XZ @ 28 NONAME ; TPhoneCmdParamBitmap::TPhoneCmdParamBitmap(void)
+ ?SetHasThumbnail@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 29 NONAME ; void TPhoneCmdParamCallHeaderData::SetHasThumbnail(int)
+ ?Text@TPhoneCmdParamNote@@QBEABVTDesC16@@XZ @ 30 NONAME ; class TDesC16 const & TPhoneCmdParamNote::Text(void) const
+ ??1CPhoneMethodLogger@@UAE@XZ @ 31 NONAME ; CPhoneMethodLogger::~CPhoneMethodLogger(void)
+ ?MaskBitmap@TPhoneCmdParamBitmap@@QBEPAVCFbsBitmap@@XZ @ 32 NONAME ; class CFbsBitmap * TPhoneCmdParamBitmap::MaskBitmap(void) const
+ ?SetText@TPhoneCmdParamGlobalNote@@QAEXABVTDesC16@@@Z @ 33 NONAME ; void TPhoneCmdParamGlobalNote::SetText(class TDesC16 const &)
+ ?AddLibraryL@CPhoneLibraryContainer@@QAEXABVRLibrary@@@Z @ 34 NONAME ; void CPhoneLibraryContainer::AddLibraryL(class RLibrary const &)
+ ??1CPhoneResourceResolverBase@@UAE@XZ @ 35 NONAME ; CPhoneResourceResolverBase::~CPhoneResourceResolverBase(void)
+ ?SetInt@CPhoneCenRepProxy@@QAEHABVTUid@@IH@Z @ 36 NONAME ; int CPhoneCenRepProxy::SetInt(class TUid const &, unsigned int, int)
+ ?GetCustomCommandForTimeOut@TPhoneCmdParamQuery@@QBEHAAH@Z @ 37 NONAME ; int TPhoneCmdParamQuery::GetCustomCommandForTimeOut(int &) const
+ ?ParamId@TPhoneCommandParam@@QBE?AW4TPhoneParamId@1@XZ @ 38 NONAME ; enum TPhoneCommandParam::TPhoneParamId TPhoneCommandParam::ParamId(void) const
+ ?SetString@CPhoneCenRepProxy@@QAEHABVTUid@@IABVTDesC16@@@Z @ 39 NONAME ; int CPhoneCenRepProxy::SetString(class TUid const &, unsigned int, class TDesC16 const &)
+ ?Line2@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 40 NONAME ; int TPhoneCmdParamCallHeaderData::Line2(void) const
+ ??1CPhoneTimer@@UAE@XZ @ 41 NONAME ; CPhoneTimer::~CPhoneTimer(void)
+ ?LogMsgFromPEToPhoneUIEnd@CPhoneLogger@@QAEXH@Z @ 42 NONAME ; void CPhoneLogger::LogMsgFromPEToPhoneUIEnd(int)
+ ?DialerController@TPhoneCmdParamCustomDialer@@QAEPAVMPhoneDialerController@@XZ @ 43 NONAME ; class MPhoneDialerController * TPhoneCmdParamCustomDialer::DialerController(void)
+ ?SetMultipleInstances@TPhoneCmdParamAppInfo@@QAEXH@Z @ 44 NONAME ; void TPhoneCmdParamAppInfo::SetMultipleInstances(int)
+ ?ChangePropertyValue@CPhonePubSubProxy@@QAEXABVTUid@@IH@Z @ 45 NONAME ; void CPhonePubSubProxy::ChangePropertyValue(class TUid const &, unsigned int, int)
+ ?SetThumbnail@TPhoneCmdParamCallHeaderData@@QAEXPAVCFbsBitmap@@@Z @ 46 NONAME ; void TPhoneCmdParamCallHeaderData::SetThumbnail(class CFbsBitmap *)
+ ?SetCbaCommandMapping@TPhoneCmdParamQuery@@QAEXHH@Z @ 47 NONAME ; void TPhoneCmdParamQuery::SetCbaCommandMapping(int, int)
+ ?EventCode@TPhoneCmdParamKeyEvent@@QBE?AW4TEventCode@@XZ @ 48 NONAME ; enum TEventCode TPhoneCmdParamKeyEvent::EventCode(void) const
+ ?KeyEvent@TPhoneCmdParamKeyEvent@@QBE?BUTKeyEvent@@XZ @ 49 NONAME ; struct TKeyEvent const TPhoneCmdParamKeyEvent::KeyEvent(void) const
+ ?SetToneType@TPhoneCmdParamGlobalNote@@QAEXW4TPhoneNotificationToneType@@@Z @ 50 NONAME ; void TPhoneCmdParamGlobalNote::SetToneType(enum TPhoneNotificationToneType)
+ ?SetDataText@TPhoneCmdParamQuery@@QAEXPAVTDes16@@@Z @ 51 NONAME ; void TPhoneCmdParamQuery::SetDataText(class TDes16 *)
+ ??0TPhoneCmdParamAppInfo@@QAE@XZ @ 52 NONAME ; TPhoneCmdParamAppInfo::TPhoneCmdParamAppInfo(void)
+ ?LittleBubbleVisible@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 53 NONAME ; int TPhoneCmdParamIncallIndicatorData::LittleBubbleVisible(void) const
+ ?SetCallState@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 54 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCallState(int)
+ ?GetString@CPhoneCenRepProxy@@QBEHABVTUid@@IAAVTDes16@@@Z @ 55 NONAME ; int CPhoneCenRepProxy::GetString(class TUid const &, unsigned int, class TDes16 &) const
+ ?SetCauseCode@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 56 NONAME ; void TPhoneCmdParamGlobalNote::SetCauseCode(int)
+ ?ResourceId@TPhoneCmdParamProgressNote@@QBEHXZ @ 57 NONAME ; int TPhoneCmdParamProgressNote::ResourceId(void) const
+ ?CallId@TPhoneCmdParamCallStateData@@QBEHXZ @ 58 NONAME ; int TPhoneCmdParamCallStateData::CallId(void) const
+ ?NotifyChangeL@CPhoneCenRepProxy@@QAEXABVTUid@@IPAVMPhoneCenRepObserver@@@Z @ 59 NONAME ; void CPhoneCenRepProxy::NotifyChangeL(class TUid const &, unsigned int, class MPhoneCenRepObserver *)
+ ?SetResourceId@TPhoneCmdParamDynMenu@@QAEXH@Z @ 60 NONAME ; void TPhoneCmdParamDynMenu::SetResourceId(int)
+ ?Validate@CPhoneKeys@@SAHABVTDesC16@@@Z @ 61 NONAME ; int CPhoneKeys::Validate(class TDesC16 const &)
+ ??0TPhoneCmdParamKeyCapture@@QAE@XZ @ 62 NONAME ; TPhoneCmdParamKeyCapture::TPhoneCmdParamKeyCapture(void)
+ ?SetResourceId@TPhoneCmdParamNote@@QAEXH@Z @ 63 NONAME ; void TPhoneCmdParamNote::SetResourceId(int)
+ ?LogMsgFromPEToPhoneUI@CPhoneLogger@@QAEXHH@Z @ 64 NONAME ; void CPhoneLogger::LogMsgFromPEToPhoneUI(int, int)
+ ?SetNotificationDialog@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 65 NONAME ; void TPhoneCmdParamGlobalNote::SetNotificationDialog(int)
+ ??0TPhoneCmdParamProgressNote@@QAE@XZ @ 66 NONAME ; TPhoneCmdParamProgressNote::TPhoneCmdParamProgressNote(void)
+ ?CallState@TPhoneCmdParamCallStateData@@QBEHXZ @ 67 NONAME ; int TPhoneCmdParamCallStateData::CallState(void) const
+ ?SetPointer@TPhoneCmdParamPointer@@QAEXPAX@Z @ 68 NONAME ; void TPhoneCmdParamPointer::SetPointer(void *)
+ ??1CPhoneCenRepProxy@@UAE@XZ @ 69 NONAME ; CPhoneCenRepProxy::~CPhoneCenRepProxy(void)
+ ?SetEventCode@TPhoneCmdParamKeyEvent@@QAEXW4TEventCode@@@Z @ 70 NONAME ; void TPhoneCmdParamKeyEvent::SetEventCode(enum TEventCode)
+ ?WaitTime@TPhoneCmdParamProgressNote@@QBE?AVTTimeIntervalMicroSeconds32@@XZ @ 71 NONAME ; class TTimeIntervalMicroSeconds32 TPhoneCmdParamProgressNote::WaitTime(void) const
+ ?SetParam@TPhoneCmdParamAppInfo@@QAEXABVTDesC8@@@Z @ 72 NONAME ; void TPhoneCmdParamAppInfo::SetParam(class TDesC8 const &)
+ ??0TPhoneCmdParamPointer@@QAE@XZ @ 73 NONAME ; TPhoneCmdParamPointer::TPhoneCmdParamPointer(void)
+ ??0TPhoneCmdParamGlobalNote@@QAE@XZ @ 74 NONAME ; TPhoneCmdParamGlobalNote::TPhoneCmdParamGlobalNote(void)
+ ?CallType@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 75 NONAME ; int TPhoneCmdParamCallHeaderData::CallType(void) const
+ ?SetCiphering@TPhoneCmdParamEmergencyCallHeaderData@@QAEXH@Z @ 76 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetCiphering(int)
+ ?SetTone@TPhoneCmdParamNote@@QAEXW4TTone@CAknNoteDialog@@@Z @ 77 NONAME ; void TPhoneCmdParamNote::SetTone(enum CAknNoteDialog::TTone)
+ ?SetCustomCommandForTimeOut@TPhoneCmdParamQuery@@QAEXH@Z @ 78 NONAME ; void TPhoneCmdParamQuery::SetCustomCommandForTimeOut(int)
+ ??1TPhoneCmdParamCallHeaderData@@QAE@XZ @ 79 NONAME ; TPhoneCmdParamCallHeaderData::~TPhoneCmdParamCallHeaderData(void)
+ ?IsBTAccAvailable@TPhoneCmdParamAudioAvailability@@QBEHXZ @ 80 NONAME ; int TPhoneCmdParamAudioAvailability::IsBTAccAvailable(void) const
+ ?NewL@CPhoneStorage@@SAPAV1@XZ @ 81 NONAME ; class CPhoneStorage * CPhoneStorage::NewL(void)
+ ?CNAPTextClippingDirection@TPhoneCmdParamCallHeaderData@@QBE?AW4TPhoneTextClippingDirection@1@XZ @ 82 NONAME ; enum TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection TPhoneCmdParamCallHeaderData::CNAPTextClippingDirection(void) const
+ ?Timeout@TPhoneCmdParamNote@@QBE?AW4TTimeout@CAknNoteDialog@@XZ @ 83 NONAME ; enum CAknNoteDialog::TTimeout TPhoneCmdParamNote::Timeout(void) const
+ ?Instance@CPhoneRecoverySystem@@SAPAV1@XZ @ 84 NONAME ; class CPhoneRecoverySystem * CPhoneRecoverySystem::Instance(void)
+ ?CancelTimer@CPhoneTimer@@QAEXXZ @ 85 NONAME ; void CPhoneTimer::CancelTimer(void)
+ ?NewL@CPhoneTimer@@SAPAV1@H@Z @ 86 NONAME ; class CPhoneTimer * CPhoneTimer::NewL(int)
+ ?GetInt@CPhoneCenRepProxy@@QBEHABVTUid@@IAAH@Z @ 87 NONAME ; int CPhoneCenRepProxy::GetInt(class TUid const &, unsigned int, int &) const
+ ?SetTextToSay@TPhoneCmdParamRingTone@@QAEXABVTDesC16@@@Z @ 88 NONAME ; void TPhoneCmdParamRingTone::SetTextToSay(class TDesC16 const &)
+ ?SetCallState@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 89 NONAME ; void TPhoneCmdParamCallHeaderData::SetCallState(int)
+ ?ContentCba@TPhoneCmdParamQuery@@QBEHXZ @ 90 NONAME ; int TPhoneCmdParamQuery::ContentCba(void) const
+ ?SetTextResourceId@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 91 NONAME ; void TPhoneCmdParamGlobalNote::SetTextResourceId(int)
+ ??0TPhoneCmdParamDynMenu@@QAE@XZ @ 92 NONAME ; TPhoneCmdParamDynMenu::TPhoneCmdParamDynMenu(void)
+ ?CancelAllNotifications@CPhonePubSubProxy@@SAXPAVMPhonePubSubObserver@@@Z @ 93 NONAME ; void CPhonePubSubProxy::CancelAllNotifications(class MPhonePubSubObserver *)
+ ??0TPhoneCommandParam@@QAE@XZ @ 94 NONAME ; TPhoneCommandParam::TPhoneCommandParam(void)
+ ?SetCLIText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@W4TPhoneTextClippingDirection@1@@Z @ 95 NONAME ; void TPhoneCmdParamCallHeaderData::SetCLIText(class TDesC16 const &, enum TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection)
+ ??1CPhoneLogger@@UAE@XZ @ 96 NONAME ; CPhoneLogger::~CPhoneLogger(void)
+ ?SetCallState@TPhoneCmdParamCallStateData@@QAEXH@Z @ 97 NONAME ; void TPhoneCmdParamCallStateData::SetCallState(int)
+ ?CallerText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 98 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::CallerText(void) const
+ ?Diverted@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 99 NONAME ; int TPhoneCmdParamCallHeaderData::Diverted(void) const
+ ?ToneType@TPhoneCmdParamGlobalNote@@QBE?AW4TPhoneNotificationToneType@@XZ @ 100 NONAME ; enum TPhoneNotificationToneType TPhoneCmdParamGlobalNote::ToneType(void) const
+ ?String@TPhoneCmdParamString@@QAEPAVTPtr16@@XZ @ 101 NONAME ; class TPtr16 * TPhoneCmdParamString::String(void)
+ ?SetKey@TPhoneCmdParamKeyCapture@@QAEXW4TStdScanCode@@@Z @ 102 NONAME ; void TPhoneCmdParamKeyCapture::SetKey(enum TStdScanCode)
+ ?NotificationDialog@TPhoneCmdParamGlobalNote@@QBEHXZ @ 103 NONAME ; int TPhoneCmdParamGlobalNote::NotificationDialog(void) const
+ ?IsExtraChar@CPhoneKeys@@SAHH@Z @ 104 NONAME ; int CPhoneKeys::IsExtraChar(int)
+ ?SetDynMenu@TPhoneCmdParamDynMenu@@QAEXPAX@Z @ 105 NONAME ; void TPhoneCmdParamDynMenu::SetDynMenu(void *)
+ ?IsSecondHashKey@CPhoneKeys@@SAHABVTDes16@@@Z @ 106 NONAME ; int CPhoneKeys::IsSecondHashKey(class TDes16 const &)
+ ?SetCallerImageStatus@TPhoneCmdParamRingTone@@QAEXH@Z @ 107 NONAME ; void TPhoneCmdParamRingTone::SetCallerImageStatus(int)
+ ?SetTimeout@TPhoneCmdParamGlobalNote@@QAEXH@Z @ 108 NONAME ; void TPhoneCmdParamGlobalNote::SetTimeout(int)
+ ?GetReal@CPhoneCenRepProxy@@QBEHABVTUid@@IAAN@Z @ 109 NONAME ; int CPhoneCenRepProxy::GetReal(class TUid const &, unsigned int, double &) const
+ ?SetShortLabelText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 110 NONAME ; void TPhoneCmdParamCallHeaderData::SetShortLabelText(class TDesC16 const &)
+ ?SetDialerController@TPhoneCmdParamCustomDialer@@QAEXPAVMPhoneDialerController@@@Z @ 111 NONAME ; void TPhoneCmdParamCustomDialer::SetDialerController(class MPhoneDialerController *)
+ ?RingTone@TPhoneCmdParamRingTone@@QBEABVTDesC16@@XZ @ 112 NONAME ; class TDesC16 const & TPhoneCmdParamRingTone::RingTone(void) const
+ ?TimeOut@TPhoneCmdParamQuery@@QBEHXZ @ 113 NONAME ; int TPhoneCmdParamQuery::TimeOut(void) const
+ ?ShortLabelText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 114 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::ShortLabelText(void) const
+ ?SetInteger@TPhoneCmdParamInteger@@QAEXH@Z @ 115 NONAME ; void TPhoneCmdParamInteger::SetInteger(int)
+ ?SetMaskBitmap@TPhoneCmdParamBitmap@@QAEXPAVCFbsBitmap@@@Z @ 116 NONAME ; void TPhoneCmdParamBitmap::SetMaskBitmap(class CFbsBitmap *)
+ ?SetTimeout@TPhoneCmdParamNote@@QAEXW4TTimeout@CAknNoteDialog@@@Z @ 117 NONAME ; void TPhoneCmdParamNote::SetTimeout(enum CAknNoteDialog::TTimeout)
+ ?SetCustomMessage@TPhoneCmdParamAppInfo@@QAEXABVTDesC8@@@Z @ 118 NONAME ; void TPhoneCmdParamAppInfo::SetCustomMessage(class TDesC8 const &)
+ ?Type@TPhoneCmdParamGlobalNote@@QBE?AW4TPhoneNotificationType@@XZ @ 119 NONAME ; enum TPhoneNotificationType TPhoneCmdParamGlobalNote::Type(void) const
+ ?BaseConstructL@CPhoneResourceResolverBase@@QAEXXZ @ 120 NONAME ; void CPhoneResourceResolverBase::BaseConstructL(void)
+ ?SetTextResourceId@TPhoneCmdParamNote@@QAEXH@Z @ 121 NONAME ; void TPhoneCmdParamNote::SetTextResourceId(int)
+ ?SetString@TPhoneCmdParamString@@QAEXPAVTPtr16@@@Z @ 122 NONAME ; void TPhoneCmdParamString::SetString(class TPtr16 *)
+ ?SetAppUid@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 123 NONAME ; void TPhoneCmdParamAppInfo::SetAppUid(class TUid const &)
+ ?SetBTAccAvailable@TPhoneCmdParamAudioAvailability@@QAEXH@Z @ 124 NONAME ; void TPhoneCmdParamAudioAvailability::SetBTAccAvailable(int)
+ ?IsTelephonyFeatureSupported@CPhoneCenRepProxy@@QAEHH@Z @ 125 NONAME ; int CPhoneCenRepProxy::IsTelephonyFeatureSupported(int)
+ ?CallImageThemeFilePath@CPhoneCallThemeMonitor@@QBE?AVTPtrC16@@XZ @ 126 NONAME ; class TPtrC16 CPhoneCallThemeMonitor::CallImageThemeFilePath(void) const
+ ?HasThumbnail@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 127 NONAME ; int TPhoneCmdParamCallHeaderData::HasThumbnail(void) const
+ ?ClearBlackListNow@CPhoneClearBlacklist@@QAEXXZ @ 128 NONAME ; void CPhoneClearBlacklist::ClearBlackListNow(void)
+ ?SetCipheringIndicatorAllowed@TPhoneCmdParamEmergencyCallHeaderData@@QAEXH@Z @ 129 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetCipheringIndicatorAllowed(int)
+ ?SetCommandParamId@TPhoneCmdParamQuery@@QAEXW4TPhoneParamId@TPhoneCommandParam@@@Z @ 130 NONAME ; void TPhoneCmdParamQuery::SetCommandParamId(enum TPhoneCommandParam::TPhoneParamId)
+ ??0TPhoneCmdParamEmergencyCallHeaderData@@QAE@XZ @ 131 NONAME ; TPhoneCmdParamEmergencyCallHeaderData::TPhoneCmdParamEmergencyCallHeaderData(void)
+ ?After@CPhoneTimer@@QAEXVTTimeIntervalMicroSeconds32@@PAVMPhoneTimer@@@Z @ 132 NONAME ; void CPhoneTimer::After(class TTimeIntervalMicroSeconds32, class MPhoneTimer *)
+ ?NewL@CPhoneLibraryContainer@@SAPAV1@XZ @ 133 NONAME ; class CPhoneLibraryContainer * CPhoneLibraryContainer::NewL(void)
+ ?CreateL@CPhoneClearBlacklist@@SAPAV1@AAVRWsSession@@ABVRWindowBase@@@Z @ 134 NONAME ; class CPhoneClearBlacklist * CPhoneClearBlacklist::CreateL(class RWsSession &, class RWindowBase const &)
+ ??1CPhoneStorage@@UAE@XZ @ 135 NONAME ; CPhoneStorage::~CPhoneStorage(void)
+ ?SetVolume@TPhoneCmdParamRingTone@@QAEXH@Z @ 136 NONAME ; void TPhoneCmdParamRingTone::SetVolume(int)
+ ??0TPhoneCmdParamString@@QAE@XZ @ 137 NONAME ; TPhoneCmdParamString::TPhoneCmdParamString(void)
+ ?SetContactLink@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC8@@@Z @ 138 NONAME ; void TPhoneCmdParamCallHeaderData::SetContactLink(class TDesC8 const &)
+ ??4TPhoneCmdParamQuery@@QAEAAV0@ABV0@@Z @ 139 NONAME ; class TPhoneCmdParamQuery & TPhoneCmdParamQuery::operator=(class TPhoneCmdParamQuery const &)
+ ??0TPhoneCmdParamAudioAvailability@@QAE@XZ @ 140 NONAME ; TPhoneCmdParamAudioAvailability::TPhoneCmdParamAudioAvailability(void)
+ ?Timeout@TPhoneCmdParamGlobalNote@@QBEHXZ @ 141 NONAME ; int TPhoneCmdParamGlobalNote::Timeout(void) const
+ ??0TPhoneCmdParamRingTone@@QAE@XZ @ 142 NONAME ; TPhoneCmdParamRingTone::TPhoneCmdParamRingTone(void)
+ ?Observer@TPhoneCmdParamNumberEntryObserver@@QAE?AVTCallBack@@XZ @ 143 NONAME ; class TCallBack TPhoneCmdParamNumberEntryObserver::Observer(void)
+ ??0CPhoneResourceResolverBase@@IAE@XZ @ 144 NONAME ; CPhoneResourceResolverBase::CPhoneResourceResolverBase(void)
+ ?SetCallId@TPhoneCmdParamCallStateData@@QAEXH@Z @ 145 NONAME ; void TPhoneCmdParamCallStateData::SetCallId(int)
+ ?MultipleInstances@TPhoneCmdParamAppInfo@@QBEHXZ @ 146 NONAME ; int TPhoneCmdParamAppInfo::MultipleInstances(void) const
+ ?ItemTextArrayForListQuery@TPhoneCmdParamQuery@@QBEPAVMDesC16Array@@XZ @ 147 NONAME ; class MDesC16Array * TPhoneCmdParamQuery::ItemTextArrayForListQuery(void) const
+ ?SetHeaderText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 148 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetHeaderText(class TDesC16 const &)
+ ?SetContentCba@TPhoneCmdParamQuery@@QAEXH@Z @ 149 NONAME ; void TPhoneCmdParamQuery::SetContentCba(int)
+ ?CaptureType@TPhoneCmdParamKeyCapture@@QBE?AW4TPhoneCaptureType@@XZ @ 150 NONAME ; enum TPhoneCaptureType TPhoneCmdParamKeyCapture::CaptureType(void) const
+ ?SetQueryResourceId@TPhoneCmdParamQuery@@QAEXH@Z @ 151 NONAME ; void TPhoneCmdParamQuery::SetQueryResourceId(int)
+ ?CancelNotify@CPhoneCenRepProxy@@QAEXPAVMPhoneCenRepObserver@@I@Z @ 152 NONAME ; void CPhoneCenRepProxy::CancelNotify(class MPhoneCenRepObserver *, unsigned int)
+ ?Param@TPhoneCmdParamAppInfo@@QBEABVTDesC8@@XZ @ 153 NONAME ; class TDesC8 const & TPhoneCmdParamAppInfo::Param(void) const
+ ??0CPhoneMethodLogger@@QAE@W4TPhoneUILoggingComponent@@VTPtrC16@@@Z @ 154 NONAME ; CPhoneMethodLogger::CPhoneMethodLogger(enum TPhoneUILoggingComponent, class TPtrC16)
+ ?IsDtmfTone@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 155 NONAME ; int CPhoneKeys::IsDtmfTone(struct TKeyEvent const &, enum TEventCode)
+ ?SetMode@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 156 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetMode(int)
+ ?NewL@CPhoneCallThemeMonitor@@SAPAV1@XZ @ 157 NONAME ; class CPhoneCallThemeMonitor * CPhoneCallThemeMonitor::NewL(void)
+ ?SendKeyEnabled@TPhoneCmdParamQuery@@QBEHXZ @ 158 NONAME ; int TPhoneCmdParamQuery::SendKeyEnabled(void) const
+ ?SetNeedToEnableKeylock@CPhoneStorage@@UAEXH@Z @ 159 NONAME ; void CPhoneStorage::SetNeedToEnableKeylock(int)
+ ?Find@CPhoneCenRepProxy@@QBEHABVTUid@@KKAAV?$RArray@K@@@Z @ 160 NONAME ; int CPhoneCenRepProxy::Find(class TUid const &, unsigned long, unsigned long, class RArray<unsigned long> &) const
+ ?SetLabelText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 161 NONAME ; void TPhoneCmdParamCallHeaderData::SetLabelText(class TDesC16 const &)
+ ?CNAPText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 162 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::CNAPText(void) const
+ ?SetOwnPhoneNumberText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 163 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetOwnPhoneNumberText(class TDesC16 const &)
+ ?Emergency@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 164 NONAME ; int TPhoneCmdParamIncallIndicatorData::Emergency(void) const
+ ?AppUid@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 165 NONAME ; class TUid TPhoneCmdParamAppInfo::AppUid(void) const
+ ?CustomMessage@TPhoneCmdParamAppInfo@@QBEABVTDesC8@@XZ @ 166 NONAME ; class TDesC8 const & TPhoneCmdParamAppInfo::CustomMessage(void) const
+ ?QueryResourceId@TPhoneCmdParamQuery@@QBEHXZ @ 167 NONAME ; int TPhoneCmdParamQuery::QueryResourceId(void) const
+ ?NotifyChangeL@CPhonePubSubProxy@@QAEXABVTUid@@IPAVMPhonePubSubObserver@@@Z @ 168 NONAME ; void CPhonePubSubProxy::NotifyChangeL(class TUid const &, unsigned int, class MPhonePubSubObserver *)
+ ?SetRingTone@TPhoneCmdParamRingTone@@QAEXABVTDesC16@@@Z @ 169 NONAME ; void TPhoneCmdParamRingTone::SetRingTone(class TDesC16 const &)
+ ?SetEmergency@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 170 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetEmergency(int)
+ ?SetDefaultCba@TPhoneCmdParamQuery@@QAEXH@Z @ 171 NONAME ; void TPhoneCmdParamQuery::SetDefaultCba(int)
+ ?Type@TPhoneCmdParamTransEffect@@QBE?AW4TPhoneTransEffectType@@XZ @ 172 NONAME ; enum TPhoneTransEffectType TPhoneCmdParamTransEffect::Type(void) const
+ ??0TPhoneCmdParamSfiData@@QAE@XZ @ 173 NONAME ; TPhoneCmdParamSfiData::TPhoneCmdParamSfiData(void)
+ ??0TPhoneCmdParamCallHeaderData@@QAE@XZ @ 174 NONAME ; TPhoneCmdParamCallHeaderData::TPhoneCmdParamCallHeaderData(void)
+ ??1CPhoneClearBlacklist@@UAE@XZ @ 175 NONAME ; CPhoneClearBlacklist::~CPhoneClearBlacklist(void)
+ ?SetMute@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 176 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetMute(int)
+ ?KeyCode@TPhoneCmdParamKeyCapture@@QBE?AW4TKeyCode@@XZ @ 177 NONAME ; enum TKeyCode TPhoneCmdParamKeyCapture::KeyCode(void) const
+ ?IsNumberKey@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 178 NONAME ; int CPhoneKeys::IsNumberKey(struct TKeyEvent const &, enum TEventCode)
+ ?TextResourceId@TPhoneCmdParamGlobalNote@@QBEHXZ @ 179 NONAME ; int TPhoneCmdParamGlobalNote::TextResourceId(void) const
+ ?SetCiphering@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 180 NONAME ; void TPhoneCmdParamCallHeaderData::SetCiphering(int)
+ ?EnablePreconditionL@CPhoneRecoverySystem@@QAEXXZ @ 181 NONAME ; void CPhoneRecoverySystem::EnablePreconditionL(void)
+ ?AddL@CPhoneRecoverySystem@@QAEHVTCallBack@@CW4TRecoveryState@CTeleRecoverySystem@@@Z @ 182 NONAME ; int CPhoneRecoverySystem::AddL(class TCallBack, signed char, enum CTeleRecoverySystem::TRecoveryState)
+ ?SetLine2@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 183 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetLine2(int)
+ ?SetAudioOutput@TPhoneCmdParamAudioOutput@@QAEXW4TPEAudioOutput@@@Z @ 184 NONAME ; void TPhoneCmdParamAudioOutput::SetAudioOutput(enum TPEAudioOutput)
+ ?HeaderText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 185 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::HeaderText(void) const
+ ?CallImageThemeSettings@CPhoneCallThemeMonitor@@QBEHXZ @ 186 NONAME ; int CPhoneCallThemeMonitor::CallImageThemeSettings(void) const
+ ??0TPhoneCmdParamTransEffect@@QAE@XZ @ 187 NONAME ; TPhoneCmdParamTransEffect::TPhoneCmdParamTransEffect(void)
+ ?Number@TPhoneCmdParamSfiData@@QBEABVTDesC16@@XZ @ 188 NONAME ; class TDesC16 const & TPhoneCmdParamSfiData::Number(void) const
+ ?OwnPhoneNumberText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 189 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::OwnPhoneNumberText(void) const
+ ?CauseCode@TPhoneCmdParamGlobalNote@@QBEHXZ @ 190 NONAME ; int TPhoneCmdParamGlobalNote::CauseCode(void) const
+ ?QueryPrompt@TPhoneCmdParamQuery@@QBEABVTDesC16@@XZ @ 191 NONAME ; class TDesC16 const & TPhoneCmdParamQuery::QueryPrompt(void) const
+ ?SetQueryPrompt@TPhoneCmdParamQuery@@QAEXABVTDesC16@@@Z @ 192 NONAME ; void TPhoneCmdParamQuery::SetQueryPrompt(class TDesC16 const &)
+ ?IsNumericKey@CPhoneKeys@@SAHABUTKeyEvent@@W4TEventCode@@@Z @ 193 NONAME ; int CPhoneKeys::IsNumericKey(struct TKeyEvent const &, enum TEventCode)
+ ?SetCaptureType@TPhoneCmdParamKeyCapture@@QAEXW4TPhoneCaptureType@@@Z @ 194 NONAME ; void TPhoneCmdParamKeyCapture::SetCaptureType(enum TPhoneCaptureType)
+ ?ViewUid@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 195 NONAME ; class TUid TPhoneCmdParamAppInfo::ViewUid(void) const
+ ?SetLabelText@TPhoneCmdParamEmergencyCallHeaderData@@QAEXABVTDesC16@@@Z @ 196 NONAME ; void TPhoneCmdParamEmergencyCallHeaderData::SetLabelText(class TDesC16 const &)
+ ?IsCallerText@TPhoneCmdParamRingTone@@QAEHXZ @ 197 NONAME ; int TPhoneCmdParamRingTone::IsCallerText(void)
+ ?SetBitmap@TPhoneCmdParamBitmap@@QAEXPAVCFbsBitmap@@@Z @ 198 NONAME ; void TPhoneCmdParamBitmap::SetBitmap(class CFbsBitmap *)
+ ?SetNumber@TPhoneCmdParamSfiData@@QAEXABVTDesC16@@@Z @ 199 NONAME ; void TPhoneCmdParamSfiData::SetNumber(class TDesC16 const &)
+ ?CipheringIndicatorAllowed@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 200 NONAME ; int TPhoneCmdParamCallHeaderData::CipheringIndicatorAllowed(void) const
+ ?Name@TPhoneCmdParamSfiData@@QBEABVTDesC16@@XZ @ 201 NONAME ; class TDesC16 const & TPhoneCmdParamSfiData::Name(void) const
+ ??0TPhoneCmdParamQuery@@QAE@ABV0@@Z @ 202 NONAME ; TPhoneCmdParamQuery::TPhoneCmdParamQuery(class TPhoneCmdParamQuery const &)
+ ?CallState@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 203 NONAME ; int TPhoneCmdParamCallHeaderData::CallState(void) const
+ ??0TPhoneCmdParamIncallIndicatorData@@QAE@XZ @ 204 NONAME ; TPhoneCmdParamIncallIndicatorData::TPhoneCmdParamIncallIndicatorData(void)
+ ?Picture@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 205 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::Picture(void) const
+ ?SetCallThemeSettingsObserver@CPhoneCallThemeMonitor@@QAEXPAVMPhoneCallThemeSettingsObserver@@@Z @ 206 NONAME ; void CPhoneCallThemeMonitor::SetCallThemeSettingsObserver(class MPhoneCallThemeSettingsObserver *)
+ ?SetDiverted@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 207 NONAME ; void TPhoneCmdParamCallHeaderData::SetDiverted(int)
+ ?ServiceId@TPhoneCmdParamCallHeaderData@@QBEKXZ @ 208 NONAME ; unsigned long TPhoneCmdParamCallHeaderData::ServiceId(void) const
+ ?LabelText@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 209 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::LabelText(void) const
+ ?Overflow@CPhoneLogger@@EAEXAAVTDes16@@@Z @ 210 NONAME ; void CPhoneLogger::Overflow(class TDes16 &)
+ ?SetCNAPText@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@W4TPhoneTextClippingDirection@1@@Z @ 211 NONAME ; void TPhoneCmdParamCallHeaderData::SetCNAPText(class TDesC16 const &, enum TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection)
+ ?SetKeyEvent@TPhoneCmdParamKeyEvent@@QAEXABUTKeyEvent@@@Z @ 212 NONAME ; void TPhoneCmdParamKeyEvent::SetKeyEvent(struct TKeyEvent const &)
+ ?Instance@CPhonePubSubProxy@@SAPAV1@XZ @ 213 NONAME ; class CPhonePubSubProxy * CPhonePubSubProxy::Instance(void)
+ ?ResourceId@TPhoneCmdParamNote@@QBEHXZ @ 214 NONAME ; int TPhoneCmdParamNote::ResourceId(void) const
+ ?CipheringIndicatorAllowed@TPhoneCmdParamEmergencyCallHeaderData@@QBEHXZ @ 215 NONAME ; int TPhoneCmdParamEmergencyCallHeaderData::CipheringIndicatorAllowed(void) const
+ ?CancelAllNotifies@CPhoneCenRepProxy@@SAXPAVMPhoneCenRepObserver@@@Z @ 216 NONAME ; void CPhoneCenRepProxy::CancelAllNotifies(class MPhoneCenRepObserver *)
+ ?TextResourceId@TPhoneCmdParamNote@@QBEHXZ @ 217 NONAME ; int TPhoneCmdParamNote::TextResourceId(void) const
+ ?SetRemotePhoneNumber@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 218 NONAME ; void TPhoneCmdParamCallHeaderData::SetRemotePhoneNumber(class TDesC16 const &)
+ ?CipheringIndicatorAllowed@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 219 NONAME ; int TPhoneCmdParamIncallIndicatorData::CipheringIndicatorAllowed(void) const
+ ??0TPhoneCmdParamCallStateData@@QAE@XZ @ 220 NONAME ; TPhoneCmdParamCallStateData::TPhoneCmdParamCallStateData(void)
+ ?SetKeyCode@TPhoneCmdParamKeyCapture@@QAEXW4TKeyCode@@@Z @ 221 NONAME ; void TPhoneCmdParamKeyCapture::SetKeyCode(enum TKeyCode)
+ ?CustomMessageId@TPhoneCmdParamAppInfo@@QBE?AVTUid@@XZ @ 222 NONAME ; class TUid TPhoneCmdParamAppInfo::CustomMessageId(void) const
+ ?RemotePhoneNumber@TPhoneCmdParamCallHeaderData@@QBEABVTDesC16@@XZ @ 223 NONAME ; class TDesC16 const & TPhoneCmdParamCallHeaderData::RemotePhoneNumber(void) const
+ ?SetType@TPhoneCmdParamNote@@QAEXW4TPhoneNoteType@@@Z @ 224 NONAME ; void TPhoneCmdParamNote::SetType(enum TPhoneNoteType)
+ ?Instance@CPhoneClearBlacklist@@SAPAV1@XZ @ 225 NONAME ; class CPhoneClearBlacklist * CPhoneClearBlacklist::Instance(void)
+ ?TextToSay@TPhoneCmdParamRingTone@@QBEABVTDesC16@@XZ @ 226 NONAME ; class TDesC16 const & TPhoneCmdParamRingTone::TextToSay(void) const
+ ?Type@TPhoneCmdParamNote@@QBE?AW4TPhoneNoteType@@XZ @ 227 NONAME ; enum TPhoneNoteType TPhoneCmdParamNote::Type(void) const
+ ?SetPicture@TPhoneCmdParamCallHeaderData@@QAEXABVTDesC16@@@Z @ 228 NONAME ; void TPhoneCmdParamCallHeaderData::SetPicture(class TDesC16 const &)
+ ?Integer@TPhoneCmdParamInteger@@QBEHXZ @ 229 NONAME ; int TPhoneCmdParamInteger::Integer(void) const
+ ?Mode@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 230 NONAME ; int TPhoneCmdParamIncallIndicatorData::Mode(void) const
+ ?SetCallerTextStatus@TPhoneCmdParamRingTone@@QAEXH@Z @ 231 NONAME ; void TPhoneCmdParamRingTone::SetCallerTextStatus(int)
+ ?SetText@TPhoneCmdParamNote@@QAEXABVTDesC16@@@Z @ 232 NONAME ; void TPhoneCmdParamNote::SetText(class TDesC16 const &)
+ ?IsWiredAccAvailable@TPhoneCmdParamAudioAvailability@@QBEHXZ @ 233 NONAME ; int TPhoneCmdParamAudioAvailability::IsWiredAccAvailable(void) const
+ ??0TPhoneCmdParamBoolean@@QAE@XZ @ 234 NONAME ; TPhoneCmdParamBoolean::TPhoneCmdParamBoolean(void)
+ ?QueryCommandObserver@TPhoneCmdParamQuery@@QAEPAVMPhoneQueryCommandObserver@@XZ @ 235 NONAME ; class MPhoneQueryCommandObserver * TPhoneCmdParamQuery::QueryCommandObserver(void)
+ ?DataText@TPhoneCmdParamQuery@@QBEPAVTDes16@@XZ @ 236 NONAME ; class TDes16 * TPhoneCmdParamQuery::DataText(void) const
+ ?SetReal@CPhoneCenRepProxy@@QAEHABVTUid@@IN@Z @ 237 NONAME ; int CPhoneCenRepProxy::SetReal(class TUid const &, unsigned int, double)
+ ??0TPhoneCmdParamCustomDialer@@QAE@XZ @ 238 NONAME ; TPhoneCmdParamCustomDialer::TPhoneCmdParamCustomDialer(void)
+ ??1CPhonePubSubProxy@@UAE@XZ @ 239 NONAME ; CPhonePubSubProxy::~CPhonePubSubProxy(void)
+ ??0TPhoneCmdParamNote@@QAE@XZ @ 240 NONAME ; TPhoneCmdParamNote::TPhoneCmdParamNote(void)
+ ?Volume@TPhoneCmdParamRingTone@@QBEHXZ @ 241 NONAME ; int TPhoneCmdParamRingTone::Volume(void) const
+ ?SetItemTextArrayForListQuery@TPhoneCmdParamQuery@@QAEXAAVMDesC16Array@@@Z @ 242 NONAME ; void TPhoneCmdParamQuery::SetItemTextArrayForListQuery(class MDesC16Array &)
+ ?Type@TPhoneCmdParamRingTone@@QBE?AW4TPhoneRingToneType@@XZ @ 243 NONAME ; enum TPhoneRingToneType TPhoneCmdParamRingTone::Type(void) const
+ ?Key@TPhoneCmdParamKeyCapture@@QBE?AW4TStdScanCode@@XZ @ 244 NONAME ; enum TStdScanCode TPhoneCmdParamKeyCapture::Key(void) const
+ ?LabelText@TPhoneCmdParamEmergencyCallHeaderData@@QBEABVTDesC16@@XZ @ 245 NONAME ; class TDesC16 const & TPhoneCmdParamEmergencyCallHeaderData::LabelText(void) const
+ ?Ciphering@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 246 NONAME ; int TPhoneCmdParamIncallIndicatorData::Ciphering(void) const
+ ?SetQueryCommandObserver@TPhoneCmdParamQuery@@QAEXAAVMPhoneQueryCommandObserver@@@Z @ 247 NONAME ; void TPhoneCmdParamQuery::SetQueryCommandObserver(class MPhoneQueryCommandObserver &)
+ ?IsPhoneUIFeatureSupported@CPhoneCenRepProxy@@QAEHH@Z @ 248 NONAME ; int CPhoneCenRepProxy::IsPhoneUIFeatureSupported(int)
+ ?DefaultCba@TPhoneCmdParamQuery@@QBEHXZ @ 249 NONAME ; int TPhoneCmdParamQuery::DefaultCba(void) const
+ ?CallState@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 250 NONAME ; int TPhoneCmdParamIncallIndicatorData::CallState(void) const
+ ??0TPhoneCmdParamNumberEntryObserver@@QAE@XZ @ 251 NONAME ; TPhoneCmdParamNumberEntryObserver::TPhoneCmdParamNumberEntryObserver(void)
+ ?SetLine2@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 252 NONAME ; void TPhoneCmdParamCallHeaderData::SetLine2(int)
+ ?FetchValuesFromCenRepL@CPhoneCenRepProxy@@QAEXAAVTPhoneCmdParamAppInfo@@W4TKeyCode@@PAVHBufC8@@AAH@Z @ 253 NONAME ; void CPhoneCenRepProxy::FetchValuesFromCenRepL(class TPhoneCmdParamAppInfo &, enum TKeyCode, class HBufC8 *, int &)
+ ?ParticipantCLI@TPhoneCmdParamCallHeaderData@@QBE?AW4TPhoneParticipantListCLI@1@XZ @ 254 NONAME ; enum TPhoneCmdParamCallHeaderData::TPhoneParticipantListCLI TPhoneCmdParamCallHeaderData::ParticipantCLI(void) const
+ ?Thumbnail@TPhoneCmdParamCallHeaderData@@QBEPAVCFbsBitmap@@XZ @ 255 NONAME ; class CFbsBitmap * TPhoneCmdParamCallHeaderData::Thumbnail(void) const
+ ?SetTimeOut@TPhoneCmdParamQuery@@QAEXH@Z @ 256 NONAME ; void TPhoneCmdParamQuery::SetTimeOut(int)
+ ?Boolean@TPhoneCmdParamBoolean@@QBEHXZ @ 257 NONAME ; int TPhoneCmdParamBoolean::Boolean(void) const
+ ?CLITextClippingDirection@TPhoneCmdParamCallHeaderData@@QBE?AW4TPhoneTextClippingDirection@1@XZ @ 258 NONAME ; enum TPhoneCmdParamCallHeaderData::TPhoneTextClippingDirection TPhoneCmdParamCallHeaderData::CLITextClippingDirection(void) const
+ ?LogMsgFromPhoneUIToPE@CPhoneLogger@@QAEXHH@Z @ 259 NONAME ; void CPhoneLogger::LogMsgFromPhoneUIToPE(int, int)
+ ?SetCustomMessageId@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 260 NONAME ; void TPhoneCmdParamAppInfo::SetCustomMessageId(class TUid const &)
+ ?ResolveResourceID@CPhoneResourceResolverBase@@UBEHABH@Z @ 261 NONAME ; int CPhoneResourceResolverBase::ResolveResourceID(int const &) const
+ ?SetName@TPhoneCmdParamSfiData@@QAEXABVTDesC16@@@Z @ 262 NONAME ; void TPhoneCmdParamSfiData::SetName(class TDesC16 const &)
+ ?SetLittleBubbleVisible@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 263 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetLittleBubbleVisible(int)
+ ?Ciphering@TPhoneCmdParamCallHeaderData@@QBEHXZ @ 264 NONAME ; int TPhoneCmdParamCallHeaderData::Ciphering(void) const
+ ?SetType@TPhoneCmdParamRingTone@@QAEXW4TPhoneRingToneType@@@Z @ 265 NONAME ; void TPhoneCmdParamRingTone::SetType(enum TPhoneRingToneType)
+ ?ResourceId@TPhoneCmdParamDynMenu@@QBEHXZ @ 266 NONAME ; int TPhoneCmdParamDynMenu::ResourceId(void) const
+ ?SetCipheringIndicatorAllowed@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 267 NONAME ; void TPhoneCmdParamCallHeaderData::SetCipheringIndicatorAllowed(int)
+ ?SetWaitTime@TPhoneCmdParamProgressNote@@QAEXVTTimeIntervalMicroSeconds32@@@Z @ 268 NONAME ; void TPhoneCmdParamProgressNote::SetWaitTime(class TTimeIntervalMicroSeconds32)
+ ?Ciphering@TPhoneCmdParamEmergencyCallHeaderData@@QBEHXZ @ 269 NONAME ; int TPhoneCmdParamEmergencyCallHeaderData::Ciphering(void) const
+ ??1CPhoneCallThemeMonitor@@UAE@XZ @ 270 NONAME ; CPhoneCallThemeMonitor::~CPhoneCallThemeMonitor(void)
+ ?SetNumberType@TPhoneCmdParamCallHeaderData@@QAEXH@Z @ 271 NONAME ; void TPhoneCmdParamCallHeaderData::SetNumberType(int)
+ ?Mute@TPhoneCmdParamIncallIndicatorData@@QBEHXZ @ 272 NONAME ; int TPhoneCmdParamIncallIndicatorData::Mute(void) const
+ ?SetBoolean@TPhoneCmdParamBoolean@@QAEXH@Z @ 273 NONAME ; void TPhoneCmdParamBoolean::SetBoolean(int)
+ ?IsTelephonyFeatureSupported@CPhoneResourceResolverBase@@MBEHH@Z @ 274 NONAME ; int CPhoneResourceResolverBase::IsTelephonyFeatureSupported(int) const
+ ?Instance@CPhoneMainErrorMessagesHandler@@SAPAV1@XZ @ 275 NONAME ; class CPhoneMainErrorMessagesHandler * CPhoneMainErrorMessagesHandler::Instance(void)
+ ?SetViewUid@TPhoneCmdParamAppInfo@@QAEXABVTUid@@@Z @ 276 NONAME ; void TPhoneCmdParamAppInfo::SetViewUid(class TUid const &)
+ ?SetServiceId@TPhoneCmdParamCallHeaderData@@QAEXK@Z @ 277 NONAME ; void TPhoneCmdParamCallHeaderData::SetServiceId(unsigned long)
+ ?Instance@CPhoneCenRepProxy@@SAPAV1@XZ @ 278 NONAME ; class CPhoneCenRepProxy * CPhoneCenRepProxy::Instance(void)
+ ?SetQueryType@TPhoneCmdParamQuery@@QAEXW4TPhoneQueryType@@@Z @ 279 NONAME ; void TPhoneCmdParamQuery::SetQueryType(enum TPhoneQueryType)
+ ?Value@CPhonePubSubProxy@@QAEHABVTUid@@I@Z @ 280 NONAME ; int CPhonePubSubProxy::Value(class TUid const &, unsigned int)
+ ?SetWiredAccAvailable@TPhoneCmdParamAudioAvailability@@QAEXH@Z @ 281 NONAME ; void TPhoneCmdParamAudioAvailability::SetWiredAccAvailable(int)
+ ??0TPhoneCmdParamAudioOutput@@QAE@XZ @ 282 NONAME ; TPhoneCmdParamAudioOutput::TPhoneCmdParamAudioOutput(void)
+ ?IsCallerImage@TPhoneCmdParamRingTone@@QAEHXZ @ 283 NONAME ; int TPhoneCmdParamRingTone::IsCallerImage(void)
+ ??0TPhoneCmdParamQuery@@QAE@XZ @ 284 NONAME ; TPhoneCmdParamQuery::TPhoneCmdParamQuery(void)
+ ?Instance@CPhoneMainResourceResolver@@SAPAV1@XZ @ 285 NONAME ; class CPhoneMainResourceResolver * CPhoneMainResourceResolver::Instance(void)
+ ??1CPhoneLibraryContainer@@UAE@XZ @ 286 NONAME ; CPhoneLibraryContainer::~CPhoneLibraryContainer(void)
+ ?ClearBlackListOnNextKey@CPhoneClearBlacklist@@QAEXXZ @ 287 NONAME ; void CPhoneClearBlacklist::ClearBlackListOnNextKey(void)
+ ?Tone@TPhoneCmdParamQuery@@QBEHXZ @ 288 NONAME ; int TPhoneCmdParamQuery::Tone(void) const
+ ?SetCiphering@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 289 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCiphering(int)
+ ?SetRingingType@TPhoneCmdParamRingTone@@QAEXH@Z @ 290 NONAME ; void TPhoneCmdParamRingTone::SetRingingType(int)
+ ?SetCipheringIndicatorAllowed@TPhoneCmdParamIncallIndicatorData@@QAEXH@Z @ 291 NONAME ; void TPhoneCmdParamIncallIndicatorData::SetCipheringIndicatorAllowed(int)
+ ?NeedToEnableKeylock@CPhoneStorage@@UAEHXZ @ 292 NONAME ; int CPhoneStorage::NeedToEnableKeylock(void)
+ ?AudioOutput@TPhoneCmdParamAudioOutput@@QBE?AW4TPEAudioOutput@@XZ @ 293 NONAME ; enum TPEAudioOutput TPhoneCmdParamAudioOutput::AudioOutput(void) const
+ ?SetResourceId@TPhoneCmdParamProgressNote@@QAEXH@Z @ 294 NONAME ; void TPhoneCmdParamProgressNote::SetResourceId(int)
+ ??0TPhoneCmdParamInteger@@QAE@XZ @ 295 NONAME ; TPhoneCmdParamInteger::TPhoneCmdParamInteger(void)
+ ?SetType@TPhoneCmdParamTransEffect@@QAEXW4TPhoneTransEffectType@@@Z @ 296 NONAME ; void TPhoneCmdParamTransEffect::SetType(enum TPhoneTransEffectType)
+ ?Bitmap@TPhoneCmdParamBitmap@@QBEPAVCFbsBitmap@@XZ @ 297 NONAME ; class CFbsBitmap * TPhoneCmdParamBitmap::Bitmap(void) const
+ ?After@CPhoneTimer@@QAEXVTTimeIntervalMicroSeconds32@@VTCallBack@@@Z @ 298 NONAME ; void CPhoneTimer::After(class TTimeIntervalMicroSeconds32, class TCallBack)
--- a/phoneapp/phoneuiutils/eabi/phoneuiutilsu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiutils/eabi/phoneuiutilsu.def Mon Oct 04 16:06:10 2010 +0300
@@ -160,228 +160,230 @@
_ZN22TPhoneCmdParamRingToneC1Ev @ 159 NONAME
_ZN22TPhoneCmdParamRingToneC2Ev @ 160 NONAME
_ZN24TPhoneCmdParamGlobalNote10SetTimeoutEi @ 161 NONAME
- _ZN24TPhoneCmdParamGlobalNote12SetCauseCodeEi @ 162 NONAME
- _ZN24TPhoneCmdParamGlobalNote17SetTextResourceIdEi @ 163 NONAME
- _ZN24TPhoneCmdParamGlobalNote21SetNotificationDialogEi @ 164 NONAME
- _ZN24TPhoneCmdParamGlobalNote7SetTextERK7TDesC16 @ 165 NONAME
- _ZN24TPhoneCmdParamGlobalNote7SetTypeE21PhoneNotificationType @ 166 NONAME
- _ZN24TPhoneCmdParamGlobalNoteC1Ev @ 167 NONAME
- _ZN24TPhoneCmdParamGlobalNoteC2Ev @ 168 NONAME
- _ZN24TPhoneCmdParamKeyCapture10SetKeyCodeE8TKeyCode @ 169 NONAME
- _ZN24TPhoneCmdParamKeyCapture14SetCaptureTypeE17TPhoneCaptureType @ 170 NONAME
- _ZN24TPhoneCmdParamKeyCapture6SetKeyE12TStdScanCode @ 171 NONAME
- _ZN24TPhoneCmdParamKeyCaptureC1Ev @ 172 NONAME
- _ZN24TPhoneCmdParamKeyCaptureC2Ev @ 173 NONAME
- _ZN25TPhoneCmdParamAudioOutput14SetAudioOutputE14TPEAudioOutput @ 174 NONAME
- _ZN25TPhoneCmdParamAudioOutputC1Ev @ 175 NONAME
- _ZN25TPhoneCmdParamAudioOutputC2Ev @ 176 NONAME
- _ZN25TPhoneCmdParamTransEffect7SetTypeE21TPhoneTransEffectType @ 177 NONAME
- _ZN25TPhoneCmdParamTransEffectC1Ev @ 178 NONAME
- _ZN25TPhoneCmdParamTransEffectC2Ev @ 179 NONAME
- _ZN26CPhoneMainResourceResolver8InstanceEv @ 180 NONAME
- _ZN26CPhoneResourceResolverBase14BaseConstructLEv @ 181 NONAME
- _ZN26CPhoneResourceResolverBaseC1Ev @ 182 NONAME
- _ZN26CPhoneResourceResolverBaseC2Ev @ 183 NONAME
- _ZN26CPhoneResourceResolverBaseD0Ev @ 184 NONAME
- _ZN26CPhoneResourceResolverBaseD1Ev @ 185 NONAME
- _ZN26CPhoneResourceResolverBaseD2Ev @ 186 NONAME
- _ZN26TPhoneCmdParamCustomDialer16DialerControllerEv @ 187 NONAME
- _ZN26TPhoneCmdParamCustomDialer19SetDialerControllerEP22MPhoneDialerController @ 188 NONAME
- _ZN26TPhoneCmdParamCustomDialerC1Ev @ 189 NONAME
- _ZN26TPhoneCmdParamCustomDialerC2Ev @ 190 NONAME
- _ZN26TPhoneCmdParamProgressNote11SetWaitTimeE27TTimeIntervalMicroSeconds32 @ 191 NONAME
- _ZN26TPhoneCmdParamProgressNote13SetResourceIdEi @ 192 NONAME
- _ZN26TPhoneCmdParamProgressNoteC1Ev @ 193 NONAME
- _ZN26TPhoneCmdParamProgressNoteC2Ev @ 194 NONAME
- _ZN27TPhoneCmdParamCallStateData12SetCallStateEi @ 195 NONAME
- _ZN27TPhoneCmdParamCallStateData9SetCallIdEi @ 196 NONAME
- _ZN27TPhoneCmdParamCallStateDataC1Ev @ 197 NONAME
- _ZN27TPhoneCmdParamCallStateDataC2Ev @ 198 NONAME
- _ZN28TPhoneCmdParamCallHeaderData10SetCLITextERK7TDesC16NS_27TPhoneTextClippingDirectionE @ 199 NONAME
- _ZN28TPhoneCmdParamCallHeaderData10SetPictureERK7TDesC16 @ 200 NONAME
- _ZN28TPhoneCmdParamCallHeaderData11SetCNAPTextERK7TDesC16NS_27TPhoneTextClippingDirectionE @ 201 NONAME
- _ZN28TPhoneCmdParamCallHeaderData11SetCallTypeEi @ 202 NONAME
- _ZN28TPhoneCmdParamCallHeaderData11SetDivertedEi @ 203 NONAME
- _ZN28TPhoneCmdParamCallHeaderData12SetCallStateEi @ 204 NONAME
- _ZN28TPhoneCmdParamCallHeaderData12SetCipheringEi @ 205 NONAME
- _ZN28TPhoneCmdParamCallHeaderData12SetLabelTextERK7TDesC16 @ 206 NONAME
- _ZN28TPhoneCmdParamCallHeaderData12SetServiceIdEm @ 207 NONAME
- _ZN28TPhoneCmdParamCallHeaderData12SetThumbnailEP10CFbsBitmap @ 208 NONAME
- _ZN28TPhoneCmdParamCallHeaderData13SetCallerTextERK7TDesC16 @ 209 NONAME
- _ZN28TPhoneCmdParamCallHeaderData13SetNumberTypeEi @ 210 NONAME
- _ZN28TPhoneCmdParamCallHeaderData14SetContactLinkERK6TDesC8 @ 211 NONAME
- _ZN28TPhoneCmdParamCallHeaderData15SetHasThumbnailEi @ 212 NONAME
- _ZN28TPhoneCmdParamCallHeaderData17SetShortLabelTextERK7TDesC16 @ 213 NONAME
- _ZN28TPhoneCmdParamCallHeaderData20SetRemotePhoneNumberERK7TDesC16 @ 214 NONAME
- _ZN28TPhoneCmdParamCallHeaderData21SetParticipantListCLIENS_24TPhoneParticipantListCLIE @ 215 NONAME
- _ZN28TPhoneCmdParamCallHeaderData28SetCipheringIndicatorAllowedEi @ 216 NONAME
- _ZN28TPhoneCmdParamCallHeaderData8SetLine2Ei @ 217 NONAME
- _ZN28TPhoneCmdParamCallHeaderDataC1Ev @ 218 NONAME
- _ZN28TPhoneCmdParamCallHeaderDataC2Ev @ 219 NONAME
- _ZN28TPhoneCmdParamCallHeaderDataD1Ev @ 220 NONAME
- _ZN28TPhoneCmdParamCallHeaderDataD2Ev @ 221 NONAME
- _ZN30CPhoneMainErrorMessagesHandler8InstanceEv @ 222 NONAME
- _ZN31TPhoneCmdParamAudioAvailability17SetBTAccAvailableEi @ 223 NONAME
- _ZN31TPhoneCmdParamAudioAvailability20SetWiredAccAvailableEi @ 224 NONAME
- _ZN31TPhoneCmdParamAudioAvailabilityC1Ev @ 225 NONAME
- _ZN31TPhoneCmdParamAudioAvailabilityC2Ev @ 226 NONAME
- _ZN33TPhoneCmdParamIncallIndicatorData12SetCallStateEi @ 227 NONAME
- _ZN33TPhoneCmdParamIncallIndicatorData12SetCipheringEi @ 228 NONAME
- _ZN33TPhoneCmdParamIncallIndicatorData12SetEmergencyEi @ 229 NONAME
- _ZN33TPhoneCmdParamIncallIndicatorData22SetLittleBubbleVisibleEi @ 230 NONAME
- _ZN33TPhoneCmdParamIncallIndicatorData28SetCipheringIndicatorAllowedEi @ 231 NONAME
- _ZN33TPhoneCmdParamIncallIndicatorData7SetModeEi @ 232 NONAME
- _ZN33TPhoneCmdParamIncallIndicatorData7SetMuteEi @ 233 NONAME
- _ZN33TPhoneCmdParamIncallIndicatorData8SetLine2Ei @ 234 NONAME
- _ZN33TPhoneCmdParamIncallIndicatorDataC1Ev @ 235 NONAME
- _ZN33TPhoneCmdParamIncallIndicatorDataC2Ev @ 236 NONAME
- _ZN33TPhoneCmdParamNumberEntryObserver11SetObserverE9TCallBack @ 237 NONAME
- _ZN33TPhoneCmdParamNumberEntryObserver8ObserverEv @ 238 NONAME
- _ZN33TPhoneCmdParamNumberEntryObserverC1Ev @ 239 NONAME
- _ZN33TPhoneCmdParamNumberEntryObserverC2Ev @ 240 NONAME
- _ZN37TPhoneCmdParamEmergencyCallHeaderData12SetCipheringEi @ 241 NONAME
- _ZN37TPhoneCmdParamEmergencyCallHeaderData12SetLabelTextERK7TDesC16 @ 242 NONAME
- _ZN37TPhoneCmdParamEmergencyCallHeaderData13SetHeaderTextERK7TDesC16 @ 243 NONAME
- _ZN37TPhoneCmdParamEmergencyCallHeaderData21SetOwnPhoneNumberTextERK7TDesC16 @ 244 NONAME
- _ZN37TPhoneCmdParamEmergencyCallHeaderData28SetCipheringIndicatorAllowedEi @ 245 NONAME
- _ZN37TPhoneCmdParamEmergencyCallHeaderDataC1Ev @ 246 NONAME
- _ZN37TPhoneCmdParamEmergencyCallHeaderDataC2Ev @ 247 NONAME
- _ZNK17CPhoneCenRepProxy4FindERK4TUidmmR6RArrayImE @ 248 NONAME
- _ZNK17CPhoneCenRepProxy6GetIntERK4TUidjRi @ 249 NONAME
- _ZNK17CPhoneCenRepProxy7GetRealERK4TUidjRd @ 250 NONAME
- _ZNK17CPhoneCenRepProxy9GetStringERK4TUidjR6TDes16 @ 251 NONAME
- _ZNK18TPhoneCmdParamNote10ResourceIdEv @ 252 NONAME
- _ZNK18TPhoneCmdParamNote14TextResourceIdEv @ 253 NONAME
- _ZNK18TPhoneCmdParamNote4TextEv @ 254 NONAME
- _ZNK18TPhoneCmdParamNote4ToneEv @ 255 NONAME
- _ZNK18TPhoneCmdParamNote4TypeEv @ 256 NONAME
- _ZNK18TPhoneCmdParamNote7TimeoutEv @ 257 NONAME
- _ZNK18TPhoneCommandParam7ParamIdEv @ 258 NONAME
- _ZNK19TPhoneCmdParamQuery10ContentCbaEv @ 259 NONAME
- _ZNK19TPhoneCmdParamQuery10DefaultCbaEv @ 260 NONAME
- _ZNK19TPhoneCmdParamQuery11QueryPromptEv @ 261 NONAME
- _ZNK19TPhoneCmdParamQuery14SendKeyEnabledEv @ 262 NONAME
- _ZNK19TPhoneCmdParamQuery15QueryResourceIdEv @ 263 NONAME
- _ZNK19TPhoneCmdParamQuery17CbaCommandMappingEi @ 264 NONAME
- _ZNK19TPhoneCmdParamQuery25ItemTextArrayForListQueryEv @ 265 NONAME
- _ZNK19TPhoneCmdParamQuery26GetCustomCommandForTimeOutERi @ 266 NONAME
- _ZNK19TPhoneCmdParamQuery4ToneEv @ 267 NONAME
- _ZNK19TPhoneCmdParamQuery7TimeOutEv @ 268 NONAME
- _ZNK19TPhoneCmdParamQuery8DataTextEv @ 269 NONAME
- _ZNK19TPhoneCmdParamQuery9QueryTypeEv @ 270 NONAME
- _ZNK20TPhoneCmdParamBitmap10MaskBitmapEv @ 271 NONAME
- _ZNK20TPhoneCmdParamBitmap6BitmapEv @ 272 NONAME
- _ZNK21TPhoneCmdParamAppInfo13CustomMessageEv @ 273 NONAME
- _ZNK21TPhoneCmdParamAppInfo15CustomMessageIdEv @ 274 NONAME
- _ZNK21TPhoneCmdParamAppInfo17MultipleInstancesEv @ 275 NONAME
- _ZNK21TPhoneCmdParamAppInfo5ParamEv @ 276 NONAME
- _ZNK21TPhoneCmdParamAppInfo6AppUidEv @ 277 NONAME
- _ZNK21TPhoneCmdParamAppInfo7ViewUidEv @ 278 NONAME
- _ZNK21TPhoneCmdParamBoolean7BooleanEv @ 279 NONAME
- _ZNK21TPhoneCmdParamDynMenu10ResourceIdEv @ 280 NONAME
- _ZNK21TPhoneCmdParamInteger7IntegerEv @ 281 NONAME
- _ZNK21TPhoneCmdParamPointer7PointerEv @ 282 NONAME
- _ZNK21TPhoneCmdParamSfiData4NameEv @ 283 NONAME
- _ZNK21TPhoneCmdParamSfiData6NumberEv @ 284 NONAME
- _ZNK22CPhoneCallThemeMonitor22CallImageThemeFilePathEv @ 285 NONAME
- _ZNK22CPhoneCallThemeMonitor22CallImageThemeSettingsEv @ 286 NONAME
- _ZNK22TPhoneCmdParamKeyEvent8KeyEventEv @ 287 NONAME
- _ZNK22TPhoneCmdParamKeyEvent9EventCodeEv @ 288 NONAME
- _ZNK22TPhoneCmdParamRingTone11RingingTypeEv @ 289 NONAME
- _ZNK22TPhoneCmdParamRingTone4TypeEv @ 290 NONAME
- _ZNK22TPhoneCmdParamRingTone6VolumeEv @ 291 NONAME
- _ZNK22TPhoneCmdParamRingTone8RingToneEv @ 292 NONAME
- _ZNK22TPhoneCmdParamRingTone9TextToSayEv @ 293 NONAME
- _ZNK24TPhoneCmdParamGlobalNote14TextResourceIdEv @ 294 NONAME
- _ZNK24TPhoneCmdParamGlobalNote18NotificationDialogEv @ 295 NONAME
- _ZNK24TPhoneCmdParamGlobalNote4TextEv @ 296 NONAME
- _ZNK24TPhoneCmdParamGlobalNote4TypeEv @ 297 NONAME
- _ZNK24TPhoneCmdParamGlobalNote7TimeoutEv @ 298 NONAME
- _ZNK24TPhoneCmdParamGlobalNote9CauseCodeEv @ 299 NONAME
- _ZNK24TPhoneCmdParamKeyCapture11CaptureTypeEv @ 300 NONAME
- _ZNK24TPhoneCmdParamKeyCapture3KeyEv @ 301 NONAME
- _ZNK24TPhoneCmdParamKeyCapture7KeyCodeEv @ 302 NONAME
- _ZNK25TPhoneCmdParamAudioOutput11AudioOutputEv @ 303 NONAME
- _ZNK25TPhoneCmdParamTransEffect4TypeEv @ 304 NONAME
- _ZNK26CPhoneResourceResolverBase17ResolveResourceIDERKi @ 305 NONAME
- _ZNK26CPhoneResourceResolverBase27IsTelephonyFeatureSupportedEi @ 306 NONAME
- _ZNK26TPhoneCmdParamProgressNote10ResourceIdEv @ 307 NONAME
- _ZNK26TPhoneCmdParamProgressNote8WaitTimeEv @ 308 NONAME
- _ZNK27TPhoneCmdParamCallStateData6CallIdEv @ 309 NONAME
- _ZNK27TPhoneCmdParamCallStateData9CallStateEv @ 310 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData10CallerTextEv @ 311 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData10NumberTypeEv @ 312 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData11ContactLinkEv @ 313 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData12HasThumbnailEv @ 314 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData14ParticipantCLIEv @ 315 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData14ShortLabelTextEv @ 316 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData17RemotePhoneNumberEv @ 317 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData24CLITextClippingDirectionEv @ 318 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData25CNAPTextClippingDirectionEv @ 319 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData25CipheringIndicatorAllowedEv @ 320 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData5Line2Ev @ 321 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData7CLITextEv @ 322 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData7PictureEv @ 323 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData8CNAPTextEv @ 324 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData8CallTypeEv @ 325 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData8DivertedEv @ 326 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData9CallStateEv @ 327 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData9CipheringEv @ 328 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData9LabelTextEv @ 329 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData9ServiceIdEv @ 330 NONAME
- _ZNK28TPhoneCmdParamCallHeaderData9ThumbnailEv @ 331 NONAME
- _ZNK31TPhoneCmdParamAudioAvailability16IsBTAccAvailableEv @ 332 NONAME
- _ZNK31TPhoneCmdParamAudioAvailability19IsWiredAccAvailableEv @ 333 NONAME
- _ZNK33TPhoneCmdParamIncallIndicatorData19LittleBubbleVisibleEv @ 334 NONAME
- _ZNK33TPhoneCmdParamIncallIndicatorData25CipheringIndicatorAllowedEv @ 335 NONAME
- _ZNK33TPhoneCmdParamIncallIndicatorData4ModeEv @ 336 NONAME
- _ZNK33TPhoneCmdParamIncallIndicatorData4MuteEv @ 337 NONAME
- _ZNK33TPhoneCmdParamIncallIndicatorData5Line2Ev @ 338 NONAME
- _ZNK33TPhoneCmdParamIncallIndicatorData9CallStateEv @ 339 NONAME
- _ZNK33TPhoneCmdParamIncallIndicatorData9CipheringEv @ 340 NONAME
- _ZNK33TPhoneCmdParamIncallIndicatorData9EmergencyEv @ 341 NONAME
- _ZNK37TPhoneCmdParamEmergencyCallHeaderData10HeaderTextEv @ 342 NONAME
- _ZNK37TPhoneCmdParamEmergencyCallHeaderData18OwnPhoneNumberTextEv @ 343 NONAME
- _ZNK37TPhoneCmdParamEmergencyCallHeaderData25CipheringIndicatorAllowedEv @ 344 NONAME
- _ZNK37TPhoneCmdParamEmergencyCallHeaderData9CipheringEv @ 345 NONAME
- _ZNK37TPhoneCmdParamEmergencyCallHeaderData9LabelTextEv @ 346 NONAME
- _ZTI11CPhoneTimer @ 347 NONAME
- _ZTI12CPhoneLogger @ 348 NONAME
- _ZTI13CPhoneStorage @ 349 NONAME
- _ZTI17CPhoneCenRepProxy @ 350 NONAME
- _ZTI17CPhonePubSubProxy @ 351 NONAME
- _ZTI18CPhoneMethodLogger @ 352 NONAME
- _ZTI20CPhoneClearBlacklist @ 353 NONAME
- _ZTI20CPhoneRecoverySystem @ 354 NONAME
- _ZTI22CPhoneCallThemeMonitor @ 355 NONAME
- _ZTI22CPhoneLibraryContainer @ 356 NONAME
- _ZTI24CPhoneCenRepEventHandler @ 357 NONAME
- _ZTI25CPhonePublishSubscriberAO @ 358 NONAME
- _ZTI26CPhoneMainResourceResolver @ 359 NONAME
- _ZTI26CPhoneResourceResolverBase @ 360 NONAME
- _ZTI30CPhoneMainErrorMessagesHandler @ 361 NONAME
- _ZTV11CPhoneTimer @ 362 NONAME
- _ZTV12CPhoneLogger @ 363 NONAME
- _ZTV13CPhoneStorage @ 364 NONAME
- _ZTV17CPhoneCenRepProxy @ 365 NONAME
- _ZTV17CPhonePubSubProxy @ 366 NONAME
- _ZTV18CPhoneMethodLogger @ 367 NONAME
- _ZTV20CPhoneClearBlacklist @ 368 NONAME
- _ZTV20CPhoneRecoverySystem @ 369 NONAME
- _ZTV22CPhoneCallThemeMonitor @ 370 NONAME
- _ZTV22CPhoneLibraryContainer @ 371 NONAME
- _ZTV24CPhoneCenRepEventHandler @ 372 NONAME
- _ZTV25CPhonePublishSubscriberAO @ 373 NONAME
- _ZTV26CPhoneMainResourceResolver @ 374 NONAME
- _ZTV26CPhoneResourceResolverBase @ 375 NONAME
- _ZTV30CPhoneMainErrorMessagesHandler @ 376 NONAME
- _ZThn4_N12CPhoneLoggerD0Ev @ 377 NONAME
- _ZThn4_N12CPhoneLoggerD1Ev @ 378 NONAME
- _ZThn4_N13CPhoneStorage19NeedToEnableKeylockEv @ 379 NONAME
- _ZThn4_N13CPhoneStorage22SetNeedToEnableKeylockEi @ 380 NONAME
- _ZThn4_N13CPhoneStorageD0Ev @ 381 NONAME
- _ZThn4_N13CPhoneStorageD1Ev @ 382 NONAME
- _ZThn4_N26CPhoneResourceResolverBaseD0Ev @ 383 NONAME
- _ZThn4_N26CPhoneResourceResolverBaseD1Ev @ 384 NONAME
- _ZThn4_NK26CPhoneResourceResolverBase17ResolveResourceIDERKi @ 385 NONAME
+ _ZN24TPhoneCmdParamGlobalNote11SetToneTypeE26TPhoneNotificationToneType @ 162 NONAME
+ _ZN24TPhoneCmdParamGlobalNote12SetCauseCodeEi @ 163 NONAME
+ _ZN24TPhoneCmdParamGlobalNote17SetTextResourceIdEi @ 164 NONAME
+ _ZN24TPhoneCmdParamGlobalNote21SetNotificationDialogEi @ 165 NONAME
+ _ZN24TPhoneCmdParamGlobalNote7SetTextERK7TDesC16 @ 166 NONAME
+ _ZN24TPhoneCmdParamGlobalNote7SetTypeE22TPhoneNotificationType @ 167 NONAME
+ _ZN24TPhoneCmdParamGlobalNoteC1Ev @ 168 NONAME
+ _ZN24TPhoneCmdParamGlobalNoteC2Ev @ 169 NONAME
+ _ZN24TPhoneCmdParamKeyCapture10SetKeyCodeE8TKeyCode @ 170 NONAME
+ _ZN24TPhoneCmdParamKeyCapture14SetCaptureTypeE17TPhoneCaptureType @ 171 NONAME
+ _ZN24TPhoneCmdParamKeyCapture6SetKeyE12TStdScanCode @ 172 NONAME
+ _ZN24TPhoneCmdParamKeyCaptureC1Ev @ 173 NONAME
+ _ZN24TPhoneCmdParamKeyCaptureC2Ev @ 174 NONAME
+ _ZN25TPhoneCmdParamAudioOutput14SetAudioOutputE14TPEAudioOutput @ 175 NONAME
+ _ZN25TPhoneCmdParamAudioOutputC1Ev @ 176 NONAME
+ _ZN25TPhoneCmdParamAudioOutputC2Ev @ 177 NONAME
+ _ZN25TPhoneCmdParamTransEffect7SetTypeE21TPhoneTransEffectType @ 178 NONAME
+ _ZN25TPhoneCmdParamTransEffectC1Ev @ 179 NONAME
+ _ZN25TPhoneCmdParamTransEffectC2Ev @ 180 NONAME
+ _ZN26CPhoneMainResourceResolver8InstanceEv @ 181 NONAME
+ _ZN26CPhoneResourceResolverBase14BaseConstructLEv @ 182 NONAME
+ _ZN26CPhoneResourceResolverBaseC1Ev @ 183 NONAME
+ _ZN26CPhoneResourceResolverBaseC2Ev @ 184 NONAME
+ _ZN26CPhoneResourceResolverBaseD0Ev @ 185 NONAME
+ _ZN26CPhoneResourceResolverBaseD1Ev @ 186 NONAME
+ _ZN26CPhoneResourceResolverBaseD2Ev @ 187 NONAME
+ _ZN26TPhoneCmdParamCustomDialer16DialerControllerEv @ 188 NONAME
+ _ZN26TPhoneCmdParamCustomDialer19SetDialerControllerEP22MPhoneDialerController @ 189 NONAME
+ _ZN26TPhoneCmdParamCustomDialerC1Ev @ 190 NONAME
+ _ZN26TPhoneCmdParamCustomDialerC2Ev @ 191 NONAME
+ _ZN26TPhoneCmdParamProgressNote11SetWaitTimeE27TTimeIntervalMicroSeconds32 @ 192 NONAME
+ _ZN26TPhoneCmdParamProgressNote13SetResourceIdEi @ 193 NONAME
+ _ZN26TPhoneCmdParamProgressNoteC1Ev @ 194 NONAME
+ _ZN26TPhoneCmdParamProgressNoteC2Ev @ 195 NONAME
+ _ZN27TPhoneCmdParamCallStateData12SetCallStateEi @ 196 NONAME
+ _ZN27TPhoneCmdParamCallStateData9SetCallIdEi @ 197 NONAME
+ _ZN27TPhoneCmdParamCallStateDataC1Ev @ 198 NONAME
+ _ZN27TPhoneCmdParamCallStateDataC2Ev @ 199 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData10SetCLITextERK7TDesC16NS_27TPhoneTextClippingDirectionE @ 200 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData10SetPictureERK7TDesC16 @ 201 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData11SetCNAPTextERK7TDesC16NS_27TPhoneTextClippingDirectionE @ 202 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData11SetCallTypeEi @ 203 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData11SetDivertedEi @ 204 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData12SetCallStateEi @ 205 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData12SetCipheringEi @ 206 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData12SetLabelTextERK7TDesC16 @ 207 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData12SetServiceIdEm @ 208 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData12SetThumbnailEP10CFbsBitmap @ 209 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData13SetCallerTextERK7TDesC16 @ 210 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData13SetNumberTypeEi @ 211 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData14SetContactLinkERK6TDesC8 @ 212 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData15SetHasThumbnailEi @ 213 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData17SetShortLabelTextERK7TDesC16 @ 214 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData20SetRemotePhoneNumberERK7TDesC16 @ 215 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData21SetParticipantListCLIENS_24TPhoneParticipantListCLIE @ 216 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData28SetCipheringIndicatorAllowedEi @ 217 NONAME
+ _ZN28TPhoneCmdParamCallHeaderData8SetLine2Ei @ 218 NONAME
+ _ZN28TPhoneCmdParamCallHeaderDataC1Ev @ 219 NONAME
+ _ZN28TPhoneCmdParamCallHeaderDataC2Ev @ 220 NONAME
+ _ZN28TPhoneCmdParamCallHeaderDataD1Ev @ 221 NONAME
+ _ZN28TPhoneCmdParamCallHeaderDataD2Ev @ 222 NONAME
+ _ZN30CPhoneMainErrorMessagesHandler8InstanceEv @ 223 NONAME
+ _ZN31TPhoneCmdParamAudioAvailability17SetBTAccAvailableEi @ 224 NONAME
+ _ZN31TPhoneCmdParamAudioAvailability20SetWiredAccAvailableEi @ 225 NONAME
+ _ZN31TPhoneCmdParamAudioAvailabilityC1Ev @ 226 NONAME
+ _ZN31TPhoneCmdParamAudioAvailabilityC2Ev @ 227 NONAME
+ _ZN33TPhoneCmdParamIncallIndicatorData12SetCallStateEi @ 228 NONAME
+ _ZN33TPhoneCmdParamIncallIndicatorData12SetCipheringEi @ 229 NONAME
+ _ZN33TPhoneCmdParamIncallIndicatorData12SetEmergencyEi @ 230 NONAME
+ _ZN33TPhoneCmdParamIncallIndicatorData22SetLittleBubbleVisibleEi @ 231 NONAME
+ _ZN33TPhoneCmdParamIncallIndicatorData28SetCipheringIndicatorAllowedEi @ 232 NONAME
+ _ZN33TPhoneCmdParamIncallIndicatorData7SetModeEi @ 233 NONAME
+ _ZN33TPhoneCmdParamIncallIndicatorData7SetMuteEi @ 234 NONAME
+ _ZN33TPhoneCmdParamIncallIndicatorData8SetLine2Ei @ 235 NONAME
+ _ZN33TPhoneCmdParamIncallIndicatorDataC1Ev @ 236 NONAME
+ _ZN33TPhoneCmdParamIncallIndicatorDataC2Ev @ 237 NONAME
+ _ZN33TPhoneCmdParamNumberEntryObserver11SetObserverE9TCallBack @ 238 NONAME
+ _ZN33TPhoneCmdParamNumberEntryObserver8ObserverEv @ 239 NONAME
+ _ZN33TPhoneCmdParamNumberEntryObserverC1Ev @ 240 NONAME
+ _ZN33TPhoneCmdParamNumberEntryObserverC2Ev @ 241 NONAME
+ _ZN37TPhoneCmdParamEmergencyCallHeaderData12SetCipheringEi @ 242 NONAME
+ _ZN37TPhoneCmdParamEmergencyCallHeaderData12SetLabelTextERK7TDesC16 @ 243 NONAME
+ _ZN37TPhoneCmdParamEmergencyCallHeaderData13SetHeaderTextERK7TDesC16 @ 244 NONAME
+ _ZN37TPhoneCmdParamEmergencyCallHeaderData21SetOwnPhoneNumberTextERK7TDesC16 @ 245 NONAME
+ _ZN37TPhoneCmdParamEmergencyCallHeaderData28SetCipheringIndicatorAllowedEi @ 246 NONAME
+ _ZN37TPhoneCmdParamEmergencyCallHeaderDataC1Ev @ 247 NONAME
+ _ZN37TPhoneCmdParamEmergencyCallHeaderDataC2Ev @ 248 NONAME
+ _ZNK17CPhoneCenRepProxy4FindERK4TUidmmR6RArrayImE @ 249 NONAME
+ _ZNK17CPhoneCenRepProxy6GetIntERK4TUidjRi @ 250 NONAME
+ _ZNK17CPhoneCenRepProxy7GetRealERK4TUidjRd @ 251 NONAME
+ _ZNK17CPhoneCenRepProxy9GetStringERK4TUidjR6TDes16 @ 252 NONAME
+ _ZNK18TPhoneCmdParamNote10ResourceIdEv @ 253 NONAME
+ _ZNK18TPhoneCmdParamNote14TextResourceIdEv @ 254 NONAME
+ _ZNK18TPhoneCmdParamNote4TextEv @ 255 NONAME
+ _ZNK18TPhoneCmdParamNote4ToneEv @ 256 NONAME
+ _ZNK18TPhoneCmdParamNote4TypeEv @ 257 NONAME
+ _ZNK18TPhoneCmdParamNote7TimeoutEv @ 258 NONAME
+ _ZNK18TPhoneCommandParam7ParamIdEv @ 259 NONAME
+ _ZNK19TPhoneCmdParamQuery10ContentCbaEv @ 260 NONAME
+ _ZNK19TPhoneCmdParamQuery10DefaultCbaEv @ 261 NONAME
+ _ZNK19TPhoneCmdParamQuery11QueryPromptEv @ 262 NONAME
+ _ZNK19TPhoneCmdParamQuery14SendKeyEnabledEv @ 263 NONAME
+ _ZNK19TPhoneCmdParamQuery15QueryResourceIdEv @ 264 NONAME
+ _ZNK19TPhoneCmdParamQuery17CbaCommandMappingEi @ 265 NONAME
+ _ZNK19TPhoneCmdParamQuery25ItemTextArrayForListQueryEv @ 266 NONAME
+ _ZNK19TPhoneCmdParamQuery26GetCustomCommandForTimeOutERi @ 267 NONAME
+ _ZNK19TPhoneCmdParamQuery4ToneEv @ 268 NONAME
+ _ZNK19TPhoneCmdParamQuery7TimeOutEv @ 269 NONAME
+ _ZNK19TPhoneCmdParamQuery8DataTextEv @ 270 NONAME
+ _ZNK19TPhoneCmdParamQuery9QueryTypeEv @ 271 NONAME
+ _ZNK20TPhoneCmdParamBitmap10MaskBitmapEv @ 272 NONAME
+ _ZNK20TPhoneCmdParamBitmap6BitmapEv @ 273 NONAME
+ _ZNK21TPhoneCmdParamAppInfo13CustomMessageEv @ 274 NONAME
+ _ZNK21TPhoneCmdParamAppInfo15CustomMessageIdEv @ 275 NONAME
+ _ZNK21TPhoneCmdParamAppInfo17MultipleInstancesEv @ 276 NONAME
+ _ZNK21TPhoneCmdParamAppInfo5ParamEv @ 277 NONAME
+ _ZNK21TPhoneCmdParamAppInfo6AppUidEv @ 278 NONAME
+ _ZNK21TPhoneCmdParamAppInfo7ViewUidEv @ 279 NONAME
+ _ZNK21TPhoneCmdParamBoolean7BooleanEv @ 280 NONAME
+ _ZNK21TPhoneCmdParamDynMenu10ResourceIdEv @ 281 NONAME
+ _ZNK21TPhoneCmdParamInteger7IntegerEv @ 282 NONAME
+ _ZNK21TPhoneCmdParamPointer7PointerEv @ 283 NONAME
+ _ZNK21TPhoneCmdParamSfiData4NameEv @ 284 NONAME
+ _ZNK21TPhoneCmdParamSfiData6NumberEv @ 285 NONAME
+ _ZNK22CPhoneCallThemeMonitor22CallImageThemeFilePathEv @ 286 NONAME
+ _ZNK22CPhoneCallThemeMonitor22CallImageThemeSettingsEv @ 287 NONAME
+ _ZNK22TPhoneCmdParamKeyEvent8KeyEventEv @ 288 NONAME
+ _ZNK22TPhoneCmdParamKeyEvent9EventCodeEv @ 289 NONAME
+ _ZNK22TPhoneCmdParamRingTone11RingingTypeEv @ 290 NONAME
+ _ZNK22TPhoneCmdParamRingTone4TypeEv @ 291 NONAME
+ _ZNK22TPhoneCmdParamRingTone6VolumeEv @ 292 NONAME
+ _ZNK22TPhoneCmdParamRingTone8RingToneEv @ 293 NONAME
+ _ZNK22TPhoneCmdParamRingTone9TextToSayEv @ 294 NONAME
+ _ZNK24TPhoneCmdParamGlobalNote14TextResourceIdEv @ 295 NONAME
+ _ZNK24TPhoneCmdParamGlobalNote18NotificationDialogEv @ 296 NONAME
+ _ZNK24TPhoneCmdParamGlobalNote4TextEv @ 297 NONAME
+ _ZNK24TPhoneCmdParamGlobalNote4TypeEv @ 298 NONAME
+ _ZNK24TPhoneCmdParamGlobalNote7TimeoutEv @ 299 NONAME
+ _ZNK24TPhoneCmdParamGlobalNote8ToneTypeEv @ 300 NONAME
+ _ZNK24TPhoneCmdParamGlobalNote9CauseCodeEv @ 301 NONAME
+ _ZNK24TPhoneCmdParamKeyCapture11CaptureTypeEv @ 302 NONAME
+ _ZNK24TPhoneCmdParamKeyCapture3KeyEv @ 303 NONAME
+ _ZNK24TPhoneCmdParamKeyCapture7KeyCodeEv @ 304 NONAME
+ _ZNK25TPhoneCmdParamAudioOutput11AudioOutputEv @ 305 NONAME
+ _ZNK25TPhoneCmdParamTransEffect4TypeEv @ 306 NONAME
+ _ZNK26CPhoneResourceResolverBase17ResolveResourceIDERKi @ 307 NONAME
+ _ZNK26CPhoneResourceResolverBase27IsTelephonyFeatureSupportedEi @ 308 NONAME
+ _ZNK26TPhoneCmdParamProgressNote10ResourceIdEv @ 309 NONAME
+ _ZNK26TPhoneCmdParamProgressNote8WaitTimeEv @ 310 NONAME
+ _ZNK27TPhoneCmdParamCallStateData6CallIdEv @ 311 NONAME
+ _ZNK27TPhoneCmdParamCallStateData9CallStateEv @ 312 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData10CallerTextEv @ 313 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData10NumberTypeEv @ 314 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData11ContactLinkEv @ 315 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData12HasThumbnailEv @ 316 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData14ParticipantCLIEv @ 317 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData14ShortLabelTextEv @ 318 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData17RemotePhoneNumberEv @ 319 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData24CLITextClippingDirectionEv @ 320 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData25CNAPTextClippingDirectionEv @ 321 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData25CipheringIndicatorAllowedEv @ 322 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData5Line2Ev @ 323 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData7CLITextEv @ 324 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData7PictureEv @ 325 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData8CNAPTextEv @ 326 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData8CallTypeEv @ 327 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData8DivertedEv @ 328 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData9CallStateEv @ 329 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData9CipheringEv @ 330 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData9LabelTextEv @ 331 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData9ServiceIdEv @ 332 NONAME
+ _ZNK28TPhoneCmdParamCallHeaderData9ThumbnailEv @ 333 NONAME
+ _ZNK31TPhoneCmdParamAudioAvailability16IsBTAccAvailableEv @ 334 NONAME
+ _ZNK31TPhoneCmdParamAudioAvailability19IsWiredAccAvailableEv @ 335 NONAME
+ _ZNK33TPhoneCmdParamIncallIndicatorData19LittleBubbleVisibleEv @ 336 NONAME
+ _ZNK33TPhoneCmdParamIncallIndicatorData25CipheringIndicatorAllowedEv @ 337 NONAME
+ _ZNK33TPhoneCmdParamIncallIndicatorData4ModeEv @ 338 NONAME
+ _ZNK33TPhoneCmdParamIncallIndicatorData4MuteEv @ 339 NONAME
+ _ZNK33TPhoneCmdParamIncallIndicatorData5Line2Ev @ 340 NONAME
+ _ZNK33TPhoneCmdParamIncallIndicatorData9CallStateEv @ 341 NONAME
+ _ZNK33TPhoneCmdParamIncallIndicatorData9CipheringEv @ 342 NONAME
+ _ZNK33TPhoneCmdParamIncallIndicatorData9EmergencyEv @ 343 NONAME
+ _ZNK37TPhoneCmdParamEmergencyCallHeaderData10HeaderTextEv @ 344 NONAME
+ _ZNK37TPhoneCmdParamEmergencyCallHeaderData18OwnPhoneNumberTextEv @ 345 NONAME
+ _ZNK37TPhoneCmdParamEmergencyCallHeaderData25CipheringIndicatorAllowedEv @ 346 NONAME
+ _ZNK37TPhoneCmdParamEmergencyCallHeaderData9CipheringEv @ 347 NONAME
+ _ZNK37TPhoneCmdParamEmergencyCallHeaderData9LabelTextEv @ 348 NONAME
+ _ZTI11CPhoneTimer @ 349 NONAME
+ _ZTI12CPhoneLogger @ 350 NONAME
+ _ZTI13CPhoneStorage @ 351 NONAME
+ _ZTI17CPhoneCenRepProxy @ 352 NONAME
+ _ZTI17CPhonePubSubProxy @ 353 NONAME
+ _ZTI18CPhoneMethodLogger @ 354 NONAME
+ _ZTI20CPhoneClearBlacklist @ 355 NONAME
+ _ZTI20CPhoneRecoverySystem @ 356 NONAME
+ _ZTI22CPhoneCallThemeMonitor @ 357 NONAME
+ _ZTI22CPhoneLibraryContainer @ 358 NONAME
+ _ZTI24CPhoneCenRepEventHandler @ 359 NONAME
+ _ZTI25CPhonePublishSubscriberAO @ 360 NONAME
+ _ZTI26CPhoneMainResourceResolver @ 361 NONAME
+ _ZTI26CPhoneResourceResolverBase @ 362 NONAME
+ _ZTI30CPhoneMainErrorMessagesHandler @ 363 NONAME
+ _ZTV11CPhoneTimer @ 364 NONAME
+ _ZTV12CPhoneLogger @ 365 NONAME
+ _ZTV13CPhoneStorage @ 366 NONAME
+ _ZTV17CPhoneCenRepProxy @ 367 NONAME
+ _ZTV17CPhonePubSubProxy @ 368 NONAME
+ _ZTV18CPhoneMethodLogger @ 369 NONAME
+ _ZTV20CPhoneClearBlacklist @ 370 NONAME
+ _ZTV20CPhoneRecoverySystem @ 371 NONAME
+ _ZTV22CPhoneCallThemeMonitor @ 372 NONAME
+ _ZTV22CPhoneLibraryContainer @ 373 NONAME
+ _ZTV24CPhoneCenRepEventHandler @ 374 NONAME
+ _ZTV25CPhonePublishSubscriberAO @ 375 NONAME
+ _ZTV26CPhoneMainResourceResolver @ 376 NONAME
+ _ZTV26CPhoneResourceResolverBase @ 377 NONAME
+ _ZTV30CPhoneMainErrorMessagesHandler @ 378 NONAME
+ _ZThn4_N12CPhoneLoggerD0Ev @ 379 NONAME
+ _ZThn4_N12CPhoneLoggerD1Ev @ 380 NONAME
+ _ZThn4_N13CPhoneStorage19NeedToEnableKeylockEv @ 381 NONAME
+ _ZThn4_N13CPhoneStorage22SetNeedToEnableKeylockEi @ 382 NONAME
+ _ZThn4_N13CPhoneStorageD0Ev @ 383 NONAME
+ _ZThn4_N13CPhoneStorageD1Ev @ 384 NONAME
+ _ZThn4_N26CPhoneResourceResolverBaseD0Ev @ 385 NONAME
+ _ZThn4_N26CPhoneResourceResolverBaseD1Ev @ 386 NONAME
+ _ZThn4_NK26CPhoneResourceResolverBase17ResolveResourceIDERKi @ 387 NONAME
--- a/phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiutils/inc/phoneloggerviewcommands.h Mon Oct 04 16:06:10 2010 +0300
@@ -50,8 +50,6 @@
EPhoneViewCreateCallHeader,
/** EPhoneViewCreateEmergencyCallHeader */
EPhoneViewCreateEmergencyCallHeader,
- /** EPhoneViewUpdateCallHeaderRemoteInfoData */
- EPhoneViewUpdateCallHeaderRemoteInfoData,
/** EPhoneViewUpdateCallHeaderCallDuration */
EPhoneViewUpdateCallHeaderCallDuration,
/** EPhoneViewRemoveCallHeader */
@@ -154,8 +152,6 @@
EPhoneViewEnableKeyLockWithoutNote,
/** EPhoneViewUpdateFSW */
EPhoneViewUpdateFSW,
- /** EPhoneViewIsQuery */
- EPhoneViewIsQuery,
/** EPhoneViewBringIdleToForeground */
EPhoneViewBringIdleToForeground,
/** EPhoneViewBeginUpdate */
@@ -166,20 +162,12 @@
EPhoneViewRemoveConferenceBubble,
/** EPhoneViewSetTouchPaneButtons */
EPhoneViewSetTouchPaneButtons,
- /** EPhoneViewGetBlockingDialogStatus */
- EPhoneViewGetBlockingDialogStatus,
- /** EPhoneViewIsNoteActive */
- EPhoneViewIsNoteActive,
/** EPhoneViewOpenCallHandling */
EPhoneViewOpenCallHandling,
/** EPhoneViewGetAudioVolumeLevel */
EPhoneViewGetAudioVolumeLevel,
- /** EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel */
- EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel,
/** EPhoneViewRemoveDtmfNote */
EPhoneViewRemoveDtmfNote,
- /** EPhoneViewSetEikonNotifiersDisabled */
- EPhoneViewSetEikonNotifiersDisabled,
/** EPhoneViewCancelAllNotications */
EPhoneViewCancelAllNotications,
/** EPhoneViewDisableKeyLock */
@@ -200,8 +188,6 @@
EPhoneViewUpdateContactByString,
/** EPhoneViewAddContactByString */
EPhoneViewAddContactByString,
- /** EPhoneViewIsActiveNoteDissmissableByKeyEvent */
- EPhoneViewIsActiveNoteDissmissableByKeyEvent,
/** EPhoneViewEnableToolbarButton */
EPhoneViewEnableToolbarButton,
/** EPhoneViewHideToolbar */
--- a/phoneapp/phoneuiutils/inc/tphonecmdparamglobalnote.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiutils/inc/tphonecmdparamglobalnote.h Mon Oct 04 16:06:10 2010 +0300
@@ -28,11 +28,21 @@
#include "tphonecommandparam.h"
// DATA TYPES
-enum PhoneNotificationType{
+enum TPhoneNotificationType
+ {
EPhoneNotificationDialog = 0, // notify of a state change that does not require user input.
EPhoneMessageBoxInformation,
EPhoneMessageBoxWarning
-};
+ };
+
+enum TPhoneNotificationToneType
+ {
+ EPhoneNoTone = 0,
+ EPhoneInformationTone,
+ EPhoneWarningTone,
+ EPhoneConfirmationTone,
+ EPhoneErrorTone
+ };
// CLASS DECLARATION
/**
@@ -53,7 +63,7 @@
* Sets the global note type.
* @param aType is the global note type
*/
- IMPORT_C void SetType( PhoneNotificationType aType );
+ IMPORT_C void SetType( TPhoneNotificationType aType );
/**
* Sets the text resource ID for the global note
@@ -89,10 +99,22 @@
IMPORT_C void SetCauseCode( TInt aCauseCode );
/**
+ * Sets tone type.
+ * @param aToneType Type of tone.
+ */
+ IMPORT_C void SetToneType( TPhoneNotificationToneType aCauseCode );
+
+ /**
+ * Returns tone type.
+ * @return Type of tone.
+ */
+ IMPORT_C TPhoneNotificationToneType ToneType() const;
+
+ /**
* Returns the global note type
* @return Returns the type
*/
- IMPORT_C PhoneNotificationType Type() const;
+ IMPORT_C TPhoneNotificationType Type() const;
/**
* Returns the global note text resource ID.
@@ -129,7 +151,7 @@
/**
* Global note type
*/
- PhoneNotificationType iType;
+ TPhoneNotificationType iType;
/**
* Global note text resource ID
@@ -155,6 +177,11 @@
* Cause code.
*/
TInt iCauseCode;
+
+ /**
+ * Notification tone type
+ */
+ TPhoneNotificationToneType iToneType;
};
#endif // __TPHONECMDPARAMGLOBALNOTE_H
--- a/phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiutils/src/phoneloggerviewcommands.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -34,98 +34,91 @@
_STLIT8(K8, "EPhoneViewClearNumberEntryContent");
_STLIT8(K9, "EPhoneViewCreateCallHeader");
_STLIT8(K10, "EPhoneViewCreateEmergencyCallHeader");
-_STLIT8(K11, "EPhoneViewUpdateCallHeaderRemoteInfoData");
-_STLIT8(K12, "EPhoneViewUpdateCallHeaderCallDuration");
-_STLIT8(K13, "EPhoneViewRemoveCallHeader");
-_STLIT8(K14, "EPhoneViewUpdateCba");
-_STLIT8(K15, "EPhoneViewUpdateBubble");
-_STLIT8(K16, "EPhoneViewActivateAudioPathUIChanges");
-_STLIT8(K17, "EPhoneViewActivateAudioAvailabilityUIChanges");
-_STLIT8(K18, "EPhoneViewActivateMuteUIChanges");
-_STLIT8(K19, "EPhoneViewShowNote");
-_STLIT8(K20, "EPhoneViewShowGlobalNote");
-_STLIT8(K21, "EPhoneViewShowProgressNote");
-_STLIT8(K22, "EPhoneViewRemoveNote");
-_STLIT8(K23, "EPhoneViewRemoveProgressNote");
-_STLIT8(K24, "EPhoneViewRemoveGlobalNote");
-_STLIT8(K25, "EPhoneViewShowQuery");
-_STLIT8(K26, "EPhoneViewSetListQueryString");
-_STLIT8(K27, "EPhoneViewRemoveQuery");
-_STLIT8(K28, "EPhoneViewBringAppToForeground");
-_STLIT8(K29, "EPhoneViewSendToBackground");
-_STLIT8(K30, "EPhoneViewGetTopApplicationIsDisplayedStatus");
-_STLIT8(K31, "EPhoneViewGetForegroundApplication");
-_STLIT8(K32, "EPhoneViewStartCapturingKey");
-_STLIT8(K33, "EPhoneViewStopCapturingKey");
-_STLIT8(K34, "EPhoneViewSetGlobalNotifiersDisabled");
-_STLIT8(K35, "EPhoneViewOpenSingleItemFetchDialog");
-_STLIT8(K36, "EPhoneViewRemovePhoneDialogs");
-_STLIT8(K37, "EPhoneViewCreateConference");
-_STLIT8(K38, "EPhoneViewAddToConference");
-_STLIT8(K39, "EPhoneViewRemoveFromConference");
-_STLIT8(K40, "EPhoneViewPrivateFromConference");
-_STLIT8(K41, "EPhoneViewSelectedConfMember");
-_STLIT8(K42, "EPhoneViewGetCallIdByState");
-_STLIT8(K43, "EPhoneViewGetCountOfActiveCalls");
-_STLIT8(K44, "EPhoneViewSetNaviPaneAudioVolume");
-_STLIT8(K45, "EPhoneViewHideNaviPaneAudioVolume");
-_STLIT8(K46, "EPhoneViewGetIsConference");
-_STLIT8(K47, "EPhoneViewGetCallExistsInConference");
-_STLIT8(K48, "EPhoneViewRemoveAllCallHeaders");
-_STLIT8(K49, "EPhoneViewPlayRingTone");
-_STLIT8(K50, "EPhoneViewMuteRingTone");
-_STLIT8(K51, "EPhoneViewStopRingTone");
-_STLIT8(K52, "EPhoneViewMuteRingToneOnAnswer");
-_STLIT8(K53, "EPhoneViewCipheringInfoChange");
-_STLIT8(K54, "EPhoneViewCloseFSW");
-_STLIT8(K55, "EPhoneViewLaunchRfsDeep");
-_STLIT8(K56, "EPhoneViewLaunchRfsNormal");
-_STLIT8(K57, "EPhoneViewOpenSoftRejectEditor");
-_STLIT8(K58, "EPhoneViewSetSecurityMode");
-_STLIT8(K59, "EPhoneViewGetSecurityModeStatus");
-_STLIT8(K60, "EPhoneViewEnableKeyLock");
-_STLIT8(K61, "EPhoneViewEnableKeyLockWithoutNote");
-_STLIT8(K62, "EPhoneViewUpdateFSW");
-_STLIT8(K63, "EPhoneViewIsQuery");
-_STLIT8(K64, "EPhoneViewBringIdleToForeground");
-_STLIT8(K65, "EPhoneViewBeginUpdate");
-_STLIT8(K66, "EPhoneViewEndUpdate");
-_STLIT8(K67, "EPhoneViewRemoveConferenceBubble");
-_STLIT8(K68, "EPhoneViewSetTouchPaneButtons");
-_STLIT8(K69, "EPhoneViewGetBlockingDialogStatus");
-_STLIT8(K70, "EPhoneViewIsNoteActive");
-_STLIT8(K71, "EPhoneViewOpenCallHandling");
-_STLIT8(K72, "EPhoneViewGetAudioVolumeLevel");
-_STLIT8(K73, "EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel");
-_STLIT8(K74, "EPhoneViewRemoveDtmfNote");
-_STLIT8(K75, "EPhoneViewSetEikonNotifiersDisabled");
-_STLIT8(K76, "EPhoneViewCancelAllNotications");
-_STLIT8(K77, "EPhoneViewDisableKeyLock");
-_STLIT8(K78, "EPhoneViewSendAiwCommand");
-_STLIT8(K79, "EPhoneViewCipheringInfoChangePlayTone");
-_STLIT8(K80, "EPhoneViewRemoveGlobalWaitNote");
-_STLIT8(K81, "EPhoneViewSetPhoneCustomization");
-_STLIT8(K82, "EPhoneViewSetViewCustomization");
-_STLIT8(K83, "EPhoneViewSetButtonCustomization");
-_STLIT8(K84, "EPhoneViewUpdateContactByString");
-_STLIT8(K85, "EPhoneViewAddContactByString");
-_STLIT8(K86, "EPhoneViewIsActiveNoteDissmissableByKeyEvent");
-_STLIT8(K87, "EPhoneViewEnableToolbarButton");
-_STLIT8(K88, "EPhoneViewHideToolbar");
-_STLIT8(K89, "EPhoneViewShowToolbar");
-_STLIT8(K90, "EPhoneViewGetExpandedBubbleCallId");
-_STLIT8(K91, "EPhoneViewOpenDialer");
-_STLIT8(K92, "EPhoneSetConferenceExpanded");
-_STLIT8(K93, "EPhoneAppShutDown");
-_STLIT8(K94, "EPhoneViewBackButtonActive");
-_STLIT8(K95, "EPhoneViewHsToForegroundAfterCall");
-_STLIT8(K96, "EPhoneViewOpenContacts");
-_STLIT8(K97, "EPhoneViewSetIhfFlag");
-_STLIT8(K98, "EPhoneViewSetMuteFlag");
-_STLIT8(K99, "EPhoneViewLaunchLogs");
-_STLIT8(K100, "EPhoneViewSetBlueToothFlag");
-_STLIT8(K101, "EPhoneViewSetBluetoothAvailableFlag");
-_STLIT8(K102, ", // Don't remove this, this should always be the last in list.");
+_STLIT8(K11, "EPhoneViewUpdateCallHeaderCallDuration");
+_STLIT8(K12, "EPhoneViewRemoveCallHeader");
+_STLIT8(K13, "EPhoneViewUpdateCba");
+_STLIT8(K14, "EPhoneViewUpdateBubble");
+_STLIT8(K15, "EPhoneViewActivateAudioPathUIChanges");
+_STLIT8(K16, "EPhoneViewActivateAudioAvailabilityUIChanges");
+_STLIT8(K17, "EPhoneViewActivateMuteUIChanges");
+_STLIT8(K18, "EPhoneViewShowNote");
+_STLIT8(K19, "EPhoneViewShowGlobalNote");
+_STLIT8(K20, "EPhoneViewShowProgressNote");
+_STLIT8(K21, "EPhoneViewRemoveNote");
+_STLIT8(K22, "EPhoneViewRemoveProgressNote");
+_STLIT8(K23, "EPhoneViewRemoveGlobalNote");
+_STLIT8(K24, "EPhoneViewShowQuery");
+_STLIT8(K25, "EPhoneViewSetListQueryString");
+_STLIT8(K26, "EPhoneViewRemoveQuery");
+_STLIT8(K27, "EPhoneViewBringAppToForeground");
+_STLIT8(K28, "EPhoneViewSendToBackground");
+_STLIT8(K29, "EPhoneViewGetTopApplicationIsDisplayedStatus");
+_STLIT8(K30, "EPhoneViewGetForegroundApplication");
+_STLIT8(K31, "EPhoneViewStartCapturingKey");
+_STLIT8(K32, "EPhoneViewStopCapturingKey");
+_STLIT8(K33, "EPhoneViewSetGlobalNotifiersDisabled");
+_STLIT8(K34, "EPhoneViewOpenSingleItemFetchDialog");
+_STLIT8(K35, "EPhoneViewRemovePhoneDialogs");
+_STLIT8(K36, "EPhoneViewCreateConference");
+_STLIT8(K37, "EPhoneViewAddToConference");
+_STLIT8(K38, "EPhoneViewRemoveFromConference");
+_STLIT8(K39, "EPhoneViewPrivateFromConference");
+_STLIT8(K40, "EPhoneViewSelectedConfMember");
+_STLIT8(K41, "EPhoneViewGetCallIdByState");
+_STLIT8(K42, "EPhoneViewGetCountOfActiveCalls");
+_STLIT8(K43, "EPhoneViewSetNaviPaneAudioVolume");
+_STLIT8(K44, "EPhoneViewHideNaviPaneAudioVolume");
+_STLIT8(K45, "EPhoneViewGetIsConference");
+_STLIT8(K46, "EPhoneViewGetCallExistsInConference");
+_STLIT8(K47, "EPhoneViewRemoveAllCallHeaders");
+_STLIT8(K48, "EPhoneViewPlayRingTone");
+_STLIT8(K49, "EPhoneViewMuteRingTone");
+_STLIT8(K50, "EPhoneViewStopRingTone");
+_STLIT8(K51, "EPhoneViewMuteRingToneOnAnswer");
+_STLIT8(K52, "EPhoneViewCipheringInfoChange");
+_STLIT8(K53, "EPhoneViewCloseFSW");
+_STLIT8(K54, "EPhoneViewLaunchRfsDeep");
+_STLIT8(K55, "EPhoneViewLaunchRfsNormal");
+_STLIT8(K56, "EPhoneViewOpenSoftRejectEditor");
+_STLIT8(K57, "EPhoneViewSetSecurityMode");
+_STLIT8(K58, "EPhoneViewGetSecurityModeStatus");
+_STLIT8(K59, "EPhoneViewEnableKeyLock");
+_STLIT8(K60, "EPhoneViewEnableKeyLockWithoutNote");
+_STLIT8(K61, "EPhoneViewUpdateFSW");
+_STLIT8(K62, "EPhoneViewBringIdleToForeground");
+_STLIT8(K63, "EPhoneViewBeginUpdate");
+_STLIT8(K64, "EPhoneViewEndUpdate");
+_STLIT8(K65, "EPhoneViewRemoveConferenceBubble");
+_STLIT8(K66, "EPhoneViewSetTouchPaneButtons");
+_STLIT8(K67, "EPhoneViewOpenCallHandling");
+_STLIT8(K68, "EPhoneViewGetAudioVolumeLevel");
+_STLIT8(K69, "EPhoneViewRemoveDtmfNote");
+_STLIT8(K70, "EPhoneViewCancelAllNotications");
+_STLIT8(K71, "EPhoneViewDisableKeyLock");
+_STLIT8(K72, "EPhoneViewSendAiwCommand");
+_STLIT8(K73, "EPhoneViewCipheringInfoChangePlayTone");
+_STLIT8(K74, "EPhoneViewRemoveGlobalWaitNote");
+_STLIT8(K75, "EPhoneViewSetPhoneCustomization");
+_STLIT8(K76, "EPhoneViewSetViewCustomization");
+_STLIT8(K77, "EPhoneViewSetButtonCustomization");
+_STLIT8(K78, "EPhoneViewUpdateContactByString");
+_STLIT8(K79, "EPhoneViewAddContactByString");
+_STLIT8(K80, "EPhoneViewEnableToolbarButton");
+_STLIT8(K81, "EPhoneViewHideToolbar");
+_STLIT8(K82, "EPhoneViewShowToolbar");
+_STLIT8(K83, "EPhoneViewGetExpandedBubbleCallId");
+_STLIT8(K84, "EPhoneViewOpenDialer");
+_STLIT8(K85, "EPhoneSetConferenceExpanded");
+_STLIT8(K86, "EPhoneAppShutDown");
+_STLIT8(K87, "EPhoneViewBackButtonActive");
+_STLIT8(K88, "EPhoneViewHsToForegroundAfterCall");
+_STLIT8(K89, "EPhoneViewOpenContacts");
+_STLIT8(K90, "EPhoneViewSetIhfFlag");
+_STLIT8(K91, "EPhoneViewSetMuteFlag");
+_STLIT8(K92, "EPhoneViewLaunchLogs");
+_STLIT8(K93, "EPhoneViewSetBlueToothFlag");
+_STLIT8(K94, "EPhoneViewSetBluetoothAvailableFlag");
+_STLIT8(K95, ", // Don't remove this, this should always be the last in list.");
// Intermediate
const void * const KStringPointers[] =
@@ -224,15 +217,8 @@
(const void*)&K92,
(const void*)&K93,
(const void*)&K94,
- (const void*)&K95,
- (const void*)&K96,
- (const void*)&K97,
- (const void*)&K98,
- (const void*)&K99,
- (const void*)&K100,
- (const void*)&K101,
- (const void*)&K102
+ (const void*)&K95
};
-const TStringTable PhoneLoggerviewCommands::Table = {102, KStringPointers, EFalse};
+const TStringTable PhoneLoggerviewCommands::Table = {95, KStringPointers, EFalse};
--- a/phoneapp/phoneuiutils/src/phoneloggerviewcommands.st Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiutils/src/phoneloggerviewcommands.st Mon Oct 04 16:06:10 2010 +0300
@@ -10,7 +10,6 @@
EPhoneViewClearNumberEntryContent EPhoneViewClearNumberEntryContent
EPhoneViewCreateCallHeader EPhoneViewCreateCallHeader
EPhoneViewCreateEmergencyCallHeader EPhoneViewCreateEmergencyCallHeader
-EPhoneViewUpdateCallHeaderRemoteInfoData EPhoneViewUpdateCallHeaderRemoteInfoData
EPhoneViewUpdateCallHeaderCallDuration EPhoneViewUpdateCallHeaderCallDuration
EPhoneViewRemoveCallHeader EPhoneViewRemoveCallHeader
EPhoneViewUpdateCba EPhoneViewUpdateCba
@@ -69,9 +68,7 @@
EPhoneViewSetTouchPaneButtons EPhoneViewSetTouchPaneButtons
EPhoneViewOpenCallHandling EPhoneViewOpenCallHandling
EPhoneViewGetAudioVolumeLevel EPhoneViewGetAudioVolumeLevel
-EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel EPhoneViewUpdateCallHeaderRemoteInfoDataAndLabel
EPhoneViewRemoveDtmfNote EPhoneViewRemoveDtmfNote
-EPhoneViewSetEikonNotifiersDisabled EPhoneViewSetEikonNotifiersDisabled
EPhoneViewCancelAllNotications EPhoneViewCancelAllNotications
EPhoneViewDisableKeyLock EPhoneViewDisableKeyLock
EPhoneViewSendAiwCommand EPhoneViewSendAiwCommand
--- a/phoneapp/phoneuiutils/src/tphonecmdparamglobalnote.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiutils/src/tphonecmdparamglobalnote.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -36,7 +36,8 @@
iText( KNullDesC ),
iTimeout( 0 ),
iNotificationDialog( EFalse ),
- iCauseCode( KErrNotFound )
+ iCauseCode( KErrNotFound ),
+ iToneType( EPhoneNoTone )
{
iParamId = EPhoneParamIdGlobalNote;
}
@@ -47,7 +48,7 @@
// (other items were commented in a header).
// ---------------------------------------------------------
//
-EXPORT_C void TPhoneCmdParamGlobalNote::SetType( /*TAknGlobalNoteType*/ PhoneNotificationType aType )
+EXPORT_C void TPhoneCmdParamGlobalNote::SetType( /*TAknGlobalNoteType*/ TPhoneNotificationType aType )
{
iType = aType;
}
@@ -85,9 +86,9 @@
// ---------------------------------------------------------
//
EXPORT_C void TPhoneCmdParamGlobalNote::SetTimeout( TInt aTimeout )
-{
+ {
iTimeout = aTimeout;
-}
+ }
// ---------------------------------------------------------
// TPhoneCmdParamGlobalNote::SetNotificationDialog
@@ -97,9 +98,9 @@
//
EXPORT_C void TPhoneCmdParamGlobalNote::SetNotificationDialog(
TBool aNotificationDialog )
-{
+ {
iNotificationDialog = aNotificationDialog;
-}
+ }
// ---------------------------------------------------------
// TPhoneCmdParamGlobalNote::SetCauseCode
@@ -109,9 +110,32 @@
//
EXPORT_C void TPhoneCmdParamGlobalNote::SetCauseCode(
TInt aCauseCode )
-{
+ {
iCauseCode = aCauseCode;
-}
+ }
+
+// ---------------------------------------------------------
+// TPhoneCmdParamGlobalNote::SetToneType
+// Sets the tone type.
+// (other items were commented in a header).
+// ---------------------------------------------------------
+//
+EXPORT_C void TPhoneCmdParamGlobalNote::SetToneType(
+ TPhoneNotificationToneType aToneType )
+ {
+ iToneType = aToneType;
+ }
+
+// ---------------------------------------------------------
+// TPhoneCmdParamGlobalNote::ToneType
+// Returns the tone type.
+// (other items were commented in a header).
+// ---------------------------------------------------------
+//
+EXPORT_C TPhoneNotificationToneType TPhoneCmdParamGlobalNote::ToneType() const
+ {
+ return iToneType;
+ }
// ---------------------------------------------------------
// TPhoneCmdParamGlobalNote::Type
@@ -119,7 +143,7 @@
// (other items were commented in a header).
// ---------------------------------------------------------
//
-EXPORT_C /*TAknGlobalNoteType*/ PhoneNotificationType TPhoneCmdParamGlobalNote::Type() const
+EXPORT_C /*TAknGlobalNoteType*/ TPhoneNotificationType TPhoneCmdParamGlobalNote::Type() const
{
return iType;
}
--- a/phoneapp/phoneuiview2/bwins/phoneuiqtviewu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiview2/bwins/phoneuiqtviewu.def Mon Oct 04 16:06:10 2010 +0300
@@ -66,4 +66,5 @@
?clearDialpad@PhoneUIQtView@@UAEXXZ @ 65 NONAME ; void PhoneUIQtView::clearDialpad(void)
?captureKey@PhoneUIQtView@@UAEXW4Key@Qt@@_N@Z @ 66 NONAME ; void PhoneUIQtView::captureKey(enum Qt::Key, bool)
?setRestrictedMode@PhoneUIQtView@@UAEX_N@Z @ 67 NONAME ; void PhoneUIQtView::setRestrictedMode(bool)
+ ?updateMenuVisibility@PhoneUIQtView@@AAEXXZ @ 68 NONAME ; void PhoneUIQtView::updateMenuVisibility(void)
--- a/phoneapp/phoneuiview2/eabi/phoneuiqtviewu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiview2/eabi/phoneuiqtviewu.def Mon Oct 04 16:06:10 2010 +0300
@@ -98,4 +98,5 @@
_ZThn28_N13PhoneUIQtView10captureKeyEN2Qt3KeyEb @ 97 NONAME
_ZN13PhoneUIQtView17setRestrictedModeEb @ 98 NONAME
_ZThn28_N13PhoneUIQtView17setRestrictedModeEb @ 99 NONAME
+ _ZN13PhoneUIQtView20updateMenuVisibilityEv @ 100 NONAME
--- a/phoneapp/phoneuiview2/inc/phoneuiqtview.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiview2/inc/phoneuiqtview.h Mon Oct 04 16:06:10 2010 +0300
@@ -375,6 +375,11 @@
*/
void createToolBarActions();
+ /*!
+ \fn void updateMenuVisibility()
+ */
+ void updateMenuVisibility();
+
private:
HbMainWindow &m_window;
BubbleManager *m_bubbleManager;
@@ -396,6 +401,7 @@
QList<Qt::Key> m_keyCaptures;
DialpadKeyHandler *m_dialpadKeyHandler;
bool m_restrictedMode;
+ HbMenu *m_optionsMenu;
};
#endif // PHONEUIQTVIEW_H
--- a/phoneapp/phoneuiview2/src/phoneuiqtview.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiview2/src/phoneuiqtview.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -48,8 +48,10 @@
m_keyCapture(0),
m_networkInfo(0),
m_dialpadKeyHandler(0),
- m_restrictedMode(false)
+ m_restrictedMode(false),
+ m_optionsMenu(0)
{
+ PHONE_TRACE
// Set network name
m_networkInfo = new QSystemNetworkInfo(this);
QString networkName = m_networkInfo->networkName(QSystemNetworkInfo::WcdmaMode);
@@ -100,10 +102,20 @@
PhoneUIQtView::~PhoneUIQtView ()
{
+ foreach (QList<HbAction *> *actions, m_bubbleActionMap) {
+ qDeleteAll(*actions);
+ delete actions;
+ }
+
+ qDeleteAll(m_participantListActions);
+ qDeleteAll(m_expandActionMap);
+ qDeleteAll(m_bubbleMap);
qDeleteAll(m_toolbarActions);
m_window.removeEventFilter(this);
+ delete m_keyCapture;
delete m_volumeSlider;
delete m_dialpad;
+ delete m_optionsMenu;
}
BubbleManagerIF& PhoneUIQtView::bubbleManager()
@@ -115,7 +127,8 @@
int bubbleId,
const PhoneAction& action )
{
- HbAction* bubbleAction = new HbAction ();
+ PHONE_TRACE
+ HbAction *bubbleAction = new HbAction ();
bubbleAction->setText (action.text());
bubbleAction->setIcon (action.icon());
setActionRole(action,*bubbleAction);
@@ -126,9 +139,9 @@
for ( int i=0; i<bubbles.size(); ++i ) {
if (bubbleId==bubbles[i]){
- connect(bubbleAction, SIGNAL (triggered ()), m_bubbleMap.value(bubbleId), SLOT (map ()));
- m_bubbleMap.value(bubbleId)->setMapping(bubbleAction, action.command());
- m_bubbleActionMap.value(bubbleId)->append(bubbleAction);
+ connect(bubbleAction, SIGNAL (triggered ()), m_bubbleMap[bubbleId], SLOT (map ()));
+ m_bubbleMap[bubbleId]->setMapping(bubbleAction, action.command());
+ m_bubbleActionMap[bubbleId]->append(bubbleAction);
found = true;
}
}
@@ -150,6 +163,7 @@
const QString& text,
const HbIcon& icon)
{
+ PHONE_TRACE
HbAction* action = new HbAction ();
action->setText (text);
action->setIcon (icon);
@@ -167,7 +181,7 @@
void PhoneUIQtView::clearParticipantListActions()
{
-
+ PHONE_TRACE
if (m_participantListSignalMapper) {
m_bubbleManager->clearParticipantListActions();
@@ -184,6 +198,7 @@
void PhoneUIQtView::clearBubbleCommands (int bubbleId)
{
+ PHONE_TRACE
m_bubbleManager->clearActions (bubbleId);
QSignalMapper *mapper = m_bubbleMap.value(bubbleId);
@@ -208,6 +223,7 @@
void PhoneUIQtView::setToolbarActions(const QList<PhoneAction*>& actions)
{
+ PHONE_TRACE
// clear current toolbar actions
for (int i=0;i<toolBar()->actions().count();++i) {
m_signalMapper->removeMappings(
@@ -287,6 +303,7 @@
void PhoneUIQtView::setVolumeSliderValue (
int value, int commandId, int maxVolumeValue, int minVolumeValue)
{
+ PHONE_TRACE
m_volumeCommandId = commandId;
if (!m_volumeSlider) {
@@ -319,6 +336,7 @@
void PhoneUIQtView::setExpandAction(int bubbleId, int commandId)
{
+ PHONE_TRACE
removeExpandAction(bubbleId);
HbAction* action = new HbAction();
@@ -338,6 +356,7 @@
void PhoneUIQtView::removeExpandAction(int bubbleId)
{
+ PHONE_TRACE
if (m_expandActionMap.contains(bubbleId)) {
m_bubbleManager->setExpandAction(bubbleId, 0);
HbAction* action = m_expandActionMap.value(bubbleId);
@@ -388,28 +407,31 @@
}
void PhoneUIQtView::setMenuActions(const QList<PhoneAction*>& actions)
-{
-
- for (int i=menu()->actions().count(); 0<i; --i) {
- HbAction* action = static_cast<HbAction*>(menu()->actions().at(i-1));
+{
+ PHONE_TRACE
+ HbMenu* optionsMenu = m_optionsMenu ? m_optionsMenu : menu();
+
+ for (int i=optionsMenu->actions().count(); 0<i; --i) {
+ HbAction* action = static_cast<HbAction*>(optionsMenu->actions().at(i-1));
m_menuSignalMapper->removeMappings(action);
- menu()->removeAction(action);
+ optionsMenu->removeAction(action);
delete action;
}
-
for (int i=0; i<actions.count(); ++i) {
HbAction* action = new HbAction();
action->setText(actions.at(i)->text());
- menu()->addAction(action);
+ optionsMenu->addAction(action);
connect(action, SIGNAL(triggered()), m_menuSignalMapper, SLOT(map()));
m_menuSignalMapper->setMapping(action, actions.at(i)->command());
- }
-
+ }
+ updateMenuVisibility();
}
HbMenu &PhoneUIQtView::menuReference()
{
- return *menu();
+ PHONE_TRACE
+ HbMenu* optionsMenu = m_optionsMenu ? m_optionsMenu : menu();
+ return *optionsMenu;
}
void PhoneUIQtView::captureKey(Qt::Key key, bool capture)
@@ -431,6 +453,7 @@
void PhoneUIQtView::handleOrientationChange(Qt::Orientation orientation)
{
+ PHONE_TRACE
if (orientation==Qt::Horizontal) {
toolBar()->setOrientation(Qt::Horizontal);
}
@@ -459,7 +482,7 @@
bool PhoneUIQtView::eventFilter(QObject *watched, QEvent * event)
{
Q_UNUSED(watched);
- PHONE_DEBUG2("PhoneUIQtView::eventFilter event type:", event->type());
+ PHONE_TRACE2(":event type", event->type())
// Allow send key only when there is callbutton enabled or no text in input field
bool sendKeyAllowed = m_dialpad->isCallButtonEnabled() ||
@@ -500,6 +523,7 @@
void PhoneUIQtView::setDialpadPosition()
{
+ PHONE_TRACE
QRectF screenRect(m_window.layoutRect());
if (m_window.orientation() == Qt::Horizontal) {
@@ -520,6 +544,7 @@
void PhoneUIQtView::setActionRole(const PhoneAction& pa, HbAction& action)
{
+ PHONE_TRACE
if (pa.actionRole()==PhoneAction::Accept) {
action.setSoftKeyRole(QAction::PositiveSoftKey);
} else if (pa.actionRole()==PhoneAction::Decline) {
@@ -529,6 +554,7 @@
void PhoneUIQtView::createToolBarActions()
{
+ PHONE_TRACE
for (int i=0;i<4;++i) {
HbAction* action = new HbAction();
connect(action, SIGNAL(triggered()), m_signalMapper, SLOT(map()));
@@ -536,6 +562,32 @@
}
}
+void PhoneUIQtView::updateMenuVisibility()
+{
+ PHONE_TRACE
+ bool visible = false;
+ HbView* view = m_window.currentView();
+ HbMenu* optionsMenu = m_optionsMenu ? m_optionsMenu : menu();
+ foreach( QAction* action, optionsMenu->actions()){
+ if(action->isVisible()){
+ visible = true;
+ break;
+ }
+ }
+ PHONE_DEBUG2("PhoneUIQtView::updateMenuVisibility - visible", visible);
+ if (!visible && !m_optionsMenu) {
+ PHONE_DEBUG("PhoneUIQtView::updateMenuVisibility - takeMenu");
+ //takeMenu() - Removes the menu from the view and returns it to the caller.
+ //ownership of the menu is transfered.
+ m_optionsMenu = view->takeMenu();
+
+ } else if (visible && m_optionsMenu) {
+ // ownership of the menu is transfered
+ view->setMenu(m_optionsMenu);
+ m_optionsMenu = 0;
+ }
+}
+
void PhoneUIQtView::shutdownPhoneApp()
{
PHONE_DEBUG("PhoneUIQtView::shutdownPhoneApp");
@@ -551,6 +603,7 @@
void PhoneUIQtView::setRestrictedMode(bool restrictedMode)
{
+ PHONE_TRACE
m_restrictedMode = restrictedMode;
m_backAction->setEnabled(!restrictedMode);
m_dialpad->setCallButtonEnabled(false);
--- a/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuiview2/tsrc/ut_phoneuiqtview/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -47,6 +47,8 @@
bool m_qtimer_stop_called;
QString m_networkName;
+bool m_take_menu_called;
+bool m_set_menu_called;
#define PHONE_QT_VIEW_TEST_MAIN(TestObject) \
int main(int argc, char *argv[]) \
@@ -100,6 +102,7 @@
void testCaptureKey();
void testRestrictedMode();
+
private:
int createCallHeader();
@@ -137,6 +140,8 @@
void TestPhoneUIQtView::init ()
{
m_qtimer_stop_called = false;
+ m_take_menu_called = false;
+ m_set_menu_called = false;
}
void TestPhoneUIQtView::cleanup ()
@@ -378,6 +383,8 @@
QList<PhoneAction*> actions;
m_view->setMenuActions(actions);
+ QVERIFY(m_take_menu_called);
+
PhoneAction* phoneAction = new PhoneAction;
phoneAction->setText(QString("test"));
phoneAction->setCommand(1);
@@ -387,7 +394,9 @@
qDeleteAll(actions);
actions.clear();
+ m_take_menu_called = false;
m_view->setMenuActions(actions);
+ QVERIFY(m_take_menu_called);
}
//Private methods
@@ -475,6 +484,17 @@
QCOMPARE(m_view->m_backAction->isEnabled(), true);
}
+HbMenu * HbView::takeMenu()
+{
+ m_take_menu_called = true;
+ return 0;
+}
+
+void HbView::setMenu(HbMenu* menu)
+{
+ m_set_menu_called = true;
+}
+
void HbView::setTitle (const QString &title)
{
m_networkName = title;
--- a/phoneapp/phoneuivoipextension/group/phoneuivoipextension.mmp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuivoipextension/group/phoneuivoipextension.mmp Mon Oct 04 16:06:10 2010 +0300
@@ -89,7 +89,6 @@
LIBRARY phoneuistates.lib
LIBRARY phoneuiutils.lib
LIBRARY serviceprovidersettings.lib
-LIBRARY serviceselector.lib
// <-- QT PHONE START -->
//LIBRARY vccuipropertyhandler.lib //For VCC Usage
// <-- QT PHONE END -->
--- a/phoneapp/phoneuivoipextension/src/cphonestateutilsvoip.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphonestateutilsvoip.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -145,13 +145,11 @@
// CPhoneStateUtilsVoip::IsVoipPreferredCall
// ---------------------------------------------------------------------------
//
-TBool CPhoneStateUtilsVoip::IsVoipPreferredCall( TUint& aServiceId )
+TBool CPhoneStateUtilsVoip::IsVoipPreferredCall( TUint& /*aServiceId*/ )
{
__LOGMETHODSTARTEND( PhoneUIVoIPExtension,
"CPhoneStateUtilsVoip::IsVoipPreferredCall" );
-
TBool isVoipPrefered( EFalse );
-
return isVoipPrefered;
}
--- a/phoneapp/phoneuivoipextension/src/cphoneviewcustomizationvoip.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphoneviewcustomizationvoip.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -143,11 +143,10 @@
// ---------------------------------------------------------------------------
//
TBool CPhoneViewCustomizationVoip::SelectVoipService(
- MPhoneViewBlockingDialogObserver& aBlockingObserver,
- TPhoneCommandParam* aCommandParam )
+ MPhoneViewBlockingDialogObserver& /*aBlockingObserver*/,
+ TPhoneCommandParam* /*aCommandParam*/ )
{
__LOGMETHODSTARTEND( PhoneUIVoIPExtension,
"CPhoneViewCustomizationVoip::SelectVoipService" );
-
return ETrue;
}
--- a/phoneengine/audiohandling/src/cpeaudiodtmftoneplayer.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/audiohandling/src/cpeaudiodtmftoneplayer.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -143,14 +143,11 @@
Cancel();
Normalize( aTone );
- // DTMF signalling.
- if ( iDTMFPlayer )
- {
- TBuf<KBufSize> key;
- key.Append( aTone );
- TEFLOGSTRING( KTAREQOUT, "AUD CPEAudioDtmfTonePlayer::PlayDtmfTone > CMMFDevSound::PlayDTMFStringL");
- TRAP_IGNORE( iDTMFPlayer->PlayDTMFStringL( key ) );
- }
+ TBuf<KBufSize> key;
+ key.Append( aTone );
+ TEFLOGSTRING( KTAREQOUT, "AUD CPEAudioDtmfTonePlayer::PlayDtmfTone > CMMFDevSound::PlayDTMFStringL");
+ TRAP_IGNORE( iDTMFPlayer->PlayDTMFStringL( key ) );
+
}
// -----------------------------------------------------------------------------
--- a/phoneengine/audiohandling/src/cpeaudioeffect.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/audiohandling/src/cpeaudioeffect.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -20,6 +20,7 @@
#include <tmsfactory.h>
#include <tmsglobalvoleffect.h>
#include <tmsglobalgaineffect.h>
+#include <tmsver.h>
#include "cpeaudioeffect.h"
#include "pepanic.pan"
@@ -62,9 +63,9 @@
//
void CPEAudioEffect::ConstructL(TMSEffectObserver& aObserver)
{
- TMSVer* v = NULL;
TInt err(KErrNotFound);
- TMSFactory::CreateFactory(iFactory, *v);
+ TMSVer v(2,0,0);
+ TMSFactory::CreateFactory(iFactory, v);
if (iFactory)
{
err = iFactory->CreateEffect(TMS_EFFECT_GLOBAL_GAIN, iGlobalGain);
@@ -85,8 +86,11 @@
//
CPEAudioEffect::~CPEAudioEffect()
{
- iFactory->DeleteEffect(iGlobalGain);
- iFactory->DeleteEffect(iGlobalVol);
+ if ( iFactory != NULL )
+ {
+ iFactory->DeleteEffect ( iGlobalGain );
+ iFactory->DeleteEffect ( iGlobalVol );
+ }
delete iFactory;
}
--- a/phoneengine/callhandling/bwins/callhandlingu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/callhandling/bwins/callhandlingu.def Mon Oct 04 16:06:10 2010 +0300
@@ -1,77 +1,71 @@
EXPORTS
?NewL@CPECallHandling@@SAPAV1@AAVMPEPhoneModelInternal@@AAVCCCE@@AAVMCCEDtmfInterface@@@Z @ 1 NONAME ; class CPECallHandling * CPECallHandling::NewL(class MPEPhoneModelInternal &, class CCCE &, class MCCEDtmfInterface &)
- ?ErrorOccurred@CPEConferenceCall@@UAEXW4TCCPConferenceCallError@@@Z @ 2 NONAME ; void CPEConferenceCall::ErrorOccurred(enum TCCPConferenceCallError)
- ?DialEmergencyCall@CPECallHandling@@UAEXABV?$TBuf@$0GE@@@@Z @ 3 NONAME ; void CPECallHandling::DialEmergencyCall(class TBuf<100> const &)
- ?HangUp@CPECallHandling@@UAEHHW4TPEHangUpOptions@@@Z @ 4 NONAME ; int CPECallHandling::HangUp(int, enum TPEHangUpOptions)
- ?TransferCalls@CPECallHandling@@UAEHXZ @ 5 NONAME ; int CPECallHandling::TransferCalls(void)
- ?TerminateAllConnections@CPECallHandling@@UAEHXZ @ 6 NONAME ; int CPECallHandling::TerminateAllConnections(void)
- ?GetCallIdByState@CPECallHandling@@UBEHI@Z @ 7 NONAME ; int CPECallHandling::GetCallIdByState(unsigned int) const
- ?CallForwardEventOccurred@CPESupplementaryServicesMonitor@@UAEXW4TCCESsCallForwardEvent@MCCESsObserver@@ABVTDesC16@@@Z @ 8 NONAME ; void CPESupplementaryServicesMonitor::CallForwardEventOccurred(enum MCCESsObserver::TCCESsCallForwardEvent, class TDesC16 const &)
- ?CallDurationChanged@CPESingleCallObserver@@UAEXVTTimeIntervalSeconds@@@Z @ 9 NONAME ; void CPESingleCallObserver::CallDurationChanged(class TTimeIntervalSeconds)
- ?IsCallByCallId@CPECallArrayOwner@@UBEHH@Z @ 10 NONAME ; int CPECallArrayOwner::IsCallByCallId(int) const
- ?DoUnattendedTransfer@CPECallHandling@@UAEHABVTDesC16@@@Z @ 11 NONAME ; int CPECallHandling::DoUnattendedTransfer(class TDesC16 const &)
- ?DialCall@CPECallHandling@@UAEHABV?$TBuf@$0GE@@@AAH@Z @ 12 NONAME ; int CPECallHandling::DialCall(class TBuf<100> const &, int &)
- ?GetCallState@CPECallHandling@@UAEIH@Z @ 13 NONAME ; unsigned int CPECallHandling::GetCallState(int)
- ?GetCallInfo@CPECallHandling@@UAEHAAVTMobileCallInfoV3@RMobileCall@@H@Z @ 14 NONAME ; int CPECallHandling::GetCallInfo(class RMobileCall::TMobileCallInfoV3 &, int)
- ?RejectCall@CPECallHandling@@UAEHXZ @ 15 NONAME ; int CPECallHandling::RejectCall(void)
- ?AddConferenceMember@CPECallHandling@@UAEHXZ @ 16 NONAME ; int CPECallHandling::AddConferenceMember(void)
- ?DropMember@CPECallHandling@@UAEHH@Z @ 17 NONAME ; int CPECallHandling::DropMember(int)
- ?SwapCalls@CPECallHandling@@UAEHXZ @ 18 NONAME ; int CPECallHandling::SwapCalls(void)
- ?ErrorOccurred@CPESingleCallObserver@@UAEXW4TCCPError@@@Z @ 19 NONAME ; void CPESingleCallObserver::ErrorOccurred(enum TCCPError)
- ?SendErrorMessage@CPECall@@UAEXH@Z @ 20 NONAME ; void CPECall::SendErrorMessage(int)
- ?RejectUnattendedTransfer@CPECallHandling@@UAEHXZ @ 21 NONAME ; int CPECallHandling::RejectUnattendedTransfer(void)
- ?HoldCall@CPECallHandling@@UAEHXZ @ 22 NONAME ; int CPECallHandling::HoldCall(void)
- ?CLIEventOccurred@CPESupplementaryServicesMonitor@@UAEXW4TCCESsCLIEvent@MCCESsObserver@@@Z @ 23 NONAME ; void CPESupplementaryServicesMonitor::CLIEventOccurred(enum MCCESsObserver::TCCESsCLIEvent)
- ?ResumeCall@CPECallHandling@@UAEHXZ @ 24 NONAME ; int CPECallHandling::ResumeCall(void)
- ?CallByCallId@CPECallArrayOwner@@UBEPAVMPECall@@H@Z @ 25 NONAME ; class MPECall * CPECallArrayOwner::CallByCallId(int) const
- ?GetCallDuration@CPECallHandling@@UAEHAAVTTimeIntervalSeconds@@H@Z @ 26 NONAME ; int CPECallHandling::GetCallDuration(class TTimeIntervalSeconds &, int)
- ?AnswerCall@CPECallHandling@@UAEHXZ @ 27 NONAME ; int CPECallHandling::AnswerCall(void)
- ??1CPECall@@MAE@XZ @ 28 NONAME ; CPECall::~CPECall(void)
- ?ActiveCallCount@CPECallArrayOwner@@UBEHXZ @ 29 NONAME ; int CPECallArrayOwner::ActiveCallCount(void) const
- ?NewL@CPEConferenceCall@@SAPAV1@AAVMPEMessageSender@@AAVCCCE@@@Z @ 30 NONAME ; class CPEConferenceCall * CPEConferenceCall::NewL(class MPEMessageSender &, class CCCE &)
- ?StartUp@CPECallHandling@@UAEXXZ @ 31 NONAME ; void CPECallHandling::StartUp(void)
- ?NotifyCurrentActiveALSLine@CPESupplementaryServicesMonitor@@UAEXH@Z @ 32 NONAME ; void CPESupplementaryServicesMonitor::NotifyCurrentActiveALSLine(int)
- ?GetCallTerminatedDiagnostics@CPECallHandling@@UBEHAAV?$TBuf@$0IA@@@@Z @ 33 NONAME ; int CPECallHandling::GetCallTerminatedDiagnostics(class TBuf<128> &) const
- ?GetNumberOfCalls@CPECallHandling@@UAEHXZ @ 34 NONAME ; int CPECallHandling::GetNumberOfCalls(void)
- ?CallCugEventOccurred@CPESupplementaryServicesMonitor@@UAEXW4TCCESsCugEvent@MCCESsObserver@@@Z @ 35 NONAME ; void CPESupplementaryServicesMonitor::CallCugEventOccurred(enum MCCESsObserver::TCCESsCugEvent)
- ?ConnectedCalls@CPECallHandling@@QAEHXZ @ 36 NONAME ; int CPECallHandling::ConnectedCalls(void)
- ?HandleDTMFEvent@CPEDtmfHandling@@UAEXW4TCCEDtmfEvent@MCCEDtmfObserver@@HVTChar@@@Z @ 37 NONAME ; void CPEDtmfHandling::HandleDTMFEvent(enum MCCEDtmfObserver::TCCEDtmfEvent, int, class TChar)
- ?BuildConference@CPECallHandling@@UAEHXZ @ 38 NONAME ; int CPECallHandling::BuildConference(void)
- ?VoiceCallDataByState@CPECallHandling@@QBEPAVCPESingleCall@@IAAH@Z @ 39 NONAME ; class CPESingleCall * CPECallHandling::VoiceCallDataByState(unsigned int, int &) const
- ?CallStateChanged@CPEConferenceCall@@UAEXW4TCCEConferenceCallState@MCCEConferenceCallObserver@@@Z @ 40 NONAME ; void CPEConferenceCall::CallStateChanged(enum MCCEConferenceCallObserver::TCCEConferenceCallState)
- ?IsCallInState@CPECallHandling@@UBEHI@Z @ 41 NONAME ; int CPECallHandling::IsCallInState(unsigned int) const
- ??0CPEDtmfHandling@@IAE@AAVCPECallHandling@@AAVMCCEDtmfInterface@@@Z @ 42 NONAME ; CPEDtmfHandling::CPEDtmfHandling(class CPECallHandling &, class MCCEDtmfInterface &)
- ?CallEventOccurred@CPESingleCallObserver@@UAEXW4TCCECallEvent@MCCECallObserver@@@Z @ 43 NONAME ; void CPESingleCallObserver::CallEventOccurred(enum MCCECallObserver::TCCECallEvent)
- ?StopDtmfTone@CPECallHandling@@UAEHXZ @ 44 NONAME ; int CPECallHandling::StopDtmfTone(void)
- ?GoOneToOne@CPECallHandling@@UAEHH@Z @ 45 NONAME ; int CPECallHandling::GoOneToOne(int)
- ?CallStateChangedWithInband@CPESingleCallObserver@@UAEXW4TCallState@CCPCall@@@Z @ 46 NONAME ; void CPESingleCallObserver::CallStateChangedWithInband(enum CCPCall::TCallState)
- ?GetMissedCall@CPECallHandling@@UAEHAAHH@Z @ 47 NONAME ; int CPECallHandling::GetMissedCall(int &, int)
- ??1CPECallHandling@@UAE@XZ @ 48 NONAME ; CPECallHandling::~CPECallHandling(void)
- ?ReleaseAll@CPECallHandling@@UAEHXZ @ 49 NONAME ; int CPECallHandling::ReleaseAll(void)
- ?CancelDtmfPlay@CPECallHandling@@UAEXXZ @ 50 NONAME ; void CPECallHandling::CancelDtmfPlay(void)
- ?CallStateChanged@CPESingleCallObserver@@UAEXW4TCallState@CCPCall@@@Z @ 51 NONAME ; void CPESingleCallObserver::CallStateChanged(enum CCPCall::TCallState)
- ?StopDtmfSending@CPECallHandling@@UAEXXZ @ 52 NONAME ; void CPECallHandling::StopDtmfSending(void)
- ?CallTerminatedError@CPECallHandling@@UAEHH@Z @ 53 NONAME ; int CPECallHandling::CallTerminatedError(int)
- ?CallByName@CPECallArrayOwner@@UBEPAVMPECall@@ABV?$TBuf@$0IA@@@@Z @ 54 NONAME ; class MPECall * CPECallArrayOwner::CallByName(class TBuf<128> const &) const
- ?CallEventOccurred@CPEConferenceCall@@UAEXW4TCCEConferenceCallEvent@MCCEConferenceCallObserver@@PAVMCCECall@@@Z @ 55 NONAME ; void CPEConferenceCall::CallEventOccurred(enum MCCEConferenceCallObserver::TCCEConferenceCallEvent, class MCCECall *)
- ?ConstructL@CPEDtmfHandling@@MAEXXZ @ 56 NONAME ; void CPEDtmfHandling::ConstructL(void)
- ?ContinueDtmfSending@CPECallHandling@@UAEXXZ @ 57 NONAME ; void CPECallHandling::ContinueDtmfSending(void)
- ?SendDtmf@CPECallHandling@@UAEHABV?$TBuf@$0GE@@@@Z @ 58 NONAME ; int CPECallHandling::SendDtmf(class TBuf<100> const &)
- ?CallOwner@CPECallHandling@@UBEAAVMPECallOwner@@XZ @ 59 NONAME ; class MPECallOwner & CPECallHandling::CallOwner(void) const
- ?CallByState@CPECallArrayOwner@@UBEPAVMPECall@@I@Z @ 60 NONAME ; class MPECall * CPECallArrayOwner::CallByState(unsigned int) const
- ?NewL@CPEConferenceCall@@SAPAV1@AAVMPEMessageSender@@AAVMCCEConferenceCall@@@Z @ 61 NONAME ; class CPEConferenceCall * CPEConferenceCall::NewL(class MPEMessageSender &, class MCCEConferenceCall &)
- ?IsCallByState@CPECallArrayOwner@@UBEHI@Z @ 62 NONAME ; int CPECallArrayOwner::IsCallByState(unsigned int) const
- ?AcceptUnattendedTransfer@CPECallHandling@@UAEHXZ @ 63 NONAME ; int CPECallHandling::AcceptUnattendedTransfer(void)
- ?HandleTransfer@CPESingleCallObserver@@UAEXHABVTDesC16@@@Z @ 64 NONAME ; void CPESingleCallObserver::HandleTransfer(int, class TDesC16 const &)
- ?ReplaceActive@CPECallHandling@@UAEHXZ @ 65 NONAME ; int CPECallHandling::ReplaceActive(void)
- ?CallCapsChanged@CPESingleCallObserver@@UAEXW4TCCECallControlCaps@MCCECallObserver@@@Z @ 66 NONAME ; void CPESingleCallObserver::CallCapsChanged(enum MCCECallObserver::TCCECallControlCaps)
- ?NewL@CPEDtmfHandling@@SAPAV1@AAVCPECallHandling@@AAVMCCEDtmfInterface@@@Z @ 67 NONAME ; class CPEDtmfHandling * CPEDtmfHandling::NewL(class CPECallHandling &, class MCCEDtmfInterface &)
- ?StartDtmfTone@CPECallHandling@@UAEHABVTChar@@@Z @ 68 NONAME ; int CPECallHandling::StartDtmfTone(class TChar const &)
- ?DialMultimedia@CPECallHandling@@UAEHABV?$TBuf@$0GE@@@AAH@Z @ 69 NONAME ; int CPECallHandling::DialMultimedia(class TBuf<100> const &, int &)
- ?SetActiveLine@CPECallHandling@@UAEXXZ @ 70 NONAME ; void CPECallHandling::SetActiveLine(void)
- ?BarringEventOccurred@CPESupplementaryServicesMonitor@@UAEXW4TCCESsBarringEvent@MCCESsObserver@@@Z @ 71 NONAME ; void CPESupplementaryServicesMonitor::BarringEventOccurred(enum MCCESsObserver::TCCESsBarringEvent)
- ??0CPECall@@IAE@AAVMPEMessageSender@@@Z @ 72 NONAME ; CPECall::CPECall(class MPEMessageSender &)
- ?ForwardCallToAddress@CPECallHandling@@UAEHH@Z @ 73 NONAME ; int CPECallHandling::ForwardCallToAddress(int)
- ??1CPEDtmfHandling@@UAE@XZ @ 74 NONAME ; CPEDtmfHandling::~CPEDtmfHandling(void)
- ?CallCapsChanged@CPEConferenceCall@@UAEXW4TCCEConferenceCallCaps@MCCEConferenceCallObserver@@@Z @ 75 NONAME ; void CPEConferenceCall::CallCapsChanged(enum MCCEConferenceCallObserver::TCCEConferenceCallCaps)
+ ?DialEmergencyCall@CPECallHandling@@UAEXABV?$TBuf@$0GE@@@@Z @ 2 NONAME ; void CPECallHandling::DialEmergencyCall(class TBuf<100> const &)
+ ?HangUp@CPECallHandling@@UAEHHW4TPEHangUpOptions@@@Z @ 3 NONAME ; int CPECallHandling::HangUp(int, enum TPEHangUpOptions)
+ ?TransferCalls@CPECallHandling@@UAEHXZ @ 4 NONAME ; int CPECallHandling::TransferCalls(void)
+ ?TerminateAllConnections@CPECallHandling@@UAEHXZ @ 5 NONAME ; int CPECallHandling::TerminateAllConnections(void)
+ ?GetCallIdByState@CPECallHandling@@UBEHI@Z @ 6 NONAME ; int CPECallHandling::GetCallIdByState(unsigned int) const
+ ?CallForwardEventOccurred@CPESupplementaryServicesMonitor@@UAEXW4TCCESsCallForwardEvent@MCCESsObserver@@ABVTDesC16@@@Z @ 7 NONAME ; void CPESupplementaryServicesMonitor::CallForwardEventOccurred(enum MCCESsObserver::TCCESsCallForwardEvent, class TDesC16 const &)
+ ?CallDurationChanged@CPESingleCallObserver@@UAEXVTTimeIntervalSeconds@@@Z @ 8 NONAME ; void CPESingleCallObserver::CallDurationChanged(class TTimeIntervalSeconds)
+ ?IsCallByCallId@CPECallArrayOwner@@UBEHH@Z @ 9 NONAME ; int CPECallArrayOwner::IsCallByCallId(int) const
+ ?DoUnattendedTransfer@CPECallHandling@@UAEHABVTDesC16@@@Z @ 10 NONAME ; int CPECallHandling::DoUnattendedTransfer(class TDesC16 const &)
+ ?DialCall@CPECallHandling@@UAEHABV?$TBuf@$0GE@@@AAH@Z @ 11 NONAME ; int CPECallHandling::DialCall(class TBuf<100> const &, int &)
+ ?GetCallState@CPECallHandling@@UAEIH@Z @ 12 NONAME ; unsigned int CPECallHandling::GetCallState(int)
+ ?GetCallInfo@CPECallHandling@@UAEHAAVTMobileCallInfoV3@RMobileCall@@H@Z @ 13 NONAME ; int CPECallHandling::GetCallInfo(class RMobileCall::TMobileCallInfoV3 &, int)
+ ?RejectCall@CPECallHandling@@UAEHXZ @ 14 NONAME ; int CPECallHandling::RejectCall(void)
+ ?AddConferenceMember@CPECallHandling@@UAEHXZ @ 15 NONAME ; int CPECallHandling::AddConferenceMember(void)
+ ?DropMember@CPECallHandling@@UAEHH@Z @ 16 NONAME ; int CPECallHandling::DropMember(int)
+ ?SwapCalls@CPECallHandling@@UAEHXZ @ 17 NONAME ; int CPECallHandling::SwapCalls(void)
+ ?ErrorOccurred@CPESingleCallObserver@@UAEXW4TCCPError@@@Z @ 18 NONAME ; void CPESingleCallObserver::ErrorOccurred(enum TCCPError)
+ ?SendErrorMessage@CPECall@@UAEXH@Z @ 19 NONAME ; void CPECall::SendErrorMessage(int)
+ ?RejectUnattendedTransfer@CPECallHandling@@UAEHXZ @ 20 NONAME ; int CPECallHandling::RejectUnattendedTransfer(void)
+ ?HoldCall@CPECallHandling@@UAEHXZ @ 21 NONAME ; int CPECallHandling::HoldCall(void)
+ ?CLIEventOccurred@CPESupplementaryServicesMonitor@@UAEXW4TCCESsCLIEvent@MCCESsObserver@@@Z @ 22 NONAME ; void CPESupplementaryServicesMonitor::CLIEventOccurred(enum MCCESsObserver::TCCESsCLIEvent)
+ ?ResumeCall@CPECallHandling@@UAEHXZ @ 23 NONAME ; int CPECallHandling::ResumeCall(void)
+ ?CallByCallId@CPECallArrayOwner@@UBEPAVMPECall@@H@Z @ 24 NONAME ; class MPECall * CPECallArrayOwner::CallByCallId(int) const
+ ?GetCallDuration@CPECallHandling@@UAEHAAVTTimeIntervalSeconds@@H@Z @ 25 NONAME ; int CPECallHandling::GetCallDuration(class TTimeIntervalSeconds &, int)
+ ?AnswerCall@CPECallHandling@@UAEHXZ @ 26 NONAME ; int CPECallHandling::AnswerCall(void)
+ ??1CPECall@@MAE@XZ @ 27 NONAME ; CPECall::~CPECall(void)
+ ?ActiveCallCount@CPECallArrayOwner@@UBEHXZ @ 28 NONAME ; int CPECallArrayOwner::ActiveCallCount(void) const
+ ?StartUp@CPECallHandling@@UAEXXZ @ 29 NONAME ; void CPECallHandling::StartUp(void)
+ ?NotifyCurrentActiveALSLine@CPESupplementaryServicesMonitor@@UAEXH@Z @ 30 NONAME ; void CPESupplementaryServicesMonitor::NotifyCurrentActiveALSLine(int)
+ ?GetCallTerminatedDiagnostics@CPECallHandling@@UBEHAAV?$TBuf@$0IA@@@@Z @ 31 NONAME ; int CPECallHandling::GetCallTerminatedDiagnostics(class TBuf<128> &) const
+ ?GetNumberOfCalls@CPECallHandling@@UAEHXZ @ 32 NONAME ; int CPECallHandling::GetNumberOfCalls(void)
+ ?CallCugEventOccurred@CPESupplementaryServicesMonitor@@UAEXW4TCCESsCugEvent@MCCESsObserver@@@Z @ 33 NONAME ; void CPESupplementaryServicesMonitor::CallCugEventOccurred(enum MCCESsObserver::TCCESsCugEvent)
+ ?ConnectedCalls@CPECallHandling@@QAEHXZ @ 34 NONAME ; int CPECallHandling::ConnectedCalls(void)
+ ?HandleDTMFEvent@CPEDtmfHandling@@UAEXW4TCCEDtmfEvent@MCCEDtmfObserver@@HVTChar@@@Z @ 35 NONAME ; void CPEDtmfHandling::HandleDTMFEvent(enum MCCEDtmfObserver::TCCEDtmfEvent, int, class TChar)
+ ?BuildConference@CPECallHandling@@UAEHXZ @ 36 NONAME ; int CPECallHandling::BuildConference(void)
+ ?VoiceCallDataByState@CPECallHandling@@QBEPAVCPESingleCall@@IAAH@Z @ 37 NONAME ; class CPESingleCall * CPECallHandling::VoiceCallDataByState(unsigned int, int &) const
+ ?IsCallInState@CPECallHandling@@UBEHI@Z @ 38 NONAME ; int CPECallHandling::IsCallInState(unsigned int) const
+ ??0CPEDtmfHandling@@IAE@AAVCPECallHandling@@AAVMCCEDtmfInterface@@@Z @ 39 NONAME ; CPEDtmfHandling::CPEDtmfHandling(class CPECallHandling &, class MCCEDtmfInterface &)
+ ?CallEventOccurred@CPESingleCallObserver@@UAEXW4TCCECallEvent@MCCECallObserver@@@Z @ 40 NONAME ; void CPESingleCallObserver::CallEventOccurred(enum MCCECallObserver::TCCECallEvent)
+ ?StopDtmfTone@CPECallHandling@@UAEHXZ @ 41 NONAME ; int CPECallHandling::StopDtmfTone(void)
+ ?GoOneToOne@CPECallHandling@@UAEHH@Z @ 42 NONAME ; int CPECallHandling::GoOneToOne(int)
+ ?CallStateChangedWithInband@CPESingleCallObserver@@UAEXW4TCallState@CCPCall@@@Z @ 43 NONAME ; void CPESingleCallObserver::CallStateChangedWithInband(enum CCPCall::TCallState)
+ ?GetMissedCall@CPECallHandling@@UAEHAAHH@Z @ 44 NONAME ; int CPECallHandling::GetMissedCall(int &, int)
+ ??1CPECallHandling@@UAE@XZ @ 45 NONAME ; CPECallHandling::~CPECallHandling(void)
+ ?ReleaseAll@CPECallHandling@@UAEHXZ @ 46 NONAME ; int CPECallHandling::ReleaseAll(void)
+ ?CancelDtmfPlay@CPECallHandling@@UAEXXZ @ 47 NONAME ; void CPECallHandling::CancelDtmfPlay(void)
+ ?CallStateChanged@CPESingleCallObserver@@UAEXW4TCallState@CCPCall@@@Z @ 48 NONAME ; void CPESingleCallObserver::CallStateChanged(enum CCPCall::TCallState)
+ ?StopDtmfSending@CPECallHandling@@UAEXXZ @ 49 NONAME ; void CPECallHandling::StopDtmfSending(void)
+ ?CallTerminatedError@CPECallHandling@@UAEHH@Z @ 50 NONAME ; int CPECallHandling::CallTerminatedError(int)
+ ?CallByName@CPECallArrayOwner@@UBEPAVMPECall@@ABV?$TBuf@$0IA@@@@Z @ 51 NONAME ; class MPECall * CPECallArrayOwner::CallByName(class TBuf<128> const &) const
+ ?ConstructL@CPEDtmfHandling@@MAEXXZ @ 52 NONAME ; void CPEDtmfHandling::ConstructL(void)
+ ?ContinueDtmfSending@CPECallHandling@@UAEXXZ @ 53 NONAME ; void CPECallHandling::ContinueDtmfSending(void)
+ ?SendDtmf@CPECallHandling@@UAEHABV?$TBuf@$0GE@@@@Z @ 54 NONAME ; int CPECallHandling::SendDtmf(class TBuf<100> const &)
+ ?CallOwner@CPECallHandling@@UBEAAVMPECallOwner@@XZ @ 55 NONAME ; class MPECallOwner & CPECallHandling::CallOwner(void) const
+ ?CallByState@CPECallArrayOwner@@UBEPAVMPECall@@I@Z @ 56 NONAME ; class MPECall * CPECallArrayOwner::CallByState(unsigned int) const
+ ?IsCallByState@CPECallArrayOwner@@UBEHI@Z @ 57 NONAME ; int CPECallArrayOwner::IsCallByState(unsigned int) const
+ ?AcceptUnattendedTransfer@CPECallHandling@@UAEHXZ @ 58 NONAME ; int CPECallHandling::AcceptUnattendedTransfer(void)
+ ?HandleTransfer@CPESingleCallObserver@@UAEXHABVTDesC16@@@Z @ 59 NONAME ; void CPESingleCallObserver::HandleTransfer(int, class TDesC16 const &)
+ ?ReplaceActive@CPECallHandling@@UAEHXZ @ 60 NONAME ; int CPECallHandling::ReplaceActive(void)
+ ?CallCapsChanged@CPESingleCallObserver@@UAEXW4TCCECallControlCaps@MCCECallObserver@@@Z @ 61 NONAME ; void CPESingleCallObserver::CallCapsChanged(enum MCCECallObserver::TCCECallControlCaps)
+ ?NewL@CPEDtmfHandling@@SAPAV1@AAVCPECallHandling@@AAVMCCEDtmfInterface@@@Z @ 62 NONAME ; class CPEDtmfHandling * CPEDtmfHandling::NewL(class CPECallHandling &, class MCCEDtmfInterface &)
+ ?StartDtmfTone@CPECallHandling@@UAEHABVTChar@@@Z @ 63 NONAME ; int CPECallHandling::StartDtmfTone(class TChar const &)
+ ?DialMultimedia@CPECallHandling@@UAEHABV?$TBuf@$0GE@@@AAH@Z @ 64 NONAME ; int CPECallHandling::DialMultimedia(class TBuf<100> const &, int &)
+ ?SetActiveLine@CPECallHandling@@UAEXXZ @ 65 NONAME ; void CPECallHandling::SetActiveLine(void)
+ ?BarringEventOccurred@CPESupplementaryServicesMonitor@@UAEXW4TCCESsBarringEvent@MCCESsObserver@@@Z @ 66 NONAME ; void CPESupplementaryServicesMonitor::BarringEventOccurred(enum MCCESsObserver::TCCESsBarringEvent)
+ ??0CPECall@@IAE@AAVMPEMessageSender@@@Z @ 67 NONAME ; CPECall::CPECall(class MPEMessageSender &)
+ ?ForwardCallToAddress@CPECallHandling@@UAEHH@Z @ 68 NONAME ; int CPECallHandling::ForwardCallToAddress(int)
+ ??1CPEDtmfHandling@@UAE@XZ @ 69 NONAME ; CPEDtmfHandling::~CPEDtmfHandling(void)
--- a/phoneengine/callhandling/eabi/callhandlingu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/callhandling/eabi/callhandlingu.def Mon Oct 04 16:06:10 2010 +0300
@@ -47,118 +47,110 @@
_ZN15CPEDtmfHandlingD0Ev @ 46 NONAME
_ZN15CPEDtmfHandlingD1Ev @ 47 NONAME
_ZN15CPEDtmfHandlingD2Ev @ 48 NONAME
- _ZN17CPEConferenceCall13ErrorOccurredE23TCCPConferenceCallError @ 49 NONAME
- _ZN17CPEConferenceCall15CallCapsChangedEN26MCCEConferenceCallObserver22TCCEConferenceCallCapsE @ 50 NONAME
- _ZN17CPEConferenceCall16CallStateChangedEN26MCCEConferenceCallObserver23TCCEConferenceCallStateE @ 51 NONAME
- _ZN17CPEConferenceCall17CallEventOccurredEN26MCCEConferenceCallObserver23TCCEConferenceCallEventEP8MCCECall @ 52 NONAME
- _ZN21CPESingleCallObserver13ErrorOccurredE9TCCPError @ 53 NONAME
- _ZN21CPESingleCallObserver14HandleTransferEiRK7TDesC16 @ 54 NONAME
- _ZN21CPESingleCallObserver15CallCapsChangedEN16MCCECallObserver19TCCECallControlCapsE @ 55 NONAME
- _ZN21CPESingleCallObserver16CallStateChangedEN7CCPCall10TCallStateE @ 56 NONAME
- _ZN21CPESingleCallObserver17CallEventOccurredEN16MCCECallObserver13TCCECallEventE @ 57 NONAME
- _ZN21CPESingleCallObserver19CallDurationChangedE20TTimeIntervalSeconds @ 58 NONAME
- _ZN21CPESingleCallObserver26CallStateChangedWithInbandEN7CCPCall10TCallStateE @ 59 NONAME
- _ZN31CPESupplementaryServicesMonitor16CLIEventOccurredEN14MCCESsObserver14TCCESsCLIEventE @ 60 NONAME
- _ZN31CPESupplementaryServicesMonitor20BarringEventOccurredEN14MCCESsObserver18TCCESsBarringEventE @ 61 NONAME
- _ZN31CPESupplementaryServicesMonitor20CallCugEventOccurredEN14MCCESsObserver14TCCESsCugEventE @ 62 NONAME
- _ZN31CPESupplementaryServicesMonitor24CallForwardEventOccurredEN14MCCESsObserver22TCCESsCallForwardEventERK7TDesC16 @ 63 NONAME
- _ZN31CPESupplementaryServicesMonitor26NotifyCurrentActiveALSLineEi @ 64 NONAME
- _ZN7CPECall16SendErrorMessageEi @ 65 NONAME
- _ZN7CPECallC1ER16MPEMessageSender @ 66 NONAME
- _ZN7CPECallC2ER16MPEMessageSender @ 67 NONAME
- _ZN7CPECallD0Ev @ 68 NONAME
- _ZN7CPECallD1Ev @ 69 NONAME
- _ZN7CPECallD2Ev @ 70 NONAME
- _ZNK15CPECallHandling13IsCallInStateEj @ 71 NONAME
- _ZNK15CPECallHandling16GetCallIdByStateEj @ 72 NONAME
- _ZNK15CPECallHandling20VoiceCallDataByStateEjRi @ 73 NONAME
- _ZNK15CPECallHandling28GetCallTerminatedDiagnosticsER4TBufILi128EE @ 74 NONAME
- _ZNK15CPECallHandling9CallOwnerEv @ 75 NONAME
- _ZNK17CPECallArrayOwner10CallByNameERK4TBufILi128EE @ 76 NONAME
- _ZNK17CPECallArrayOwner11CallByStateEj @ 77 NONAME
- _ZNK17CPECallArrayOwner12CallByCallIdEi @ 78 NONAME
- _ZNK17CPECallArrayOwner13IsCallByStateEj @ 79 NONAME
- _ZNK17CPECallArrayOwner14IsCallByCallIdEi @ 80 NONAME
- _ZNK17CPECallArrayOwner15ActiveCallCountEv @ 81 NONAME
- _ZTI13CPESingleCall @ 82 NONAME
- _ZTI15CPECallHandling @ 83 NONAME
- _ZTI15CPEDtmfHandling @ 84 NONAME
- _ZTI17CPECallArrayOwner @ 85 NONAME
- _ZTI17CPEConferenceCall @ 86 NONAME
- _ZTI18CPEGprsTermination @ 87 NONAME
- _ZTI18CPESystemCallState @ 88 NONAME
- _ZTI20CPEVideoCallHandling @ 89 NONAME
- _ZTI21CPESingleCallObserver @ 90 NONAME
- _ZTI31CPESupplementaryServicesMonitor @ 91 NONAME
- _ZTI7CPECall @ 92 NONAME
- _ZTV13CPESingleCall @ 93 NONAME
- _ZTV15CPECallHandling @ 94 NONAME
- _ZTV15CPEDtmfHandling @ 95 NONAME
- _ZTV17CPECallArrayOwner @ 96 NONAME
- _ZTV17CPEConferenceCall @ 97 NONAME
- _ZTV18CPEGprsTermination @ 98 NONAME
- _ZTV18CPESystemCallState @ 99 NONAME
- _ZTV20CPEVideoCallHandling @ 100 NONAME
- _ZTV21CPESingleCallObserver @ 101 NONAME
- _ZTV31CPESupplementaryServicesMonitor @ 102 NONAME
- _ZTV7CPECall @ 103 NONAME
- _ZThn24_N17CPEConferenceCall13ErrorOccurredE23TCCPConferenceCallError @ 104 NONAME
- _ZThn24_N17CPEConferenceCall15CallCapsChangedEN26MCCEConferenceCallObserver22TCCEConferenceCallCapsE @ 105 NONAME
- _ZThn24_N17CPEConferenceCall16CallStateChangedEN26MCCEConferenceCallObserver23TCCEConferenceCallStateE @ 106 NONAME
- _ZThn24_N17CPEConferenceCall17CallEventOccurredEN26MCCEConferenceCallObserver23TCCEConferenceCallEventEP8MCCECall @ 107 NONAME
- _ZThn24_N21CPESingleCallObserver13ErrorOccurredE9TCCPError @ 108 NONAME
- _ZThn24_N21CPESingleCallObserver14HandleTransferEiRK7TDesC16 @ 109 NONAME
- _ZThn24_N21CPESingleCallObserver15CallCapsChangedEN16MCCECallObserver19TCCECallControlCapsE @ 110 NONAME
- _ZThn24_N21CPESingleCallObserver16CallStateChangedEN7CCPCall10TCallStateE @ 111 NONAME
- _ZThn24_N21CPESingleCallObserver17CallEventOccurredEN16MCCECallObserver13TCCECallEventE @ 112 NONAME
- _ZThn24_N21CPESingleCallObserver19CallDurationChangedE20TTimeIntervalSeconds @ 113 NONAME
- _ZThn24_N21CPESingleCallObserver26CallStateChangedWithInbandEN7CCPCall10TCallStateE @ 114 NONAME
- _ZThn4_N15CPEDtmfHandling15HandleDTMFEventEN16MCCEDtmfObserver13TCCEDtmfEventEi5TChar @ 115 NONAME
- _ZThn4_NK17CPECallArrayOwner10CallByNameERK4TBufILi128EE @ 116 NONAME
- _ZThn4_NK17CPECallArrayOwner11CallByStateEj @ 117 NONAME
- _ZThn4_NK17CPECallArrayOwner12CallByCallIdEi @ 118 NONAME
- _ZThn4_NK17CPECallArrayOwner13IsCallByStateEj @ 119 NONAME
- _ZThn4_NK17CPECallArrayOwner14IsCallByCallIdEi @ 120 NONAME
- _ZThn4_NK17CPECallArrayOwner15ActiveCallCountEv @ 121 NONAME
- _ZThn8_N15CPECallHandling10AnswerCallEv @ 122 NONAME
- _ZThn8_N15CPECallHandling10DropMemberEi @ 123 NONAME
- _ZThn8_N15CPECallHandling10GoOneToOneEi @ 124 NONAME
- _ZThn8_N15CPECallHandling10RejectCallEv @ 125 NONAME
- _ZThn8_N15CPECallHandling10ReleaseAllEv @ 126 NONAME
- _ZThn8_N15CPECallHandling10ResumeCallEv @ 127 NONAME
- _ZThn8_N15CPECallHandling11GetCallInfoERN11RMobileCall17TMobileCallInfoV3Ei @ 128 NONAME
- _ZThn8_N15CPECallHandling12GetCallStateEi @ 129 NONAME
- _ZThn8_N15CPECallHandling12StopDtmfToneEv @ 130 NONAME
- _ZThn8_N15CPECallHandling13GetMissedCallERii @ 131 NONAME
- _ZThn8_N15CPECallHandling13ReplaceActiveEv @ 132 NONAME
- _ZThn8_N15CPECallHandling13SetActiveLineEv @ 133 NONAME
- _ZThn8_N15CPECallHandling13StartDtmfToneERK5TChar @ 134 NONAME
- _ZThn8_N15CPECallHandling13TransferCallsEv @ 135 NONAME
- _ZThn8_N15CPECallHandling14CancelDtmfPlayEv @ 136 NONAME
- _ZThn8_N15CPECallHandling14DialMultimediaERK4TBufILi100EERi @ 137 NONAME
- _ZThn8_N15CPECallHandling15BuildConferenceEv @ 138 NONAME
- _ZThn8_N15CPECallHandling15GetCallDurationER20TTimeIntervalSecondsi @ 139 NONAME
- _ZThn8_N15CPECallHandling15StopDtmfSendingEv @ 140 NONAME
- _ZThn8_N15CPECallHandling16GetNumberOfCallsEv @ 141 NONAME
- _ZThn8_N15CPECallHandling17DialEmergencyCallERK4TBufILi100EE @ 142 NONAME
- _ZThn8_N15CPECallHandling19AddConferenceMemberEv @ 143 NONAME
- _ZThn8_N15CPECallHandling19CallTerminatedErrorEi @ 144 NONAME
- _ZThn8_N15CPECallHandling19ContinueDtmfSendingEv @ 145 NONAME
- _ZThn8_N15CPECallHandling20DoUnattendedTransferERK7TDesC16 @ 146 NONAME
- _ZThn8_N15CPECallHandling20ForwardCallToAddressEi @ 147 NONAME
- _ZThn8_N15CPECallHandling23TerminateAllConnectionsEv @ 148 NONAME
- _ZThn8_N15CPECallHandling24AcceptUnattendedTransferEv @ 149 NONAME
- _ZThn8_N15CPECallHandling24RejectUnattendedTransferEv @ 150 NONAME
- _ZThn8_N15CPECallHandling6HangUpEi16TPEHangUpOptions @ 151 NONAME
- _ZThn8_N15CPECallHandling7StartUpEv @ 152 NONAME
- _ZThn8_N15CPECallHandling8DialCallERK4TBufILi100EERi @ 153 NONAME
- _ZThn8_N15CPECallHandling8HoldCallEv @ 154 NONAME
- _ZThn8_N15CPECallHandling8SendDtmfERK4TBufILi100EE @ 155 NONAME
- _ZThn8_N15CPECallHandling9SwapCallsEv @ 156 NONAME
- _ZThn8_N15CPECallHandlingD0Ev @ 157 NONAME
- _ZThn8_N15CPECallHandlingD1Ev @ 158 NONAME
- _ZThn8_NK15CPECallHandling13IsCallInStateEj @ 159 NONAME
- _ZThn8_NK15CPECallHandling16GetCallIdByStateEj @ 160 NONAME
- _ZThn8_NK15CPECallHandling28GetCallTerminatedDiagnosticsER4TBufILi128EE @ 161 NONAME
- _ZThn8_NK15CPECallHandling9CallOwnerEv @ 162 NONAME
+ _ZN21CPESingleCallObserver13ErrorOccurredE9TCCPError @ 49 NONAME
+ _ZN21CPESingleCallObserver14HandleTransferEiRK7TDesC16 @ 50 NONAME
+ _ZN21CPESingleCallObserver15CallCapsChangedEN16MCCECallObserver19TCCECallControlCapsE @ 51 NONAME
+ _ZN21CPESingleCallObserver16CallStateChangedEN7CCPCall10TCallStateE @ 52 NONAME
+ _ZN21CPESingleCallObserver17CallEventOccurredEN16MCCECallObserver13TCCECallEventE @ 53 NONAME
+ _ZN21CPESingleCallObserver19CallDurationChangedE20TTimeIntervalSeconds @ 54 NONAME
+ _ZN21CPESingleCallObserver26CallStateChangedWithInbandEN7CCPCall10TCallStateE @ 55 NONAME
+ _ZN31CPESupplementaryServicesMonitor16CLIEventOccurredEN14MCCESsObserver14TCCESsCLIEventE @ 56 NONAME
+ _ZN31CPESupplementaryServicesMonitor20BarringEventOccurredEN14MCCESsObserver18TCCESsBarringEventE @ 57 NONAME
+ _ZN31CPESupplementaryServicesMonitor20CallCugEventOccurredEN14MCCESsObserver14TCCESsCugEventE @ 58 NONAME
+ _ZN31CPESupplementaryServicesMonitor24CallForwardEventOccurredEN14MCCESsObserver22TCCESsCallForwardEventERK7TDesC16 @ 59 NONAME
+ _ZN31CPESupplementaryServicesMonitor26NotifyCurrentActiveALSLineEi @ 60 NONAME
+ _ZN7CPECall16SendErrorMessageEi @ 61 NONAME
+ _ZN7CPECallC1ER16MPEMessageSender @ 62 NONAME
+ _ZN7CPECallC2ER16MPEMessageSender @ 63 NONAME
+ _ZN7CPECallD0Ev @ 64 NONAME
+ _ZN7CPECallD1Ev @ 65 NONAME
+ _ZN7CPECallD2Ev @ 66 NONAME
+ _ZNK15CPECallHandling13IsCallInStateEj @ 67 NONAME
+ _ZNK15CPECallHandling16GetCallIdByStateEj @ 68 NONAME
+ _ZNK15CPECallHandling20VoiceCallDataByStateEjRi @ 69 NONAME
+ _ZNK15CPECallHandling28GetCallTerminatedDiagnosticsER4TBufILi128EE @ 70 NONAME
+ _ZNK15CPECallHandling9CallOwnerEv @ 71 NONAME
+ _ZNK17CPECallArrayOwner10CallByNameERK4TBufILi128EE @ 72 NONAME
+ _ZNK17CPECallArrayOwner11CallByStateEj @ 73 NONAME
+ _ZNK17CPECallArrayOwner12CallByCallIdEi @ 74 NONAME
+ _ZNK17CPECallArrayOwner13IsCallByStateEj @ 75 NONAME
+ _ZNK17CPECallArrayOwner14IsCallByCallIdEi @ 76 NONAME
+ _ZNK17CPECallArrayOwner15ActiveCallCountEv @ 77 NONAME
+ _ZTI13CPESingleCall @ 78 NONAME
+ _ZTI15CPECallHandling @ 79 NONAME
+ _ZTI15CPEDtmfHandling @ 80 NONAME
+ _ZTI17CPECallArrayOwner @ 81 NONAME
+ _ZTI17CPEConferenceCall @ 82 NONAME
+ _ZTI18CPEGprsTermination @ 83 NONAME
+ _ZTI18CPESystemCallState @ 84 NONAME
+ _ZTI20CPEVideoCallHandling @ 85 NONAME
+ _ZTI21CPESingleCallObserver @ 86 NONAME
+ _ZTI31CPESupplementaryServicesMonitor @ 87 NONAME
+ _ZTI7CPECall @ 88 NONAME
+ _ZTV13CPESingleCall @ 89 NONAME
+ _ZTV15CPECallHandling @ 90 NONAME
+ _ZTV15CPEDtmfHandling @ 91 NONAME
+ _ZTV17CPECallArrayOwner @ 92 NONAME
+ _ZTV17CPEConferenceCall @ 93 NONAME
+ _ZTV18CPEGprsTermination @ 94 NONAME
+ _ZTV18CPESystemCallState @ 95 NONAME
+ _ZTV20CPEVideoCallHandling @ 96 NONAME
+ _ZTV21CPESingleCallObserver @ 97 NONAME
+ _ZTV31CPESupplementaryServicesMonitor @ 98 NONAME
+ _ZTV7CPECall @ 99 NONAME
+ _ZThn24_N21CPESingleCallObserver13ErrorOccurredE9TCCPError @ 100 NONAME
+ _ZThn24_N21CPESingleCallObserver14HandleTransferEiRK7TDesC16 @ 101 NONAME
+ _ZThn24_N21CPESingleCallObserver15CallCapsChangedEN16MCCECallObserver19TCCECallControlCapsE @ 102 NONAME
+ _ZThn24_N21CPESingleCallObserver16CallStateChangedEN7CCPCall10TCallStateE @ 103 NONAME
+ _ZThn24_N21CPESingleCallObserver17CallEventOccurredEN16MCCECallObserver13TCCECallEventE @ 104 NONAME
+ _ZThn24_N21CPESingleCallObserver19CallDurationChangedE20TTimeIntervalSeconds @ 105 NONAME
+ _ZThn24_N21CPESingleCallObserver26CallStateChangedWithInbandEN7CCPCall10TCallStateE @ 106 NONAME
+ _ZThn4_N15CPEDtmfHandling15HandleDTMFEventEN16MCCEDtmfObserver13TCCEDtmfEventEi5TChar @ 107 NONAME
+ _ZThn4_NK17CPECallArrayOwner10CallByNameERK4TBufILi128EE @ 108 NONAME
+ _ZThn4_NK17CPECallArrayOwner11CallByStateEj @ 109 NONAME
+ _ZThn4_NK17CPECallArrayOwner12CallByCallIdEi @ 110 NONAME
+ _ZThn4_NK17CPECallArrayOwner13IsCallByStateEj @ 111 NONAME
+ _ZThn4_NK17CPECallArrayOwner14IsCallByCallIdEi @ 112 NONAME
+ _ZThn4_NK17CPECallArrayOwner15ActiveCallCountEv @ 113 NONAME
+ _ZThn8_N15CPECallHandling10AnswerCallEv @ 114 NONAME
+ _ZThn8_N15CPECallHandling10DropMemberEi @ 115 NONAME
+ _ZThn8_N15CPECallHandling10GoOneToOneEi @ 116 NONAME
+ _ZThn8_N15CPECallHandling10RejectCallEv @ 117 NONAME
+ _ZThn8_N15CPECallHandling10ReleaseAllEv @ 118 NONAME
+ _ZThn8_N15CPECallHandling10ResumeCallEv @ 119 NONAME
+ _ZThn8_N15CPECallHandling11GetCallInfoERN11RMobileCall17TMobileCallInfoV3Ei @ 120 NONAME
+ _ZThn8_N15CPECallHandling12GetCallStateEi @ 121 NONAME
+ _ZThn8_N15CPECallHandling12StopDtmfToneEv @ 122 NONAME
+ _ZThn8_N15CPECallHandling13GetMissedCallERii @ 123 NONAME
+ _ZThn8_N15CPECallHandling13ReplaceActiveEv @ 124 NONAME
+ _ZThn8_N15CPECallHandling13SetActiveLineEv @ 125 NONAME
+ _ZThn8_N15CPECallHandling13StartDtmfToneERK5TChar @ 126 NONAME
+ _ZThn8_N15CPECallHandling13TransferCallsEv @ 127 NONAME
+ _ZThn8_N15CPECallHandling14CancelDtmfPlayEv @ 128 NONAME
+ _ZThn8_N15CPECallHandling14DialMultimediaERK4TBufILi100EERi @ 129 NONAME
+ _ZThn8_N15CPECallHandling15BuildConferenceEv @ 130 NONAME
+ _ZThn8_N15CPECallHandling15GetCallDurationER20TTimeIntervalSecondsi @ 131 NONAME
+ _ZThn8_N15CPECallHandling15StopDtmfSendingEv @ 132 NONAME
+ _ZThn8_N15CPECallHandling16GetNumberOfCallsEv @ 133 NONAME
+ _ZThn8_N15CPECallHandling17DialEmergencyCallERK4TBufILi100EE @ 134 NONAME
+ _ZThn8_N15CPECallHandling19AddConferenceMemberEv @ 135 NONAME
+ _ZThn8_N15CPECallHandling19CallTerminatedErrorEi @ 136 NONAME
+ _ZThn8_N15CPECallHandling19ContinueDtmfSendingEv @ 137 NONAME
+ _ZThn8_N15CPECallHandling20DoUnattendedTransferERK7TDesC16 @ 138 NONAME
+ _ZThn8_N15CPECallHandling20ForwardCallToAddressEi @ 139 NONAME
+ _ZThn8_N15CPECallHandling23TerminateAllConnectionsEv @ 140 NONAME
+ _ZThn8_N15CPECallHandling24AcceptUnattendedTransferEv @ 141 NONAME
+ _ZThn8_N15CPECallHandling24RejectUnattendedTransferEv @ 142 NONAME
+ _ZThn8_N15CPECallHandling6HangUpEi16TPEHangUpOptions @ 143 NONAME
+ _ZThn8_N15CPECallHandling7StartUpEv @ 144 NONAME
+ _ZThn8_N15CPECallHandling8DialCallERK4TBufILi100EERi @ 145 NONAME
+ _ZThn8_N15CPECallHandling8HoldCallEv @ 146 NONAME
+ _ZThn8_N15CPECallHandling8SendDtmfERK4TBufILi100EE @ 147 NONAME
+ _ZThn8_N15CPECallHandling9SwapCallsEv @ 148 NONAME
+ _ZThn8_N15CPECallHandlingD0Ev @ 149 NONAME
+ _ZThn8_N15CPECallHandlingD1Ev @ 150 NONAME
+ _ZThn8_NK15CPECallHandling13IsCallInStateEj @ 151 NONAME
+ _ZThn8_NK15CPECallHandling16GetCallIdByStateEj @ 152 NONAME
+ _ZThn8_NK15CPECallHandling28GetCallTerminatedDiagnosticsER4TBufILi128EE @ 153 NONAME
+ _ZThn8_NK15CPECallHandling9CallOwnerEv @ 154 NONAME
--- a/phoneengine/callhandling/inc/cpecallhandling.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/callhandling/inc/cpecallhandling.h Mon Oct 04 16:06:10 2010 +0300
@@ -675,7 +675,7 @@
// ReplaceActive
TBool iReplaceActive;
// Status of dial, before dialing state
- TBool iDialRequest;
+ TBool iDialRequestCallId;
/**
* CCE observer.
--- a/phoneengine/callhandling/inc/cpeconferencecall.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/callhandling/inc/cpeconferencecall.h Mon Oct 04 16:06:10 2010 +0300
@@ -58,7 +58,7 @@
/**
* Two-phased constructor.
*/
- IMPORT_C static CPEConferenceCall* NewL(
+ static CPEConferenceCall* NewL(
MPEMessageSender& aOwner,
CCCE& aConvergedCallEngine );
@@ -66,7 +66,7 @@
* Two-phased constructor.
* Conference call is made outof telephony control
*/
- IMPORT_C static CPEConferenceCall* NewL(
+ static CPEConferenceCall* NewL(
MPEMessageSender& aOwner,
MCCEConferenceCall& aCall );
@@ -107,7 +107,7 @@
* MCCEConferenceCall::RemoveCallL
* Default value is NULL.
*/
- IMPORT_C void CallEventOccurred(
+ void CallEventOccurred(
const MCCEConferenceCallObserver::TCCEConferenceCallEvent aEvent,
MCCECall* aReferredCall = NULL );
@@ -116,7 +116,7 @@
*
* @param aStateContains the state of the conference call
*/
- IMPORT_C void CallStateChanged(
+ void CallStateChanged(
const MCCEConferenceCallObserver::TCCEConferenceCallState aState );
@@ -124,7 +124,7 @@
* Conference capabilities have changed.
* @param aCaps Updated call control capabilities
*/
- IMPORT_C void CallCapsChanged(
+ void CallCapsChanged(
const MCCEConferenceCallObserver::TCCEConferenceCallCaps aCaps );
/**
@@ -139,7 +139,7 @@
*
* @param aError Occurred error code.
*/
- IMPORT_C void ErrorOccurred( TCCPConferenceCallError aError );
+ void ErrorOccurred( TCCPConferenceCallError aError );
public: // New Functions
--- a/phoneengine/callhandling/src/cpecallhandling.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/callhandling/src/cpecallhandling.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -96,7 +96,7 @@
iConvergedCallEngine( aConvergedCallEngine ),
iDtmfInterface( aDtmfInterface ),
iReplaceActive( EFalse ),
- iDialRequest( EFalse )
+ iDialRequestCallId( KErrNotFound )
{
TEFLOGSTRING( KTAOBJECT, "CALL CPECallHandling::CPECallHandling()");
}
@@ -240,7 +240,7 @@
if( callData->GetCallState() == EPEStateIdle )
{
ReleaseCallObject( aCallId );
- iDialRequest = EFalse;
+ iDialRequestCallId = KErrNotFound;
}
}
}
@@ -289,7 +289,7 @@
{
case MEngineMonitor::EPEMessageDialing:
{
- iDialRequest = EFalse;
+ iDialRequestCallId = KErrNotFound;
CPESingleCall* callData = iCallArrayOwner->GetCallObject( aCallId );
if( callData )
{
@@ -312,6 +312,11 @@
}
case MEngineMonitor::EPEMessageIdle:
{
+ // If Idle is received to pending dial request, clear request
+ if ( aCallId == iDialRequestCallId )
+ {
+ iDialRequestCallId = KErrNotFound;
+ }
HandleAutoResume();
break;
}
@@ -642,7 +647,7 @@
// If there is allready video call, one dial in connecting, dialing or disconnecting state,
// we just ignore new dial request and send KErrInUse back to UI
- if( iDialRequest )
+ if( iDialRequestCallId != KErrNotFound )
{
// Dial request already send, waiting for dialing state.
errorCode = KErrGeneral;
@@ -670,12 +675,12 @@
}
TEFLOGSTRING( KTAINT, "CALL CPECallHandling::DialCall > Dial" );
- iDialRequest = ETrue;
+ iDialRequestCallId = aCallId;
errorCode = callData->Dial( aNumber );
if ( errorCode != KErrNone )
{
- iDialRequest = EFalse;
+ iDialRequestCallId = KErrNotFound;
// Dial failed: clean up
ReleaseCallObject( callData->GetCallId() );
TEFLOGSTRING2( KTAERROR,
--- a/phoneengine/callhandling/src/cpeconferencecall.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/callhandling/src/cpeconferencecall.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -169,7 +169,7 @@
// A conference call event has occurred.
// -----------------------------------------------------------------------------
//
-EXPORT_C void CPEConferenceCall::CallEventOccurred(
+void CPEConferenceCall::CallEventOccurred(
const MCCEConferenceCallObserver::TCCEConferenceCallEvent aEvent,
MCCECall* aReferredCall )
{
@@ -241,7 +241,7 @@
// A conference call state has changed.
// -----------------------------------------------------------------------------
//
-EXPORT_C void CPEConferenceCall::CallStateChanged(
+void CPEConferenceCall::CallStateChanged(
const MCCEConferenceCallObserver::TCCEConferenceCallState aState )
{
switch ( aState )
@@ -281,7 +281,7 @@
// Conference call capabilities have changed.
// -----------------------------------------------------------------------------
//
-EXPORT_C void CPEConferenceCall::CallCapsChanged(
+void CPEConferenceCall::CallCapsChanged(
const MCCEConferenceCallObserver::TCCEConferenceCallCaps aCaps )
{
TEFLOGSTRING2( KTAREQEND, "CALL CPEConferenceCall::CallCapsChanged, caps: %d", aCaps );
@@ -294,7 +294,7 @@
//
// -----------------------------------------------------------------------------
//
-EXPORT_C void CPEConferenceCall::ErrorOccurred( TCCPConferenceCallError aError )
+void CPEConferenceCall::ErrorOccurred( TCCPConferenceCallError aError )
{
TEFLOGSTRING2( KTAERROR, "CALL CPEConferenceCall::ErrorOccurred, error: %d", aError );
--- a/phoneengine/contacthandling2/bwins/contacthandlingu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/contacthandling2/bwins/contacthandlingu.def Mon Oct 04 16:06:10 2010 +0300
@@ -4,6 +4,4 @@
?CreateFirstPhaseL@CPEContactHandlingProxy@@SAPAVMPEContactHandling@@XZ @ 3 NONAME ; class MPEContactHandling * CPEContactHandlingProxy::CreateFirstPhaseL(void)
?FindContactInfoSync@CPEContactHandlingProxy@@UAEHHW4TPEFindContactKey@@@Z @ 4 NONAME ; int CPEContactHandlingProxy::FindContactInfoSync(int, enum TPEFindContactKey)
?CreateSecondPhaseL@CPEContactHandlingProxy@@QAEXAAVMPEPhoneModelInternal@@AAVRFs@@@Z @ 5 NONAME ; void CPEContactHandlingProxy::CreateSecondPhaseL(class MPEPhoneModelInternal &, class RFs &)
- ??1CPEContactHandlingProxy@@UAE@XZ @ 6 NONAME ; CPEContactHandlingProxy::~CPEContactHandlingProxy(void)
- ?NewL@CPEContactMatch@@SAPAV1@AAVCPEContactHandling@@AAVMPEDataStore@@@Z @ 7 NONAME ; class CPEContactMatch * CPEContactMatch::NewL(class CPEContactHandling &, class MPEDataStore &)
--- a/phoneengine/contacthandling2/inc/cpecontacthandlingproxy.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/contacthandling2/inc/cpecontacthandlingproxy.h Mon Oct 04 16:06:10 2010 +0300
@@ -66,7 +66,7 @@
/**
* Destructor.
*/
- IMPORT_C virtual ~CPEContactHandlingProxy();
+ virtual ~CPEContactHandlingProxy();
public:
/**
--- a/phoneengine/contacthandling2/inc/cpecontactmatch.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/contacthandling2/inc/cpecontactmatch.h Mon Oct 04 16:06:10 2010 +0300
@@ -64,7 +64,7 @@
* @param aDataStore, handle to internal engine info interface
* @return an instance of class CPEContactMatch
*/
- IMPORT_C static CPEContactMatch* NewL(
+ static CPEContactMatch* NewL(
CPEContactHandling& aOwner,
MPEDataStore& aDataStore );
@@ -145,7 +145,6 @@
*/
TInt LoadThumbnail( const CPhCntContactId& aContactId, const TInt aCallId );
-
private: // Data
--- a/phoneengine/contacthandling2/tsrc/run_auto_tests.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/contacthandling2/tsrc/run_auto_tests.bat Mon Oct 04 16:06:10 2010 +0300
@@ -32,7 +32,7 @@
:: starting with "ut_".
::::::::::::::::::::::::::::::::::::::::::::::::::::::
:DEFAULT
-set TESTED_SRC=..\..\..\..\src\*
+set TESTED_SRC=..\..\..\src\*
for /f %%a in ('dir /b ut_*') do call :build %%a
if [%DOMODULESTESTS%] EQU [TRUE] (
@@ -149,7 +149,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%
)
@@ -189,7 +189,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/phoneengine/engineinfo/bwins/engineinfou.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/engineinfo/bwins/engineinfou.def Mon Oct 04 16:06:10 2010 +0300
@@ -1,5 +1,4 @@
EXPORTS
?NewL@CPEEngineInfo@@SAPAV1@XZ @ 1 NONAME ; class CPEEngineInfo * CPEEngineInfo::NewL(void)
?NewL@CPEClientInformation@@SAPAV1@XZ @ 2 NONAME ; class CPEClientInformation * CPEClientInformation::NewL(void)
- ?NewL@CPEEngineInfoImpl@@SAPAV1@XZ @ 3 NONAME ; class CPEEngineInfoImpl * CPEEngineInfoImpl::NewL(void)
--- a/phoneengine/engineinfo/eabi/engineinfou.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/engineinfo/eabi/engineinfou.def Mon Oct 04 16:06:10 2010 +0300
@@ -1,4 +1,4 @@
EXPORTS
- _ZN20CPEClientInformation4NewLEv @ 1 NONAME
- _ZN13CPEEngineInfo4NewLEv @ 2 NONAME
+ _ZN13CPEEngineInfo4NewLEv @ 1 NONAME
+ _ZN20CPEClientInformation4NewLEv @ 2 NONAME
--- a/phoneengine/engineinfo/inc/cpeengineinfoimpl.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/engineinfo/inc/cpeengineinfoimpl.h Mon Oct 04 16:06:10 2010 +0300
@@ -113,7 +113,7 @@
/**
* Two-phased constructor.
*/
- IMPORT_C static CPEEngineInfoImpl* NewL();
+ static CPEEngineInfoImpl* NewL();
/**
* Destructor.
--- a/phoneengine/loghandling/group/loghandling.mmp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/loghandling/group/loghandling.mmp Mon Oct 04 16:06:10 2010 +0300
@@ -45,6 +45,7 @@
SYSTEMINCLUDE ../../inc // PhoneEngine private headers
SYSTEMINCLUDE ../../../inc // Telephony internal headers
SYSTEMINCLUDE /epoc32/include/ecom
+SYSTEMINCLUDE /epoc32/include/mw/hb/hbcore
LIBRARY customapi.lib
LIBRARY efsrv.lib
@@ -57,6 +58,8 @@
LIBRARY centralrepository.lib
LIBRARY serviceprovidersettings.lib
LIBRARY ecom.lib
+LIBRARY hbcore.lib
+
LANG SC
START WINS
--- a/phoneengine/loghandling/inc/cpeloghandling.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/loghandling/inc/cpeloghandling.h Mon Oct 04 16:06:10 2010 +0300
@@ -253,6 +253,14 @@
*/
CPELogExtensionWrapper* CreateExtensionWrapperLC(
const TUid& aPluginUid ) const;
+
+ /**
+ * Sets emergency call text to the log info's
+ * name field.
+ * @param aLogInfo Log info.
+ * @return None.
+ */
+ void SetEmergencyCallName( CPELogInfo& aLogInfo );
private: // data
// Reference to MPEPhoneModelInternal, also object owner
--- a/phoneengine/loghandling/src/cpeloghandling.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/loghandling/src/cpeloghandling.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -32,6 +32,7 @@
#include <pepanic.pan>
#include <mpephonemodelinternal.h>
#include <mpedatastore.h>
+#include <hbtextresolversymbian.h>
#include "cpeloginfo.h"
#include "cpelogextensionwrapper.h"
@@ -42,7 +43,9 @@
/// None
// CONSTANTS
-// None
+_LIT(KEmergencyText, "txt_phone_other_emergency_call");
+_LIT(KPhoneLocalisationFile, "telephone_");
+_LIT(KTsFilePath, "z:/resource/qt/translations/");
// MACROS
// None
@@ -117,8 +120,7 @@
RFs& aFsSession
) : iModel( aModel ),
iDataStore( *( aModel.DataStore( ) ) ),
- iFsSession( aFsSession ),
- iLogEventUnderProcessing( NULL )
+ iFsSession( aFsSession )
{
TEFLOGSTRING( KTAOBJECT, "LOG CPELogHandling::CPELogHandling" );
}
@@ -209,6 +211,11 @@
// default logging strategy is used if error happens while using extension
UpdateLogInfoWithExtensionDataL( aCallId, *logInfo ) );
+ if ( CPELogInfo::EPEEmergecyEvent == logInfo->EventType() )
+ {
+ SetEmergencyCallName( *logInfo );
+ }
+
TRAP( errorCode, SaveCallInfoL( *logInfo ) );
delete logInfo;
}
@@ -841,4 +848,25 @@
return CPELogExtensionWrapper::NewLC( aPluginUid );
}
+// -----------------------------------------------------------------------------
+// CPELogHandling::SetEmergencyCallName
+// -----------------------------------------------------------------------------
+//
+void CPELogHandling::SetEmergencyCallName( CPELogInfo& aLogInfo )
+ {
+ HBufC* emergencyText = NULL;
+
+ if ( HbTextResolverSymbian::Init( KPhoneLocalisationFile, KTsFilePath) )
+ {
+ TRAP_IGNORE( emergencyText =
+ HbTextResolverSymbian::LoadL(KEmergencyText) );
+ }
+
+ if ( emergencyText )
+ {
+ aLogInfo.SetName( emergencyText->Des().
+ Left( Min(emergencyText->Length(), KCntMaxTextFieldLength) ) );
+ }
+ }
+
// End of File
--- a/phoneengine/loghandling/tsrc/run_auto_tests.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/loghandling/tsrc/run_auto_tests.bat Mon Oct 04 16:06:10 2010 +0300
@@ -32,7 +32,7 @@
:: starting with "ut_".
::::::::::::::::::::::::::::::::::::::::::::::::::::::
:DEFAULT
-set TESTED_SRC=..\..\..\..\src\*
+set TESTED_SRC=..\..\..\src\*
for /f %%a in ('dir /b ut_*') do call :build %%a
if [%DOMODULESTESTS%] EQU [TRUE] (
@@ -149,7 +149,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 m -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%
)
@@ -189,8 +189,8 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::
:CALCULATECOVERAGE
echo Calculating coverage
-ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
-call ctc2html -i profile.txt -o \coverage_result -nsb
+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/phoneengine/networkhandlingstarter/networkhandlingstarter.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/networkhandlingstarter/networkhandlingstarter.pro Mon Oct 04 16:06:10 2010 +0300
@@ -15,7 +15,9 @@
#
#
-CONFIG += hb mobility
+CONFIG += mobility
+load(hb.prf)
+symbian:CONFIG -= symbian_i18n // to prevent compile warnings from non-existent ts files
MOBILITY += systeminfo
TEMPLATE = app
TARGET = networkhandlingstarter
--- a/phoneengine/networkhandlingstarter/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/networkhandlingstarter/tsrc/run_auto_tests_qt.bat Mon Oct 04 16:06:10 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%
)
Binary file phoneengine/phonemodel/conf/ci_s60telephony.confml has changed
Binary file phoneengine/phonemodel/conf/s60telephony.confml has changed
--- a/phoneengine/phonemodel/inc/qtphonelog.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/phonemodel/inc/qtphonelog.h Mon Oct 04 16:06:10 2010 +0300
@@ -15,29 +15,53 @@
*
*/
-
-
#ifndef __QTPHONELOG_H__
#define __QTPHONELOG_H__
// INCLUDES
#include <e32def.h>
#include <QDebug>
+#include <QTime>
+#include <QString>
+
+#ifdef _DEBUG
+// simple class to do the timing.
+class ElapsedTimer{
+public:
+ ElapsedTimer(QString a):
+ m_blockName(a){
+ qDebug() << m_blockName << " start";
+ m_startTime = QTime::currentTime();
+ }
+ virtual ~ElapsedTimer(){
+ qDebug() << m_blockName << " end - elapsed time ms" << milliseconds();
+ }
+private:
+ ulong milliseconds(){
+ QTime now = QTime::currentTime();
+ return ((now.second()*1000 + now.msec()) -
+ ( m_startTime.second()*1000 + m_startTime.msec()));
+ }
+private:
+ QString m_blockName;
+ QTime m_startTime;
+};
+#endif
// Q_FUNC_INFO does not print function signature in Symbian..
#ifdef _DEBUG
-#define PHONE_DEBUG(A) qDebug() <<A;
+#define PHONE_DEBUG(A) qDebug() <<A
#define PHONE_DEBUG2(A, B) qDebug() <<A <<B
#define PHONE_DEBUG3(A, B, C) qDebug() <<A <<B <<C
#define PHONE_DEBUG4(A, B, C, D) qDebug() <<A <<B <<C <<D
#ifdef Q_OS_SYMBIAN
-#define PHONE_TRACE qDebug() <<__PRETTY_FUNCTION__;
-#define PHONE_TRACE1(A) qDebug() <<__PRETTY_FUNCTION__ <<A;
-#define PHONE_TRACE2(A, B) qDebug() <<__PRETTY_FUNCTION__ <<A <<B
-#define PHONE_TRACE3(A, B, C) qDebug() <<__PRETTY_FUNCTION__ <<A <<B <<C
-#define PHONE_TRACE4(A, B, C, D) qDebug() <<__PRETTY_FUNCTION__ <<A <<B <<C <<D
+#define PHONE_TRACE ElapsedTimer __elapsedTime(QString( "%1").arg( __PRETTY_FUNCTION__));
+#define PHONE_TRACE1(A) ElapsedTimer __elapsedTime1(QString( "%1 %2").arg( __PRETTY_FUNCTION__ ).arg(A));
+#define PHONE_TRACE2(A, B) ElapsedTimer __elapsedTime2(QString( "%1 %2 %3").arg( __PRETTY_FUNCTION__).arg(A).arg(B));
+#define PHONE_TRACE3(A, B, C) ElapsedTimer __elapsedTime3(QString( "%1 %2 %3 %4").arg( __PRETTY_FUNCTION__).arg(A).arg(B).arg(C));
+#define PHONE_TRACE4(A, B, C, D) ElapsedTimer __elapsedTime4(QString( "%1 %2 %3 %4 %5").arg( __PRETTY_FUNCTION__).arg(A).arg(B).arg(C).arg(D));
#else //cannot use __PRETTY_FUNCTION__ in win32
#define PHONE_TRACE
#define PHONE_TRACE1(A) PHONE_DEBUG(A)
--- a/phoneengine/phonemodel/inc/talogger.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/phonemodel/inc/talogger.h Mon Oct 04 16:06:10 2010 +0300
@@ -37,7 +37,6 @@
} // User can change mask value to get different king of logging.
#ifndef _DEBUG
-
/***************************
* Logging method variants:
* 0 = No logging
@@ -48,13 +47,7 @@
#define TEF_LOGGING_METHOD 0 // UREL BUILD
#else
-
-#ifdef __WINS__
-#define TEF_LOGGING_METHOD 0 // UDEB BUILD, WINS
-#else
-#define TEF_LOGGING_METHOD 2 // UDEB BUILD, HW
-#endif // __WINS__
-
+#define TEF_LOGGING_METHOD 2
#endif // _DEBUG
--- a/phoneengine/phonemodel/phonemodel.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/phonemodel/phonemodel.pro Mon Oct 04 16:06:10 2010 +0300
@@ -63,7 +63,6 @@
-lloghandling \
-lphoneparser \
-lphonesettings \
- -lPsui \
-lsecui \
-lSysUtil \
-lws32 \
@@ -180,7 +179,6 @@
BLD_INF_RULES.prj_exports += \
"$${LITERAL_HASH}include <platform_paths.hrh>" \
"./rom/phonengengine.iby CORE_APP_LAYER_IBY_EXPORT_PATH(phonengengine.iby)"
-BLD_INF_RULES.prj_exports += "./conf/ci_s60telephony.confml APP_LAYER_CONFML(ci_s60telephony.confml)"
BLD_INF_RULES.prj_exports += "./conf/s60telephony.confml APP_LAYER_CONFML(s60telephony.confml)"
BLD_INF_RULES.prj_exports += "./conf/s60telephony_japan.confml CONFML_EXPORT_PATH(s60telephony_japan.confml,japan)"
BLD_INF_RULES.prj_exports += "./conf/s60telephony_101f87e3.crml APP_LAYER_CRML(s60telephony_101f87e3.crml)"
--- a/phoneengine/phonemodel/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/phonemodel/tsrc/run_auto_tests_qt.bat Mon Oct 04 16:06:10 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/phoneengine/phoneservices/tsrc/ut_dialservice/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/phoneservices/tsrc/ut_dialservice/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -28,7 +28,7 @@
#include <mockservice.h>
#include "dialservice.h"
-#include "qtestmains60.h"
+#include "phonetestmain.h"
bool m_featureManagerReturnValue;
int m_featureManagerRequestedFeatureSupport;
@@ -357,5 +357,5 @@
QVERIFY( verify() );
}
-QTEST_MAIN_S60(TestDialService)
+PHONE_TEST_MAIN(TestDialService)
#include "unit_tests.moc"
--- a/phoneengine/phoneservices/tsrc/ut_dtmfservice/unit_tests.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneengine/phoneservices/tsrc/ut_dtmfservice/unit_tests.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -22,7 +22,7 @@
#include <smcobjecttotypemapper.h>
#include <mockservice.h>
#include "dtmfservice.h"
-#include "qtestmains60.h"
+#include "phonetestmain.h"
typedef QSet<int> IntegerSet;
@@ -208,6 +208,6 @@
}
-QTEST_MAIN_S60(TestDTMFService)
+PHONE_TEST_MAIN(TestDTMFService)
#include "unit_tests.moc"
--- a/phoneplugins/csplugin/src/tmshandler.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneplugins/csplugin/src/tmshandler.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -18,6 +18,7 @@
#include <tmsfactory.h>
#include <tmscall.h>
#include <tmsstream.h>
+#include <tmsver.h>
#include "tmshandler.h"
#include "csplogger.h"
#include "csppanic.pan"
@@ -203,9 +204,9 @@
TInt TmsHandler::CreateTMSCallControl()
{
CSPLOGSTRING(CSPINT, "TmsHandler::CreateTMSCallControl");
- TMSVer* v = NULL;
TInt status;
- status = TMSFactory::CreateFactory(iFactory, *v);
+ TMSVer v(2,0,0);
+ status = TMSFactory::CreateFactory(iFactory, v);
__ASSERT_ALWAYS(iFactory, Panic(ECSPPanicBadHandle));
@@ -350,9 +351,7 @@
}
else if (event.type == TMS_EVENT_STREAM_STATE_CHANGE_ERROR)
{
-#ifndef __WINS__
Panic( ECSPPanicAudioStreamInitFailure );
-#endif
}
}
else if (strmType == TMS_STREAM_DOWNLINK)
@@ -363,9 +362,7 @@
}
else if (event.type == TMS_EVENT_STREAM_STATE_CHANGE_ERROR)
{
-#ifndef __WINS__
Panic( ECSPPanicAudioStreamInitFailure );
-#endif
}
}
}
--- a/phoneplugins/dialerwidgetplugin/src/dialerwidget.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/src/dialerwidget.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -197,6 +197,8 @@
void DialerWidget::onUninitialize()
{
PHONE_TRACE
+ delete m_engine;
+ m_engine = 0;
}
void DialerWidget::onEngineException(const int& exc)
--- a/phoneplugins/dialerwidgetplugin/src/dialerwidgetengine.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/src/dialerwidgetengine.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -26,17 +26,12 @@
DialerWidgetEngine::~DialerWidgetEngine()
{
- delete m_settingsManager;
- m_settingsManager = NULL;
}
bool DialerWidgetEngine::initialize()
{
-#ifdef Q_OS_SYMBIAN
m_settingsManager = new XQSettingsManager(this);
- if ( !m_settingsManager ){
- return false;
- }
+
XQSettingsKey settingsKey( XQSettingsKey::TargetCentralRepository,
KCRUidLogs.iUid, KLogsNewMissedCalls );
@@ -45,18 +40,14 @@
emit missedCallsCountChanged(m_missedCalls);
}
- if ( !connect( m_settingsManager,
- SIGNAL( valueChanged(const XQSettingsKey & ,const QVariant &)),
- this, SLOT(valueChanged(XQSettingsKey,
- QVariant)))){
- return false;
- }
+ connect( m_settingsManager,
+ SIGNAL( valueChanged(const XQSettingsKey & ,const QVariant &)),
+ this, SLOT(valueChanged(XQSettingsKey, QVariant)) );
if(!m_settingsManager->startMonitoring( settingsKey )){
return false;
}
-#endif
return true;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbabstractbutton.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,466 @@
+/** 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 "hbabstractbutton.h"
+#include <HbStylePrimitiveData>
+
+// NOTE! The following header include requires
+// INCLUDEPATH += /sf/mw/hb/include/hbcore/private
+#include <hbstyleoption_p.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::HbAbstractButton
+// -----------------------------------------------------------------------------
+//
+HbAbstractButton::HbAbstractButton(
+ QGraphicsItem * parent )
+ //:
+ //HbWidget( /*parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::~HbAbstractButton
+// -----------------------------------------------------------------------------
+//
+HbAbstractButton::~HbAbstractButton( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::setCheckable
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::setCheckable( bool checkable )
+ {
+ SMC_MOCK_METHOD1( void, bool, checkable )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::isCheckable
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractButton::isCheckable( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::isChecked
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractButton::isChecked( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::setDown
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::setDown( bool set )
+ {
+ SMC_MOCK_METHOD1( void, bool, set )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::isDown
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractButton::isDown( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::setAutoRepeat
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::setAutoRepeat( bool set )
+ {
+ SMC_MOCK_METHOD1( void, bool, set )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::autoRepeat
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractButton::autoRepeat( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::setAutoRepeatDelay
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::setAutoRepeatDelay( int delay )
+ {
+ SMC_MOCK_METHOD1( void, int, delay )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::autoRepeatDelay
+// -----------------------------------------------------------------------------
+//
+int HbAbstractButton::autoRepeatDelay( ) const
+ {
+ SMC_MOCK_METHOD0( int )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::setAutoRepeatInterval
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::setAutoRepeatInterval( int interval )
+ {
+ SMC_MOCK_METHOD1( void, int, interval )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::autoRepeatInterval
+// -----------------------------------------------------------------------------
+//
+int HbAbstractButton::autoRepeatInterval( ) const
+ {
+ SMC_MOCK_METHOD0( int )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::setAutoExclusive
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::setAutoExclusive( bool exclusive )
+ {
+ SMC_MOCK_METHOD1( void, bool, exclusive )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::autoExclusive
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractButton::autoExclusive( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::animateClick
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::animateClick(
+ int msec )
+ {
+ SMC_MOCK_METHOD1( void, int, msec )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::click
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::click( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::toggle
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::toggle( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::setChecked
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::setChecked( bool checked )
+ {
+ SMC_MOCK_METHOD1( void, bool, checked )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::pressed
+// -----------------------------------------------------------------------------
+//
+/*void HbAbstractButton::pressed( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }*/
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::released
+// -----------------------------------------------------------------------------
+//
+/*void HbAbstractButton::released( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }*/
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::clicked
+// -----------------------------------------------------------------------------
+//
+/*void HbAbstractButton::clicked(
+ bool checked )
+ {
+ SMC_MOCK_METHOD1( void, bool, checked )
+ }*/
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::toggled
+// -----------------------------------------------------------------------------
+//
+/*void HbAbstractButton::toggled(
+ bool checked )
+ {
+ SMC_MOCK_METHOD1( void, bool, checked )
+ }*/
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::HbAbstractButton
+// -----------------------------------------------------------------------------
+//
+HbAbstractButton::HbAbstractButton(
+ HbAbstractButtonPrivate & dd,
+ QGraphicsItem * parent )
+ //:
+ //HbWidget( /*dd, parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::initStyleOption
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::initStyleOption(
+ HbStyleOption * option ) const
+ {
+ SMC_MOCK_METHOD1( void, HbStyleOption *, option )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::initPrimitiveData
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::initPrimitiveData(
+ HbStylePrimitiveData * primitiveData,
+ const QGraphicsObject * primitive )
+ {
+ SMC_MOCK_METHOD2( void, HbStylePrimitiveData *, primitiveData,
+ const QGraphicsObject *, primitive )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::hitButton
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractButton::hitButton(
+ const QPointF & pos ) const
+ {
+ SMC_MOCK_METHOD1( bool, const QPointF &, pos )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::checkStateSet
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::checkStateSet( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::nextCheckState
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::nextCheckState( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::event
+// -----------------------------------------------------------------------------
+//
+bool HbAbstractButton::event(
+ QEvent * event )
+ {
+ SMC_MOCK_METHOD1( bool, QEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::keyPressEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::keyPressEvent(
+ QKeyEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QKeyEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::keyReleaseEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::keyReleaseEvent(
+ QKeyEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QKeyEvent *, event )
+ }
+
+
+#ifndef HB_GESTURE_FW
+// -----------------------------------------------------------------------------
+// HbAbstractButton::mousePressEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::mousePressEvent(
+ QGraphicsSceneMouseEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::mouseReleaseEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::mouseReleaseEvent(
+ QGraphicsSceneMouseEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::mouseMoveEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::mouseMoveEvent(
+ QGraphicsSceneMouseEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
+ }
+#endif
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::focusInEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::focusInEvent(
+ QFocusEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QFocusEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::changeEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::changeEvent(
+ QEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::timerEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::timerEvent(
+ QTimerEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QTimerEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::sizeHint
+// -----------------------------------------------------------------------------
+//
+QSizeF HbAbstractButton::sizeHint(
+ Qt::SizeHint which,
+ const QSizeF & constraint ) const
+ {
+ SMC_MOCK_METHOD2( QSizeF, Qt::SizeHint, which,
+ const QSizeF &, constraint )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::polish
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::polish(
+ HbStyleParameters & params )
+ {
+ SMC_MOCK_METHOD1( void, HbStyleParameters &, params )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAbstractButton::gestureEvent
+// -----------------------------------------------------------------------------
+//
+void HbAbstractButton::gestureEvent(
+ QGestureEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QGestureEvent *, event )
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbaction.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,203 @@
+/** 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 "hbaction.h"
+#include <HbToolBarExtension>
+#include <HbMenu>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbAction::HbAction
+// -----------------------------------------------------------------------------
+//
+HbAction::HbAction(
+ QObject * parent )
+ :QAction( parent ), d_ptr(0)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::HbAction
+// -----------------------------------------------------------------------------
+//
+HbAction::HbAction(
+ const QString & text,
+ QObject * parent )
+ :QAction( text, parent ), d_ptr(0)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::HbAction
+// -----------------------------------------------------------------------------
+//
+HbAction::HbAction(
+ const HbIcon & icon,
+ const QString & text,
+ QObject * parent )
+ :QAction( parent ), d_ptr(0)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::HbAction
+// -----------------------------------------------------------------------------
+//
+HbAction::HbAction(
+ Hb::NavigationAction action,
+ QObject * parent )
+ :QAction( parent ), d_ptr(0)
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::~HbAction
+// -----------------------------------------------------------------------------
+//
+HbAction::~HbAction( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::setIcon
+// -----------------------------------------------------------------------------
+//
+void HbAction::setIcon(
+ const HbIcon & icon )
+ {
+ SMC_MOCK_METHOD1( void, const HbIcon &, icon )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::icon
+// -----------------------------------------------------------------------------
+//
+HbIcon HbAction::icon( ) const
+ {
+ SMC_MOCK_METHOD0( HbIcon )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::setMenu
+// -----------------------------------------------------------------------------
+//
+void HbAction::setMenu(
+ HbMenu * menu )
+ {
+ SMC_MOCK_METHOD1( void, HbMenu *, menu )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::menu
+// -----------------------------------------------------------------------------
+//
+HbMenu * HbAction::menu( ) const
+ {
+ SMC_MOCK_METHOD0( HbMenu * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::setToolTip
+// -----------------------------------------------------------------------------
+//
+void HbAction::setToolTip(
+ const QString & tooltip )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, tooltip )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::toolTip
+// -----------------------------------------------------------------------------
+//
+QString HbAction::toolTip( ) const
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::setToolBarExtension
+// -----------------------------------------------------------------------------
+//
+void HbAction::setToolBarExtension(
+ HbToolBarExtension * extension )
+ {
+ SMC_MOCK_METHOD1( void, HbToolBarExtension *, extension )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::toolBarExtension
+// -----------------------------------------------------------------------------
+//
+HbToolBarExtension * HbAction::toolBarExtension( ) const
+ {
+ SMC_MOCK_METHOD0( HbToolBarExtension * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::setCommandRole
+// -----------------------------------------------------------------------------
+//
+void HbAction::setCommandRole(
+ CommandRole commandRole )
+ {
+ SMC_MOCK_METHOD1( void, CommandRole, commandRole )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::commandRole
+// -----------------------------------------------------------------------------
+//
+HbAction::CommandRole HbAction::commandRole( ) const
+ {
+ SMC_MOCK_METHOD0( HbAction::CommandRole )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbAction::HbAction
+// -----------------------------------------------------------------------------
+//
+HbAction::HbAction(
+ HbActionPrivate & dd,
+ QObject * parent )
+ :QAction( parent ), d_ptr(0)
+ {
+
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbcheckbox.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,269 @@
+/** 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 <hbcheckbox.h>
+#include <QGraphicsSceneResizeEvent>
+
+// NOTE! The following header include requires
+// INCLUDEPATH += /sf/mw/hb/include/hbcore/private
+#include <hbstyleoptioncheckbox_p.h>
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::HbCheckBox
+// -----------------------------------------------------------------------------
+//
+HbCheckBox::HbCheckBox(
+ QGraphicsItem * parent )
+ //:
+ //HbAbstractButton( /*parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::HbCheckBox
+// -----------------------------------------------------------------------------
+//
+HbCheckBox::HbCheckBox(
+ const QString & text,
+ QGraphicsItem * parent )
+ //:
+ //HbAbstractButton( /*text, parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::~HbCheckBox
+// -----------------------------------------------------------------------------
+//
+HbCheckBox::~HbCheckBox( )
+ {
+
+ }
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::setText
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::setText(
+ const QString & text )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, text )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::text
+// -----------------------------------------------------------------------------
+//
+QString HbCheckBox::text( ) const
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::setTristate
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::setTristate(
+ bool isTristate )
+ {
+ SMC_MOCK_METHOD1( void, bool, isTristate )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::isTristate
+// -----------------------------------------------------------------------------
+//
+bool HbCheckBox::isTristate( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::checkState
+// -----------------------------------------------------------------------------
+//
+Qt::CheckState HbCheckBox::checkState( ) const
+ {
+ SMC_MOCK_METHOD0( Qt::CheckState )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::primitive
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbCheckBox::primitive(
+ HbStyle::Primitive primitive ) const
+ {
+ SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::setCheckState
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::setCheckState(
+ Qt::CheckState state )
+ {
+ SMC_MOCK_METHOD1( void, Qt::CheckState, state )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::updatePrimitives
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::updatePrimitives( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::initStyleOption
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::initStyleOption(
+ HbStyleOptionCheckBox * option ) const
+ {
+ SMC_MOCK_METHOD1( void, HbStyleOptionCheckBox *, option )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::resizeEvent
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::resizeEvent(
+ QGraphicsSceneResizeEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QGraphicsSceneResizeEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::hitButton
+// -----------------------------------------------------------------------------
+//
+bool HbCheckBox::hitButton(
+ const QPointF & pos ) const
+ {
+ SMC_MOCK_METHOD1( bool, const QPointF &, pos )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::checkStateSet
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::checkStateSet( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::nextCheckState
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::nextCheckState( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+#ifndef HB_GESTURE_FW
+// -----------------------------------------------------------------------------
+// HbCheckBox::mouseReleaseEvent
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::mouseReleaseEvent(
+ QGraphicsSceneMouseEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::mouseMoveEvent
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::mouseMoveEvent(
+ QGraphicsSceneMouseEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QGraphicsSceneMouseEvent *, event )
+ }
+#endif
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::gestureEvent
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::gestureEvent(
+ QGestureEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QGestureEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::keyPressEvent
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::keyPressEvent(
+ QKeyEvent * keyEvent )
+ {
+ SMC_MOCK_METHOD1( void, QKeyEvent *, keyEvent )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::itemChange
+// -----------------------------------------------------------------------------
+//
+QVariant HbCheckBox::itemChange(
+ GraphicsItemChange change,
+ const QVariant & value )
+ {
+ SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change,
+ const QVariant &, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbCheckBox::stateChanged
+// -----------------------------------------------------------------------------
+//
+void HbCheckBox::stateChanged(
+ int state )
+ {
+ SMC_MOCK_METHOD1( void, int, state )
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbmessagebox.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,366 @@
+/** 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 "hbmessagebox.h"
+#include <HbStylePrimitiveData>
+#include <QGraphicsScene>
+
+// NOTE! The following header include requires
+// INCLUDEPATH += /sf/mw/hb/include/hbcore/private
+#include <hbstyleoptionmessagebox_p.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::HbMessageBox
+// -----------------------------------------------------------------------------
+//
+HbMessageBox::HbMessageBox(
+ MessageBoxType type,
+ QGraphicsItem * parent )
+ //:
+ //HbDialog( /*type, parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::HbMessageBox
+// -----------------------------------------------------------------------------
+//
+HbMessageBox::HbMessageBox(
+ const QString & text,
+ MessageBoxType type,
+ QGraphicsItem * parent )
+ //:
+ //HbDialog( /*text, type, parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::~HbMessageBox
+// -----------------------------------------------------------------------------
+//
+HbMessageBox::~HbMessageBox( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::setText
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::setText(
+ const QString & text )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, text )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::text
+// -----------------------------------------------------------------------------
+//
+QString HbMessageBox::text( ) const
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::setIcon
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::setIcon(
+ const HbIcon & icon )
+ {
+ SMC_MOCK_METHOD1( void, const HbIcon &, icon )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::icon
+// -----------------------------------------------------------------------------
+//
+HbIcon HbMessageBox::icon( ) const
+ {
+ SMC_MOCK_METHOD0( HbIcon )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::setIconVisible
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::setIconVisible(
+ bool visible )
+ {
+ SMC_MOCK_METHOD1( void, bool, visible )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::iconVisible
+// -----------------------------------------------------------------------------
+//
+bool HbMessageBox::iconVisible( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::setStandardButtons
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::setStandardButtons(
+ StandardButtons buttons )
+ {
+ //SMC_MOCK_METHOD1( void, StandardButtons, buttons )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::standardButtons
+// -----------------------------------------------------------------------------
+//
+HbMessageBox::StandardButtons HbMessageBox::standardButtons( ) const
+ {
+ SMC_MOCK_METHOD0( HbMessageBox::StandardButtons )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::primitive
+// -----------------------------------------------------------------------------
+//
+QGraphicsItem * HbMessageBox::primitive(
+ HbStyle::Primitive primitive ) const
+ {
+ SMC_MOCK_METHOD1( QGraphicsItem *, HbStyle::Primitive, primitive )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::question
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::question(
+ const QString & questionText,
+ QObject * receiver,
+ const char * member,
+ const QString & primaryButtonText,
+ const QString & secondaryButtonText,
+ QGraphicsWidget * headWidget,
+ QGraphicsScene * scene,
+ QGraphicsItem * parent )
+ {
+ SMC_MOCK_METHOD8( void, const QString &, questionText,
+ QObject *, receiver,
+ const char *, member,
+ const QString &, primaryButtonText,
+ const QString &, secondaryButtonText,
+ QGraphicsWidget *, headWidget,
+ QGraphicsScene *, scene,
+ QGraphicsItem *, parent )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::information
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::information(
+ const QString & informationText,
+ QObject * receiver,
+ const char * member,
+ QGraphicsWidget * headWidget,
+ QGraphicsScene * scene,
+ QGraphicsItem * parent )
+ {
+ SMC_MOCK_METHOD6( void, const QString &, informationText,
+ QObject *, receiver,
+ const char *, member,
+ QGraphicsWidget *, headWidget,
+ QGraphicsScene *, scene,
+ QGraphicsItem *, parent )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::warning
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::warning(
+ const QString & warningText,
+ QObject * receiver,
+ const char * member,
+ QGraphicsWidget * headWidget,
+ QGraphicsScene * scene,
+ QGraphicsItem * parent )
+ {
+ SMC_MOCK_METHOD6( void, const QString &, warningText,
+ QObject *, receiver,
+ const char *, member,
+ QGraphicsWidget *, headWidget,
+ QGraphicsScene *, scene,
+ QGraphicsItem *, parent )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::question
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::question(
+ const QString & questionText,
+ QObject * receiver,
+ const char * member,
+ HbMessageBox::StandardButtons buttons,
+ QGraphicsWidget * headingWidget,
+ QGraphicsScene * scene,
+ QGraphicsItem * parent )
+ {
+ /*SMC_MOCK_METHOD7( void, const QString &, questionText,
+ QObject *, receiver,
+ const char *, member,
+ HbMessageBox::StandardButtons, buttons,
+ QGraphicsWidget *, headingWidget,
+ QGraphicsScene *, scene,
+ QGraphicsItem *, parent )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::information
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::information(
+ const QString & informationText,
+ QObject * receiver,
+ const char * member,
+ HbMessageBox::StandardButtons buttons,
+ QGraphicsWidget * headingWidget,
+ QGraphicsScene * scene,
+ QGraphicsItem * parent )
+ {
+ /*SMC_MOCK_METHOD7( void, const QString &, informationText,
+ QObject *, receiver,
+ const char *, member,
+ HbMessageBox::StandardButtons, buttons,
+ QGraphicsWidget *, headingWidget,
+ QGraphicsScene *, scene,
+ QGraphicsItem *, parent )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::warning
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::warning(
+ const QString & warningText,
+ QObject * receiver,
+ const char * member,
+ HbMessageBox::StandardButtons buttons,
+ QGraphicsWidget * headingWidget,
+ QGraphicsScene * scene,
+ QGraphicsItem * parent )
+ {
+ /*SMC_MOCK_METHOD7( void, const QString &, warningText,
+ QObject *, receiver,
+ const char *, member,
+ HbMessageBox::StandardButtons, buttons,
+ QGraphicsWidget *, headingWidget,
+ QGraphicsScene *, scene,
+ QGraphicsItem *, parent )*/
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::recreatePrimitives
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::recreatePrimitives( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::updatePrimitives
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::updatePrimitives( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::showEvent
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::showEvent(
+ QShowEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QShowEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::HbMessageBox
+// -----------------------------------------------------------------------------
+//
+HbMessageBox::HbMessageBox(
+ HbMessageBoxPrivate & dd,
+ QGraphicsItem * parent )
+ //:
+ //HbDialog( /*dd, parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::initStyleOption
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::initStyleOption(
+ HbStyleOptionMessageBox * option ) const
+ {
+ SMC_MOCK_METHOD1( void, HbStyleOptionMessageBox *, option )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbMessageBox::initPrimitiveData
+// -----------------------------------------------------------------------------
+//
+void HbMessageBox::initPrimitiveData(
+ HbStylePrimitiveData * primitiveData,
+ const QGraphicsObject * primitive )
+ {
+ SMC_MOCK_METHOD2( void, HbStylePrimitiveData *, primitiveData,
+ const QGraphicsObject *, primitive )
+ }
+
+
--- a/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbstyle.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbstyle.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -17,6 +17,7 @@
#include <QDebug>
#include <smcmockclassincludes.h>
#include "hbstyle.h"
+#include <hbstyleprimitivedata.h>
//needed for TSmcValue<HbStyleParameters &,100>Size()const
class HbStyleParameters {};
@@ -50,12 +51,14 @@
// HbStyle::createPrimitive
// -----------------------------------------------------------------------------
//
-QGraphicsItem * HbStyle::createPrimitive(
- HbStyle::Primitive primitive,
- QGraphicsItem * parent ) const
+QGraphicsObject * HbStyle::createPrimitive(
+ HbStyle::PrimitiveType primitiveType,
+ const QString &itemName,
+ QGraphicsObject *parent ) const
{
- SMC_MOCK_METHOD2( QGraphicsItem *, HbStyle::Primitive, primitive,
- QGraphicsItem *, parent )
+ SMC_MOCK_METHOD3( QGraphicsObject *, HbStyle::PrimitiveType, primitiveType,
+ const QString &, itemName,
+ QGraphicsObject *, parent )
}
@@ -63,14 +66,14 @@
// HbStyle::updatePrimitive
// -----------------------------------------------------------------------------
//
-void HbStyle::updatePrimitive(
- QGraphicsItem * item,
- HbStyle::Primitive primitive,
- const QStyleOption * option ) const
+bool HbStyle::updatePrimitive(
+ QGraphicsObject *primitive,
+ const HbStylePrimitiveData *data,
+ QGraphicsObject *parent ) const
{
- SMC_MOCK_METHOD3( void, QGraphicsItem *, item,
- HbStyle::Primitive, primitive,
- const QStyleOption *, option )
+ SMC_MOCK_METHOD3( bool, QGraphicsObject *, primitive,
+ const HbStylePrimitiveData *, data,
+ QGraphicsObject *, parent )
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbtapgesture.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,132 @@
+/** 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 "hbtapgesture.h"
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbTapGesture::HbTapGesture
+// -----------------------------------------------------------------------------
+//
+HbTapGesture::HbTapGesture(
+ QObject * parent )
+ :d_ptr(0)
+ //QTapGesture( /*parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTapGesture::~HbTapGesture
+// -----------------------------------------------------------------------------
+//
+HbTapGesture::~HbTapGesture( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTapGesture::startPos
+// -----------------------------------------------------------------------------
+//
+QPointF HbTapGesture::startPos( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTapGesture::setStartPos
+// -----------------------------------------------------------------------------
+//
+void HbTapGesture::setStartPos(
+ const QPointF & startPos )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, startPos )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTapGesture::sceneStartPos
+// -----------------------------------------------------------------------------
+//
+QPointF HbTapGesture::sceneStartPos( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTapGesture::setSceneStartPos
+// -----------------------------------------------------------------------------
+//
+void HbTapGesture::setSceneStartPos(
+ const QPointF & startPos )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, startPos )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTapGesture::scenePosition
+// -----------------------------------------------------------------------------
+//
+QPointF HbTapGesture::scenePosition( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTapGesture::setScenePosition
+// -----------------------------------------------------------------------------
+//
+void HbTapGesture::setScenePosition(
+ const QPointF & pos )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, pos )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTapGesture::tapStyleHint
+// -----------------------------------------------------------------------------
+//
+HbTapGesture::TapStyleHint HbTapGesture::tapStyleHint( ) const
+ {
+ SMC_MOCK_METHOD0( HbTapGesture::TapStyleHint )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbTapGesture::HbTapGesture
+// -----------------------------------------------------------------------------
+//
+HbTapGesture::HbTapGesture(
+ HbTapGesturePrivate & dd,
+ QObject * parent )
+ :d_ptr(0)
+ //QTapGesture( /*dd, parent*/ )
+ {
+
+ }
+
--- a/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbwidget.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbwidget.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -88,10 +88,10 @@
// HbWidget::pluginBaseId
// -----------------------------------------------------------------------------
//
-int HbWidget::pluginBaseId( ) const
+/*int HbWidget::pluginBaseId( ) const
{
SMC_MOCK_METHOD0( int )
- }
+ }*/
// -----------------------------------------------------------------------------
@@ -414,11 +414,11 @@
// HbWidget::setPluginBaseId
// -----------------------------------------------------------------------------
//
-void HbWidget::setPluginBaseId(
+/*void HbWidget::setPluginBaseId(
int baseId )
{
SMC_MOCK_METHOD1( void, int, baseId )
- }
+ }*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbwidgetbase.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,225 @@
+/** 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 "hbwidgetbase.h"
+
+#include <HbStylePrimitiveData>
+
+// NOTE! The following header include requires
+// INCLUDEPATH += /sf/mw/hb/include/hbcore/private
+#include <hbstyleoption_p.h>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::HbWidgetBase
+// -----------------------------------------------------------------------------
+//
+HbWidgetBase::HbWidgetBase(
+ QGraphicsItem * parent,
+ Qt::WindowFlags wFlags )
+ :d_ptr(0)
+ //QGraphicsWidget( /*parent, wFlags*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::~HbWidgetBase
+// -----------------------------------------------------------------------------
+//
+HbWidgetBase::~HbWidgetBase( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::event
+// -----------------------------------------------------------------------------
+//
+bool HbWidgetBase::event(
+ QEvent * e )
+ {
+ SMC_MOCK_METHOD1( bool, QEvent *, e )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::fontSpec
+// -----------------------------------------------------------------------------
+//
+HbFontSpec HbWidgetBase::fontSpec( ) const
+ {
+ SMC_MOCK_METHOD0( HbFontSpec )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::setFontSpec
+// -----------------------------------------------------------------------------
+//
+void HbWidgetBase::setFontSpec(
+ const HbFontSpec & fontSpec )
+ {
+ SMC_MOCK_METHOD1( void, const HbFontSpec &, fontSpec )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::effectiveFontSpec
+// -----------------------------------------------------------------------------
+//
+HbFontSpec HbWidgetBase::effectiveFontSpec( ) const
+ {
+ SMC_MOCK_METHOD0( HbFontSpec )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::setAttribute
+// -----------------------------------------------------------------------------
+//
+void HbWidgetBase::setAttribute(
+ Qt::WidgetAttribute att,
+ bool on )
+ {
+ SMC_MOCK_METHOD2( void, Qt::WidgetAttribute, att,
+ bool, on )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::testAttribute
+// -----------------------------------------------------------------------------
+//
+bool HbWidgetBase::testAttribute(
+ Qt::WidgetAttribute att ) const
+ {
+ SMC_MOCK_METHOD1( bool, Qt::WidgetAttribute, att )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::setAttribute
+// -----------------------------------------------------------------------------
+//
+void HbWidgetBase::setAttribute(
+ Hb::WidgetAttribute att,
+ bool on )
+ {
+ SMC_MOCK_METHOD2( void, Hb::WidgetAttribute, att,
+ bool, on )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::testAttribute
+// -----------------------------------------------------------------------------
+//
+bool HbWidgetBase::testAttribute(
+ Hb::WidgetAttribute att ) const
+ {
+ SMC_MOCK_METHOD1( bool, Hb::WidgetAttribute, att )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::HbWidgetBase
+// -----------------------------------------------------------------------------
+//
+HbWidgetBase::HbWidgetBase(
+ HbWidgetBasePrivate & dd,
+ QGraphicsItem * parent,
+ Qt::WindowFlags wFlags )
+ :d_ptr(0)
+ //QGraphicsWidget( /*dd, parent, wFlags*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::itemChange
+// -----------------------------------------------------------------------------
+//
+QVariant HbWidgetBase::itemChange(
+ GraphicsItemChange change,
+ const QVariant & value )
+ {
+ SMC_MOCK_METHOD2( QVariant, GraphicsItemChange, change,
+ const QVariant &, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::sceneEvent
+// -----------------------------------------------------------------------------
+//
+bool HbWidgetBase::sceneEvent(
+ QEvent * event )
+ {
+ SMC_MOCK_METHOD1( bool, QEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::gestureEvent
+// -----------------------------------------------------------------------------
+//
+void HbWidgetBase::gestureEvent(
+ QGestureEvent * event )
+ {
+ SMC_MOCK_METHOD1( void, QGestureEvent *, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::updateGeometry
+// -----------------------------------------------------------------------------
+//
+void HbWidgetBase::updateGeometry( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::initStyleOption
+// -----------------------------------------------------------------------------
+//
+void HbWidgetBase::initStyleOption(
+ HbStyleOption * option ) const
+ {
+ SMC_MOCK_METHOD1( void, HbStyleOption *, option )
+ }
+
+
+// -----------------------------------------------------------------------------
+// HbWidgetBase::initPrimitiveData
+// -----------------------------------------------------------------------------
+//
+void HbWidgetBase::initPrimitiveData(
+ HbStylePrimitiveData * primitiveData,
+ const QGraphicsObject * primitive )
+ {
+ SMC_MOCK_METHOD2( void, HbStylePrimitiveData *, primitiveData,
+ const QGraphicsObject *, primitive )
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_qaction.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,742 @@
+/*
+* 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 <QAction>
+
+#include <QIcon>
+#include <QActionGroup>
+#include <QMenu>
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// QAction::QAction
+// -----------------------------------------------------------------------------
+//
+QAction::QAction(
+ QObject * parent )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::QAction
+// -----------------------------------------------------------------------------
+//
+QAction::QAction(
+ const QString & text,
+ QObject * parent )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::QAction
+// -----------------------------------------------------------------------------
+//
+QAction::QAction(
+ const QIcon & icon,
+ const QString & text,
+ QObject * parent )
+ {
+
+ }
+
+
+#ifdef QT3_SUPPORT
+// -----------------------------------------------------------------------------
+// QAction::QAction
+// -----------------------------------------------------------------------------
+//
+QAction::QAction(
+ QObject * parent,
+ const char * name )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::QAction
+// -----------------------------------------------------------------------------
+//
+QAction::QAction(
+ const QString & text,
+ const QKeySequence & shortcut,
+ QObject * parent,
+ const char * name )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::QAction
+// -----------------------------------------------------------------------------
+//
+QAction::QAction(
+ const QIcon & icon,
+ const QString & text,
+ const QKeySequence & shortcut,
+ QObject * parent,
+ const char * name )
+ {
+
+ }
+#endif
+
+// -----------------------------------------------------------------------------
+// QAction::~QAction
+// -----------------------------------------------------------------------------
+//
+QAction::~QAction( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setActionGroup
+// -----------------------------------------------------------------------------
+//
+void QAction::setActionGroup(
+ QActionGroup * group )
+ {
+ SMC_MOCK_METHOD1( void, QActionGroup *, group )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::actionGroup
+// -----------------------------------------------------------------------------
+//
+QActionGroup * QAction::actionGroup( ) const
+ {
+ SMC_MOCK_METHOD0( QActionGroup * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setIcon
+// -----------------------------------------------------------------------------
+//
+void QAction::setIcon(
+ const QIcon & icon )
+ {
+ SMC_MOCK_METHOD1( void, const QIcon &, icon )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::icon
+// -----------------------------------------------------------------------------
+//
+QIcon QAction::icon( ) const
+ {
+ SMC_MOCK_METHOD0( QIcon )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setText
+// -----------------------------------------------------------------------------
+//
+void QAction::setText(
+ const QString & text )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, text )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::text
+// -----------------------------------------------------------------------------
+//
+QString QAction::text( ) const
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setIconText
+// -----------------------------------------------------------------------------
+//
+void QAction::setIconText(
+ const QString & text )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, text )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::iconText
+// -----------------------------------------------------------------------------
+//
+QString QAction::iconText( ) const
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setToolTip
+// -----------------------------------------------------------------------------
+//
+void QAction::setToolTip(
+ const QString & tip )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, tip )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::toolTip
+// -----------------------------------------------------------------------------
+//
+QString QAction::toolTip( ) const
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setStatusTip
+// -----------------------------------------------------------------------------
+//
+void QAction::setStatusTip(
+ const QString & statusTip )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, statusTip )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::statusTip
+// -----------------------------------------------------------------------------
+//
+QString QAction::statusTip( ) const
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setWhatsThis
+// -----------------------------------------------------------------------------
+//
+void QAction::setWhatsThis(
+ const QString & what )
+ {
+ SMC_MOCK_METHOD1( void, const QString &, what )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::whatsThis
+// -----------------------------------------------------------------------------
+//
+QString QAction::whatsThis( ) const
+ {
+ SMC_MOCK_METHOD0( QString )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setPriority
+// -----------------------------------------------------------------------------
+//
+void QAction::setPriority(
+ QAction::Priority priority )
+ {
+ SMC_MOCK_METHOD1( void, Priority, priority )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::priority
+// -----------------------------------------------------------------------------
+//
+QAction::Priority QAction::priority( ) const
+ {
+ SMC_MOCK_METHOD0( Priority )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::menu
+// -----------------------------------------------------------------------------
+//
+QMenu * QAction::menu( ) const
+ {
+ SMC_MOCK_METHOD0( QMenu * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setMenu
+// -----------------------------------------------------------------------------
+//
+void QAction::setMenu(
+ QMenu * menu )
+ {
+ SMC_MOCK_METHOD1( void, QMenu *, menu )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setSeparator
+// -----------------------------------------------------------------------------
+//
+void QAction::setSeparator(
+ bool b )
+ {
+ SMC_MOCK_METHOD1( void, bool, b )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::isSeparator
+// -----------------------------------------------------------------------------
+//
+bool QAction::isSeparator( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setShortcut
+// -----------------------------------------------------------------------------
+//
+void QAction::setShortcut(
+ const QKeySequence & shortcut )
+ {
+ SMC_MOCK_METHOD1( void, const QKeySequence &, shortcut )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::shortcut
+// -----------------------------------------------------------------------------
+//
+QKeySequence QAction::shortcut( ) const
+ {
+ SMC_MOCK_METHOD0( QKeySequence )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setShortcuts
+// -----------------------------------------------------------------------------
+//
+void QAction::setShortcuts(
+ const QList<QKeySequence> & shortcuts )
+ {
+ // SMC_MOCK_METHOD1( void, const QList<QKeySequence> &, shortcuts )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setShortcuts
+// -----------------------------------------------------------------------------
+//
+void QAction::setShortcuts(
+ QKeySequence:: StandardKey )
+ {
+// SMC_MOCK_METHOD1( void, QKeySequence::, StandardKey )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::shortcuts
+// -----------------------------------------------------------------------------
+//
+QList <QKeySequence > QAction::shortcuts( ) const
+ {
+// SMC_MOCK_METHOD0( QList <QKeySequence > )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setShortcutContext
+// -----------------------------------------------------------------------------
+//
+void QAction::setShortcutContext(
+ Qt::ShortcutContext context )
+ {
+ //SMC_MOCK_METHOD1( void, Qt::ShortcutContext, context )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::shortcutContext
+// -----------------------------------------------------------------------------
+//
+Qt::ShortcutContext QAction::shortcutContext( ) const
+ {
+ SMC_MOCK_METHOD0( Qt::ShortcutContext )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setAutoRepeat
+// -----------------------------------------------------------------------------
+//
+void QAction::setAutoRepeat( bool )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::autoRepeat
+// -----------------------------------------------------------------------------
+//
+bool QAction::autoRepeat( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setFont
+// -----------------------------------------------------------------------------
+//
+void QAction::setFont(
+ const QFont & font )
+ {
+ SMC_MOCK_METHOD1( void, const QFont &, font )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::font
+// -----------------------------------------------------------------------------
+//
+QFont QAction::font( ) const
+ {
+ SMC_MOCK_METHOD0( QFont )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setCheckable
+// -----------------------------------------------------------------------------
+//
+void QAction::setCheckable( bool )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::isCheckable
+// -----------------------------------------------------------------------------
+//
+bool QAction::isCheckable( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::data
+// -----------------------------------------------------------------------------
+//
+QVariant QAction::data( ) const
+ {
+ SMC_MOCK_METHOD0( QVariant )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setData
+// -----------------------------------------------------------------------------
+//
+void QAction::setData(
+ const QVariant & var )
+ {
+ SMC_MOCK_METHOD1( void, const QVariant &, var )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::isChecked
+// -----------------------------------------------------------------------------
+//
+bool QAction::isChecked( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::isEnabled
+// -----------------------------------------------------------------------------
+//
+bool QAction::isEnabled( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::isVisible
+// -----------------------------------------------------------------------------
+//
+bool QAction::isVisible( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::activate
+// -----------------------------------------------------------------------------
+//
+void QAction::activate(
+ ActionEvent event )
+ {
+ SMC_MOCK_METHOD1( void, ActionEvent, event )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::showStatusText
+// -----------------------------------------------------------------------------
+//
+bool QAction::showStatusText(
+ QWidget * widget )
+ {
+ SMC_MOCK_METHOD1( bool, QWidget *, widget )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setMenuRole
+// -----------------------------------------------------------------------------
+//
+void QAction::setMenuRole(
+ QAction::MenuRole menuRole )
+ {
+ SMC_MOCK_METHOD1( void, MenuRole, menuRole )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::menuRole
+// -----------------------------------------------------------------------------
+//
+QAction::MenuRole QAction::menuRole( ) const
+ {
+ SMC_MOCK_METHOD0( MenuRole )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setSoftKeyRole
+// -----------------------------------------------------------------------------
+//
+void QAction::setSoftKeyRole(
+ QAction::SoftKeyRole softKeyRole )
+ {
+ SMC_MOCK_METHOD1( void, SoftKeyRole, softKeyRole )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::softKeyRole
+// -----------------------------------------------------------------------------
+//
+QAction::SoftKeyRole QAction::softKeyRole( ) const
+ {
+
+ SMC_MOCK_METHOD0( SoftKeyRole )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setIconVisibleInMenu
+// -----------------------------------------------------------------------------
+//
+void QAction::setIconVisibleInMenu(
+ bool visible )
+ {
+ SMC_MOCK_METHOD1( void, bool, visible )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::isIconVisibleInMenu
+// -----------------------------------------------------------------------------
+//
+bool QAction::isIconVisibleInMenu( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::parentWidget
+// -----------------------------------------------------------------------------
+//
+QWidget * QAction::parentWidget( ) const
+ {
+ // SMC_MOCK_METHOD0( QWidget * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::associatedWidgets
+// -----------------------------------------------------------------------------
+//
+QList <QWidget * > QAction::associatedWidgets( ) const
+ {
+ // SMC_MOCK_METHOD0( QList <QWidget * > )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::associatedGraphicsWidgets
+// -----------------------------------------------------------------------------
+//
+QList <QGraphicsWidget * > QAction::associatedGraphicsWidgets( ) const
+ {
+ // SMC_MOCK_METHOD0( QList <QGraphicsWidget * > )
+ }
+
+// -----------------------------------------------------------------------------
+// QAction::setChecked
+// -----------------------------------------------------------------------------
+//
+void QAction::setChecked( bool )
+ {
+ //SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::toggle
+// -----------------------------------------------------------------------------
+//
+void QAction::toggle( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setEnabled
+// -----------------------------------------------------------------------------
+//
+void QAction::setEnabled( bool )
+ {
+ // SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::setVisible
+// -----------------------------------------------------------------------------
+//
+void QAction::setVisible( bool )
+ {
+ // SMC_MOCK_METHOD0( void )
+ }
+
+/*
+// -----------------------------------------------------------------------------
+// QAction::changed
+// -----------------------------------------------------------------------------
+//
+void QAction::changed( )
+ {
+ // SMC_MOCK_METHOD0( Q_SIGNALS : void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::triggered
+// -----------------------------------------------------------------------------
+//
+void QAction::triggered(
+ bool checked )
+ {
+ SMC_MOCK_METHOD1( void, bool, checked )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::hovered
+// -----------------------------------------------------------------------------
+//
+void QAction::hovered( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::toggled
+// -----------------------------------------------------------------------------
+//
+void QAction::toggled( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::activated
+// -----------------------------------------------------------------------------
+//
+void QAction::activated(
+ int )
+ {
+ // SMC_MOCK_METHOD1( QT_MOC_COMPAT void, , int )
+ }
+*/
+
+// -----------------------------------------------------------------------------
+// QAction::event
+// -----------------------------------------------------------------------------
+//
+bool QAction::event(
+ QEvent * )
+ {
+// SMC_MOCK_METHOD1( bool, QEvent, * )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QAction::QAction
+// -----------------------------------------------------------------------------
+//
+QAction::QAction(
+ QActionPrivate & dd,
+ QObject * parent )
+ //:
+ //QObject( /*dd, parent*/ )
+ {
+
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_qevent.cpp Mon Oct 04 16:06:10 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/phoneplugins/infowidgetplugin/tsrc/mocks/mock_qgesture.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,560 @@
+/** 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 "qgesture.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// QSwipeGesture::QSwipeGesture
+// -----------------------------------------------------------------------------
+//
+QSwipeGesture::QSwipeGesture(
+ QObject * parent )
+ //:
+ //QGesture( /*parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSwipeGesture::horizontalDirection
+// -----------------------------------------------------------------------------
+//
+QSwipeGesture::SwipeDirection QSwipeGesture::horizontalDirection( ) const
+ {
+ SMC_MOCK_METHOD0( QSwipeGesture::SwipeDirection )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSwipeGesture::verticalDirection
+// -----------------------------------------------------------------------------
+//
+QSwipeGesture::SwipeDirection QSwipeGesture::verticalDirection( ) const
+ {
+ SMC_MOCK_METHOD0( QSwipeGesture::SwipeDirection )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSwipeGesture::swipeAngle
+// -----------------------------------------------------------------------------
+//
+qreal QSwipeGesture::swipeAngle( ) const
+ {
+ SMC_MOCK_METHOD0( qreal )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QSwipeGesture::setSwipeAngle
+// -----------------------------------------------------------------------------
+//
+void QSwipeGesture::setSwipeAngle(
+ qreal value )
+ {
+ SMC_MOCK_METHOD1( void, qreal, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTapAndHoldGesture::position
+// -----------------------------------------------------------------------------
+//
+QPointF QTapAndHoldGesture::position( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTapAndHoldGesture::setPosition
+// -----------------------------------------------------------------------------
+//
+void QTapAndHoldGesture::setPosition(
+ const QPointF & pos )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, pos )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTapAndHoldGesture::setTimeout
+// -----------------------------------------------------------------------------
+//
+void QTapAndHoldGesture::setTimeout(
+ int msecs )
+ {
+ SMC_MOCK_METHOD1( void, int, msecs )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTapAndHoldGesture::timeout
+// -----------------------------------------------------------------------------
+//
+int QTapAndHoldGesture::timeout( )
+ {
+ SMC_MOCK_METHOD0( int )
+ }
+
+// -----------------------------------------------------------------------------
+// QPanGesture::lastOffset
+// -----------------------------------------------------------------------------
+//
+QPointF QPanGesture::lastOffset( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPanGesture::offset
+// -----------------------------------------------------------------------------
+//
+QPointF QPanGesture::offset( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPanGesture::delta
+// -----------------------------------------------------------------------------
+//
+QPointF QPanGesture::delta( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPanGesture::acceleration
+// -----------------------------------------------------------------------------
+//
+qreal QPanGesture::acceleration( ) const
+ {
+ SMC_MOCK_METHOD0( qreal )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPanGesture::setLastOffset
+// -----------------------------------------------------------------------------
+//
+void QPanGesture::setLastOffset(
+ const QPointF & value )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPanGesture::setOffset
+// -----------------------------------------------------------------------------
+//
+void QPanGesture::setOffset(
+ const QPointF & value )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPanGesture::setAcceleration
+// -----------------------------------------------------------------------------
+//
+void QPanGesture::setAcceleration(
+ qreal value )
+ {
+ SMC_MOCK_METHOD1( void, qreal, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTapGesture::position
+// -----------------------------------------------------------------------------
+//
+QPointF QTapGesture::position( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QTapGesture::setPosition
+// -----------------------------------------------------------------------------
+//
+void QTapGesture::setPosition(
+ const QPointF & pos )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, pos )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::QPinchGesture
+// -----------------------------------------------------------------------------
+//
+QPinchGesture::QPinchGesture(
+ QObject * parent )
+ //:
+ //QGesture( /*parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::totalChangeFlags
+// -----------------------------------------------------------------------------
+//
+QPinchGesture::ChangeFlags QPinchGesture::totalChangeFlags( ) const
+ {
+ SMC_MOCK_METHOD0( QPinchGesture::ChangeFlags )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setTotalChangeFlags
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setTotalChangeFlags(
+ ChangeFlags value )
+ {
+ //SMC_MOCK_METHOD1( void, ChangeFlags, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::changeFlags
+// -----------------------------------------------------------------------------
+//
+QPinchGesture::ChangeFlags QPinchGesture::changeFlags( ) const
+ {
+ SMC_MOCK_METHOD0( QPinchGesture::ChangeFlags )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setChangeFlags
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setChangeFlags(
+ ChangeFlags value )
+ {
+ //SMC_MOCK_METHOD1( void, ChangeFlags, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::startCenterPoint
+// -----------------------------------------------------------------------------
+//
+QPointF QPinchGesture::startCenterPoint( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::lastCenterPoint
+// -----------------------------------------------------------------------------
+//
+QPointF QPinchGesture::lastCenterPoint( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::centerPoint
+// -----------------------------------------------------------------------------
+//
+QPointF QPinchGesture::centerPoint( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setStartCenterPoint
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setStartCenterPoint(
+ const QPointF & value )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setLastCenterPoint
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setLastCenterPoint(
+ const QPointF & value )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setCenterPoint
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setCenterPoint(
+ const QPointF & value )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::totalScaleFactor
+// -----------------------------------------------------------------------------
+//
+qreal QPinchGesture::totalScaleFactor( ) const
+ {
+ SMC_MOCK_METHOD0( qreal )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::lastScaleFactor
+// -----------------------------------------------------------------------------
+//
+qreal QPinchGesture::lastScaleFactor( ) const
+ {
+ SMC_MOCK_METHOD0( qreal )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::scaleFactor
+// -----------------------------------------------------------------------------
+//
+qreal QPinchGesture::scaleFactor( ) const
+ {
+ SMC_MOCK_METHOD0( qreal )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setTotalScaleFactor
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setTotalScaleFactor(
+ qreal value )
+ {
+ SMC_MOCK_METHOD1( void, qreal, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setLastScaleFactor
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setLastScaleFactor(
+ qreal value )
+ {
+ SMC_MOCK_METHOD1( void, qreal, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setScaleFactor
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setScaleFactor(
+ qreal value )
+ {
+ SMC_MOCK_METHOD1( void, qreal, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::totalRotationAngle
+// -----------------------------------------------------------------------------
+//
+qreal QPinchGesture::totalRotationAngle( ) const
+ {
+ SMC_MOCK_METHOD0( qreal )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::lastRotationAngle
+// -----------------------------------------------------------------------------
+//
+qreal QPinchGesture::lastRotationAngle( ) const
+ {
+ SMC_MOCK_METHOD0( qreal )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::rotationAngle
+// -----------------------------------------------------------------------------
+//
+qreal QPinchGesture::rotationAngle( ) const
+ {
+ SMC_MOCK_METHOD0( qreal )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setTotalRotationAngle
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setTotalRotationAngle(
+ qreal value )
+ {
+ SMC_MOCK_METHOD1( void, qreal, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setLastRotationAngle
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setLastRotationAngle(
+ qreal value )
+ {
+ SMC_MOCK_METHOD1( void, qreal, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QPinchGesture::setRotationAngle
+// -----------------------------------------------------------------------------
+//
+void QPinchGesture::setRotationAngle(
+ qreal value )
+ {
+ SMC_MOCK_METHOD1( void, qreal, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGesture::QGesture
+// -----------------------------------------------------------------------------
+//
+QGesture::QGesture(
+ QGesturePrivate & dd,
+ QObject * parent )
+ //:
+ //QObject( /*dd, parent*/ )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGesture::~QGesture
+// -----------------------------------------------------------------------------
+//
+QGesture::~QGesture( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGesture::gestureType
+// -----------------------------------------------------------------------------
+//
+Qt::GestureType QGesture::gestureType( ) const
+ {
+ SMC_MOCK_METHOD0( Qt::GestureType )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGesture::state
+// -----------------------------------------------------------------------------
+//
+Qt::GestureState QGesture::state( ) const
+ {
+ SMC_MOCK_METHOD0( Qt::GestureState )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGesture::hotSpot
+// -----------------------------------------------------------------------------
+//
+QPointF QGesture::hotSpot( ) const
+ {
+ SMC_MOCK_METHOD0( QPointF )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGesture::setHotSpot
+// -----------------------------------------------------------------------------
+//
+void QGesture::setHotSpot(
+ const QPointF & value )
+ {
+ SMC_MOCK_METHOD1( void, const QPointF &, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGesture::hasHotSpot
+// -----------------------------------------------------------------------------
+//
+bool QGesture::hasHotSpot( ) const
+ {
+ SMC_MOCK_METHOD0( bool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGesture::unsetHotSpot
+// -----------------------------------------------------------------------------
+//
+void QGesture::unsetHotSpot( )
+ {
+ SMC_MOCK_METHOD0( void )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGesture::setGestureCancelPolicy
+// -----------------------------------------------------------------------------
+//
+void QGesture::setGestureCancelPolicy(
+ GestureCancelPolicy policy )
+ {
+ //SMC_MOCK_METHOD1( void, GestureCancelPolicy, policy )
+ }
+
+
+// -----------------------------------------------------------------------------
+// QGesture::gestureCancelPolicy
+// -----------------------------------------------------------------------------
+//
+QGesture::GestureCancelPolicy QGesture::gestureCancelPolicy( ) const
+ {
+ SMC_MOCK_METHOD0( QGesture::GestureCancelPolicy )
+ }
+
+
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/inc/ut_infowidget.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/inc/ut_infowidget.h Mon Oct 04 16:06:10 2010 +0300
@@ -78,7 +78,14 @@
void t_startMarquees();
void t_stopMarquees();
void t_marqueeNext();
-
+
+ void t_setHomeZoneDisplay();
+ void t_setActiveLineDisplay();
+ void t_initializeCheckBoxStates();
+ void t_settingsEditingCancelled();
+ void t_settingsDialogClosed();
+ void t_settingsValidationFailed();
+
/*
* Not work from commmand prompt.
*/
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/src/ut_infowidget.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/src/ut_infowidget.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -28,12 +28,15 @@
#include <hbframedrawer.h>
#include "ut_infowidget.h"
#include "qtestmains60.h"
+#include <HbTapGesture>
+#include <HbAction>
+
+// mocked dependencies
+#include "infowidgetpreferences.h"
#define private friend class UT_InfoWidget;private
#include "infowidget.h"
-// mocked dependencies
-#include "infowidgetpreferences.h"
const QString KPreferenceOn("On");
const QString KPreferenceOff("Off");
@@ -88,8 +91,11 @@
SmcDefaultValue<InfoWidgetLayoutManager::DisplayRole>::SetL(
InfoWidgetLayoutManager::InfoDisplay);
m_infoWidget = new InfoWidget();
+ // Give time for Qt & Orbit method calls invoked in InfoWidget's
+ // constructor to complete.
+ //QTest::qWait(300);
SmcDefaultValue<QString>::SetL("");
-
+
QVERIFY(verify());
}
@@ -773,13 +779,112 @@
*/
void UT_InfoWidget::t_gestureEvent()
{
- QList<QGesture> gestures;
- //QScopedPointer<QGestureEvent> event(new QGestureEvent);
- //void gestureEvent(QGestureEvent *event);
- m_infoWidget->gestureEvent(NULL);
+ QList<QGesture *> gestures;
+ HbTapGesture gesture;
+ gestures.append(&gesture);
+ QGestureEvent event(gestures);
+
+ EXPECT(QGestureEvent, gesture).returns(&gesture);
+ EXPECT(QGesture, state).returns(Qt::GestureFinished);
+ EXPECT(HbTapGesture, tapStyleHint).returns(HbTapGesture::Tap);
+ EXPECT(InfoWidgetLayoutManager, currentDisplayRole).returns(
+ InfoWidgetLayoutManager::InfoDisplay);
+ m_infoWidget->gestureEvent(&event);
+ QVERIFY(verify());
+
+ EXPECT(QGestureEvent, gesture).returns(&gesture);
+ EXPECT(QGesture, state).returns(Qt::GestureFinished);
+ EXPECT(HbTapGesture, tapStyleHint).returns(HbTapGesture::Tap);
+ EXPECT(InfoWidgetLayoutManager, currentDisplayRole).returns(
+ InfoWidgetLayoutManager::SettingsDialog);
+ m_infoWidget->gestureEvent(&event);
+ QVERIFY(verify());
+
+ EXPECT(QGestureEvent, gesture).returns(&gesture);
+ EXPECT(QGesture, state).returns(Qt::GestureFinished);
+ EXPECT(HbTapGesture, tapStyleHint).returns(HbTapGesture::TapAndHold);
+ m_infoWidget->gestureEvent(&event);
+ QVERIFY(verify());
+
+ EXPECT(QGestureEvent, gesture).returns(&gesture);
+ EXPECT(QGesture, state).returns(Qt::NoGesture);
+ m_infoWidget->gestureEvent(&event);
+ QVERIFY(verify());
+
+ EXPECT(QGestureEvent, gesture).returns<HbTapGesture *>(0);
+ m_infoWidget->gestureEvent(&event);
QVERIFY(verify());
}
+void UT_InfoWidget::t_setHomeZoneDisplay()
+{
+ m_infoWidget->setHomeZoneDisplay(QString(""));
+}
+void UT_InfoWidget::t_setActiveLineDisplay()
+{
+ m_infoWidget->setActiveLineDisplay(QString(""));
+}
+
+void UT_InfoWidget::t_initializeCheckBoxStates()
+{
+ EXPECT(InfoWidgetLayoutManager, getWidget).returns<QGraphicsWidget *>(0);
+ EXPECT(InfoWidgetLayoutManager, getWidget).returns<QGraphicsWidget *>(0);
+ EXPECT(InfoWidgetLayoutManager, getWidget).returns<QGraphicsWidget *>(0);
+ m_infoWidget->initializeCheckBoxStates();
+ QVERIFY(verify());
+
+ HbCheckBox box;
+
+ EXPECT(InfoWidgetLayoutManager, getWidget).returns(&box);
+ EXPECT(InfoWidgetPreferences, isPreferenceSet).returns(true);
+ EXPECT(HbAbstractButton, setChecked);
+ EXPECT(InfoWidgetLayoutManager, getWidget).returns(&box);
+ EXPECT(InfoWidgetPreferences, isPreferenceSet).returns(true);
+ EXPECT(HbAbstractButton, setChecked);
+ EXPECT(InfoWidgetLayoutManager, getWidget).returns(&box);
+ EXPECT(InfoWidgetPreferences, isPreferenceSet).returns(true);
+ EXPECT(HbAbstractButton, setChecked);
+ m_infoWidget->initializeCheckBoxStates();
+ QVERIFY(verify());
+}
+
+void UT_InfoWidget::t_settingsEditingCancelled()
+{
+ m_infoWidget->settingsEditingCancelled();
+}
+
+void UT_InfoWidget::t_settingsDialogClosed()
+{
+ EXPECT(InfoWidgetLayoutManager, layoutInfoDisplay).returns<QGraphicsWidget *>(0);
+ m_infoWidget->settingsDialogClosed(0);
+ QVERIFY(verify());
+
+ HbAction action;
+ EXPECT(QAction, text).returns(hbTrId("txt_common_button_ok"));
+ EXPECT(InfoWidgetLayoutManager, layoutInfoDisplay).returns<QGraphicsWidget *>(0);
+ m_infoWidget->settingsDialogClosed(&action);
+ QVERIFY(verify());
+
+ EXPECT(QAction, text).returns(hbTrId("txt_common_button_cancel"));
+ EXPECT(InfoWidgetLayoutManager, layoutInfoDisplay).returns<QGraphicsWidget *>(0);
+ m_infoWidget->settingsDialogClosed(&action);
+ QVERIFY(verify());
+
+ EXPECT(QAction, text).returns(hbTrId("blah"));
+ EXPECT(InfoWidgetLayoutManager, layoutInfoDisplay).returns<QGraphicsWidget *>(0);
+ m_infoWidget->settingsDialogClosed(&action);
+ QVERIFY(verify());
+
+}
+
+void UT_InfoWidget::t_settingsValidationFailed()
+{
+ m_infoWidget->m_initialized = true;
+ m_infoWidget->settingsValidationFailed();
+
+ m_infoWidget->m_initialized = false;
+ m_infoWidget->settingsValidationFailed();
+}
QTEST_MAIN_S60(UT_InfoWidget)
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/ut_infowidget.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/ut_infowidget.pro Mon Oct 04 16:06:10 2010 +0300
@@ -23,6 +23,8 @@
INCLUDEPATH += ../common
INCLUDEPATH += ../../inc/
INCLUDEPATH += ../../infowidget/inc/
+# the following is needed for a couple of hb mocks
+INCLUDEPATH += /sf/mw/hb/include/hbcore/private
DEFINES += QT_NO_DEBUG_STREAM
@@ -65,5 +67,14 @@
SOURCES += ../mocks/mock_hbframedrawer.cpp
SOURCES += ../mocks/mock_hbframeitem.cpp
SOURCES += ../mocks/mock_rsatservice.cpp
+SOURCES += ../mocks/mock_hbwidgetbase.cpp
+SOURCES += ../mocks/mock_hbtapgesture.cpp
+SOURCES += ../mocks/mock_qevent.cpp
+SOURCES += ../mocks/mock_qgesture.cpp
+SOURCES += ../mocks/mock_hbcheckbox.cpp
+SOURCES += ../mocks/mock_hbabstractbutton.cpp
+SOURCES += ../mocks/mock_qaction.cpp
+SOURCES += ../mocks/mock_hbaction.cpp
+SOURCES += ../mocks/mock_hbmessagebox.cpp
symbian:MMP_RULES += SMPSAFE
--- a/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/run_auto_tests_qt.bat Mon Oct 04 16:06:10 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/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/tsrc/ut_barringplugingroup/ut_barringplugingroup.pro Mon Oct 04 16:06:10 2010 +0300
@@ -23,7 +23,7 @@
INCLUDEPATH += ../../../cptelephonyutils/inc
INCLUDEPATH += ../../../tsrc/common
-DEFINES += BUILD_CPTELEPHONYUTILS BUILD_BARRINGPLUGIN \
+DEFINES += BUILD_TELEPHONYUTILS BUILD_BARRINGPLUGIN \
BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER BUILD_PSUINOTES
DEFINES += QT_NO_DEBUG_STREAM
--- a/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -43,7 +43,7 @@
{
DPRINT << ": IN";
- m_cpSettingsWrapper = new CpSettingsWrapper;
+ m_cpSettingsWrapper = new SettingsWrapper;
m_pSetWrapper = new PSetWrapper;
DPRINT << "PSetWrapper created";
@@ -160,14 +160,14 @@
if (showCallDurationStatus) {
m_DataItemShowCallDuration->setContentWidgetData(
- "text", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
+ "text", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_on")));
m_DataItemShowCallDuration->setContentWidgetData(
- "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_no")));
+ "additionalText", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_off")));
} else {
m_DataItemShowCallDuration->setContentWidgetData(
- "text", QVariant(hbTrId("txt_phone_setlabel_val_no")));
+ "text", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_off")));
m_DataItemShowCallDuration->setContentWidgetData(
- "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
+ "additionalText", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_on")));
}
DPRINT << ": OUT";
@@ -373,23 +373,23 @@
if (showCallDurationStatus) {
m_DataItemShowCallDuration->setContentWidgetData(
- "text", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
+ "text", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_on")));
m_DataItemShowCallDuration->setContentWidgetData(
- "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_no")));
+ "additionalText", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_off")));
} else {
m_DataItemShowCallDuration->setContentWidgetData(
- "text", QVariant(hbTrId("txt_phone_setlabel_val_no")));
+ "text", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_off")));
m_DataItemShowCallDuration->setContentWidgetData(
- "additionalText", QVariant(hbTrId("txt_phone_setlabel_val_yes")));
+ "additionalText", QVariant(hbTrId("txt_phone_setlabel_show_call_duration_val_on")));
}
emit showGlobalNote(
m_activeNoteId,
emit hbTrId("txt_phone_info_not_allowed"),
HbMessageBox::MessageTypeWarning);
} else {
- if (showCallDurationText == hbTrId("txt_phone_setlabel_val_yes")) {
+ if (showCallDurationText == hbTrId("txt_phone_setlabel_show_call_duration_val_on")) {
m_cpSettingsWrapper->setShowCallDuration(true);
- } else if (showCallDurationText == hbTrId("txt_phone_setlabel_val_no")){
+ } else if (showCallDurationText == hbTrId("txt_phone_setlabel_show_call_duration_val_off")){
m_cpSettingsWrapper->setShowCallDuration(false);
} else {
DPRINT << "nothing done";
--- a/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/src/cpcallsplugingroup.h Mon Oct 04 16:06:10 2010 +0300
@@ -31,7 +31,7 @@
class PSetCliWrapper;
class SsSettingsWrapper;
class PSetCallWaitingWrapper;
-class CpSettingsWrapper;
+class SettingsWrapper;
class CpCallsPluginGroup: public CpSettingFormItemData
{
@@ -91,7 +91,7 @@
// Setting wrappers
PSetWrapper *m_pSetWrapper;
SsSettingsWrapper *m_ssSettingsWrapper;
- CpSettingsWrapper *m_cpSettingsWrapper;
+ SettingsWrapper *m_cpSettingsWrapper;
// Not own
PSetCliWrapper* m_cliWrapper;
--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/run_auto_tests_qt.bat Mon Oct 04 16:06:10 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/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -71,7 +71,7 @@
} else {
b=0;
}
- EXPECT(CpSettingsWrapper, showCallDuration).returns(b);
+ EXPECT(SettingsWrapper, showCallDuration).returns(b);
static int i=0;//No Errors
if (i==0) {
@@ -81,11 +81,11 @@
}
EXPECT(SsSettingsWrapper, get).returns(i);
- EXPECT(CpSettingsWrapper, readSoftRejectText);
+ EXPECT(SettingsWrapper, readSoftRejectText);
if (qstrcmp(QTest::currentTestFunction(),
"t_handleCallWaitingGetStatusDistinguishEnabled") == 0) {
- EXPECT(CpSettingsWrapper, isFeatureCallWaitingDistiquishNotProvisionedEnabled)
+ EXPECT(SettingsWrapper, isFeatureCallWaitingDistiquishNotProvisionedEnabled)
.returns(true);
}
@@ -101,18 +101,18 @@
bool bOngoing=true;
bool bDuration=true;
- EXPECT(CpSettingsWrapper, isOngoingCall).returns(bOngoing);
- EXPECT(CpSettingsWrapper, showCallDuration).returns(bDuration);
+ EXPECT(SettingsWrapper, isOngoingCall).returns(bOngoing);
+ EXPECT(SettingsWrapper, showCallDuration).returns(bDuration);
EXPECT(PsUiNotes, showGlobalNote);
m_callspluginGroup->showCallDurationStateChanged();
bDuration = false;
- EXPECT(CpSettingsWrapper, isOngoingCall).returns(bOngoing);
- EXPECT(CpSettingsWrapper, showCallDuration).returns(bDuration);
+ EXPECT(SettingsWrapper, isOngoingCall).returns(bOngoing);
+ EXPECT(SettingsWrapper, showCallDuration).returns(bDuration);
m_callspluginGroup->showCallDurationStateChanged();
bOngoing = false;
- EXPECT(CpSettingsWrapper, isOngoingCall).returns(bOngoing);
+ EXPECT(SettingsWrapper, isOngoingCall).returns(bOngoing);
m_callspluginGroup->showCallDurationStateChanged();
QVERIFY(verify());
@@ -233,7 +233,7 @@
void UT_CpCallsPluginGroup::t_softRejectTextChanged()
{
int iRet=0;
- EXPECT(CpSettingsWrapper, writeSoftRejectText).returns(iRet);
+ EXPECT(SettingsWrapper, writeSoftRejectText).returns(iRet);
m_callspluginGroup->softRejectTextChanged();
QVERIFY(verify());
@@ -276,7 +276,7 @@
*/
void UT_CpCallsPluginGroup::t_ownVideoInReceivedCallStateChanged()
{
- EXPECT(CpSettingsWrapper, writeVtVideoSending).times(3);
+ EXPECT(SettingsWrapper, writeVtVideoSending).times(3);
m_callspluginGroup->ownVideoInReceivedCallStateChanged(0);
m_callspluginGroup->ownVideoInReceivedCallStateChanged(1);
m_callspluginGroup->ownVideoInReceivedCallStateChanged(2);
--- a/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/callsplugin/tsrc/ut_callsplugingroup/ut_callsplugingroup.pro Mon Oct 04 16:06:10 2010 +0300
@@ -24,7 +24,7 @@
INCLUDEPATH += /sf/mw/phonesrv/cellular/telephonysettings/xqbindings/psetwrapper/src
INCLUDEPATH += ../../../tsrc/common
-DEFINES += BUILD_CALLSPLUGIN BUILD_CPTELEPHONYUTILS \
+DEFINES += BUILD_CALLSPLUGIN BUILD_TELEPHONYUTILS \
BUILD_PSETWRAPPER BUILD_SSSETTINGSWRAPPER BUILD_PSUINOTES
QT -= gui
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -32,12 +32,12 @@
DPRINT << ": IN";
// Create guarded objects
- m_localisation.reset(new CpPhoneLocalisation);
+ m_localisation.reset(new PhoneLocalisation);
m_networkStatus.reset(new CpNetworkStatus);
// Install required translations
m_localisation->installTranslator(
- CpPhoneLocalisation::
+ PhoneLocalisation::
TranslationFileCommon);
DPRINT << ": OUT";
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.h Mon Oct 04 16:06:10 2010 +0300
@@ -53,7 +53,7 @@
CpBaseSettingView *createSettingView(const QVariant &hint) const;
private:
- QScopedPointer<CpPhoneLocalisation> m_localisation;
+ QScopedPointer<PhoneLocalisation> m_localisation;
QScopedPointer<CpNetworkStatus> m_networkStatus;
};
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -54,7 +54,7 @@
mCellularSettings = QSharedPointer<CellularDataSettings>(new CellularDataSettings);
QScopedPointer<HbDataFormModel> model(new HbDataFormModel);
- QScopedPointer<CpSettingsWrapper> cpSettingsWrapperGuard(new CpSettingsWrapper);
+ QScopedPointer<SettingsWrapper> cpSettingsWrapperGuard(new SettingsWrapper);
// #1 Read Network mode value from Cenrep
model->appendDataFormItem(createNetworkModeItem());
@@ -953,7 +953,9 @@
HbDataFormModel* formModel = qobject_cast<HbDataFormModel*>(model());
if (formModel) {
if (visible && !m_NetworkOperatorSelectionItemData) {
- formModel->appendDataFormItem(createOperatorSelectionItem());
+ const int KOperatorSelectionItemIndex = 1;
+ formModel->insertDataFormItem(
+ KOperatorSelectionItemIndex, createOperatorSelectionItem());
} else if (!visible && m_NetworkOperatorSelectionItemData) {
removeConnection(
m_NetworkOperatorSelectionItemData,
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.h Mon Oct 04 16:06:10 2010 +0300
@@ -25,7 +25,7 @@
#include <hbmessagebox.h>
class HbDataFormModelItem;
-class CpSettingsWrapper;
+class SettingsWrapper;
class PSetWrapper;
class HbListWidget;
class PSetNetworkWrapper;
@@ -106,7 +106,7 @@
int m_activeProgressNoteId;
// Own
PSetWrapper *m_pSetWrapper;
- CpSettingsWrapper *m_cpSettingsWrapper;
+ SettingsWrapper *m_cpSettingsWrapper;
QSharedPointer<CellularDataSettings> mCellularSettings;
HbDialog *m_dialog;
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkstatus.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkstatus.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -51,7 +51,7 @@
QSystemNetworkInfo::NetworkMode,
QSystemNetworkInfo::NetworkStatus)));
- m_cpSettingsWrapper = new CpSettingsWrapper;
+ m_cpSettingsWrapper = new SettingsWrapper;
DPRINT << ": OUT";
}
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkstatus.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkstatus.h Mon Oct 04 16:06:10 2010 +0300
@@ -25,7 +25,7 @@
class CpSettingFormItemData;
class HbIcon;
-class CpSettingsWrapper;
+class SettingsWrapper;
class CpNetworkStatus
: public QObject
@@ -65,7 +65,7 @@
QScopedPointer<QSystemNetworkInfo> m_networkInfo;
QScopedPointer<QSystemDeviceInfo> m_deviceInfo;
- CpSettingsWrapper *m_cpSettingsWrapper;
+ SettingsWrapper *m_cpSettingsWrapper;
// Not own
CpSettingFormItemData *m_settingFormItemData;
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/run_auto_tests_qt.bat Mon Oct 04 16:06:10 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/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkplugin/ut_cpnetworkplugin.pro Mon Oct 04 16:06:10 2010 +0300
@@ -23,7 +23,7 @@
INCLUDEPATH +=../../../inc
INCLUDEPATH +=../../../cptelephonyutils/inc
INCLUDEPATH += ../../../tsrc/common
-DEFINES += BUILD_CPTELEPHONYUTILS
+DEFINES += BUILD_TELEPHONYUTILS
QT -= gui
QT += testlib
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_cpnetworkpluginform.pro Mon Oct 04 16:06:10 2010 +0300
@@ -26,7 +26,7 @@
INCLUDEPATH += ../../../inc
INCLUDEPATH += ../../../cptelephonyutils/inc
DEFINES += BUILD_NETWORKPLUGIN BUILD_PSETWRAPPER \
- BUILD_CPTELEPHONYUTILS BUILD_PSUINOTES
+ BUILD_TELEPHONYUTILS BUILD_PSUINOTES
QT -= gui
QT += testlib
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkpluginform/ut_networkpluginform.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -19,6 +19,7 @@
#include "qtestmains60ui.h"
#include "cpitemdatahelper.h"
#include "psetwrapper.h"
+#include "cpplugincommon.h"
#define private public
#include "cpnetworkpluginform.h"
@@ -64,15 +65,15 @@
QVERIFY(!m_networkPluginForm);
CPsetContainer tmpPsetContainer;
m_networkWrapper = new PSetNetworkWrapper(tmpPsetContainer);
- expect("PSetWrapper::networkWrapper").returns(m_networkWrapper);
- expect("PSetNetworkWrapper::isManualNetworkSelectionSupported").returns(true);
+ EXPECT(PSetWrapper, networkWrapper).returns(m_networkWrapper);
+ EXPECT(PSetNetworkWrapper, isManualNetworkSelectionSupported).returns(true);
if(i) {
m_NetworkSelectionMode = PSetNetworkWrapper::SelectionModeAutomatic;
} else {
m_NetworkSelectionMode = PSetNetworkWrapper::SelectionModeManual;
}
i++;
- expect("PSetNetworkWrapper::getNetworkSelectionMode").willOnce(invoke(this, &updateNetworkSelectionMode));
+ EXPECT(PSetNetworkWrapper, getNetworkSelectionMode).willOnce(invoke(this, &updateNetworkSelectionMode));
m_networkPluginForm = new CpNetworkPluginForm();
QVERIFY(m_networkPluginForm);
}
@@ -114,19 +115,19 @@
*/
void UT_CpNetworkPluginForm::t_networkModeStateChanged()
{
- expect("CpSettingsWrapper::isPhoneOffline").returns(false);
+ EXPECT(SettingsWrapper, isPhoneOffline).returns(false);
m_networkPluginForm->networkModeStateChanged(0);
- expect("CpSettingsWrapper::isPhoneOffline").returns(false);
+ EXPECT(SettingsWrapper, isPhoneOffline).returns(false);
m_networkPluginForm->networkModeStateChanged(1);
- expect("CpSettingsWrapper::isPhoneOffline").returns(false);
+ EXPECT(SettingsWrapper, isPhoneOffline).returns(false);
m_networkPluginForm->networkModeStateChanged(2);
- expect("CpSettingsWrapper::isPhoneOffline").returns(false);
+ EXPECT(SettingsWrapper, isPhoneOffline).returns(false);
m_networkPluginForm->networkModeStateChanged(3);
- expect("CpSettingsWrapper::isPhoneOffline").returns(true);
+ EXPECT(SettingsWrapper, isPhoneOffline).returns(true);
m_networkPluginForm->networkModeStateChanged(0);
QVERIFY(verify());
@@ -137,17 +138,17 @@
*/
void UT_CpNetworkPluginForm::t_operatorSelectionStateChanged()
{
- expect("CpSettingsWrapper::isPhoneOffline").returns(false);
+ EXPECT(SettingsWrapper, isPhoneOffline).returns(false);
m_NetworkSelectionMode = PSetNetworkWrapper::SelectionModeAutomatic;
expect("PSetNetworkWrapper::getNetworkSelectionMode").willOnce(invoke(this, &updateNetworkSelectionMode));
m_networkPluginForm->operatorSelectionStateChanged();
- expect("CpSettingsWrapper::isPhoneOffline").returns(false);
+ EXPECT(SettingsWrapper, isPhoneOffline).returns(false);
m_NetworkSelectionMode = PSetNetworkWrapper::SelectionModeManual;
expect("PSetNetworkWrapper::getNetworkSelectionMode").willOnce(invoke(this, &updateNetworkSelectionMode));
m_networkPluginForm->operatorSelectionStateChanged();
- expect("CpSettingsWrapper::isPhoneOffline").returns(true);
+ EXPECT(SettingsWrapper, isPhoneOffline).returns(true);
m_networkPluginForm->operatorSelectionStateChanged();
QVERIFY(verify());
@@ -178,7 +179,7 @@
QList<PSetNetworkWrapper::NetworkInfo*> networkInfoList;
networkInfoList.append(&temp);
- expect("HbDialog::open");
+ EXPECT(HbDialog, open);
m_networkPluginForm->availableNetworksGot(networkInfoList);
QVERIFY(verify());
@@ -191,17 +192,17 @@
{
PSetNetworkWrapper::ErrorCode error(PSetNetworkWrapper::ErrCauseCallActive);
PSetNetworkWrapper::RequestType type(PSetNetworkWrapper::RequestSetNetworkMode);
- expect("PSetNetworkWrapper::getNetworkAccessMode");
+ EXPECT(PSetNetworkWrapper, getNetworkAccessMode);
m_networkPluginForm->networkReqestFailed(error, type);
error = PSetNetworkWrapper::ErrNoNetworkService;
type = PSetNetworkWrapper::RequestSetNetworkMode;
- expect("PSetNetworkWrapper::getNetworkAccessMode");
+ EXPECT(PSetNetworkWrapper, getNetworkAccessMode);
m_networkPluginForm->networkReqestFailed(error, type);
error = PSetNetworkWrapper::ErrOfflineOpNotAllowed;
type = PSetNetworkWrapper::RequestSetNetworkMode;
- expect("PSetNetworkWrapper::getNetworkAccessMode");
+ EXPECT(PSetNetworkWrapper, getNetworkAccessMode);
m_networkPluginForm->networkReqestFailed(error, type);
PSetNetworkWrapper::NetworkInfo temp;
@@ -210,7 +211,7 @@
m_networkPluginForm->availableNetworksGot(networkInfoList);
error = PSetNetworkWrapper::ErrNoNetworkAccess;
type = PSetNetworkWrapper::RequestSetNetwork;
- expect("HbDialog::open");
+ EXPECT(HbDialog, open);
m_networkPluginForm->networkReqestFailed(error, type);
QVERIFY(verify());
@@ -222,11 +223,11 @@
void UT_CpNetworkPluginForm::t_userCancel()
{
m_NetworkSelectionMode = PSetNetworkWrapper::SelectionModeManual;
- expect("PSetNetworkWrapper::getNetworkSelectionMode").willOnce(invoke(this, &updateNetworkSelectionMode));
+ EXPECT(PSetNetworkWrapper, getNetworkSelectionMode).willOnce(invoke(this, &updateNetworkSelectionMode));
m_networkPluginForm->userCancel();
m_NetworkSelectionMode = PSetNetworkWrapper::SelectionModeAutomatic;
- expect("PSetNetworkWrapper::getNetworkSelectionMode").willOnce(invoke(this, &updateNetworkSelectionMode));
+ EXPECT(PSetNetworkWrapper, getNetworkSelectionMode).willOnce(invoke(this, &updateNetworkSelectionMode));
m_networkPluginForm->userCancel();
QVERIFY(verify());
@@ -279,7 +280,7 @@
void UT_CpNetworkPluginForm::t_primaryIconForNetwork()
{
QScopedPointer<PSetWrapper> wrapper(new PSetWrapper());
- expect("PSetWrapper::networkWrapper").returns(wrapper.data());
+ EXPECT(PSetWrapper, networkWrapper).returns(wrapper.data());
QScopedPointer<CpNetworkPluginFormAdapter>
formClassAdapter(new CpNetworkPluginFormAdapter());
@@ -288,47 +289,47 @@
// Test: forbidden icon flag ON, mode: GSM, status: forbidden
currentInfo.m_access = PSetNetworkWrapper::AccessTypeGsm;
currentInfo.m_status = PSetNetworkWrapper::StatusForbidden;
- expect("CpSettingsWrapper::forbiddenIconSupported").returns(true);
+ EXPECT(SettingsWrapper, forbiddenIconSupported).returns(true);
QString iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
QCOMPARE(iconName, KIconGsmForbidden);
// Test: forbidden icon flag ON, mode: GSM, status: available
currentInfo.m_access = PSetNetworkWrapper::AccessTypeGsm;
currentInfo.m_status = PSetNetworkWrapper::StatusAvailable;
- expect("CpSettingsWrapper::forbiddenIconSupported").returns(true);
+ EXPECT(SettingsWrapper, forbiddenIconSupported).returns(true);
iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
QCOMPARE(iconName, KIconGsmNotForbidden);
// Test: forbidden icon flag ON, mode: WCDMA, status: forbidden
currentInfo.m_access = PSetNetworkWrapper::AccessTypeWcdma;
currentInfo.m_status = PSetNetworkWrapper::StatusForbidden;
- expect("CpSettingsWrapper::forbiddenIconSupported").returns(true);
+ EXPECT(SettingsWrapper, forbiddenIconSupported).returns(true);
iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
QCOMPARE(iconName, KIconWcdmaForbidden);
// Test: forbidden icon flag ON, mode: WCDMA, status: available
currentInfo.m_access = PSetNetworkWrapper::AccessTypeWcdma;
currentInfo.m_status = PSetNetworkWrapper::StatusAvailable;
- expect("CpSettingsWrapper::forbiddenIconSupported").returns(true);
+ EXPECT(SettingsWrapper, forbiddenIconSupported).returns(true);
iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
QCOMPARE(iconName, KIconWcdmaNotForbidden);
// Test: forbidden icon flag ON, mode: GSM and WCDMA, status: forbidden
currentInfo.m_access = PSetNetworkWrapper::AccessTypeGsmAndWcdma;
currentInfo.m_status = PSetNetworkWrapper::StatusForbidden;
- expect("CpSettingsWrapper::forbiddenIconSupported").returns(true);
+ EXPECT(SettingsWrapper, forbiddenIconSupported).returns(true);
iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
QCOMPARE(iconName, KIconGsmAndWcdmaForbidden);
// Test: forbidden icon flag ON, mode: GSM and WCDMA, status: available
currentInfo.m_access = PSetNetworkWrapper::AccessTypeGsmAndWcdma;
currentInfo.m_status = PSetNetworkWrapper::StatusAvailable;
- expect("CpSettingsWrapper::forbiddenIconSupported").returns(true);
+ EXPECT(SettingsWrapper,forbiddenIconSupported).returns(true);
iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
QCOMPARE(iconName, KIconGsmAndWcdmaNotForbidden);
// Test: forbidden icon flag OFF
- expect("CpSettingsWrapper::forbiddenIconSupported").returns(false);
+ EXPECT(SettingsWrapper, forbiddenIconSupported).returns(false);
iconName = formClassAdapter->primaryIconForNetwork(currentInfo);
QCOMPARE(iconName, QString(""));
}
--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/ut_cpnetworkstatus.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/tsrc/ut_cpnetworkstatus/ut_cpnetworkstatus.pro Mon Oct 04 16:06:10 2010 +0300
@@ -23,7 +23,7 @@
INCLUDEPATH +=../../../inc
INCLUDEPATH +=../../../cptelephonyutils/inc
INCLUDEPATH += ../../../tsrc/common
-DEFINES += BUILD_NETWORKPLUGIN BUILD_CPTELEPHONYUTILS BUILD_PSETWRAPPER \
+DEFINES += BUILD_NETWORKPLUGIN BUILD_TELEPHONYUTILS BUILD_PSETWRAPPER \
QT_BUILD_SYSINFO_LIB QT_MAKEDLL
MOBILITY += systeminfo
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/bwins/cptelephonyutilsu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/bwins/cptelephonyutilsu.def Mon Oct 04 16:06:10 2010 +0300
@@ -1,54 +1,54 @@
EXPORTS
- ?qt_metacast@CpPhoneLocalisation@@UAEPAXPBD@Z @ 1 NONAME ; void * CpPhoneLocalisation::qt_metacast(char const *)
- ?qt_metacast@CpSettingsWrapper@@UAEPAXPBD@Z @ 2 NONAME ; void * CpSettingsWrapper::qt_metacast(char const *)
- ??1CpSettingsWrapper@@UAE@XZ @ 3 NONAME ; CpSettingsWrapper::~CpSettingsWrapper(void)
- ?getStaticMetaObject@Tools@@SAABUQMetaObject@@XZ @ 4 NONAME ; struct QMetaObject const & Tools::getStaticMetaObject(void)
- ?installTranslator@CpPhoneLocalisation@@QAE_NW4TranslationFileId@1@@Z @ 5 NONAME ; bool CpPhoneLocalisation::installTranslator(enum CpPhoneLocalisation::TranslationFileId)
- ?metaObject@CpPhoneLocalisation@@UBEPBUQMetaObject@@XZ @ 6 NONAME ; struct QMetaObject const * CpPhoneLocalisation::metaObject(void) const
- ?forbiddenIconSupported@CpSettingsWrapper@@QBE_NXZ @ 7 NONAME ; bool CpSettingsWrapper::forbiddenIconSupported(void) const
- ?tr@CpPhoneLocalisation@@SA?AVQString@@PBD0@Z @ 8 NONAME ; class QString CpPhoneLocalisation::tr(char const *, char const *)
- ?trUtf8@CpPhoneLocalisation@@SA?AVQString@@PBD0H@Z @ 9 NONAME ; class QString CpPhoneLocalisation::trUtf8(char const *, char const *, int)
- ?tr@CpPhoneLocalisation@@SA?AVQString@@PBD0H@Z @ 10 NONAME ; class QString CpPhoneLocalisation::tr(char const *, char const *, int)
- ?readPubSubValue@CpSettingsWrapper@@ABE?AVQVariant@@JK@Z @ 11 NONAME ; class QVariant CpSettingsWrapper::readPubSubValue(long, unsigned long) const
- ?tr@CpSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 12 NONAME ; class QString CpSettingsWrapper::tr(char const *, char const *, int)
- ?isOngoingCall@CpSettingsWrapper@@QBE_NXZ @ 13 NONAME ; bool CpSettingsWrapper::isOngoingCall(void) const
- ?metaObject@Tools@@UBEPBUQMetaObject@@XZ @ 14 NONAME ; struct QMetaObject const * Tools::metaObject(void) const
- ?readSoftRejectText@CpSettingsWrapper@@QAEXAAVQString@@AA_N@Z @ 15 NONAME ; void CpSettingsWrapper::readSoftRejectText(class QString &, bool &)
- ?getStaticMetaObject@CpSettingsWrapper@@SAABUQMetaObject@@XZ @ 16 NONAME ; struct QMetaObject const & CpSettingsWrapper::getStaticMetaObject(void)
- ?metaObject@CpSettingsWrapper@@UBEPBUQMetaObject@@XZ @ 17 NONAME ; struct QMetaObject const * CpSettingsWrapper::metaObject(void) const
- ?videoSupported@Tools@@SA_NXZ @ 18 NONAME ; bool Tools::videoSupported(void)
- ?showCallDuration@CpSettingsWrapper@@QAE_NXZ @ 19 NONAME ; bool CpSettingsWrapper::showCallDuration(void)
- ?isPhoneOffline@CpSettingsWrapper@@QBE_NXZ @ 20 NONAME ; bool CpSettingsWrapper::isPhoneOffline(void) const
- ?qt_metacall@CpPhoneLocalisation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 21 NONAME ; int CpPhoneLocalisation::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?writeVtVideoSending@CpSettingsWrapper@@QAEHH@Z @ 22 NONAME ; int CpSettingsWrapper::writeVtVideoSending(int)
- ?readCenrepString@CpSettingsWrapper@@ABE?AVQString@@JK@Z @ 23 NONAME ; class QString CpSettingsWrapper::readCenrepString(long, unsigned long) const
- ?writeSoftRejectText@CpSettingsWrapper@@QAEHABVQString@@_N@Z @ 24 NONAME ; int CpSettingsWrapper::writeSoftRejectText(class QString const &, bool)
- ?setShowCallDuration@CpSettingsWrapper@@QAEH_N@Z @ 25 NONAME ; int CpSettingsWrapper::setShowCallDuration(bool)
- ?qt_metacall@Tools@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 26 NONAME ; int Tools::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?trUtf8@CpSettingsWrapper@@SA?AVQString@@PBD0@Z @ 27 NONAME ; class QString CpSettingsWrapper::trUtf8(char const *, char const *)
- ??1CpPhoneLocalisation@@UAE@XZ @ 28 NONAME ; CpPhoneLocalisation::~CpPhoneLocalisation(void)
- ??_ECpSettingsWrapper@@UAE@I@Z @ 29 NONAME ; CpSettingsWrapper::~CpSettingsWrapper(unsigned int)
- ?trUtf8@CpSettingsWrapper@@SA?AVQString@@PBD0H@Z @ 30 NONAME ; class QString CpSettingsWrapper::trUtf8(char const *, char const *, int)
- ?trUtf8@CpPhoneLocalisation@@SA?AVQString@@PBD0@Z @ 31 NONAME ; class QString CpPhoneLocalisation::trUtf8(char const *, char const *)
- ?tr@Tools@@SA?AVQString@@PBD0@Z @ 32 NONAME ; class QString Tools::tr(char const *, char const *)
- ?voipSupported@Tools@@SA_NXZ @ 33 NONAME ; bool Tools::voipSupported(void)
- ?qt_metacast@Tools@@UAEPAXPBD@Z @ 34 NONAME ; void * Tools::qt_metacast(char const *)
- ?staticMetaObject@CpPhoneLocalisation@@2UQMetaObject@@B @ 35 NONAME ; struct QMetaObject const CpPhoneLocalisation::staticMetaObject
- ?readCenrepValue@CpSettingsWrapper@@ABE?AVQVariant@@JK@Z @ 36 NONAME ; class QVariant CpSettingsWrapper::readCenrepValue(long, unsigned long) const
- ?trUtf8@Tools@@SA?AVQString@@PBD0H@Z @ 37 NONAME ; class QString Tools::trUtf8(char const *, char const *, int)
- ?getStaticMetaObject@CpPhoneLocalisation@@SAABUQMetaObject@@XZ @ 38 NONAME ; struct QMetaObject const & CpPhoneLocalisation::getStaticMetaObject(void)
- ?tr@Tools@@SA?AVQString@@PBD0H@Z @ 39 NONAME ; class QString Tools::tr(char const *, char const *, int)
- ?qt_metacall@CpSettingsWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 40 NONAME ; int CpSettingsWrapper::qt_metacall(enum QMetaObject::Call, int, void * *)
- ??0CpPhoneLocalisation@@QAE@PAVQObject@@@Z @ 41 NONAME ; CpPhoneLocalisation::CpPhoneLocalisation(class QObject *)
- ??_ECpPhoneLocalisation@@UAE@I@Z @ 42 NONAME ; CpPhoneLocalisation::~CpPhoneLocalisation(unsigned int)
- ?removeTranslators@CpPhoneLocalisation@@QAEXXZ @ 43 NONAME ; void CpPhoneLocalisation::removeTranslators(void)
- ?numberGroupingSupported@CpSettingsWrapper@@QBE_NXZ @ 44 NONAME ; bool CpSettingsWrapper::numberGroupingSupported(void) const
- ?tr@CpSettingsWrapper@@SA?AVQString@@PBD0@Z @ 45 NONAME ; class QString CpSettingsWrapper::tr(char const *, char const *)
- ?isFeatureCallWaitingDistiquishNotProvisionedEnabled@CpSettingsWrapper@@QAE_NXZ @ 46 NONAME ; bool CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled(void)
- ?writeCenrepValue@CpSettingsWrapper@@ABEHJKABVQVariant@@@Z @ 47 NONAME ; int CpSettingsWrapper::writeCenrepValue(long, unsigned long, class QVariant const &) const
- ?readVtVideoSending@CpSettingsWrapper@@QAEHXZ @ 48 NONAME ; int CpSettingsWrapper::readVtVideoSending(void)
- ?staticMetaObject@Tools@@2UQMetaObject@@B @ 49 NONAME ; struct QMetaObject const Tools::staticMetaObject
- ?trUtf8@Tools@@SA?AVQString@@PBD0@Z @ 50 NONAME ; class QString Tools::trUtf8(char const *, char const *)
- ??0CpSettingsWrapper@@QAE@PAVQObject@@@Z @ 51 NONAME ; CpSettingsWrapper::CpSettingsWrapper(class QObject *)
- ?staticMetaObject@CpSettingsWrapper@@2UQMetaObject@@B @ 52 NONAME ; struct QMetaObject const CpSettingsWrapper::staticMetaObject
+ ?numberGroupingSupported@SettingsWrapper@@QBE_NXZ @ 1 NONAME ; bool SettingsWrapper::numberGroupingSupported(void) const
+ ?trUtf8@SettingsWrapper@@SA?AVQString@@PBD0H@Z @ 2 NONAME ; class QString SettingsWrapper::trUtf8(char const *, char const *, int)
+ ?getStaticMetaObject@PhoneLocalisation@@SAABUQMetaObject@@XZ @ 3 NONAME ; struct QMetaObject const & PhoneLocalisation::getStaticMetaObject(void)
+ ?qt_metacast@PhoneLocalisation@@UAEPAXPBD@Z @ 4 NONAME ; void * PhoneLocalisation::qt_metacast(char const *)
+ ?qt_metacall@SettingsWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 5 NONAME ; int SettingsWrapper::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ??_EPhoneLocalisation@@UAE@I@Z @ 6 NONAME ; PhoneLocalisation::~PhoneLocalisation(unsigned int)
+ ?readSoftRejectText@SettingsWrapper@@QAEXAAVQString@@AA_N@Z @ 7 NONAME ; void SettingsWrapper::readSoftRejectText(class QString &, bool &)
+ ?removeTranslators@PhoneLocalisation@@QAEXXZ @ 8 NONAME ; void PhoneLocalisation::removeTranslators(void)
+ ?getStaticMetaObject@Tools@@SAABUQMetaObject@@XZ @ 9 NONAME ; struct QMetaObject const & Tools::getStaticMetaObject(void)
+ ?isPhoneOffline@SettingsWrapper@@QBE_NXZ @ 10 NONAME ; bool SettingsWrapper::isPhoneOffline(void) const
+ ?staticMetaObject@PhoneLocalisation@@2UQMetaObject@@B @ 11 NONAME ; struct QMetaObject const PhoneLocalisation::staticMetaObject
+ ?trUtf8@PhoneLocalisation@@SA?AVQString@@PBD0@Z @ 12 NONAME ; class QString PhoneLocalisation::trUtf8(char const *, char const *)
+ ?qt_metacast@SettingsWrapper@@UAEPAXPBD@Z @ 13 NONAME ; void * SettingsWrapper::qt_metacast(char const *)
+ ?trUtf8@SettingsWrapper@@SA?AVQString@@PBD0@Z @ 14 NONAME ; class QString SettingsWrapper::trUtf8(char const *, char const *)
+ ??1PhoneLocalisation@@UAE@XZ @ 15 NONAME ; PhoneLocalisation::~PhoneLocalisation(void)
+ ?tr@SettingsWrapper@@SA?AVQString@@PBD0@Z @ 16 NONAME ; class QString SettingsWrapper::tr(char const *, char const *)
+ ?forbiddenIconSupported@SettingsWrapper@@QBE_NXZ @ 17 NONAME ; bool SettingsWrapper::forbiddenIconSupported(void) const
+ ?tr@PhoneLocalisation@@SA?AVQString@@PBD0H@Z @ 18 NONAME ; class QString PhoneLocalisation::tr(char const *, char const *, int)
+ ?metaObject@Tools@@UBEPBUQMetaObject@@XZ @ 19 NONAME ; struct QMetaObject const * Tools::metaObject(void) const
+ ?writeSoftRejectText@SettingsWrapper@@QAEHABVQString@@_N@Z @ 20 NONAME ; int SettingsWrapper::writeSoftRejectText(class QString const &, bool)
+ ?readCenrepString@SettingsWrapper@@ABE?AVQString@@JK@Z @ 21 NONAME ; class QString SettingsWrapper::readCenrepString(long, unsigned long) const
+ ??0PhoneLocalisation@@QAE@PAVQObject@@@Z @ 22 NONAME ; PhoneLocalisation::PhoneLocalisation(class QObject *)
+ ?videoSupported@Tools@@SA_NXZ @ 23 NONAME ; bool Tools::videoSupported(void)
+ ?tr@SettingsWrapper@@SA?AVQString@@PBD0H@Z @ 24 NONAME ; class QString SettingsWrapper::tr(char const *, char const *, int)
+ ?metaObject@PhoneLocalisation@@UBEPBUQMetaObject@@XZ @ 25 NONAME ; struct QMetaObject const * PhoneLocalisation::metaObject(void) const
+ ?installTranslator@PhoneLocalisation@@QAE_NW4TranslationFileId@1@@Z @ 26 NONAME ; bool PhoneLocalisation::installTranslator(enum PhoneLocalisation::TranslationFileId)
+ ?isFeatureCallWaitingDistiquishNotProvisionedEnabled@SettingsWrapper@@QAE_NXZ @ 27 NONAME ; bool SettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled(void)
+ ?isOngoingCall@SettingsWrapper@@QBE_NXZ @ 28 NONAME ; bool SettingsWrapper::isOngoingCall(void) const
+ ?tr@PhoneLocalisation@@SA?AVQString@@PBD0@Z @ 29 NONAME ; class QString PhoneLocalisation::tr(char const *, char const *)
+ ?qt_metacall@Tools@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 30 NONAME ; int Tools::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?writeCenrepValue@SettingsWrapper@@ABEHJKABVQVariant@@@Z @ 31 NONAME ; int SettingsWrapper::writeCenrepValue(long, unsigned long, class QVariant const &) const
+ ?staticMetaObject@SettingsWrapper@@2UQMetaObject@@B @ 32 NONAME ; struct QMetaObject const SettingsWrapper::staticMetaObject
+ ?readVtVideoSending@SettingsWrapper@@QAEHXZ @ 33 NONAME ; int SettingsWrapper::readVtVideoSending(void)
+ ?readPubSubValue@SettingsWrapper@@ABE?AVQVariant@@JK@Z @ 34 NONAME ; class QVariant SettingsWrapper::readPubSubValue(long, unsigned long) const
+ ?tr@Tools@@SA?AVQString@@PBD0@Z @ 35 NONAME ; class QString Tools::tr(char const *, char const *)
+ ?readCenrepValue@SettingsWrapper@@ABE?AVQVariant@@JK@Z @ 36 NONAME ; class QVariant SettingsWrapper::readCenrepValue(long, unsigned long) const
+ ?trUtf8@PhoneLocalisation@@SA?AVQString@@PBD0H@Z @ 37 NONAME ; class QString PhoneLocalisation::trUtf8(char const *, char const *, int)
+ ?voipSupported@Tools@@SA_NXZ @ 38 NONAME ; bool Tools::voipSupported(void)
+ ?qt_metacast@Tools@@UAEPAXPBD@Z @ 39 NONAME ; void * Tools::qt_metacast(char const *)
+ ?trUtf8@Tools@@SA?AVQString@@PBD0H@Z @ 40 NONAME ; class QString Tools::trUtf8(char const *, char const *, int)
+ ?qt_metacall@PhoneLocalisation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 41 NONAME ; int PhoneLocalisation::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ??0SettingsWrapper@@QAE@PAVQObject@@@Z @ 42 NONAME ; SettingsWrapper::SettingsWrapper(class QObject *)
+ ?tr@Tools@@SA?AVQString@@PBD0H@Z @ 43 NONAME ; class QString Tools::tr(char const *, char const *, int)
+ ?setShowCallDuration@SettingsWrapper@@QAEH_N@Z @ 44 NONAME ; int SettingsWrapper::setShowCallDuration(bool)
+ ?metaObject@SettingsWrapper@@UBEPBUQMetaObject@@XZ @ 45 NONAME ; struct QMetaObject const * SettingsWrapper::metaObject(void) const
+ ?getStaticMetaObject@SettingsWrapper@@SAABUQMetaObject@@XZ @ 46 NONAME ; struct QMetaObject const & SettingsWrapper::getStaticMetaObject(void)
+ ?showCallDuration@SettingsWrapper@@QAE_NXZ @ 47 NONAME ; bool SettingsWrapper::showCallDuration(void)
+ ?writeVtVideoSending@SettingsWrapper@@QAEHH@Z @ 48 NONAME ; int SettingsWrapper::writeVtVideoSending(int)
+ ??1SettingsWrapper@@UAE@XZ @ 49 NONAME ; SettingsWrapper::~SettingsWrapper(void)
+ ?staticMetaObject@Tools@@2UQMetaObject@@B @ 50 NONAME ; struct QMetaObject const Tools::staticMetaObject
+ ??_ESettingsWrapper@@UAE@I@Z @ 51 NONAME ; SettingsWrapper::~SettingsWrapper(unsigned int)
+ ?trUtf8@Tools@@SA?AVQString@@PBD0@Z @ 52 NONAME ; class QString Tools::trUtf8(char const *, char const *)
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/cptelephonyutils.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/cptelephonyutils.pro Mon Oct 04 16:06:10 2010 +0300
@@ -38,7 +38,7 @@
TRANSLATIONS = telephone_cp.ts
-DEFINES += BUILD_CPTELEPHONYUTILS
+DEFINES += BUILD_TELEPHONYUTILS
symbian: {
load(data_caging_paths)
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/eabi/cptelephonyutilsu.def Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/eabi/cptelephonyutilsu.def Mon Oct 04 16:06:10 2010 +0300
@@ -1,52 +1,52 @@
EXPORTS
- _ZN17CpSettingsWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
- _ZN17CpSettingsWrapper11qt_metacastEPKc @ 2 NONAME
- _ZN17CpSettingsWrapper16showCallDurationEv @ 3 NONAME
- _ZN17CpSettingsWrapper16staticMetaObjectE @ 4 NONAME DATA 16
- _ZN17CpSettingsWrapper18readSoftRejectTextER7QStringRb @ 5 NONAME
- _ZN17CpSettingsWrapper18readVtVideoSendingEv @ 6 NONAME
- _ZN17CpSettingsWrapper19getStaticMetaObjectEv @ 7 NONAME
- _ZN17CpSettingsWrapper19setShowCallDurationEb @ 8 NONAME
- _ZN17CpSettingsWrapper19writeSoftRejectTextERK7QStringb @ 9 NONAME
- _ZN17CpSettingsWrapper19writeVtVideoSendingEi @ 10 NONAME
- _ZN17CpSettingsWrapper51isFeatureCallWaitingDistiquishNotProvisionedEnabledEv @ 11 NONAME
- _ZN17CpSettingsWrapperC1EP7QObject @ 12 NONAME
- _ZN17CpSettingsWrapperC2EP7QObject @ 13 NONAME
- _ZN17CpSettingsWrapperD0Ev @ 14 NONAME
- _ZN17CpSettingsWrapperD1Ev @ 15 NONAME
- _ZN17CpSettingsWrapperD2Ev @ 16 NONAME
- _ZN19CpPhoneLocalisation11qt_metacallEN11QMetaObject4CallEiPPv @ 17 NONAME
- _ZN19CpPhoneLocalisation11qt_metacastEPKc @ 18 NONAME
- _ZN19CpPhoneLocalisation16staticMetaObjectE @ 19 NONAME DATA 16
- _ZN19CpPhoneLocalisation17installTranslatorENS_17TranslationFileIdE @ 20 NONAME
- _ZN19CpPhoneLocalisation17removeTranslatorsEv @ 21 NONAME
- _ZN19CpPhoneLocalisation19getStaticMetaObjectEv @ 22 NONAME
- _ZN19CpPhoneLocalisationC1EP7QObject @ 23 NONAME
- _ZN19CpPhoneLocalisationC2EP7QObject @ 24 NONAME
- _ZN19CpPhoneLocalisationD0Ev @ 25 NONAME
- _ZN19CpPhoneLocalisationD1Ev @ 26 NONAME
- _ZN19CpPhoneLocalisationD2Ev @ 27 NONAME
+ _ZN15SettingsWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
+ _ZN15SettingsWrapper11qt_metacastEPKc @ 2 NONAME
+ _ZN15SettingsWrapper16showCallDurationEv @ 3 NONAME
+ _ZN15SettingsWrapper16staticMetaObjectE @ 4 NONAME DATA 16
+ _ZN15SettingsWrapper18readSoftRejectTextER7QStringRb @ 5 NONAME
+ _ZN15SettingsWrapper18readVtVideoSendingEv @ 6 NONAME
+ _ZN15SettingsWrapper19getStaticMetaObjectEv @ 7 NONAME
+ _ZN15SettingsWrapper19setShowCallDurationEb @ 8 NONAME
+ _ZN15SettingsWrapper19writeSoftRejectTextERK7QStringb @ 9 NONAME
+ _ZN15SettingsWrapper19writeVtVideoSendingEi @ 10 NONAME
+ _ZN15SettingsWrapper51isFeatureCallWaitingDistiquishNotProvisionedEnabledEv @ 11 NONAME
+ _ZN15SettingsWrapperC1EP7QObject @ 12 NONAME
+ _ZN15SettingsWrapperC2EP7QObject @ 13 NONAME
+ _ZN15SettingsWrapperD0Ev @ 14 NONAME
+ _ZN15SettingsWrapperD1Ev @ 15 NONAME
+ _ZN15SettingsWrapperD2Ev @ 16 NONAME
+ _ZN17PhoneLocalisation11qt_metacallEN11QMetaObject4CallEiPPv @ 17 NONAME
+ _ZN17PhoneLocalisation11qt_metacastEPKc @ 18 NONAME
+ _ZN17PhoneLocalisation16staticMetaObjectE @ 19 NONAME DATA 16
+ _ZN17PhoneLocalisation17installTranslatorENS_17TranslationFileIdE @ 20 NONAME
+ _ZN17PhoneLocalisation17removeTranslatorsEv @ 21 NONAME
+ _ZN17PhoneLocalisation19getStaticMetaObjectEv @ 22 NONAME
+ _ZN17PhoneLocalisationC1EP7QObject @ 23 NONAME
+ _ZN17PhoneLocalisationC2EP7QObject @ 24 NONAME
+ _ZN17PhoneLocalisationD0Ev @ 25 NONAME
+ _ZN17PhoneLocalisationD1Ev @ 26 NONAME
+ _ZN17PhoneLocalisationD2Ev @ 27 NONAME
_ZN5Tools11qt_metacallEN11QMetaObject4CallEiPPv @ 28 NONAME
_ZN5Tools11qt_metacastEPKc @ 29 NONAME
_ZN5Tools13voipSupportedEv @ 30 NONAME
_ZN5Tools14videoSupportedEv @ 31 NONAME
_ZN5Tools16staticMetaObjectE @ 32 NONAME DATA 16
_ZN5Tools19getStaticMetaObjectEv @ 33 NONAME
- _ZNK17CpSettingsWrapper10metaObjectEv @ 34 NONAME
- _ZNK17CpSettingsWrapper13isOngoingCallEv @ 35 NONAME
- _ZNK17CpSettingsWrapper14isPhoneOfflineEv @ 36 NONAME
- _ZNK17CpSettingsWrapper15readCenrepValueElm @ 37 NONAME
- _ZNK17CpSettingsWrapper15readPubSubValueElm @ 38 NONAME
- _ZNK17CpSettingsWrapper16readCenrepStringElm @ 39 NONAME
- _ZNK17CpSettingsWrapper16writeCenrepValueElmRK8QVariant @ 40 NONAME
- _ZNK17CpSettingsWrapper22forbiddenIconSupportedEv @ 41 NONAME
- _ZNK17CpSettingsWrapper23numberGroupingSupportedEv @ 42 NONAME
- _ZNK19CpPhoneLocalisation10metaObjectEv @ 43 NONAME
+ _ZNK15SettingsWrapper10metaObjectEv @ 34 NONAME
+ _ZNK15SettingsWrapper13isOngoingCallEv @ 35 NONAME
+ _ZNK15SettingsWrapper14isPhoneOfflineEv @ 36 NONAME
+ _ZNK15SettingsWrapper15readCenrepValueElm @ 37 NONAME
+ _ZNK15SettingsWrapper15readPubSubValueElm @ 38 NONAME
+ _ZNK15SettingsWrapper16readCenrepStringElm @ 39 NONAME
+ _ZNK15SettingsWrapper16writeCenrepValueElmRK8QVariant @ 40 NONAME
+ _ZNK15SettingsWrapper22forbiddenIconSupportedEv @ 41 NONAME
+ _ZNK15SettingsWrapper23numberGroupingSupportedEv @ 42 NONAME
+ _ZNK17PhoneLocalisation10metaObjectEv @ 43 NONAME
_ZNK5Tools10metaObjectEv @ 44 NONAME
- _ZTI17CpSettingsWrapper @ 45 NONAME
- _ZTI19CpPhoneLocalisation @ 46 NONAME
+ _ZTI15SettingsWrapper @ 45 NONAME
+ _ZTI17PhoneLocalisation @ 46 NONAME
_ZTI5Tools @ 47 NONAME
- _ZTV17CpSettingsWrapper @ 48 NONAME
- _ZTV19CpPhoneLocalisation @ 49 NONAME
+ _ZTV15SettingsWrapper @ 48 NONAME
+ _ZTV17PhoneLocalisation @ 49 NONAME
_ZTV5Tools @ 50 NONAME
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpphonelocalisation.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpphonelocalisation.h Mon Oct 04 16:06:10 2010 +0300
@@ -24,7 +24,7 @@
// Forward declarations
class QTranslator;
-class CPTELEPHONYUTILS_EXPORT CpPhoneLocalisation: public QObject
+class TELEPHONYUTILS_EXPORT PhoneLocalisation : public QObject
{
Q_OBJECT
@@ -37,8 +37,8 @@
public:
- CpPhoneLocalisation(QObject *parent = NULL);
- ~CpPhoneLocalisation();
+ PhoneLocalisation(QObject *parent = NULL);
+ ~PhoneLocalisation();
bool installTranslator(TranslationFileId translationFileId);
void removeTranslators();
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpplugincommon.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cpplugincommon.h Mon Oct 04 16:06:10 2010 +0300
@@ -31,7 +31,7 @@
\class Tools
\brief The static functionality.
*/
-class CPTELEPHONYUTILS_EXPORT Tools : public QObject
+class TELEPHONYUTILS_EXPORT Tools : public QObject
{
Q_OBJECT
@@ -52,12 +52,12 @@
\class SettingsWrapper
\brief Wraps central repository and P&S dependency.
*/
-class CPTELEPHONYUTILS_EXPORT CpSettingsWrapper : public QObject
+class TELEPHONYUTILS_EXPORT SettingsWrapper : public QObject
{
Q_OBJECT
public:
- CpSettingsWrapper(QObject *parent = NULL);
- ~CpSettingsWrapper();
+ SettingsWrapper(QObject *parent = NULL);
+ ~SettingsWrapper();
public:
/*!
Show call duration setting
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cptelephonyutilsdefs.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/inc/cptelephonyutilsdefs.h Mon Oct 04 16:06:10 2010 +0300
@@ -19,10 +19,10 @@
#define CPTELEPHONYUTILSDEFS_H_
-#ifdef BUILD_CPTELEPHONYUTILS
-#define CPTELEPHONYUTILS_EXPORT Q_DECL_EXPORT
+#ifdef BUILD_TELEPHONYUTILS
+#define TELEPHONYUTILS_EXPORT Q_DECL_EXPORT
#else
-#define CPTELEPHONYUTILS_EXPORT Q_DECL_IMPORT
+#define TELEPHONYUTILS_EXPORT Q_DECL_IMPORT
#endif
namespace CpTelephonyUtils {
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpphonelocalisation.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpphonelocalisation.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -26,7 +26,7 @@
const char *TS_FILE_COMMON = "common";
/*!
- \class CpPhoneLocalisation
+ \class PhoneLocalisation
\brief Localisation utility class for
Telephony control panel plugins.
@@ -34,15 +34,15 @@
needed translation files.
Takes ownership of the created QTranslator objects
- and destroys them when CpPhoneLocalisation
+ and destroys them when PhoneLocalisation
object is destructed.
*/
/*!
- CpPhoneLocalisation::CpPhoneLocalisation()
+ PhoneLocalisation::PhoneLocalisation()
*/
-CpPhoneLocalisation::CpPhoneLocalisation(QObject *parent)
+PhoneLocalisation::PhoneLocalisation(QObject *parent)
:QObject(parent)
{
DPRINT;
@@ -50,9 +50,9 @@
/*!
- CpPhoneLocalisation::~CpPhoneLocalisation()
+ PhoneLocalisation::~PhoneLocalisation()
*/
-CpPhoneLocalisation::~CpPhoneLocalisation()
+PhoneLocalisation::~PhoneLocalisation()
{
DPRINT << ":IN";
removeTranslators();
@@ -61,9 +61,9 @@
/*!
- CpPhoneLocalisation::installTranslator()
+ PhoneLocalisation::installTranslator()
*/
-bool CpPhoneLocalisation::installTranslator(
+bool PhoneLocalisation::installTranslator(
TranslationFileId translationFileId)
{
DPRINT << ": IN";
@@ -106,9 +106,9 @@
/*!
- CpPhoneLocalisation::removeTranslators()
+ PhoneLocalisation::removeTranslators()
*/
-void CpPhoneLocalisation::removeTranslators()
+void PhoneLocalisation::removeTranslators()
{
DPRINT << ": IN";
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -59,7 +59,7 @@
return XQSysInfo::isSupported(KFeatureIdCsVideoTelephony);
}
-CpSettingsWrapper::CpSettingsWrapper(QObject *parent):
+SettingsWrapper::SettingsWrapper(QObject *parent):
QObject(parent),
m_settings(NULL),
m_deviceInfo(NULL)
@@ -68,12 +68,12 @@
m_deviceInfo = new QSystemDeviceInfo(this);
}
-CpSettingsWrapper::~CpSettingsWrapper()
+SettingsWrapper::~SettingsWrapper()
{
}
-bool CpSettingsWrapper::showCallDuration()
+bool SettingsWrapper::showCallDuration()
{
bool showDuration;
if (CenrepKeyValueOn == readCenrepValue(KCRUidLogs.iUid, KLogsShowCallDuration).toInt()) {
@@ -86,7 +86,7 @@
return showDuration;
}
-int CpSettingsWrapper::setShowCallDuration(bool value)
+int SettingsWrapper::setShowCallDuration(bool value)
{
int cenrepValue;
DPRINT << "show call duration:" << value;
@@ -99,19 +99,19 @@
return writeCenrepValue(KCRUidLogs.iUid, KLogsShowCallDuration, cenrepValue );
}
-int CpSettingsWrapper::readVtVideoSending()
+int SettingsWrapper::readVtVideoSending()
{
DPRINT << ": IN";
return readCenrepValue(KCRUidTelephonySettings.iUid, KSettingsVTVideoSending).toInt();
}
-int CpSettingsWrapper::writeVtVideoSending(int value)
+int SettingsWrapper::writeVtVideoSending(int value)
{
DPRINT << ": IN";
return writeCenrepValue(KCRUidTelephonySettings.iUid, KSettingsVTVideoSending, value);
}
-void CpSettingsWrapper::readSoftRejectText(QString &text, bool &userDefined )
+void SettingsWrapper::readSoftRejectText(QString &text, bool &userDefined )
{
if (SoftRejectTextDefault ==
readCenrepValue(KCRUidTelephonySettings.iUid, KSettingsSoftRejectDefaultInUse ).toInt()) {
@@ -124,7 +124,7 @@
DPRINT << "text:" << text << " ,userDefined:" << userDefined;
}
-int CpSettingsWrapper::writeSoftRejectText(const QString &text, bool userDefined )
+int SettingsWrapper::writeSoftRejectText(const QString &text, bool userDefined )
{
int err = writeCenrepValue(KCRUidTelephonySettings.iUid, KSettingsSoftRejectText, text);
int cenrepValue;
@@ -138,18 +138,18 @@
return err;
}
- bool CpSettingsWrapper::numberGroupingSupported() const
+ bool SettingsWrapper::numberGroupingSupported() const
{
return readCenrepValue(KCRUidNumberGrouping.iUid, KNumberGrouping).toBool();
}
- bool CpSettingsWrapper::forbiddenIconSupported() const
+ bool SettingsWrapper::forbiddenIconSupported() const
{
int keyValue = readCenrepValue(KCRUidTelVariation.iUid, KTelVariationFlags).toInt();
return (KTelephonyLVFlagForbiddenIcon & keyValue);
}
-QVariant CpSettingsWrapper::readCenrepValue(
+QVariant SettingsWrapper::readCenrepValue(
const long int uid, const unsigned long int key) const
{
XQSettingsKey settingsKey(XQSettingsKey::TargetCentralRepository, uid, key);
@@ -158,7 +158,7 @@
return ret;
}
-QVariant CpSettingsWrapper::readPubSubValue(
+QVariant SettingsWrapper::readPubSubValue(
const long int uid, const unsigned long int key) const
{
XQSettingsKey settingsKey(XQSettingsKey::TargetPublishAndSubscribe, uid, key);
@@ -167,7 +167,7 @@
return ret;
}
-QString CpSettingsWrapper::readCenrepString(
+QString SettingsWrapper::readCenrepString(
const long int uid, const unsigned long int key) const
{
XQSettingsKey settingsKey(XQSettingsKey::TargetCentralRepository, uid, key);
@@ -176,7 +176,7 @@
return text;
}
-int CpSettingsWrapper::writeCenrepValue(
+int SettingsWrapper::writeCenrepValue(
const long int uid, const unsigned long int key, const QVariant &settingsKeyValue ) const
{
DPRINT << "uid:" << uid << ", key:" << key << ", settingsKeyValue:" << settingsKeyValue;
@@ -186,14 +186,14 @@
return err;
}
-bool CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled()
+bool SettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled()
{
bool enabled = readCenrepValue(KCRUidPhoneSettings.iUid, KPSetCallWaiting).toBool();
DPRINT << "enabled: " << enabled;
return enabled;
}
-bool CpSettingsWrapper::isPhoneOffline() const
+bool SettingsWrapper::isPhoneOffline() const
{
bool networkConnectionAllowed = readCenrepValue(KCRUidCoreApplicationUIs.iUid,
KCoreAppUIsNetworkConnectionAllowed).toBool();
@@ -202,7 +202,7 @@
return !networkConnectionAllowed;
}
-bool CpSettingsWrapper::isOngoingCall() const
+bool SettingsWrapper::isOngoingCall() const
{
bool callOngoing(false);
if (EPSCTsyCallStateNone <
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon_s.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/src/cpplugincommon_s.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -41,48 +41,48 @@
return Unknown;
}
-CpSettingsWrapper::CpSettingsWrapper(QObject *parent):
+SettingsWrapper::SettingsWrapper(QObject *parent):
QObject(parent)
{
DPRINT << "DUMMY WRAPPER";
}
-CpSettingsWrapper::~CpSettingsWrapper()
+SettingsWrapper::~SettingsWrapper()
{
DPRINT << "DUMMY WRAPPER";
}
-bool CpSettingsWrapper::showCallDuration()
+bool SettingsWrapper::showCallDuration()
{
DPRINT << "DUMMY WRAPPER";
return 0;
}
-int CpSettingsWrapper::setShowCallDuration(bool value)
+int SettingsWrapper::setShowCallDuration(bool value)
{
DPRINT << "DUMMY WRAPPER: value:" << value;
return 0;
}
-void CpSettingsWrapper::readSoftRejectText(QString &text, bool &userDefined)
+void SettingsWrapper::readSoftRejectText(QString &text, bool &userDefined)
{
DPRINT << "DUMMY WRAPPER: text:" << text << " ,userDefined:" << userDefined;
}
-int CpSettingsWrapper::writeSoftRejectText(const QString &text, bool userDefined)
+int SettingsWrapper::writeSoftRejectText(const QString &text, bool userDefined)
{
DPRINT << "DUMMY WRAPPER: text:" << text << " ,userDefined:" << userDefined;
return 0;
}
-bool CpSettingsWrapper::numberGroupingSupported() const
+bool SettingsWrapper::numberGroupingSupported() const
{
DPRINT << "DUMMY WRAPPER";
return true;
}
-bool CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled()
+bool SettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled()
{
bool enabled = false;
DPRINT << "DUMMY WRAPPER: enabled: " << enabled;
@@ -90,7 +90,7 @@
}
-bool CpSettingsWrapper::isPhoneOffline() const
+bool SettingsWrapper::isPhoneOffline() const
{
bool enabled = false;
DPRINT << "DUMMY WRAPPER: enabled: " << enabled;
@@ -98,7 +98,7 @@
}
-bool CpSettingsWrapper::isOngoingCall() const
+bool SettingsWrapper::isOngoingCall() const
{
bool ongoingCall = false;
DPRINT << "DUMMY WRAPPER: ongoingCall: " << ongoingCall;
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/run_auto_tests_qt.bat Mon Oct 04 16:06:10 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/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -49,7 +49,7 @@
{
initialize();
- m_phoneLocalisation.reset(new CpPhoneLocalisation);
+ m_phoneLocalisation.reset(new PhoneLocalisation);
}
/*!
@@ -81,7 +81,7 @@
expect("QCoreApplication::installTranslator").times(1);
m_phoneLocalisation->installTranslator(
- CpPhoneLocalisation::TranslationFileCommon);
+ PhoneLocalisation::TranslationFileCommon);
QVERIFY(m_phoneLocalisation->m_translators.count() == 1);
QVERIFY(verify());
@@ -90,14 +90,14 @@
returns(false);
expect("QCoreApplication::installTranslator").times(0);
m_phoneLocalisation->installTranslator(
- CpPhoneLocalisation::TranslationFileCommon);
+ PhoneLocalisation::TranslationFileCommon);
QVERIFY(m_phoneLocalisation->m_translators.count() == 1);
// Test: Unknown enum value
QVERIFY(verify());
expect("QCoreApplication::installTranslator").times(0);
m_phoneLocalisation->installTranslator(
- (CpPhoneLocalisation::TranslationFileId)2);
+ (PhoneLocalisation::TranslationFileId)2);
QVERIFY(m_phoneLocalisation->m_translators.count() == 1);
QVERIFY(verify());
@@ -106,7 +106,7 @@
returns(false);
expect("QCoreApplication::installTranslator").times(0);
m_phoneLocalisation->installTranslator(
- CpPhoneLocalisation::TranslationFileTelephoneCp);
+ PhoneLocalisation::TranslationFileTelephoneCp);
QVERIFY(verify());
}
@@ -120,9 +120,9 @@
returns(true);
m_phoneLocalisation->installTranslator(
- CpPhoneLocalisation::TranslationFileCommon);
+ PhoneLocalisation::TranslationFileCommon);
m_phoneLocalisation->installTranslator(
- CpPhoneLocalisation::TranslationFileTelephoneCp);
+ PhoneLocalisation::TranslationFileTelephoneCp);
m_phoneLocalisation->removeTranslators();
QVERIFY(m_phoneLocalisation->m_translators.count() == 0);
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.h Mon Oct 04 16:06:10 2010 +0300
@@ -21,7 +21,7 @@
#include <QtTest/QtTest>
#include <mockservice.h>
-class CpPhoneLocalisation;
+class PhoneLocalisation;
class UT_cpphonelocalisation : public QObject, MockService
{
@@ -39,7 +39,7 @@
void t_removeTranslators();
private:
- QScopedPointer<CpPhoneLocalisation> m_phoneLocalisation;
+ QScopedPointer<PhoneLocalisation> m_phoneLocalisation;
};
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpphonelocalisation/ut_cpphonelocalisation.pro Mon Oct 04 16:06:10 2010 +0300
@@ -21,7 +21,7 @@
DEPENDPATH += . ../../src/
INCLUDEPATH += . ../../inc/
INCLUDEPATH += ../../../tsrc/common
-DEFINES += BUILD_CPTELEPHONYUTILS
+DEFINES += BUILD_TELEPHONYUTILS
QT -= gui
QT += testlib
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -48,7 +48,7 @@
{
initialize();
- mWrapper = new CpSettingsWrapper();
+ mWrapper = new SettingsWrapper();
}
/*!
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.h Mon Oct 04 16:06:10 2010 +0300
@@ -21,7 +21,7 @@
#include <QtTest/QtTest>
#include <mockservice.h>
-class CpSettingsWrapper;
+class SettingsWrapper;
class UT_CpPluginCommon : public QObject, MockService
{
@@ -55,7 +55,7 @@
void t_isOngoingCall();
private:
- CpSettingsWrapper *mWrapper;
+ SettingsWrapper *mWrapper;
};
--- a/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/cptelephonyutils/tsrc/ut_cpplugincommon/ut_cpplugincommon.pro Mon Oct 04 16:06:10 2010 +0300
@@ -21,7 +21,7 @@
DEPENDPATH += . ../../src/
INCLUDEPATH += . ../../inc/
INCLUDEPATH += ../../../tsrc/common
-DEFINES += BUILD_CPTELEPHONYUTILS \
+DEFINES += BUILD_TELEPHONYUTILS \
XQSETTINGSMANAGER_NO_LIBRARY \
XQSYSINFO_NO_LIBRARY \
QT_BUILD_SYSINFO_LIB \
--- a/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugingroup.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/src/cpdivertplugingroup.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -149,7 +149,7 @@
DivertConditionUnconditional,
ServiceGroupVoice,
hbTrId("txt_phone_setlabel_all_calls"),
- hbTrId("txt_phone_setlabel_all_calls"), false,
+ hbTrId("txt_phone_title_all_calls"), false,
page);
m_DataItemVoiceAllCalls->setObjectName("voiceAllCallsDataItem");
@@ -157,7 +157,7 @@
DivertConditionBusy,
ServiceGroupVoice,
hbTrId("txt_phone_setlabel_if_busy"),
- hbTrId("txt_phone_setlabel_if_busy"), false,
+ hbTrId("txt_phone_title_if_busy"), false,
page);
m_DataItemVoiceIfBusy->setObjectName("voiceIfBusyDataItem");
@@ -165,7 +165,7 @@
DivertConditionNoReply,
ServiceGroupVoice,
hbTrId("txt_phone_setlabel_if_not_answered"),
- hbTrId("txt_phone_setlabel_if_not_answered"), true,
+ hbTrId("txt_phone_title_if_not_answered"), true,
page);
m_DataItemVoiceIfNotAnswered->setObjectName("voiceIfNotAnsweredDataItem");
@@ -173,7 +173,7 @@
DivertConditionNotReachable,
ServiceGroupVoice,
hbTrId("txt_phone_setlabel_if_out_of_reach"),
- hbTrId("txt_phone_setlabel_if_out_of_reach"), false,
+ hbTrId("txt_phone_title_if_out_of_reach"), false,
page);
m_DataItemVoiceIfOutOfReach->setObjectName("voiceIfOutOfReachDataItem");
@@ -181,7 +181,7 @@
DivertConditionAllConditionalCases,
ServiceGroupVoice,
hbTrId("txt_phone_setlabel_if_not_available"),
- hbTrId("txt_phone_setlabel_if_not_available"), true,
+ hbTrId("txt_phone_title_if_not_available"), true,
page);
m_DataItemVoiceIfNotAvailable->setObjectName("voiceIfNotAvailableDataItem");
@@ -206,7 +206,7 @@
DivertConditionUnconditional,
ServiceGroupData,
hbTrId("txt_phone_setlabel_all_calls"),
- hbTrId("txt_phone_setlabel_all_calls"), false,
+ hbTrId("txt_phone_title_all_calls"), false,
page);
m_DataItemVideoAllCalls->setObjectName("videoAllCallsDataItem");
@@ -214,7 +214,7 @@
DivertConditionBusy,
ServiceGroupData,
hbTrId("txt_phone_setlabel_if_busy"),
- hbTrId("txt_phone_setlabel_if_busy"), false,
+ hbTrId("txt_phone_title_if_busy"), false,
page);
m_DataItemVideoIfBusy->setObjectName("videoIfBusyDataItem");
@@ -222,7 +222,7 @@
DivertConditionNoReply,
ServiceGroupData,
hbTrId("txt_phone_setlabel_if_not_answered"),
- hbTrId("txt_phone_setlabel_if_not_answered"), true,
+ hbTrId("txt_phone_title_if_not_answered"), true,
page);
m_DataItemVideoIfNotAnswered->setObjectName("videoIfNotAnsweredDataItem");
@@ -230,7 +230,7 @@
DivertConditionNotReachable,
ServiceGroupData,
hbTrId("txt_phone_setlabel_if_out_of_reach"),
- hbTrId("txt_phone_setlabel_if_out_of_reach"), false,
+ hbTrId("txt_phone_title_if_out_of_reach"), false,
page);
m_DataItemVideoIfOutOfReach->setObjectName("videoIfOutOfReachDataItem");
@@ -238,7 +238,7 @@
DivertConditionAllConditionalCases,
ServiceGroupData,
hbTrId("txt_phone_setlabel_if_not_available"),
- hbTrId("txt_phone_setlabel_if_not_available"), true,
+ hbTrId("txt_phone_title_if_not_available"), true,
page);
m_DataItemVideoIfNotAvailable->setObjectName("videoIfNotAvailableDataItem");
--- a/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/run_auto_tests_qt.bat Mon Oct 04 16:06:10 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/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.cpp Mon Oct 04 16:06:10 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"
@@ -157,7 +157,7 @@
{
//except user cancels
- appendAction("txt_phone_setlabel_all_calls", selectAction, "Cancel");
+ appendAction("txt_phone_title_all_calls", selectAction, "Cancel");
EXPECT(PSetCallDivertingWrapper, getDefaultNumbers);
m_divertpluginGroup->m_DataItemVoiceAllCalls->setContentWidgetData("text", "");
m_divertpluginGroup->m_DataItemVoiceAllCalls->setContentWidgetData(
@@ -167,7 +167,7 @@
QVERIFY(verify());
//except user selects vmb
- appendAction("txt_phone_setlabel_all_calls", selectItem, "txt_phone_setlabel_voice_mbx");
+ appendAction("txt_phone_title_all_calls", selectItem, "txt_phone_list_to_voice_mailbox");
EXPECT(PSetCallDivertingWrapper, getDefaultNumbers);
EXPECT(PSetCallDivertingWrapper, queryVoiceMailBoxNumber).willOnce(invoke(fillNumber)).returns(0);
EXPECT(SsSettingsWrapper, get);
@@ -195,7 +195,7 @@
m_divertpluginGroup->m_DataItemVoiceAllCalls->setContentWidgetData("text", "");
m_divertpluginGroup->m_DataItemVoiceAllCalls->setContentWidgetData(
"checkState", Qt::Checked);
- appendAction("txt_phone_setlabel_all_calls", selectItem, "0401234567");
+ appendAction("txt_phone_title_all_calls", selectItem, "0401234567");
EXPECT(PSetCallDivertingWrapper,getDefaultNumbers);
EXPECT(SsSettingsWrapper,get);
EXPECT(PSetCallDivertingWrapper,setCallDiverting);
@@ -316,8 +316,8 @@
void UT_CpDivertPlugin::t_popUpTimerQuery()
{
const QString delayLnString("txt_phone_list_ln_seconds");
-
- appendAction("txt_phone_setlabel_if_not_answered", selectItem, "txt_phone_list_enter_number_manually");
+
+ appendAction("txt_phone_title_if_not_answered", selectItem, "txt_phone_list_enter_number_manually");
appendAction("txt_phone_info_number", insertText, "12345");
appendAction("txt_phone_info_number", selectAction, "OK");
appendAction("txt_phone_title_delay", selectItem, delayLnString);
--- a/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/divertplugin/tsrc/ut_cpdivertplugin/ut_cpdivertplugin.pro Mon Oct 04 16:06:10 2010 +0300
@@ -20,7 +20,7 @@
DEPENDPATH += . ../../src/
INCLUDEPATH += .
INCLUDEPATH +=../../../cptelephonyutils/inc
-DEFINES += BUILD_CPTELEPHONYUTILS BUILD_PSETWRAPPER \
+DEFINES += BUILD_TELEPHONYUTILS BUILD_PSETWRAPPER \
BUILD_SSSETTINGSWRAPPER BUILD_PSUINOTES
QT -= gui
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -33,14 +33,14 @@
DPRINT << ": IN";
// Set scoped pointer
- m_localisation.reset(new CpPhoneLocalisation(this));
+ m_localisation.reset(new PhoneLocalisation(this));
// Install required translations
m_localisation->installTranslator(
- CpPhoneLocalisation::
+ PhoneLocalisation::
TranslationFileCommon);
m_localisation->installTranslator(
- CpPhoneLocalisation::
+ PhoneLocalisation::
TranslationFileTelephoneCp);
DPRINT << ": OUT";
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/src/cptelephonyplugin.h Mon Oct 04 16:06:10 2010 +0300
@@ -56,7 +56,7 @@
private:
- QScopedPointer<CpPhoneLocalisation> m_localisation;
+ QScopedPointer<PhoneLocalisation> m_localisation;
};
#endif /* CPTELEPHONYPLUGIN_H */
--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/run_auto_tests_qt.bat Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/run_auto_tests_qt.bat Mon Oct 04 16:06:10 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/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpphonelocalisation.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpphonelocalisation.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -21,10 +21,10 @@
// ============================ MEMBER FUNCTIONS ===============================
// -----------------------------------------------------------------------------
-// CpPhoneLocalisation::CpPhoneLocalisation
+// PhoneLocalisation::PhoneLocalisation
// -----------------------------------------------------------------------------
//
-CpPhoneLocalisation::CpPhoneLocalisation(
+PhoneLocalisation::PhoneLocalisation(
QObject * /*parent*/ )
//:
//QObject( /*parent*/ )
@@ -34,20 +34,20 @@
// -----------------------------------------------------------------------------
-// CpPhoneLocalisation::~CpPhoneLocalisation
+// PhoneLocalisation::~PhoneLocalisation
// -----------------------------------------------------------------------------
//
-CpPhoneLocalisation::~CpPhoneLocalisation( )
+PhoneLocalisation::~PhoneLocalisation( )
{
}
// -----------------------------------------------------------------------------
-// CpPhoneLocalisation::installTranslator
+// PhoneLocalisation::installTranslator
// -----------------------------------------------------------------------------
//
-bool CpPhoneLocalisation::installTranslator(
+bool PhoneLocalisation::installTranslator(
TranslationFileId translationFileId )
{
SMC_MOCK_METHOD1( bool, TranslationFileId, translationFileId )
@@ -55,10 +55,10 @@
// -----------------------------------------------------------------------------
-// CpPhoneLocalisation::removeTranslators
+// PhoneLocalisation::removeTranslators
// -----------------------------------------------------------------------------
//
-void CpPhoneLocalisation::removeTranslators( )
+void PhoneLocalisation::removeTranslators( )
{
SMC_MOCK_METHOD0( void )
}
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cpplugincommon.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -21,10 +21,10 @@
// ============================ MEMBER FUNCTIONS ===============================
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::CpSettingsWrapper
+// SettingsWrapper::SettingsWrapper
// -----------------------------------------------------------------------------
//
-CpSettingsWrapper::CpSettingsWrapper(
+SettingsWrapper::SettingsWrapper(
QObject * parent ) : QObject( parent )
{
@@ -32,30 +32,30 @@
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::~CpSettingsWrapper
+// SettingsWrapper::~SettingsWrapper
// -----------------------------------------------------------------------------
//
-CpSettingsWrapper::~CpSettingsWrapper( )
+SettingsWrapper::~SettingsWrapper( )
{
}
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::showCallDuration
+// SettingsWrapper::showCallDuration
// -----------------------------------------------------------------------------
//
-bool CpSettingsWrapper::showCallDuration( )
+bool SettingsWrapper::showCallDuration( )
{
SMC_MOCK_METHOD0( bool )
}
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::setShowCallDuration
+// SettingsWrapper::setShowCallDuration
// -----------------------------------------------------------------------------
//
-int CpSettingsWrapper::setShowCallDuration(
+int SettingsWrapper::setShowCallDuration(
bool value )
{
SMC_MOCK_METHOD1( int, bool, value )
@@ -63,20 +63,20 @@
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::readVtVideoSending
+// SettingsWrapper::readVtVideoSending
// -----------------------------------------------------------------------------
//
-int CpSettingsWrapper::readVtVideoSending( )
+int SettingsWrapper::readVtVideoSending( )
{
SMC_MOCK_METHOD0( int )
}
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::writeVtVideoSending
+// SettingsWrapper::writeVtVideoSending
// -----------------------------------------------------------------------------
//
-int CpSettingsWrapper::writeVtVideoSending(
+int SettingsWrapper::writeVtVideoSending(
int value )
{
SMC_MOCK_METHOD1( int, int, value )
@@ -84,10 +84,10 @@
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::readSoftRejectText
+// SettingsWrapper::readSoftRejectText
// -----------------------------------------------------------------------------
//
-void CpSettingsWrapper::readSoftRejectText(
+void SettingsWrapper::readSoftRejectText(
QString & text, bool & userDefined )
{
//To improve coverage
@@ -103,10 +103,10 @@
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::writeSoftRejectText
+// SettingsWrapper::writeSoftRejectText
// -----------------------------------------------------------------------------
//
-int CpSettingsWrapper::writeSoftRejectText(
+int SettingsWrapper::writeSoftRejectText(
const QString & text,
bool userDefined )
{
@@ -116,50 +116,50 @@
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::numberGroupingSupported
+// SettingsWrapper::numberGroupingSupported
// -----------------------------------------------------------------------------
//
-bool CpSettingsWrapper::numberGroupingSupported( ) const
+bool SettingsWrapper::numberGroupingSupported( ) const
{
SMC_MOCK_METHOD0( bool )
}
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled
+// SettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled
// -----------------------------------------------------------------------------
//
-bool CpSettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled( )
+bool SettingsWrapper::isFeatureCallWaitingDistiquishNotProvisionedEnabled( )
{
SMC_MOCK_METHOD0( bool )
}
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::isPhoneOffline
+// SettingsWrapper::isPhoneOffline
// -----------------------------------------------------------------------------
//
-bool CpSettingsWrapper::isPhoneOffline( ) const
+bool SettingsWrapper::isPhoneOffline( ) const
{
SMC_MOCK_METHOD0( bool )
}
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::isOngoingCall
+// SettingsWrapper::isOngoingCall
// -----------------------------------------------------------------------------
//
-bool CpSettingsWrapper::isOngoingCall( ) const
+bool SettingsWrapper::isOngoingCall( ) const
{
SMC_MOCK_METHOD0( bool )
}
// -----------------------------------------------------------------------------
-// CpSettingsWrapper::forbiddenIconSupported
+// SettingsWrapper::forbiddenIconSupported
// -----------------------------------------------------------------------------
//
-bool CpSettingsWrapper::forbiddenIconSupported( ) const
+bool SettingsWrapper::forbiddenIconSupported( ) const
{
SMC_MOCK_METHOD0( bool )
}
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbwidget.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_hbwidget.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -112,10 +112,10 @@
// HbWidget::pluginBaseId
// -----------------------------------------------------------------------------
//
-int HbWidget::pluginBaseId( ) const
+/*int HbWidget::pluginBaseId( ) const
{
SMC_MOCK_METHOD0( int )
- }
+ }*/
// -----------------------------------------------------------------------------
@@ -445,11 +445,11 @@
// HbWidget::setPluginBaseId
// -----------------------------------------------------------------------------
//
-void HbWidget::setPluginBaseId(
+/*void HbWidget::setPluginBaseId(
int baseId )
{
SMC_MOCK_METHOD1( void, int, baseId )
- }
+ }*/
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleexpandedhandler.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleexpandedhandler.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -82,9 +82,12 @@
mHeading->readBubbleHeader(header);
- if (!mHeader->callImage().isEmpty() ||
+ if (!header.callImage().isEmpty() ||
header.showDefaultAvatar()) {
mImage->setImageName(header.callImage());
+ if (header.callFlags()&BubbleManagerIF::EmergencyCall) {
+ mImage->displayEmergencyCallIcon();
+ }
mImage->show();
} else {
mImage->hide();
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -34,7 +34,7 @@
: HbWidget(parent),
mImageManager(imageManager),
mDefaultAvatar(0),
- mKeepSquareShape(0)
+ mKeepSquareShape(false)
{
setFlag(QGraphicsItem::ItemHasNoContents, false);
@@ -183,8 +183,12 @@
updateGeometry();
}
-
-
+void BubbleImageWidget::displayEmergencyCallIcon()
+{
+ // this method overrides default avatar set in setImageName()
+ if (mImageName.isEmpty()) {
+ mDefaultAvatar->setIconName(
+ QLatin1String("qtg_large_emergency_call"));
+ }
+}
-
-
--- a/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/bubblemanager2/bubblecore/src/bubbleimagewidget.h Mon Oct 04 16:06:10 2010 +0300
@@ -42,6 +42,8 @@
bool keepSquareShape() const;
void setKeepSquareShape(bool keepSquare);
+ void displayEmergencyCallIcon();
+
protected slots:
void imageLoaded(QString imageFileName);
--- a/phoneuis/bubblemanager2/inc/bubblemanagerif.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/bubblemanager2/inc/bubblemanagerif.h Mon Oct 04 16:06:10 2010 +0300
@@ -51,7 +51,8 @@
Muted = 0x20,
Diverted = 0x40,
Video = 0x80,
- VoIPCall = 0x100
+ VoIPCall = 0x100,
+ EmergencyCall = 0x200
};
Q_DECLARE_FLAGS(PhoneCallFlags, PhoneCallFlag)
--- a/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/bubblemanager2/tsrc/bubbletest2/bubbletestview.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -538,6 +538,8 @@
if (mEmergencyCall->isChecked()) {
bubbleManager().setCli( bubble, "emergency call", Qt::ElideRight );
bubbleManager().setLabel( bubble, "Attempting", Qt::ElideRight );
+ bubbleManager().setCallFlag( bubble, BubbleManager::EmergencyCall, true);
+ bubbleManager().setCallObjectFromTheme(bubble);
} else {
if ( mContactName->isChecked() ) {
bubbleManager().setCli( bubble, "Bart Simpson", Qt::ElideRight );
--- a/phoneuis/bubblemanager2/tsrc/unit/mt_bubblemanager2/mt_bubblemanager2.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/bubblemanager2/tsrc/unit/mt_bubblemanager2/mt_bubblemanager2.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -470,6 +470,8 @@
bubbleManager->setCli( bubbleId, "emergency call", Qt::ElideRight );
bubbleManager->setNumberType( bubbleId, BubbleManager::Mobile );
bubbleManager->setLabel( bubbleId,"Attempting");
+ bubbleManager->setCallFlag(bubbleId, BubbleManager::EmergencyCall, true);
+ bubbleManager->setCallObjectFromTheme(bubbleId);
HbAction action1("End call", this);
action1.setSoftKeyRole(QAction::NegativeSoftKey);
bubbleManager->clearActions(bubbleId);
--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleimagewidget/ut_bubbleimagewidget.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleimagewidget/ut_bubbleimagewidget.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -44,6 +44,8 @@
void testSizeHint();
+ void testDisplayEmergencyCallIcon();
+
private:
QString fileNameWithPath(const QString& fileName);
@@ -113,5 +115,20 @@
// ..
}
+void ut_BubbleImageWidget::testDisplayEmergencyCallIcon()
+{
+ // override default avatar
+ mImage->setImageName("");
+ mImage->displayEmergencyCallIcon();
+ QVERIFY(mAvatar->isVisible());
+ QVERIFY(mImage->imageName()=="qtg_large_emergency_call");
+
+ // do not override image
+ mImage->setImageName(":/data/pixmap.png");
+ mImage->displayEmergencyCallIcon();
+ QVERIFY(!mAvatar->isVisible());
+ QVERIFY(mAvatar->iconName()=="");
+}
+
BUBBLE_TEST_MAIN(ut_BubbleImageWidget)
#include "ut_bubbleimagewidget.moc"
--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleparticipantlistitem/ut_bubbleparticipantlistitem.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleparticipantlistitem/ut_bubbleparticipantlistitem.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -54,6 +54,7 @@
static_cast<BubbleParticipantListItem*>(mItem);
item->updateChildItems();
mMainWindow->show();
+ QTest::qWait(300); // Give HbMainWindow time to complete show() function call.
}
void ut_BubbleParticipantListItem::cleanupTestCase()
--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleutils/ut_bubbleutils.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleutils/ut_bubbleutils.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -564,9 +564,14 @@
BubbleUtils::setButtonStyleForAction(button,action);
QVERIFY(button.buttonType()==BubbleButton::GreenButton);
+ // The next test is flagged out from winscw build because seems that
+ // in Qt 4.7 the behaviour of QAction::setSoftKeyRole and
+ // QAction::softKeyRole is broken.
+#if not defined(__WINSCW__)
action.setSoftKeyRole(QAction::NegativeSoftKey);
BubbleUtils::setButtonStyleForAction(button,action);
QVERIFY(button.buttonType()==BubbleButton::RedButton);
+#endif
}
void ut_BubbleUtils::test_setIndicators()
--- a/phoneuis/ussdeditor/inc/ussdcomms.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/ussdeditor/inc/ussdcomms.h Mon Oct 04 16:06:10 2010 +0300
@@ -23,13 +23,13 @@
class CPhCltUssdInt;
-class CUssdComms: public QObject
+class UssdComms: public QObject
{
Q_OBJECT
public:
- CUssdComms(QObject* parent);
- ~CUssdComms();
+ UssdComms(QObject* parent);
+ ~UssdComms();
public slots:
void appStarting();
--- a/phoneuis/ussdeditor/inc/ussdeditorquery.h Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/ussdeditor/inc/ussdeditorquery.h Mon Oct 04 16:06:10 2010 +0300
@@ -22,14 +22,14 @@
// INCLUDES
#include <hbinputdialog.h>
-class CUssdComms;
+class UssdComms;
class UssdEditorQuery: public HbInputDialog
{
Q_OBJECT
public:
- UssdEditorQuery( CUssdComms &ussd, QGraphicsItem *parent = 0);
+ UssdEditorQuery( UssdComms &ussd, QGraphicsItem *parent = 0);
~UssdEditorQuery();
private slots:
@@ -38,7 +38,7 @@
void updateButtonVisible( const QString &text );
private:
// From main.cpp
- CUssdComms &mComms;
+ UssdComms &mComms;
};
#endif // USSDEDITORQUERY_H
--- a/phoneuis/ussdeditor/src/main.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/ussdeditor/src/main.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -57,8 +57,8 @@
window.addView(view);
TFLOGSTRING("USSDEDITOR: main addView")
- // Create CUssdComms - ussd client
- CUssdComms *ussdComms = new CUssdComms(view);
+ // Create UssdComms - ussd client
+ UssdComms *ussdComms = new UssdComms(view);
TFLOGSTRING("USSDEDITOR: main ussdComms")
// Create HbInputDialog
--- a/phoneuis/ussdeditor/src/ussdcomms.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/ussdeditor/src/ussdcomms.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -28,125 +28,125 @@
// ============================ MEMBER FUNCTIONS ===============================
// -----------------------------------------------------------------------------
-// CUssdComms::CUssdComms
+// UssdComms::UssdComms
// Constructor.
// -----------------------------------------------------------------------------
//
-CUssdComms::CUssdComms(QObject *parent)
+UssdComms::UssdComms(QObject *parent)
: QObject(parent),
mUssd(NULL),
mErrorCode(static_cast<int>(EPhCltExitReasonUnknown))
{
// Default value - ETrue
TRAP_IGNORE(mUssd = CPhCltUssdInt::NewL());
- TFLOGSTRING("USSDEDITOR: CUssdComms::CUssdComms")
+ TFLOGSTRING("USSDEDITOR: UssdComms::UssdComms")
}
// -----------------------------------------------------------------------------
-// CUssdComms::~CUssdComms
-// ~CUssdComms.
+// UssdComms::~UssdComms
+// ~UssdComms.
// -----------------------------------------------------------------------------
//
-CUssdComms::~CUssdComms()
+UssdComms::~UssdComms()
{
if (mUssd){
mErrorCode = mUssd->AppTerminating(
static_cast<TPhCltUssdAppExitReason>(mErrorCode));
delete mUssd;
mUssd = NULL;
- TFLOGSTRING2("USSDEDITOR: CUssdComms::~CUssdComms %d", mErrorCode)
+ TFLOGSTRING2("USSDEDITOR: UssdComms::~UssdComms %d", mErrorCode)
}
- TFLOGSTRING("USSDEDITOR: CUssdComms::~CUssdComms")
+ TFLOGSTRING("USSDEDITOR: UssdComms::~UssdComms")
}
// -----------------------------------------------------------------------------
-// CUssdComms::appStarting
+// UssdComms::appStarting
// appStarting.
// -----------------------------------------------------------------------------
//
-void CUssdComms::appStarting()
+void UssdComms::appStarting()
{
mErrorCode = mUssd->AppStarting();
- TFLOGSTRING("USSDEDITOR: CUssdComms::appStarting")
+ TFLOGSTRING("USSDEDITOR: UssdComms::appStarting")
}
// -----------------------------------------------------------------------------
-// CUssdComms::appTerminating
+// UssdComms::appTerminating
// appTerminating.
// -----------------------------------------------------------------------------
//
-void CUssdComms::appTerminating()
+void UssdComms::appTerminating()
{
mErrorCode = mUssd->AppTerminating(EPhCltUserExit);
- TFLOGSTRING("USSDEDITOR: CUssdComms::appTerminating")
+ TFLOGSTRING("USSDEDITOR: UssdComms::appTerminating")
}
// -----------------------------------------------------------------------------
-// CUssdComms::appToBackground
+// UssdComms::appToBackground
// appToBackground.
// -----------------------------------------------------------------------------
//
-void CUssdComms::appToBackground()
+void UssdComms::appToBackground()
{
mErrorCode = mUssd->AppToBackground();
- TFLOGSTRING("USSDEDITOR: CUssdComms::appToBackground")
+ TFLOGSTRING("USSDEDITOR: UssdComms::appToBackground")
}
// -----------------------------------------------------------------------------
-// CUssdComms::appToForeground
+// UssdComms::appToForeground
// appToForeground.
// -----------------------------------------------------------------------------
//
-void CUssdComms::appToForeground()
+void UssdComms::appToForeground()
{
mErrorCode = mUssd->AppToForeground();
- TFLOGSTRING("USSDEDITOR: CUssdComms::appToForeground")
+ TFLOGSTRING("USSDEDITOR: UssdComms::appToForeground")
}
// -----------------------------------------------------------------------------
-// CUssdComms::send
+// UssdComms::send
// send.
// -----------------------------------------------------------------------------
//
-int CUssdComms::send( const QString& message )
+int UssdComms::send( const QString& message )
{
TBuf<KUssdEditorMaxLength> buf16;
buf16.Copy((const TUint16*)message.constData(), message.length());
mErrorCode = mUssd->SendUssd(buf16);
- TFLOGSTRING("USSDEDITOR: CUssdComms::send")
+ TFLOGSTRING("USSDEDITOR: UssdComms::send")
return mErrorCode;
}
// -----------------------------------------------------------------------------
-// CUssdComms::cancel
+// UssdComms::cancel
// cancel.
// -----------------------------------------------------------------------------
//
-void CUssdComms::cancel()
+void UssdComms::cancel()
{
mUssd->SendUssdCancel();
- TFLOGSTRING("USSDEDITOR: CUssdComms::cancel")
+ TFLOGSTRING("USSDEDITOR: UssdComms::cancel")
}
// -----------------------------------------------------------------------------
-// CUssdComms::errorCode
+// UssdComms::errorCode
// errorCode.
// -----------------------------------------------------------------------------
//
-int CUssdComms::errorCode()
+int UssdComms::errorCode()
{
- TFLOGSTRING("USSDEDITOR: CUssdComms::send")
+ TFLOGSTRING("USSDEDITOR: UssdComms::send")
return mErrorCode;
}
// -----------------------------------------------------------------------------
-// CUssdComms::informExitReason
+// UssdComms::informExitReason
// informExitReason.
// -----------------------------------------------------------------------------
//
-void CUssdComms::informExitReason(int aExitReason)
+void UssdComms::informExitReason(int aExitReason)
{
- TFLOGSTRING2("USSDEDITOR: CUssdComms::informExitReason \
+ TFLOGSTRING2("USSDEDITOR: UssdComms::informExitReason \
%d", aExitReason)
mErrorCode = aExitReason;
}
--- a/phoneuis/ussdeditor/src/ussdeditorquery.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/ussdeditor/src/ussdeditorquery.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -38,7 +38,7 @@
// Constructor.
// -----------------------------------------------------------------------------
//
-UssdEditorQuery::UssdEditorQuery(CUssdComms &ussd, QGraphicsItem *parent)
+UssdEditorQuery::UssdEditorQuery(UssdComms &ussd, QGraphicsItem *parent)
:HbInputDialog(parent), mComms(ussd)
{
TFLOGSTRING("USSDEDITOR: UssdEditorQuery::UssdEditorQuery IN")
@@ -50,28 +50,20 @@
lineEdit()->setMaxRows(KUssdMaxNumberOfEditorLines);
lineEdit()->setText(QString());
- // 0-9, *, +, #
- lineEdit()->setInputMethodHints(Qt::ImhDialableCharactersOnly);
+ lineEdit()->setInputMethodHints(Qt::ImhEmailCharactersOnly);
mComms.appStarting();
// Disable Ok key by default
actions().at(0)->setEnabled(false);
- bool ret(false);
- ret = connect(actions().at(0), SIGNAL(triggered(bool)),
+ connect(actions().at(0), SIGNAL(triggered(bool)),
this, SLOT(sendUssdString()));
- TFLOGSTRING2("USSDEDITOR: UssdEditorQuery::UssdEditorQuery \
- connect send %d", ret);
- ret = connect(lineEdit(), SIGNAL(textChanged(QString)),
+ connect(lineEdit(), SIGNAL(textChanged(QString)),
this, SLOT(updateButtonVisible(QString)));
- TFLOGSTRING2("USSDEDITOR: UssdEditorQuery::UssdEditorQuery \
- connect ok button %d", ret);
// Connect cancel
- ret = connect(actions().at(1), SIGNAL(triggered(bool)),
+ connect(actions().at(1), SIGNAL(triggered(bool)),
this, SLOT(cancelUssdString()));
- TFLOGSTRING2("USSDEDITOR: UssdEditorQuery::UssdEditorQuery \
- connect send %d", ret);
}
TFLOGSTRING("USSDEDITOR: UssdEditorQuery::UssdEditorQuery OUT")
}
--- a/phoneuis/ussdeditor/ussdeditor.pro Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneuis/ussdeditor/ussdeditor.pro Mon Oct 04 16:06:10 2010 +0300
@@ -39,13 +39,13 @@
LIBS += -lphoneclient
LIBS += -lflogger
-SOURCES += src\main.cpp
-SOURCES += src\ussdeditorquery.cpp
-SOURCES += src\ussdcomms.cpp
+SOURCES += src/main.cpp
+SOURCES += src/ussdeditorquery.cpp
+SOURCES += src/ussdcomms.cpp
-HEADERS += inc\ussdeditorquery.h
-HEADERS += inc\ussdcomms.h
-HEADERS += inc\tflogger.h
+HEADERS += inc/ussdeditorquery.h
+HEADERS += inc/ussdcomms.h
+HEADERS += inc/tflogger.h
BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
"rom/ussdeditor.iby CORE_APP_LAYER_IBY_EXPORT_PATH(ussdeditor.iby)" \
--- a/tsrc/common/phonetest.pri Fri Sep 17 17:09:12 2010 +0300
+++ b/tsrc/common/phonetest.pri Mon Oct 04 16:06:10 2010 +0300
@@ -6,3 +6,28 @@
runtest_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$${TARGET}.exe" -dtextshell --
QMAKE_EXTRA_TARGETS += runtest_target
+# for coverage measurement
+instrument_target.target = instrument
+instrument_target.depends = clean-debug-winscw
+instrument_target.commands = ctcwrap -2comp -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=*/src/*.cpp" sbs -c winscw_udeb
+QMAKE_EXTRA_TARGETS += instrument_target
+
+runcovtest_target.target = runcovtest
+runcovtest_target.depends = instrument
+runcovtest_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$${TARGET}.exe" -dtextshell --
+QMAKE_EXTRA_TARGETS += runcovtest_target
+
+ctcpost_target.target = ctcpost
+ctcpost_target.depends = runcovtest
+ctcpost_target.commands = ctcpost mon.sym mon.dat -p profile.txt
+QMAKE_EXTRA_TARGETS += ctcpost_target
+
+ctc2html_target.target = ctc2html
+ctc2html_target.depends = ctcpost
+ctc2html_target.commands = ctc2html -i profile.txt
+QMAKE_EXTRA_TARGETS += ctc2html_target
+
+coverage_target.target = coverage
+coverage_target.depends = ctc2html
+coverage_target.commands = del MON.sym del MON.dat del ctc*.txt del profile.txt
+QMAKE_EXTRA_TARGETS += coverage_target
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/common/phonetestmain.h Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef PHONETESTMAIN
+#define PHONETESTMAIN
+
+#define PHONE_TEST_MAIN(TestObject) \
+int main(int argc, char *argv[]) \
+{ \
+char *new_argv[3]; \
+QCoreApplication app(argc, argv); \
+\
+QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
+QByteArray bytes = str.toAscii(); \
+\
+char arg1[] = "-o"; \
+\
+new_argv[0] = argv[0]; \
+new_argv[1] = arg1; \
+new_argv[2] = bytes.data(); \
+\
+TestObject tc; \
+return QTest::qExec(&tc, 3, new_argv); \
+}
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/common/phoneuitest.pri Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,33 @@
+######################################################################
+# Phone unit test qmake project include
+######################################################################
+
+runtest_target.target = runtest
+runtest_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$${TARGET}.exe"
+QMAKE_EXTRA_TARGETS += runtest_target
+
+# for coverage measurement
+instrument_target.target = instrument
+instrument_target.depends = clean-debug-winscw
+instrument_target.commands = ctcwrap -2comp -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=*/src/*.cpp" sbs -c winscw_udeb
+QMAKE_EXTRA_TARGETS += instrument_target
+
+runcovtest_target.target = runcovtest
+runcovtest_target.depends = instrument
+runcovtest_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$${TARGET}.exe"
+QMAKE_EXTRA_TARGETS += runcovtest_target
+
+ctcpost_target.target = ctcpost
+ctcpost_target.depends = runcovtest
+ctcpost_target.commands = ctcpost mon.sym mon.dat -p profile.txt
+QMAKE_EXTRA_TARGETS += ctcpost_target
+
+ctc2html_target.target = ctc2html
+ctc2html_target.depends = ctcpost
+ctc2html_target.commands = ctc2html -i profile.txt
+QMAKE_EXTRA_TARGETS += ctc2html_target
+
+coverage_target.target = coverage
+coverage_target.depends = ctc2html
+coverage_target.commands = del MON.sym del MON.dat del ctc*.txt del profile.txt
+QMAKE_EXTRA_TARGETS += coverage_target
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/common/phoneuitestmain.h Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,54 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef PHONEUITESTMAIN
+#define PHONEUITESTMAIN
+
+#include <hbapplication.h>
+#include <hbmainwindow.h>
+
+char *new_argv[3];
+HbMainWindow *mainWindow;
+#define PHONE_UITEST_MAIN(TestObject) \
+int main(int argc, char *argv[]) \
+{ \
+HbApplication *app = new HbApplication(argc, argv); \
+QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
+QByteArray bytes = str.toAscii(); \
+\
+char arg1[] = "-o"; \
+\
+new_argv[0] = argv[0]; \
+new_argv[1] = arg1; \
+new_argv[2] = bytes.data(); \
+\
+TestObject tc; \
+QResource::registerResource("../hbcore.rcc"); \
+mainWindow = new HbMainWindow;\
+mainWindow->show(); \
+int ret = QTest::qExec(&tc, 3, new_argv); \
+/* Core dump if HbIconLoader instance is not destroyed before the application instance. */ \
+/* HbIconLoader uses QCoreApplication::aboutToQuit() signal to destroy itself. */ \
+/* app.exec() where the signal is normally emitted is not called here. */ \
+/* So, invoking the signal explicitly. */ \
+QMetaObject::invokeMethod(app, "aboutToQuit", Qt::DirectConnection); \
+delete mainWindow; \
+delete app; \
+return ret; \
+}
+
+#endif
--- a/tsrc/common/qtestmains60.h Fri Sep 17 17:09:12 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef QTESTMAINS60
-#define QTESTMAINS60
-
-#define QTEST_MAIN_S60(TestObject) \
-int main(int argc, char *argv[]) \
-{ \
-char *new_argv[3]; \
-QCoreApplication app(argc, argv); \
-\
-QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + ".log"; \
-QByteArray bytes = str.toAscii(); \
-\
-char arg1[] = "-o"; \
-\
-new_argv[0] = argv[0]; \
-new_argv[1] = arg1; \
-new_argv[2] = bytes.data(); \
-\
-TestObject tc; \
-return QTest::qExec(&tc, 3, new_argv); \
-}
-
-#endif
--- a/tsrc/mocks/phoneuiqtviewadapter/mock_phonecallheaderutil.cpp Fri Sep 17 17:09:12 2010 +0300
+++ b/tsrc/mocks/phoneuiqtviewadapter/mock_phonecallheaderutil.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -42,115 +42,6 @@
// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetIncomingCallHeaderParams
-// -----------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetIncomingCallHeaderParams(
- const TInt aCallId,
- const TBool aWaitingCall,
- const TBool aVideoCall,
- TPhoneCmdParamCallHeaderData * aCallHeaderData )
- {
- SMC_MOCK_METHOD4( void, const TInt, aCallId,
- const TBool, aWaitingCall,
- const TBool, aVideoCall,
- TPhoneCmdParamCallHeaderData *, aCallHeaderData )
- }
-
-
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetOutgoingCallHeaderParams
-// -----------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetOutgoingCallHeaderParams(
- const TInt aCallId,
- TPhoneCmdParamCallHeaderData * aCallHeaderData )
- {
- SMC_MOCK_METHOD2( void, const TInt, aCallId,
- TPhoneCmdParamCallHeaderData *, aCallHeaderData )
- }
-
-
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::UpdateCallHeaderInfo
-// -----------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::UpdateCallHeaderInfo(
- const TInt aCallId,
- const TBool aWaitingCall,
- const TBool aVideoCall,
- TPhoneCmdParamCallHeaderData * aCallHeaderData )
- {
- SMC_MOCK_METHOD4( void, const TInt, aCallId,
- const TBool, aWaitingCall,
- const TBool, aVideoCall,
- TPhoneCmdParamCallHeaderData *, aCallHeaderData )
- }
-
-
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetCallHeaderType
-// -----------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetCallHeaderType(
- TInt aCallHeaderType )
- {
- SMC_MOCK_METHOD1( void, TInt, aCallHeaderType )
- }
-
-
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::CallHeaderType
-// -----------------------------------------------------------------------------
-//
-TInt PhoneCallHeaderUtil::CallHeaderType( ) const
- {
- SMC_MOCK_METHOD0( TInt )
- }
-
-
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetDivertIndication
-// -----------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetDivertIndication(
- const TBool aDivertIndication )
- {
- SMC_MOCK_METHOD1( void, const TBool, aDivertIndication )
- }
-
-
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::GetRemoteInfoData
-// -----------------------------------------------------------------------------
-//
-TBool PhoneCallHeaderUtil::GetRemoteInfoData(
- const TInt aCallId,
- TDes & aData ) const
- {
- SMC_MOCK_METHOD2( TBool, const TInt, aCallId,
- TDes &, aData )
- }
-
-
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::SetCallHeaderTexts
-// -----------------------------------------------------------------------------
-//
-void PhoneCallHeaderUtil::SetCallHeaderTexts(
- const TInt aCallId,
- const TBool aWaitingCall,
- const TBool aVideoCall,
- TPhoneCmdParamCallHeaderData * aCallHeaderData )
- {
- SMC_MOCK_METHOD4( void, const TInt, aCallId,
- const TBool, aWaitingCall,
- const TBool, aVideoCall,
- TPhoneCmdParamCallHeaderData *, aCallHeaderData )
- }
-
-
-// -----------------------------------------------------------------------------
// PhoneCallHeaderUtil::LabelText
// -----------------------------------------------------------------------------
//
@@ -162,6 +53,142 @@
// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::GetCliTexts
+// -----------------------------------------------------------------------------
+//
+void PhoneCallHeaderUtil::GetCliTexts(
+ TInt aCallId,
+ TDes & aCliText,
+ ClippingDirection & aCliClip,
+ TDes & aSecondaryCliText,
+ ClippingDirection & aSecondaryCliClip )
+ {
+ SMC_MOCK_METHOD5( void, TInt, aCallId,
+ TDes &, aCliText,
+ ClippingDirection &, aCliClip,
+ TDes &, aSecondaryCliText,
+ ClippingDirection &, aSecondaryCliClip )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::GetCli
+// -----------------------------------------------------------------------------
+//
+void PhoneCallHeaderUtil::GetCli(
+ TInt aCallId,
+ TDes & aCliText,
+ ClippingDirection & aClipping )
+ {
+ SMC_MOCK_METHOD3( void, TInt, aCallId,
+ TDes &, aCliText,
+ ClippingDirection &, aClipping )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::GetSecondaryCli
+// -----------------------------------------------------------------------------
+//
+void PhoneCallHeaderUtil::GetSecondaryCli(
+ TInt aCallId,
+ TDes & aSecondaryCliText,
+ ClippingDirection & aClipping )
+ {
+ SMC_MOCK_METHOD3( void, TInt, aCallId,
+ TDes &, aSecondaryCliText,
+ ClippingDirection &, aClipping )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::RemotePhoneNumber
+// -----------------------------------------------------------------------------
+//
+const TDesC & PhoneCallHeaderUtil::RemotePhoneNumber(
+ TInt aCallId ) const
+ {
+ SMC_MOCK_METHOD1( const TDesC &, TInt, aCallId )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::CallType
+// -----------------------------------------------------------------------------
+//
+TInt PhoneCallHeaderUtil::CallType(
+ const TInt aCallId )
+ {
+ SMC_MOCK_METHOD1( TInt, const TInt, aCallId )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::ServiceId
+// -----------------------------------------------------------------------------
+//
+TInt PhoneCallHeaderUtil::ServiceId(
+ const TInt aCallId )
+ {
+ SMC_MOCK_METHOD1( TInt, const TInt, aCallId )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::IsCallForwarded
+// -----------------------------------------------------------------------------
+//
+TBool PhoneCallHeaderUtil::IsCallForwarded(
+ TInt aCallId )
+ {
+ SMC_MOCK_METHOD1( TBool, TInt, aCallId )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::SecureSpecified
+// -----------------------------------------------------------------------------
+//
+TBool PhoneCallHeaderUtil::SecureSpecified( )
+ {
+ SMC_MOCK_METHOD0( TBool )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::Ciphering
+// -----------------------------------------------------------------------------
+//
+TBool PhoneCallHeaderUtil::Ciphering(
+ TInt aCallId )
+ {
+ SMC_MOCK_METHOD1( TBool, TInt, aCallId )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::CallState
+// -----------------------------------------------------------------------------
+//
+TInt PhoneCallHeaderUtil::CallState(
+ TInt aCallId ) const
+ {
+ SMC_MOCK_METHOD1( TInt, TInt, aCallId )
+ }
+
+
+// -----------------------------------------------------------------------------
+// PhoneCallHeaderUtil::CallerImage
+// -----------------------------------------------------------------------------
+//
+const TDesC & PhoneCallHeaderUtil::CallerImage(
+ const TInt aCallId )
+ {
+ SMC_MOCK_METHOD1( const TDesC &, const TInt, aCallId )
+ }
+
+
+// -----------------------------------------------------------------------------
// PhoneCallHeaderUtil::EmergencyHeaderText
// -----------------------------------------------------------------------------
//
@@ -182,37 +209,24 @@
// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::CallState
+// PhoneCallHeaderUtil::IsVoiceCall
// -----------------------------------------------------------------------------
//
-TInt PhoneCallHeaderUtil::CallState(
+TBool PhoneCallHeaderUtil::IsVoiceCall(
TInt aCallId ) const
{
- SMC_MOCK_METHOD1( TInt, TInt, aCallId )
+ SMC_MOCK_METHOD1( TBool, TInt, aCallId )
}
// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::LoadResource
+// PhoneCallHeaderUtil::IsVideoCall
// -----------------------------------------------------------------------------
//
-void PhoneCallHeaderUtil::LoadResource(
- TDes & aData,
- const TInt aResource ) const
+TBool PhoneCallHeaderUtil::IsVideoCall(
+ int aCallId ) const
{
- SMC_MOCK_METHOD2( void, TDes &, aData,
- const TInt, aResource )
+ SMC_MOCK_METHOD1( TBool, int, aCallId )
}
-// -----------------------------------------------------------------------------
-// PhoneCallHeaderUtil::LoadResource
-// -----------------------------------------------------------------------------
-//
-HBufC * PhoneCallHeaderUtil::LoadResource(
- const TInt aResource ) const
- {
- SMC_MOCK_METHOD1( HBufC *, const TInt, aResource )
- }
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/mocks/qtmobility/mock_xqsettingskey.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,123 @@
+/*
+* 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 "xqsettingskey.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// XQSettingsKey::XQSettingsKey
+// -----------------------------------------------------------------------------
+//
+XQSettingsKey::XQSettingsKey(
+ XQSettingsKey::Target target,
+ long int uid,
+ unsigned long int key )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsKey::~XQSettingsKey
+// -----------------------------------------------------------------------------
+//
+XQSettingsKey::~XQSettingsKey( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsKey::target
+// -----------------------------------------------------------------------------
+//
+XQSettingsKey::Target XQSettingsKey::target( ) const
+ {
+
+ XQSettingsKey::Target variable;
+ return variable;
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsKey::uid
+// -----------------------------------------------------------------------------
+//
+long int XQSettingsKey::uid( ) const
+ {
+ SMC_MOCK_METHOD0(long int)
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsKey::key
+// -----------------------------------------------------------------------------
+//
+unsigned long int XQSettingsKey::key( ) const
+ {
+ SMC_MOCK_METHOD0(unsigned long int)
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQPublishAndSubscribeSettingsKey::XQPublishAndSubscribeSettingsKey
+// -----------------------------------------------------------------------------
+//
+XQPublishAndSubscribeSettingsKey::XQPublishAndSubscribeSettingsKey(
+ long int categoryUid,
+ unsigned long int key ) :
+ XQSettingsKey( XQSettingsKey::TargetPublishAndSubscribe, categoryUid, key )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQPublishAndSubscribeSettingsKey::~XQPublishAndSubscribeSettingsKey
+// -----------------------------------------------------------------------------
+//
+XQPublishAndSubscribeSettingsKey::~XQPublishAndSubscribeSettingsKey( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQCentralRepositorySettingsKey::XQCentralRepositorySettingsKey
+// -----------------------------------------------------------------------------
+//
+XQCentralRepositorySettingsKey::XQCentralRepositorySettingsKey(
+ long int repositoryUid,
+ unsigned long int key ) :
+ XQSettingsKey( XQSettingsKey::TargetCentralRepository, repositoryUid, key )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQCentralRepositorySettingsKey::~XQCentralRepositorySettingsKey
+// -----------------------------------------------------------------------------
+//
+XQCentralRepositorySettingsKey::~XQCentralRepositorySettingsKey( )
+ {
+
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/mocks/qtmobility/mock_xqsettingsmanager.cpp Mon Oct 04 16:06:10 2010 +0300
@@ -0,0 +1,100 @@
+/*
+* 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 "xqsettingsmanager.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::XQSettingsManager
+// -----------------------------------------------------------------------------
+//
+XQSettingsManager::XQSettingsManager(
+ QObject * parent )
+ : QObject( parent )
+ {
+
+ }
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::~XQSettingsManager
+// -----------------------------------------------------------------------------
+//
+XQSettingsManager::~XQSettingsManager( )
+ {
+
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::readItemValue
+// -----------------------------------------------------------------------------
+//
+QVariant XQSettingsManager::readItemValue(
+ const XQSettingsKey & key,
+ XQSettingsManager::Type type )
+ {
+ SMC_MOCK_METHOD2( QVariant, const XQSettingsKey &, key, XQSettingsManager::Type, type )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::writeItemValue
+// -----------------------------------------------------------------------------
+//
+bool XQSettingsManager::writeItemValue(
+ const XQSettingsKey & key,
+ const QVariant & value )
+ {
+ SMC_MOCK_METHOD2( bool, const XQSettingsKey &, key, const QVariant &, value )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::startMonitoring
+// -----------------------------------------------------------------------------
+//
+bool XQSettingsManager::startMonitoring(
+ const XQSettingsKey & key,
+ XQSettingsManager::Type type )
+ {
+ SMC_MOCK_METHOD2( bool, const XQSettingsKey &, key, XQSettingsManager::Type, type )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::stopMonitoring
+// -----------------------------------------------------------------------------
+//
+bool XQSettingsManager::stopMonitoring(
+ const XQSettingsKey & key )
+ {
+ SMC_MOCK_METHOD1( bool, const XQSettingsKey &, key )
+ }
+
+
+// -----------------------------------------------------------------------------
+// XQSettingsManager::error
+// -----------------------------------------------------------------------------
+//
+XQSettingsManager::Error XQSettingsManager::error( ) const
+ {
+ SMC_MOCK_METHOD0( XQSettingsManager::Error )
+ }
+
+